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

lavc/vvcdec: export stream level VUI information

Browse Source 
Previously, VUI information was not exposed.
If the container lacks HDR metadata, HDR videos appear washed out

Command: mp4box -add hdr.mp4#video:colr=nclc,1,1,1 -new new.mp4 && ffprobe new.mp4
Before: Stream #0:0[0x1](und): Video: vvc (vvc1 / 0x31637676), yuv420p10le(bt709), 1920x1080, 12164 kb/s, 50 fps, 50 tbr, 90k tbn (default)
After:  Stream #0:0[0x1](und): Video: vvc (vvc1 / 0x31637676), yuv420p10le(tv, bt2020nc/bt2020/arib-std-b67), 1920x1080 [SAR 1:1 DAR 16:9], 12164 kb/s, 50 fps, 50 tbr, 90k tbn (default)

Reported-by: Barry Warburton <blwarburton@gmail.com>
This commit is contained in:
Nuo Mi
2025-02-03 17:17:51 +08:00
parent 2d9433f25b
commit bb8e95b650
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/vvc/ps.c
View File

@ -24,6 +24,7 @@
#include "libavcodec/cbs_h266.h"
#include "libavcodec/decode.h"
#include "libavcodec/h2645data.h"
#include "libavutil/mem.h"
#include "libavutil/pixdesc.h"
#include "libavutil/refstruct.h"
@ -181,11 +182,50 @@ static void sps_ladf(VVCSPS* sps)
}
}
#define EXTENDED_SAR 255
static void sps_vui(AVCodecContext *c, const H266RawVUI *vui)
{
AVRational sar = (AVRational){ 0, 1 };
if (vui->vui_aspect_ratio_info_present_flag) {
if (vui->vui_aspect_ratio_idc < FF_ARRAY_ELEMS(ff_h2645_pixel_aspect))
sar = ff_h2645_pixel_aspect[vui->vui_aspect_ratio_idc];
else if (vui->vui_aspect_ratio_idc == EXTENDED_SAR) {
sar = (AVRational){ vui->vui_sar_width, vui->vui_sar_height };
} else {
av_log(c, AV_LOG_WARNING, "Unknown SAR index: %u.\n", vui->vui_aspect_ratio_idc);
}
}
ff_set_sar(c, sar);
if (vui->vui_colour_description_present_flag) {
c->color_primaries = vui->vui_colour_primaries;
c->color_trc = vui->vui_transfer_characteristics;
c->colorspace = vui->vui_matrix_coeffs;
c->color_range = vui->vui_full_range_flag ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
// Set invalid values to "unspecified"
if (!av_color_primaries_name(c->color_primaries))
c->color_primaries = AVCOL_PRI_UNSPECIFIED;
if (!av_color_transfer_name(c->color_trc))
c->color_trc = AVCOL_TRC_UNSPECIFIED;
if (!av_color_space_name(c->colorspace))
c->colorspace = AVCOL_SPC_UNSPECIFIED;
} else {
c->color_primaries = AVCOL_PRI_UNSPECIFIED;
c->color_trc = AVCOL_TRC_UNSPECIFIED;
c->colorspace = AVCOL_SPC_UNSPECIFIED;
c->color_range = AVCOL_RANGE_MPEG;
}
}
static void sps_export_stream_params(AVCodecContext *c, const VVCSPS *sps)
{
const H266RawSPS *r = sps->r;
c->has_b_frames = !!r->sps_dpb_params.dpb_max_num_reorder_pics[r->sps_max_sublayers_minus1];
if (r->sps_vui_parameters_present_flag)
sps_vui(c, &r->vui);
}
static int sps_derive(VVCSPS *sps, AVCodecContext *c)