virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/flvdec: Use appropriate types in FLVMetaVideoColor

Browse Source 
This also reduce memory usage.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
This commit is contained in:
Zhao Zhili
2025-03-11 10:35:16 +08:00
parent f0cf122cf4
commit 888f5ea72b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/flvdec.c
View File

@ -60,11 +60,11 @@ typedef struct FLVMasteringMeta {
} FLVMasteringMeta; } FLVMasteringMeta;
typedef struct FLVMetaVideoColor { typedef struct FLVMetaVideoColor {
uint64_t matrix_coefficients; enum AVColorSpace matrix_coefficients;
uint64_t transfer_characteristics; enum AVColorTransferCharacteristic trc;
uint64_t primaries; enum AVColorPrimaries primaries;
uint64_t max_cll; uint16_t max_cll;
uint64_t max_fall; uint16_t max_fall;
FLVMasteringMeta mastering_meta; FLVMasteringMeta mastering_meta;
} FLVMetaVideoColor; } FLVMetaVideoColor;
@ -759,7 +759,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
if (!strcmp(key, "colorPrimaries")) { if (!strcmp(key, "colorPrimaries")) {
meta_video_color->primaries = num_val; meta_video_color->primaries = num_val;
} else if (!strcmp(key, "transferCharacteristics")) { } else if (!strcmp(key, "transferCharacteristics")) {
meta_video_color->transfer_characteristics = num_val; meta_video_color->trc = num_val;
} else if (!strcmp(key, "matrixCoefficients")) { } else if (!strcmp(key, "matrixCoefficients")) {
meta_video_color->matrix_coefficients = num_val; meta_video_color->matrix_coefficients = num_val;
} else if (!strcmp(key, "maxFall")) { } else if (!strcmp(key, "maxFall")) {
@ -1235,9 +1235,9 @@ static int flv_update_video_color_info(AVFormatContext *s, AVStream *st)
if (meta_video_color->primaries != AVCOL_PRI_RESERVED && if (meta_video_color->primaries != AVCOL_PRI_RESERVED &&
meta_video_color->primaries != AVCOL_PRI_RESERVED0) meta_video_color->primaries != AVCOL_PRI_RESERVED0)
st->codecpar->color_primaries = meta_video_color->primaries; st->codecpar->color_primaries = meta_video_color->primaries;
if (meta_video_color->transfer_characteristics != AVCOL_TRC_RESERVED && if (meta_video_color->trc != AVCOL_TRC_RESERVED &&
meta_video_color->transfer_characteristics != AVCOL_TRC_RESERVED0) meta_video_color->trc != AVCOL_TRC_RESERVED0)
st->codecpar->color_trc = meta_video_color->transfer_characteristics; st->codecpar->color_trc = meta_video_color->trc;
if (meta_video_color->max_cll && meta_video_color->max_fall) { if (meta_video_color->max_cll && meta_video_color->max_fall) {
size_t size = 0; size_t size = 0;