ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Mar 19 20:58:40 2025 -0300| [3e0b38ed7ff1e9bd740c7e1d66695895146ce429] | committer: James Almer
avcodec/cbs_av1: also store a pointer to the start of the tile group data This will be useful a following commit, where the offset of the Tile Group inside a Frame OBU needs to be known. Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e0b38ed7ff1e9bd740c7e1d66695895146ce429 --- libavcodec/cbs_av1.c | 91 ++++++++++++++++++++++-------------- libavcodec/cbs_av1.h | 4 ++ libavcodec/cbs_av1_syntax_template.c | 2 - 3 files changed, 60 insertions(+), 37 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index fea079379b..d7862a2e48 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -782,7 +782,8 @@ fail: static int cbs_av1_ref_tile_data(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit, GetBitContext *gbc, - AV1RawTileData *td) + AVBufferRef **data_ref, + uint8_t **data, size_t *data_size) { int pos; @@ -795,12 +796,12 @@ static int cbs_av1_ref_tile_data(CodedBitstreamContext *ctx, // Must be byte-aligned at this point. av_assert0(pos % 8 == 0); - td->data_ref = av_buffer_ref(unit->data_ref); - if (!td->data_ref) + *data_ref = av_buffer_ref(unit->data_ref); + if (!*data_ref) return AVERROR(ENOMEM); - td->data = unit->data + pos / 8; - td->data_size = unit->data_size - pos / 8; + *data = unit->data + pos / 8; + *data_size = unit->data_size - pos / 8; return 0; } @@ -901,28 +902,31 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, return err; } break; - case AV1_OBU_TILE_GROUP: - { - err = cbs_av1_read_tile_group_obu(ctx, &gbc, - &obu->obu.tile_group); + case AV1_OBU_FRAME: + err = cbs_av1_read_frame_obu(ctx, &gbc, &obu->obu.frame, + unit->data_ref); if (err < 0) return err; - + // fall-through + case AV1_OBU_TILE_GROUP: + { + AV1RawTileGroup *tile_group = obu->header.obu_type == AV1_OBU_FRAME ? &obu->obu.frame.tile_group + : &obu->obu.tile_group; err = cbs_av1_ref_tile_data(ctx, unit, &gbc, - &obu->obu.tile_group.tile_data); + &tile_group->data_ref, + &tile_group->data, + &tile_group->data_size); if (err < 0) return err; - } - break; - case AV1_OBU_FRAME: - { - err = cbs_av1_read_frame_obu(ctx, &gbc, &obu->obu.frame, - unit->data_ref); + + err = cbs_av1_read_tile_group_obu(ctx, &gbc, tile_group); if (err < 0) return err; err = cbs_av1_ref_tile_data(ctx, unit, &gbc, - &obu->obu.frame.tile_group.tile_data); + &tile_group->tile_data.data_ref, + &tile_group->tile_data.data, + &tile_group->tile_data.data_size); if (err < 0) return err; } @@ -935,7 +939,9 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, return err; err = cbs_av1_ref_tile_data(ctx, unit, &gbc, - &obu->obu.tile_list.tile_data); + &obu->obu.tile_list.tile_data.data_ref, + &obu->obu.tile_list.tile_data.data, + &obu->obu.tile_list.tile_data.data_size); if (err < 0) return err; } @@ -1065,23 +1071,20 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, goto error; } break; - case AV1_OBU_TILE_GROUP: - { - err = cbs_av1_write_tile_group_obu(ctx, pbc, - &obu->obu.tile_group); + case AV1_OBU_FRAME: + err = cbs_av1_write_frame_obu(ctx, pbc, &obu->obu.frame, NULL); if (err < 0) goto error; - - td = &obu->obu.tile_group.tile_data; - } - break; - case AV1_OBU_FRAME: + // fall-through + case AV1_OBU_TILE_GROUP: { - err = cbs_av1_write_frame_obu(ctx, pbc, &obu->obu.frame, NULL); + AV1RawTileGroup *tile_group = obu->header.obu_type == AV1_OBU_FRAME ? &obu->obu.frame.tile_group + : &obu->obu.tile_group; + err = cbs_av1_write_tile_group_obu(ctx, pbc, tile_group); if (err < 0) goto error; - td = &obu->obu.frame.tile_group.tile_data; + td = &tile_group->tile_data; } break; case AV1_OBU_TILE_LIST: @@ -1258,11 +1261,29 @@ static const CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = { CBS_UNIT_TYPE_POD(AV1_OBU_TEMPORAL_DELIMITER, AV1RawOBU), CBS_UNIT_TYPE_POD(AV1_OBU_FRAME_HEADER, AV1RawOBU), CBS_UNIT_TYPE_POD(AV1_OBU_REDUNDANT_FRAME_HEADER, AV1RawOBU), - - CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_TILE_GROUP, AV1RawOBU, - obu.tile_group.tile_data.data), - CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_FRAME, AV1RawOBU, - obu.frame.tile_group.tile_data.data), + { + .nb_unit_types = 1, + .unit_type.list[0] = AV1_OBU_TILE_GROUP, + .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, + .content_size = sizeof(AV1RawOBU), + .type.ref = { + .nb_offsets = 2, + .offsets = { offsetof(AV1RawOBU, obu.tile_group.data), + offsetof(AV1RawOBU, obu.tile_group.tile_data.data) } + }, + }, + + { + .nb_unit_types = 1, + .unit_type.list[0] = AV1_OBU_FRAME, + .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, + .content_size = sizeof(AV1RawOBU), + .type.ref = { + .nb_offsets = 2, + .offsets = { offsetof(AV1RawOBU, obu.frame.tile_group.data), + offsetof(AV1RawOBU, obu.frame.tile_group.tile_data.data) } + }, + }, CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_TILE_LIST, AV1RawOBU, obu.tile_list.tile_data.data), CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_PADDING, AV1RawOBU, diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 8586f2bf4a..62c7720142 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -295,6 +295,10 @@ typedef struct AV1RawTileData { } AV1RawTileData; typedef struct AV1RawTileGroup { + uint8_t *data; + AVBufferRef *data_ref; + size_t data_size; + uint8_t tile_start_and_end_present_flag; uint16_t tg_start; uint16_t tg_end; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index a4a912482c..62a83945ec 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1865,8 +1865,6 @@ static int FUNC(frame_obu)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(byte_alignment)(ctx, rw)); - CHECK(FUNC(tile_group_obu)(ctx, rw, ¤t->tile_group)); - return 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
