har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-21 02:36:04 +02:00
parent 8be6552aa4
commit 832e6563df
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroskadec.c
View File

@ -46,6 +46,7 @@
#include "libavutil/mastering_display_metadata.h" #include "libavutil/mastering_display_metadata.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/time_internal.h" #include "libavutil/time_internal.h"
#include "libavutil/spherical.h" #include "libavutil/spherical.h"
@ -2184,7 +2185,7 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) {
color->chroma_siting_horz < MATROSKA_COLOUR_CHROMASITINGHORZ_NB && color->chroma_siting_horz < MATROSKA_COLOUR_CHROMASITINGHORZ_NB &&
color->chroma_siting_vert < MATROSKA_COLOUR_CHROMASITINGVERT_NB) { color->chroma_siting_vert < MATROSKA_COLOUR_CHROMASITINGVERT_NB) {
st->codecpar->chroma_location = st->codecpar->chroma_location =
avcodec_chroma_pos_to_enum((color->chroma_siting_horz - 1) << 7, av_chroma_location_pos_to_enum((color->chroma_siting_horz - 1) << 7,
(color->chroma_siting_vert - 1) << 7); (color->chroma_siting_vert - 1) << 7);
} }
if (color->max_cll && color->max_fall) { if (color->max_cll && color->max_fall) {

3
libavformat/matroskaenc.c
View File

@ -51,6 +51,7 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
@ -1322,7 +1323,7 @@ static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st,
par->chroma_location <= AVCHROMA_LOC_TOP) { par->chroma_location <= AVCHROMA_LOC_TOP) {
int xpos, ypos; int xpos, ypos;
avcodec_enum_to_chroma_pos(&xpos, &ypos, par->chroma_location); av_chroma_location_enum_to_pos(&xpos, &ypos, par->chroma_location);
ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ, ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ,
(xpos >> 7) + 1); (xpos >> 7) + 1);
ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT, ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT,