History

avcodec/dovi_rpu: move ext blocks into dedicated struct

Slightly re-organize the logic around extension blocks in order to allow expanding the state tracking in a following commit.

Niklas Haas committed 2 years ago

Commit f5d6eb41 parent b3d33f14 files · +38 −23Browse files

Unified · Split

4 files
  1. libavcodec/dovi_rpu.c +0 −1
  2. libavcodec/dovi_rpu.h +7 −2
  3. libavcodec/dovi_rpudec.c +22 −13
  4. libavcodec/dovi_rpuenc.c +9 −7
libavcodec/dovi_rpu.c+0−1
@@ -66,7 +66,6 @@ void ff_dovi_ctx_replace(DOVIContext *s, const DOVIContext *s0) · 65 unmodified lines
66 for (int i = 0; i <= DOVI_MAX_DM_ID; i++)66 for (int i = 0; i <= DOVI_MAX_DM_ID; i++)
67 ff_refstruct_replace(&s->vdr[i], s0->vdr[i]);67 ff_refstruct_replace(&s->vdr[i], s0->vdr[i]);
68 ff_refstruct_replace(&s->ext_blocks, s0->ext_blocks);68 ff_refstruct_replace(&s->ext_blocks, s0->ext_blocks);
69 s->num_ext_blocks = s0->num_ext_blocks;
70}69}
71 70
72int ff_dovi_guess_profile_hevc(const AVDOVIRpuDataHeader *hdr)71int ff_dovi_guess_profile_hevc(const AVDOVIRpuDataHeader *hdr)
libavcodec/dovi_rpu.h+7−2
@@ -31,6 +31,12 @@ · 30 unmodified lines
31#include "codec_par.h"31#include "codec_par.h"
32 32
33#define DOVI_MAX_DM_ID 1533#define DOVI_MAX_DM_ID 15
34
35typedef struct DOVIExt {
36 AVDOVIDmData dm[AV_DOVI_MAX_EXT_BLOCKS];
37 int num_dm;
38} DOVIExt;
39
34typedef struct DOVIContext {40typedef struct DOVIContext {
35 void *logctx;41 void *logctx;
36 42
@@ -70,8 +76,7 @@ typedef struct DOVIContext { · 33 unmodified lines
70 * Currently active extension blocks, updates on every ff_dovi_rpu_parse()76 * Currently active extension blocks, updates on every ff_dovi_rpu_parse()
71 * or ff_dovi_rpu_generate().77 * or ff_dovi_rpu_generate().
72 */78 */
73 AVDOVIDmData *ext_blocks;79 DOVIExt *ext_blocks; ///< RefStruct, or NULL if no extension blocks
74 int num_ext_blocks;
75 80
76 /**81 /**
77 * Private fields internal to dovi_rpu.c82 * Private fields internal to dovi_rpu.c
libavcodec/dovi_rpudec.c+22−13
@@ -33,7 +33,7 @@ · 32 unmodified lines
33int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata)33int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata)
34{34{
35 AVDOVIMetadata *dovi;35 AVDOVIMetadata *dovi;
36 size_t dovi_size, ext_sz;36 size_t dovi_size;
37 37
38 if (!s->mapping || !s->color)38 if (!s->mapping || !s->color)
39 return 0; /* incomplete dovi metadata */39 return 0; /* incomplete dovi metadata */
@@ -47,10 +47,14 @@ int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata) · 7 unmodified lines
47 COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, ext_mapping_idc_5_7);47 COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, ext_mapping_idc_5_7);
48 COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots);48 COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots);
49 COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal);49 COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal);
50 ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size);50
51 for (int i = 0; i < s->num_ext_blocks; i++)51 if (s->ext_blocks) {
52 memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz);52 const DOVIExt *ext = s->ext_blocks;
53 dovi->num_ext_blocks = s->num_ext_blocks;53 size_t ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size);
54 for (int i = 0; i < ext->num_dm; i++)
55 memcpy(av_dovi_get_ext(dovi, i), &ext->dm[i], ext_sz);
56 dovi->num_ext_blocks = ext->num_dm;
57 }
54 58
55 *out_metadata = dovi;59 *out_metadata = dovi;
56 return dovi_size;60 return dovi_size;
@@ -279,20 +283,24 @@ static int parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, · 222 unmodified lines
279static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver)283static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver)
280{284{
281 int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret;285 int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret;
286 DOVIExt *ext = s->ext_blocks;
282 287
283 num_ext_blocks = get_ue_golomb_31(gb);288 num_ext_blocks = get_ue_golomb_31(gb);
284 align_get_bits(gb);289 align_get_bits(gb);
285 if (s->num_ext_blocks + num_ext_blocks > AV_DOVI_MAX_EXT_BLOCKS)
286 return AVERROR_INVALIDDATA;
287 290
288 if (!s->ext_blocks) {291 if (!ext) {
289 s->ext_blocks = ff_refstruct_allocz(sizeof(AVDOVIDmData) * AV_DOVI_MAX_EXT_BLOCKS);292 ext = s->ext_blocks = ff_refstruct_allocz(sizeof(*s->ext_blocks));
290 if (!s->ext_blocks)293 if (!ext)
291 return AVERROR(ENOMEM);294 return AVERROR(ENOMEM);
292 }295 }
293 296
294 while (num_ext_blocks--) {297 while (num_ext_blocks--) {
295 AVDOVIDmData *dm = &s->ext_blocks[s->num_ext_blocks++];298 AVDOVIDmData *dm;
299
300 if (ext->num_dm >= FF_ARRAY_ELEMS(ext->dm))
301 return AVERROR_INVALIDDATA;
302 dm = &ext->dm[ext->num_dm++];
303
296 ext_block_length = get_ue_golomb_31(gb);304 ext_block_length = get_ue_golomb_31(gb);
297 dm->level = get_bits(gb, 8);305 dm->level = get_bits(gb, 8);
298 start_pos = get_bits_count(gb);306 start_pos = get_bits_count(gb);
@@ -666,7 +674,8 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, · 367 unmodified lines
666 color->source_diagonal = get_bits(gb, 10);674 color->source_diagonal = get_bits(gb, 10);
667 675
668 /* Parse extension blocks */676 /* Parse extension blocks */
669 s->num_ext_blocks = 0;677 if (s->ext_blocks)
678 s->ext_blocks->num_dm = 0;
670 if ((ret = parse_ext_blocks(s, gb, 1)) < 0) {679 if ((ret = parse_ext_blocks(s, gb, 1)) < 0) {
671 ff_dovi_ctx_unref(s);680 ff_dovi_ctx_unref(s);
672 return ret;681 return ret;
@@ -680,7 +689,7 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, · 7 unmodified lines
680 }689 }
681 } else {690 } else {
682 s->color = &ff_dovi_color_default;691 s->color = &ff_dovi_color_default;
683 s->num_ext_blocks = 0;692 ff_refstruct_unref(&s->ext_blocks);
684 }693 }
685 694
686 return 0;695 return 0;
libavcodec/dovi_rpuenc.c+9−7
@@ -583,7 +583,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, · 582 unmodified lines
583 }583 }
584 584
585 if (metadata->num_ext_blocks && !s->ext_blocks) {585 if (metadata->num_ext_blocks && !s->ext_blocks) {
586 s->ext_blocks = ff_refstruct_allocz(sizeof(AVDOVIDmData) * AV_DOVI_MAX_EXT_BLOCKS);586 s->ext_blocks = ff_refstruct_allocz(sizeof(*s->ext_blocks));
587 if (!s->ext_blocks)587 if (!s->ext_blocks)
588 return AVERROR(ENOMEM);588 return AVERROR(ENOMEM);
589 }589 }
@@ -717,7 +717,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, · 127 unmodified lines
717 }717 }
718 718
719 if (vdr_dm_metadata_present) {719 if (vdr_dm_metadata_present) {
720 size_t ext_sz;720 DOVIExt *ext = s->ext_blocks;
721 const int denom = profile == 4 ? (1 << 30) : (1 << 28);721 const int denom = profile == 4 ? (1 << 30) : (1 << 28);
722 set_ue_golomb(pb, color->dm_metadata_id); /* affected_dm_id */722 set_ue_golomb(pb, color->dm_metadata_id); /* affected_dm_id */
723 set_ue_golomb(pb, color->dm_metadata_id); /* current_dm_id */723 set_ue_golomb(pb, color->dm_metadata_id); /* current_dm_id */
@@ -756,13 +756,15 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, · 32 unmodified lines
756 generate_ext_v2(pb, av_dovi_get_ext(metadata, i));756 generate_ext_v2(pb, av_dovi_get_ext(metadata, i));
757 }757 }
758 758
759 ext_sz = FFMIN(sizeof(AVDOVIDmData), metadata->ext_block_size);759 if (ext) {
760 for (int i = 0; i < metadata->num_ext_blocks; i++)760 size_t ext_sz = FFMIN(sizeof(AVDOVIDmData), metadata->ext_block_size);
761 memcpy(&s->ext_blocks[i], av_dovi_get_ext(metadata, i), ext_sz);761 for (int i = 0; i < metadata->num_ext_blocks; i++)
762 s->num_ext_blocks = metadata->num_ext_blocks;762 memcpy(&ext->dm[i], av_dovi_get_ext(metadata, i), ext_sz);
763 ext->num_dm = metadata->num_ext_blocks;
764 }
763 } else {765 } else {
764 s->color = &ff_dovi_color_default;766 s->color = &ff_dovi_color_default;
765 s->num_ext_blocks = 0;767 ff_refstruct_unref(&s->ext_blocks);
766 }768 }
767 769
768 flush_put_bits(pb);770 flush_put_bits(pb);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t