----- Le 23 Aoû 16, à 4:03, Petter Reinholdtsen p...@hungry.com a écrit :
Hi. When trying to build ring on Debian Jessie, I ran into a problem with a few missing V4L2 defines missing. This patch make the problematic formats optional. It would be great if the patch was included in a future version of Ring. I do not have access to gerrit, so I did not try to push the patch that way. Sorry about that. My effort to get Ring working on Debian Jessie can be followed on <URL: https://bugs.debian.org/830265 >. diff --git a/daemon/src/media/video/v4l2/video_device_impl.cpp b/daemon/src/media/video/v4l2/video_device_impl.cpp index b8737b7..ab453f5 100644 --- a/daemon/src/media/video/v4l2/video_device_impl.cpp +++ b/daemon/src/media/video/v4l2/video_device_impl.cpp @@ -183,7 +183,9 @@ static const unsigned pixelformats_supported[] = { V4L2_PIX_FMT_MPEG, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_H264_NO_SC, +#ifdef V4L2_PIX_FMT_H264_MVC V4L2_PIX_FMT_H264_MVC, +#endif V4L2_PIX_FMT_H263, V4L2_PIX_FMT_MPEG1, V4L2_PIX_FMT_MPEG2, @@ -191,7 +193,9 @@ static const unsigned pixelformats_supported[] = { V4L2_PIX_FMT_XVID, V4L2_PIX_FMT_VC1_ANNEX_G, V4L2_PIX_FMT_VC1_ANNEX_L, +#ifdef V4L2_PIX_FMT_VP8 V4L2_PIX_FMT_VP8, +#endif #if 0 /* RGB formats */ @@ -488,7 +492,9 @@ VideoV4l2Rate::libAvPixelformat() const return "mpeg1video"; case V4L2_PIX_FMT_H264: case V4L2_PIX_FMT_H264_NO_SC: +#ifdef V4L2_PIX_FMT_H264_MVC case V4L2_PIX_FMT_H264_MVC: +#endif return "h264"; case V4L2_PIX_FMT_H263: return "h263"; @@ -499,8 +505,10 @@ VideoV4l2Rate::libAvPixelformat() const case V4L2_PIX_FMT_VC1_ANNEX_G: case V4L2_PIX_FMT_VC1_ANNEX_L: return "vc1"; +#ifdef V4L2_PIX_FMT_VP8 case V4L2_PIX_FMT_VP8: return "vp8"; +#endif default: // Most pixel formats do not need any codec return ""; } -- Happy hacking Petter Reinholdtsen _______________________________________________ Ring mailing list Ring@lists.savoirfairelinux.net https://lists.savoirfairelinux.net/mailman/listinfo/ring
