LAV
/
FFmpeg
1
0
Fork 0
Code

avcodec/dovi_rpu: Use RefStruct API for Vdr data 

It avoids allocations and the corresponding error checks.
Also avoids casts and indirections.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-08-04 12:53:28 +02:00
parent 05f557b259
commit 61bc8764d4
3 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libavcodec/dovi_rpu.c
View File

@ -26,6 +26,7 @@
#include "dovi_rpu.h" #include "dovi_rpu.h"
#include "golomb.h" #include "golomb.h"
#include "get_bits.h" #include "get_bits.h"
#include "refstruct.h"
enum { enum {
RPU_COEFF_FIXED = 0, RPU_COEFF_FIXED = 0,
@ -33,17 +34,17 @@ enum {
}; };
/** /**
* Private contents of vdr_ref. * Private contents of vdr.
*/ */
typedef struct DOVIVdrRef { typedef struct DOVIVdr {
AVDOVIDataMapping mapping; AVDOVIDataMapping mapping;
AVDOVIColorMetadata color; AVDOVIColorMetadata color;
} DOVIVdrRef; } DOVIVdr;
void ff_dovi_ctx_unref(DOVIContext *s) void ff_dovi_ctx_unref(DOVIContext *s)
{ {
for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr_ref); i++) for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++)
av_buffer_unref(&s->vdr_ref[i]); ff_refstruct_unref(&s->vdr[i]);
*s = (DOVIContext) { *s = (DOVIContext) {
.logctx = s->logctx, .logctx = s->logctx,
@ -52,8 +53,8 @@ void ff_dovi_ctx_unref(DOVIContext *s)
void ff_dovi_ctx_flush(DOVIContext *s) void ff_dovi_ctx_flush(DOVIContext *s)
{ {
for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr_ref); i++) for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++)
av_buffer_unref(&s->vdr_ref[i]); ff_refstruct_unref(&s->vdr[i]);
*s = (DOVIContext) { *s = (DOVIContext) {
.logctx = s->logctx, .logctx = s->logctx,
@ -61,23 +62,14 @@ void ff_dovi_ctx_flush(DOVIContext *s)
}; };
} }
int ff_dovi_ctx_replace(DOVIContext *s, const DOVIContext *s0) void ff_dovi_ctx_replace(DOVIContext *s, const DOVIContext *s0)
{ {
int ret;
s->logctx = s0->logctx; s->logctx = s0->logctx;
s->mapping = s0->mapping; s->mapping = s0->mapping;
s->color = s0->color; s->color = s0->color;
s->dv_profile = s0->dv_profile; s->dv_profile = s0->dv_profile;
for (int i = 0; i < DOVI_MAX_DM_ID; i++) { for (int i = 0; i < DOVI_MAX_DM_ID; i++)
if ((ret = av_buffer_replace(&s->vdr_ref[i], s0->vdr_ref[i])) < 0) ff_refstruct_replace(&s->vdr[i], s0->vdr[i]);
goto fail;
}
return 0;
fail:
ff_dovi_ctx_unref(s);
return ret;
} }
void ff_dovi_update_cfg(DOVIContext *s, const AVDOVIDecoderConfigurationRecord *cfg) void ff_dovi_update_cfg(DOVIContext *s, const AVDOVIDecoderConfigurationRecord *cfg)
@ -195,7 +187,7 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size)
{ {
AVDOVIRpuDataHeader *hdr = &s->header; AVDOVIRpuDataHeader *hdr = &s->header;
GetBitContext *gb = &(GetBitContext){0}; GetBitContext *gb = &(GetBitContext){0};
DOVIVdrRef *vdr; DOVIVdr *vdr;
int ret; int ret;
uint8_t nal_prefix; uint8_t nal_prefix;
@ -278,23 +270,23 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size)
if (use_prev_vdr_rpu) { if (use_prev_vdr_rpu) {
int prev_vdr_rpu_id = get_ue_golomb_31(gb); int prev_vdr_rpu_id = get_ue_golomb_31(gb);
VALIDATE(prev_vdr_rpu_id, 0, DOVI_MAX_DM_ID); VALIDATE(prev_vdr_rpu_id, 0, DOVI_MAX_DM_ID);
if (!s->vdr_ref[prev_vdr_rpu_id]) { if (!s->vdr[prev_vdr_rpu_id]) {
av_log(s->logctx, AV_LOG_ERROR, "Unknown previous RPU ID: %u\n", av_log(s->logctx, AV_LOG_ERROR, "Unknown previous RPU ID: %u\n",
prev_vdr_rpu_id); prev_vdr_rpu_id);
goto fail; goto fail;
} }
vdr = (DOVIVdrRef *) s->vdr_ref[prev_vdr_rpu_id]->data; vdr = s->vdr[prev_vdr_rpu_id];
s->mapping = &vdr->mapping; s->mapping = &vdr->mapping;
} else { } else {
int vdr_rpu_id = get_ue_golomb_31(gb); int vdr_rpu_id = get_ue_golomb_31(gb);
VALIDATE(vdr_rpu_id, 0, DOVI_MAX_DM_ID); VALIDATE(vdr_rpu_id, 0, DOVI_MAX_DM_ID);
if (!s->vdr_ref[vdr_rpu_id]) { if (!s->vdr[vdr_rpu_id]) {
s->vdr_ref[vdr_rpu_id] = av_buffer_allocz(sizeof(DOVIVdrRef)); s->vdr[vdr_rpu_id] = ff_refstruct_allocz(sizeof(DOVIVdr));
if (!s->vdr_ref[vdr_rpu_id]) if (!s->vdr[vdr_rpu_id])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
vdr = (DOVIVdrRef *) s->vdr_ref[vdr_rpu_id]->data; vdr = s->vdr[vdr_rpu_id];
s->mapping = &vdr->mapping; s->mapping = &vdr->mapping;
vdr->mapping.vdr_rpu_id = vdr_rpu_id; vdr->mapping.vdr_rpu_id = vdr_rpu_id;
@ -390,24 +382,24 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size)
int current_dm_id = get_ue_golomb_31(gb); int current_dm_id = get_ue_golomb_31(gb);
VALIDATE(affected_dm_id, 0, DOVI_MAX_DM_ID); VALIDATE(affected_dm_id, 0, DOVI_MAX_DM_ID);
VALIDATE(current_dm_id, 0, DOVI_MAX_DM_ID); VALIDATE(current_dm_id, 0, DOVI_MAX_DM_ID);
if (!s->vdr_ref[affected_dm_id]) { if (!s->vdr[affected_dm_id]) {
s->vdr_ref[affected_dm_id] = av_buffer_allocz(sizeof(DOVIVdrRef)); s->vdr[affected_dm_id] = ff_refstruct_allocz(sizeof(DOVIVdr));
if (!s->vdr_ref[affected_dm_id]) if (!s->vdr[affected_dm_id])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (!s->vdr_ref[current_dm_id]) { if (!s->vdr[current_dm_id]) {
av_log(s->logctx, AV_LOG_ERROR, "Unknown previous RPU DM ID: %u\n", av_log(s->logctx, AV_LOG_ERROR, "Unknown previous RPU DM ID: %u\n",
current_dm_id); current_dm_id);
goto fail; goto fail;
} }
/* Update current pointer based on current_dm_id */ /* Update current pointer based on current_dm_id */
vdr = (DOVIVdrRef *) s->vdr_ref[current_dm_id]->data; vdr = s->vdr[current_dm_id];
s->color = &vdr->color; s->color = &vdr->color;
/* Update values of affected_dm_id */ /* Update values of affected_dm_id */
vdr = (DOVIVdrRef *) s->vdr_ref[affected_dm_id]->data; vdr = s->vdr[affected_dm_id];
color = &vdr->color; color = &vdr->color;
color->dm_metadata_id = affected_dm_id; color->dm_metadata_id = affected_dm_id;
color->scene_refresh_flag = get_ue_golomb_31(gb); color->scene_refresh_flag = get_ue_golomb_31(gb);

4
libavcodec/dovi_rpu.h
View File

@ -47,12 +47,12 @@ typedef struct DOVIContext {
/** /**
* Private fields internal to dovi_rpu.c * Private fields internal to dovi_rpu.c
*/ */
AVBufferRef *vdr_ref[DOVI_MAX_DM_ID+1]; struct DOVIVdr *vdr[DOVI_MAX_DM_ID+1]; ///< RefStruct references
uint8_t dv_profile; uint8_t dv_profile;
} DOVIContext; } DOVIContext;
int ff_dovi_ctx_replace(DOVIContext *s, const DOVIContext *s0); void ff_dovi_ctx_replace(DOVIContext *s, const DOVIContext *s0);
/** /**
* Completely reset a DOVIContext, preserving only logctx. * Completely reset a DOVIContext, preserving only logctx.

4
libavcodec/hevcdec.c
View File

@ -3596,9 +3596,7 @@ static int hevc_update_thread_context(AVCodecContext *dst,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ff_dovi_ctx_replace(&s->dovi_ctx, &s0->dovi_ctx); ff_dovi_ctx_replace(&s->dovi_ctx, &s0->dovi_ctx);
if (ret < 0)
return ret;
ret = av_buffer_replace(&s->sei.common.dynamic_hdr_vivid.info, ret = av_buffer_replace(&s->sei.common.dynamic_hdr_vivid.info,
s0->sei.common.dynamic_hdr_vivid.info); s0->sei.common.dynamic_hdr_vivid.info);