avformat/matroska*: Use av_chroma_location_(pos_to_enum|enum_to_pos)

Andreas Rheinhardt committed 4 years ago

Commit 832e6561 parent 8be65522 files · +5 −3Browse files

Unified · Split

2 files

libavformat/matroskadec.c +3 −2
libavformat/matroskaenc.c +2 −1

libavformat/matroskadec.c+3−2

@@ -46,6 +46,7 @@ · 45 unmodified lines
46	46	#include "libavutil/mastering_display_metadata.h"
47	47	#include "libavutil/mathematics.h"
48	48	#include "libavutil/opt.h"
	49	+#include "libavutil/pixdesc.h"
49	50	#include "libavutil/time_internal.h"
50	51	#include "libavutil/spherical.h"
51	52
@@ -2184,8 +2185,8 @@ static int mkv_parse_video_color(AVStream st, const MatroskaTrack track) { · 2132 unmodified lines
2184	2185	color->chroma_siting_horz < MATROSKA_COLOUR_CHROMASITINGHORZ_NB &&
2185	2186	color->chroma_siting_vert < MATROSKA_COLOUR_CHROMASITINGVERT_NB) {
2186	2187	st->codecpar->chroma_location =
2187		− avcodec_chroma_pos_to_enum((color->chroma_siting_horz - 1) << 7,
2188		− (color->chroma_siting_vert - 1) << 7);
	2188	+ av_chroma_location_pos_to_enum((color->chroma_siting_horz - 1) << 7,
	2189	+ (color->chroma_siting_vert - 1) << 7);
2189	2190	}
2190	2191	if (color->max_cll && color->max_fall) {
2191	2192	size_t size = 0;

libavformat/matroskaenc.c+2−1

@@ -51,6 +51,7 @@ · 50 unmodified lines
51	51	#include "libavutil/mathematics.h"
52	52	#include "libavutil/opt.h"
53	53	#include "libavutil/parseutils.h"
	54	+#include "libavutil/pixdesc.h"
54	55	#include "libavutil/random_seed.h"
55	56	#include "libavutil/rational.h"
56	57	#include "libavutil/samplefmt.h"
@@ -1322,7 +1323,7 @@ static void mkv_write_video_color(EbmlWriter writer, const AVStream st, · 1265 unmodified lines
1322	1323	par->chroma_location <= AVCHROMA_LOC_TOP) {
1323	1324	int xpos, ypos;
1324	1325
1325		− avcodec_enum_to_chroma_pos(&xpos, &ypos, par->chroma_location);
	1326	+ av_chroma_location_enum_to_pos(&xpos, &ypos, par->chroma_location);
1326	1327	ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ,
1327	1328	(xpos >> 7) + 1);
1328	1329	ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT,