virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/matroskadec: support parsing Chroma Location elements

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2016-10-17 23:50:14 -03:00
parent d2ae5f77c6
commit 47ee6f1a59
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/matroska.h
View File

@@ -317,6 +317,20 @@ typedef enum {
MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN = 4, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN = 4,
} MatroskaVideoDisplayUnit; } MatroskaVideoDisplayUnit;
typedef enum {
MATROSKA_COLOUR_CHROMASITINGHORZ_UNDETERMINED = 0,
MATROSKA_COLOUR_CHROMASITINGHORZ_LEFT = 1,
MATROSKA_COLOUR_CHROMASITINGHORZ_HALF = 2,
MATROSKA_COLOUR_CHROMASITINGHORZ_NB
} MatroskaColourChromaSitingHorz;
typedef enum {
MATROSKA_COLOUR_CHROMASITINGVERT_UNDETERMINED = 0,
MATROSKA_COLOUR_CHROMASITINGVERT_TOP = 1,
MATROSKA_COLOUR_CHROMASITINGVERT_HALF = 2,
MATROSKA_COLOUR_CHROMASITINGVERT_NB
} MatroskaColourChromaSitingVert;
/* /*
* Matroska Codec IDs, strings * Matroska Codec IDs, strings
*/ */

8
libavformat/matroskadec.c
View File

@@ -1827,6 +1827,14 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) {
if (track->video.color.range != AVCOL_RANGE_UNSPECIFIED && if (track->video.color.range != AVCOL_RANGE_UNSPECIFIED &&
track->video.color.range <= AVCOL_RANGE_JPEG) track->video.color.range <= AVCOL_RANGE_JPEG)
st->codecpar->color_range = track->video.color.range; st->codecpar->color_range = track->video.color.range;
if (track->video.color.chroma_siting_horz != MATROSKA_COLOUR_CHROMASITINGHORZ_UNDETERMINED &&
track->video.color.chroma_siting_vert != MATROSKA_COLOUR_CHROMASITINGVERT_UNDETERMINED &&
track->video.color.chroma_siting_horz < MATROSKA_COLOUR_CHROMASITINGHORZ_NB &&
track->video.color.chroma_siting_vert < MATROSKA_COLOUR_CHROMASITINGVERT_NB) {
st->codecpar->chroma_location =
avcodec_chroma_pos_to_enum((track->video.color.chroma_siting_horz - 1) << 7,
(track->video.color.chroma_siting_vert - 1) << 7);
}
if (has_mastering_primaries || has_mastering_luminance) { if (has_mastering_primaries || has_mastering_luminance) {
// Use similar rationals as other standards. // Use similar rationals as other standards.