Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -48,6 +48,7 @@ void ff_dovi_ctx_unref(DOVIContext *s) · 47 unmodified lines | |||
| 48 | { | 48 | { |
| 49 | for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++) | 49 | for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++) |
| 50 | ff_refstruct_unref(&s->vdr[i]); | 50 | ff_refstruct_unref(&s->vdr[i]); |
| 51 | ff_refstruct_unref(&s->ext_blocks); | ||
| 51 | av_free(s->rpu_buf); | 52 | av_free(s->rpu_buf); |
| 52 | 53 | ||
| 53 | *s = (DOVIContext) { | 54 | *s = (DOVIContext) { |
| @@ -59,6 +60,7 @@ void ff_dovi_ctx_flush(DOVIContext *s) · 5 unmodified lines | |||
| 59 | { | 60 | { |
| 60 | for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++) | 61 | for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++) |
| 61 | ff_refstruct_unref(&s->vdr[i]); | 62 | ff_refstruct_unref(&s->vdr[i]); |
| 63 | ff_refstruct_unref(&s->ext_blocks); | ||
| 62 | 64 | ||
| 63 | *s = (DOVIContext) { | 65 | *s = (DOVIContext) { |
| 64 | .logctx = s->logctx, | 66 | .logctx = s->logctx, |
| @@ -77,6 +79,7 @@ void ff_dovi_ctx_replace(DOVIContext *s, const DOVIContext *s0) · 12 unmodified lines | |||
| 77 | s->dv_profile = s0->dv_profile; | 79 | s->dv_profile = s0->dv_profile; |
| 78 | for (int i = 0; i <= DOVI_MAX_DM_ID; i++) | 80 | for (int i = 0; i <= DOVI_MAX_DM_ID; i++) |
| 79 | ff_refstruct_replace(&s->vdr[i], s0->vdr[i]); | 81 | ff_refstruct_replace(&s->vdr[i], s0->vdr[i]); |
| 82 | ff_refstruct_replace(&s->ext_blocks, s0->ext_blocks); | ||
| 80 | } | 83 | } |
| 81 | 84 | ||
| 82 | void ff_dovi_update_cfg(DOVIContext *s, const AVDOVIDecoderConfigurationRecord *cfg) | 85 | void ff_dovi_update_cfg(DOVIContext *s, const AVDOVIDecoderConfigurationRecord *cfg) |
| @@ -44,6 +44,12 @@ typedef struct DOVIContext { · 43 unmodified lines | |||
| 44 | const AVDOVIDataMapping *mapping; | 44 | const AVDOVIDataMapping *mapping; |
| 45 | const AVDOVIColorMetadata *color; | 45 | const AVDOVIColorMetadata *color; |
| 46 | 46 | ||
| 47 | /** | ||
| 48 | * Currently active extension blocks, updates on every ff_dovi_rpu_parse() | ||
| 49 | */ | ||
| 50 | AVDOVIDmData *ext_blocks; | ||
| 51 | int num_ext_blocks; | ||
| 52 | |||
| 47 | /** | 53 | /** |
| 48 | * Private fields internal to dovi_rpu.c | 54 | * Private fields internal to dovi_rpu.c |
| 49 | */ | 55 | */ |