Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400)

e00f1e39 · Alexander Reshetnikov · aea24ffc · e00f1e39 · e00f1e39
隐藏空白更改
内联并排

Showing with 8 addition and 4 deletion

modules/highgui/src/cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +4 -2

modules/highgui/src/cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +4 -2

未找到文件。
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -1262,8 +1262,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
      bitrate_scale = 128;
      break;
    case CODEC_ID_RAWVIDEO:
-      codec_pix_fmt = input_pix_fmt;
-      break;
+        codec_pix_fmt = input_pix_fmt == PIX_FMT_GRAY8 ||
+                        input_pix_fmt == PIX_FMT_GRAY16LE ||
+                        input_pix_fmt == PIX_FMT_GRAY16BE ? input_pix_fmt : PIX_FMT_YUV420P;
+        break;
    default:
        // good for lossy formats, MPEG, etc.
        codec_pix_fmt = PIX_FMT_YUV420P;

--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -1372,8 +1372,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
      bitrate_scale = 128;
      break;
    case CODEC_ID_RAWVIDEO:
-      codec_pix_fmt = input_pix_fmt;
-      break;
+        codec_pix_fmt = input_pix_fmt == PIX_FMT_GRAY8 ||
+                        input_pix_fmt == PIX_FMT_GRAY16LE ||
+                        input_pix_fmt == PIX_FMT_GRAY16BE ? input_pix_fmt : PIX_FMT_YUV420P;
+        break;
    default:
        // good for lossy formats, MPEG, etc.
        codec_pix_fmt = PIX_FMT_YUV420P;