Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
pull/13383/head
Alexander Reshetnikov 13 years ago
parent aea24ffcd5
commit e00f1e3911
2 changed files with 8 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/highgui/src/cap_ffmpeg_impl.hpp
  2. 6
      modules/highgui/src/cap_ffmpeg_impl_v2.hpp

6
modules/highgui/src/cap_ffmpeg_impl.hpp
Unescape View File

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

6
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save