MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dovi_rpu: expose guess_profile(), clarify semantics 

To allow internally re-using it for both the encoder and decoder.

This is based on HEVC only, H.264/AV1 use their own (hopefully correctly
signalled) profiles (and in particular, the AV1 decoders implicitly
default the correct profile in the absence of a configuration record).
This commit is contained in:
Niklas Haas 2024-03-22 21:25:35 +01:00
parent dbfd979c1b
commit 2a99d3527b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dovi_rpu.c
View File

@ -121,7 +121,7 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame)
return 0;
}
static int guess_profile(const AVDOVIRpuDataHeader *hdr)
int ff_dovi_guess_profile_hevc(const AVDOVIRpuDataHeader *hdr)
{
switch (hdr->vdr_rpu_profile) {
case 0:
@ -510,7 +510,7 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size,
use_prev_vdr_rpu = get_bits1(gb);
use_nlq = (hdr->rpu_format & 0x700) == 0 && !hdr->disable_residual_flag;
profile = s->cfg.dv_profile ? s->cfg.dv_profile : guess_profile(hdr);
profile = s->cfg.dv_profile ? s->cfg.dv_profile : ff_dovi_guess_profile_hevc(hdr);
if (profile == 5 && use_nlq) {
av_log(s->logctx, AV_LOG_ERROR, "Profile 5 RPUs should not use NLQ\n");
goto fail;

11
libavcodec/dovi_rpu.h
View File

@ -87,6 +87,10 @@ void ff_dovi_ctx_flush(DOVIContext *s);
* DOVIContext struct.
*
* Returns 0 or an error code.
*
* Note: `DOVIContext.cfg` should be initialized before calling into this
* function. If not done, the profile will be guessed according to HEVC
* semantics.
*/
int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size,
int err_recognition);
@ -96,4 +100,11 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size,
*/
int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame);
/**
* Internal helper function to guess the correct DV profile for HEVC.
*
* Returns the profile number or 0 if unknown.
*/
int ff_dovi_guess_profile_hevc(const AVDOVIRpuDataHeader *hdr);
#endif /* AVCODEC_DOVI_RPU_H */