Merge pull request #84 from RanAwaySuccessfully/master
Feature: add device format support on Linux
This commit is contained in:
commit
9e61fcf1ea
2 changed files with 36 additions and 0 deletions
|
|
@ -18,6 +18,8 @@ if os.name == 'nt':
|
|||
else:
|
||||
parser.add_argument("-W", "--width", type=int, help="Set raw RGB width", default=640)
|
||||
parser.add_argument("-H", "--height", type=int, help="Set raw RGB height", default=360)
|
||||
if sys.platform == 'linux':
|
||||
parser.add_argument("--dformat", type=str, help="Set which device format to use (MJPG, YUYV, RGB3, ...)", default=None)
|
||||
parser.add_argument("-F", "--fps", type=int, help="Set camera frames per second", default=24)
|
||||
parser.add_argument("-c", "--capture", help="Set camera ID (0, 1...) or video file", default="0")
|
||||
parser.add_argument("-M", "--mirror-input", action="store_true", help="Process a mirror image of the input video")
|
||||
|
|
@ -162,6 +164,8 @@ if os.name == 'nt':
|
|||
input_reader = InputReader(args.capture, args.raw_rgb, args.width, args.height, fps, use_dshowcapture=use_dshowcapture_flag, dcap=dcap)
|
||||
if args.dcap == -1 and type(input_reader) == DShowCaptureReader:
|
||||
fps = min(fps, input_reader.device.get_fps())
|
||||
elif sys.platform == 'linux' and args.dformat:
|
||||
input_reader = InputReader(args.capture, args.raw_rgb, args.width, args.height, fps, dcap=args.dformat)
|
||||
else:
|
||||
input_reader = InputReader(args.capture, args.raw_rgb, args.width, args.height, fps)
|
||||
if type(input_reader.reader) == VideoReader:
|
||||
|
|
|
|||
|
|
@ -121,6 +121,30 @@ class OpenCVReader(VideoReader):
|
|||
def close(self):
|
||||
super(OpenCVReader, self).close()
|
||||
|
||||
class V4L2Reader(OpenCVReader):
|
||||
def __init__(self, capture, width, height, fps, dformat):
|
||||
self.cap = cv2.VideoCapture(capture, cv2.CAP_V4L2)
|
||||
if dformat:
|
||||
fourcc = cv2.VideoWriter.fourcc(*dformat)
|
||||
self.cap.set(6, fourcc)
|
||||
self.device = None
|
||||
self.width = width
|
||||
self.height = height
|
||||
self.fps = fps
|
||||
self.name = str(capture)
|
||||
self.cap.set(3, width)
|
||||
self.cap.set(4, height)
|
||||
self.cap.set(38, 1)
|
||||
self.cap.set(5, fps)
|
||||
def is_open(self):
|
||||
return super(V4L2Reader, self).is_open()
|
||||
def is_ready(self):
|
||||
return super(V4L2Reader, self).is_ready()
|
||||
def read(self):
|
||||
return super(V4L2Reader, self).read()
|
||||
def close(self):
|
||||
super(V4L2Reader, self).close()
|
||||
|
||||
class RawReader:
|
||||
def __init__(self, width, height):
|
||||
self.width = int(width)
|
||||
|
|
@ -232,6 +256,14 @@ class InputReader():
|
|||
print(f"Escapi failed. Falling back to OpenCV. If this fails, please change your camera settings.", file=sys.stderr)
|
||||
self.reader = OpenCVReader(int(capture), width, height, fps)
|
||||
self.name = self.reader.name
|
||||
elif sys.platform == 'linux':
|
||||
try:
|
||||
self.reader = V4L2Reader(int(capture), width, height, fps, dcap)
|
||||
except:
|
||||
print("V4L2 exception: ")
|
||||
traceback.print_exc()
|
||||
print(f"V4L2 failed. Falling back to OpenCV. If this fails, please change your camera settings.", file=sys.stderr)
|
||||
self.reader = OpenCVReader(int(capture), width, height, fps)
|
||||
else:
|
||||
self.reader = OpenCVReader(int(capture), width, height, fps)
|
||||
except Exception as e:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue