virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/cbs_av1: add a range check to tg_end

Browse Source 
Section 6.10.1 of the AV1 spec states:

It is a requirement of bitstream conformance that the value of tg_start is
equal to the value of TileNum at the point that tile_group_obu is invoked.
It is a requirement of bitstream conformance that the value of tg_end is
greater than or equal to tg_start.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-10-27 18:25:06 -03:00
parent ddb0e4fecd
commit a876bc9c17
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/cbs_av1.c
View File

@ -1205,6 +1205,7 @@ static void cbs_av1_flush(CodedBitstreamContext *ctx)
memset(priv->ref, 0, sizeof(priv->ref)); memset(priv->ref, 0, sizeof(priv->ref));
priv->operating_point_idc = 0; priv->operating_point_idc = 0;
priv->seen_frame_header = 0; priv->seen_frame_header = 0;
priv->tile_num = 0;
} }
static void cbs_av1_close(CodedBitstreamContext *ctx) static void cbs_av1_close(CodedBitstreamContext *ctx)

1
libavcodec/cbs_av1.h
View File

@ -446,6 +446,7 @@ typedef struct CodedBitstreamAV1Context {
int all_lossless; int all_lossless;
int tile_cols; int tile_cols;
int tile_rows; int tile_rows;
int tile_num;
AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES]; AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES];
} CodedBitstreamAV1Context; } CodedBitstreamAV1Context;

8
libavcodec/cbs_av1_syntax_template.c
View File

@ -1725,6 +1725,8 @@ static int FUNC(frame_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
CHECK(FUNC(uncompressed_header)(ctx, rw, current)); CHECK(FUNC(uncompressed_header)(ctx, rw, current));
priv->tile_num = 0;
if (current->show_existing_frame) { if (current->show_existing_frame) {
priv->seen_frame_header = 0; priv->seen_frame_header = 0;
} else { } else {
@ -1790,10 +1792,12 @@ static int FUNC(tile_group_obu)(CodedBitstreamContext *ctx, RWContext *rw,
} else { } else {
tile_bits = cbs_av1_tile_log2(1, priv->tile_cols) + tile_bits = cbs_av1_tile_log2(1, priv->tile_cols) +
cbs_av1_tile_log2(1, priv->tile_rows); cbs_av1_tile_log2(1, priv->tile_rows);
fb(tile_bits, tg_start); fc(tile_bits, tg_start, priv->tile_num, num_tiles - 1);
fb(tile_bits, tg_end); fc(tile_bits, tg_end, current->tg_start, num_tiles - 1);
} }
priv->tile_num = current->tg_end + 1;
CHECK(FUNC(byte_alignment)(ctx, rw)); CHECK(FUNC(byte_alignment)(ctx, rw));
// Reset header for next frame. // Reset header for next frame.