Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/matroska: write FlagInterlaced element in WebM

Browse Source 
It's listed as supported in both https://www.webmproject.org/docs/container/
and https://matroska.org/technical/specs/index.html

Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: James Almer <jamrial@gmail.com>
pull/237/merge
James Almer 8 years ago
parent ee72b6d187
commit 3cc9d6d382
1 changed files with 21 additions and 20 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. 41
      libavformat/matroskaenc.c

41
libavformat/matroskaenc.c
Unescape View File

@ -791,7 +791,7 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre
return 0; return 0;
} }
static void mkv_write_field_order(AVIOContext *pb, static void mkv_write_field_order(AVIOContext *pb, int mode,
enum AVFieldOrder field_order) enum AVFieldOrder field_order)
{ {
switch (field_order) { switch (field_order) {
@ -809,23 +809,25 @@ static void mkv_write_field_order(AVIOContext *pb,
case AV_FIELD_BT: case AV_FIELD_BT:
put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED, put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED,
MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED); MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED);
switch (field_order) { if (mode != MODE_WEBM) {
case AV_FIELD_TT: switch (field_order) {
put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, case AV_FIELD_TT:
MATROSKA_VIDEO_FIELDORDER_TT); put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
break; MATROSKA_VIDEO_FIELDORDER_TT);
case AV_FIELD_BB: break;
put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, case AV_FIELD_BB:
MATROSKA_VIDEO_FIELDORDER_BB); put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
break; MATROSKA_VIDEO_FIELDORDER_BB);
case AV_FIELD_TB: break;
put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, case AV_FIELD_TB:
MATROSKA_VIDEO_FIELDORDER_TB); put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
break; MATROSKA_VIDEO_FIELDORDER_TB);
case AV_FIELD_BT: break;
put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, case AV_FIELD_BT:
MATROSKA_VIDEO_FIELDORDER_BT); put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
break; MATROSKA_VIDEO_FIELDORDER_BT);
break;
}
} }
} }
} }
@ -1088,8 +1090,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width); put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width);
put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height); put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height);
if (mkv->mode != MODE_WEBM) mkv_write_field_order(pb, mkv->mode, par->field_order);
mkv_write_field_order(pb, par->field_order);
// check both side data and metadata for stereo information, // check both side data and metadata for stereo information,
// write the result to the bitstream if any is found // write the result to the bitstream if any is found

Write Preview
Loading…
Cancel
Save