generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'

Browse Source 
* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
  matroska: Support interlaced content correctly

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-08 22:58:18 +01:00
commit f3972b3b7d
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/matroska.h
View File

@ -119,6 +119,7 @@
#define MATROSKA_ID_VIDEOPIXELCROPR 0x54DD #define MATROSKA_ID_VIDEOPIXELCROPR 0x54DD
#define MATROSKA_ID_VIDEODISPLAYUNIT 0x54B2 #define MATROSKA_ID_VIDEODISPLAYUNIT 0x54B2
#define MATROSKA_ID_VIDEOFLAGINTERLACED 0x9A #define MATROSKA_ID_VIDEOFLAGINTERLACED 0x9A
#define MATROSKA_ID_VIDEOFIELDORDER 0x9D
#define MATROSKA_ID_VIDEOSTEREOMODE 0x53B8 #define MATROSKA_ID_VIDEOSTEREOMODE 0x53B8
#define MATROSKA_ID_VIDEOALPHAMODE 0x53C0 #define MATROSKA_ID_VIDEOALPHAMODE 0x53C0
#define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3 #define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3
@ -274,6 +275,21 @@ typedef enum {
MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP = 3, MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP = 3,
} MatroskaTrackEncodingCompAlgo; } MatroskaTrackEncodingCompAlgo;
typedef enum {
MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED = 0,
MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED = 1,
MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE = 2
} MatroskaVideoInterlaceFlag;
typedef enum {
MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE = 0,
MATROSKA_VIDEO_FIELDORDER_UNDETERMINED = 2,
MATROSKA_VIDEO_FIELDORDER_TT = 1,
MATROSKA_VIDEO_FIELDORDER_BB = 6,
MATROSKA_VIDEO_FIELDORDER_BT = 9,
MATROSKA_VIDEO_FIELDORDER_TB = 14,
} MatroskaVideoFieldOrder;
typedef enum { typedef enum {
MATROSKA_VIDEO_STEREOMODE_TYPE_MONO = 0, MATROSKA_VIDEO_STEREOMODE_TYPE_MONO = 0,
MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT = 1, MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT = 1,

31
libavformat/matroskadec.c
View File

@ -168,6 +168,8 @@ typedef struct MatroskaTrackVideo {
uint64_t pixel_width; uint64_t pixel_width;
uint64_t pixel_height; uint64_t pixel_height;
EbmlBin color_space; EbmlBin color_space;
uint64_t interlaced;
uint64_t field_order;
uint64_t stereo_mode; uint64_t stereo_mode;
uint64_t alpha_mode; uint64_t alpha_mode;
MatroskaTrackVideoColor color; MatroskaTrackVideoColor color;
@ -434,7 +436,8 @@ static const EbmlSyntax matroska_track_video[] = {
{ MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE },
{ MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE },
{ MATROSKA_ID_VIDEODISPLAYUNIT, EBML_NONE }, { MATROSKA_ID_VIDEODISPLAYUNIT, EBML_NONE },
{ MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_NONE }, { MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_UINT, 0, offsetof(MatroskaTrackVideo, interlaced), { .u = MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED } },
{ MATROSKA_ID_VIDEOFIELDORDER, EBML_UINT, 0, offsetof(MatroskaTrackVideo, field_order), { .u = MATROSKA_VIDEO_FIELDORDER_UNDETERMINED } },
{ MATROSKA_ID_VIDEOSTEREOMODE, EBML_UINT, 0, offsetof(MatroskaTrackVideo, stereo_mode), { .u = MATROSKA_VIDEO_STEREOMODE_TYPE_NB } }, { MATROSKA_ID_VIDEOSTEREOMODE, EBML_UINT, 0, offsetof(MatroskaTrackVideo, stereo_mode), { .u = MATROSKA_VIDEO_STEREOMODE_TYPE_NB } },
{ MATROSKA_ID_VIDEOASPECTRATIO, EBML_NONE }, { MATROSKA_ID_VIDEOASPECTRATIO, EBML_NONE },
{ 0 } { 0 }
@ -1749,7 +1752,28 @@ static int matroska_parse_flac(AVFormatContext *s,
return 0; return 0;
} }
static void mkv_stereo_mode_display_mul(int stereo_mode, int *h_width, int *h_height) static int mkv_field_order(int64_t field_order)
{
switch (field_order) {
case MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE:
return AV_FIELD_PROGRESSIVE;
case MATROSKA_VIDEO_FIELDORDER_UNDETERMINED:
return AV_FIELD_UNKNOWN;
case MATROSKA_VIDEO_FIELDORDER_TT:
return AV_FIELD_TT;
case MATROSKA_VIDEO_FIELDORDER_BB:
return AV_FIELD_BB;
case MATROSKA_VIDEO_FIELDORDER_BT:
return AV_FIELD_BT;
case MATROSKA_VIDEO_FIELDORDER_TB:
return AV_FIELD_TB;
default:
return AV_FIELD_UNKNOWN;
}
}
static void mkv_stereo_mode_display_mul(int stereo_mode,
int *h_width, int *h_height)
{ {
switch (stereo_mode) { switch (stereo_mode) {
case MATROSKA_VIDEO_STEREOMODE_TYPE_MONO: case MATROSKA_VIDEO_STEREOMODE_TYPE_MONO:
@ -2255,6 +2279,9 @@ static int matroska_parse_tracks(AVFormatContext *s)
st->codecpar->width = track->video.pixel_width; st->codecpar->width = track->video.pixel_width;
st->codecpar->height = track->video.pixel_height; st->codecpar->height = track->video.pixel_height;
if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED)
st->codecpar->field_order = mkv_field_order(track->video.field_order);
if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB)
mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul); mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul);