diff options
| author | James Almer <jamrial@gmail.com> | 2020-07-07 22:29:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-07-16 21:49:27 -0300 |
| commit | d11cc743c8e5a60b196d7ec514fb31d558c933ef (patch) | |
| tree | 30f9d51733d0e8a4e0efce1e654b8fb560d2353f | |
| parent | 2493944e31a48e42fab0e78207d76ddd7231ed89 (diff) | |
| download | ffmpeg-d11cc743c8e5a60b196d7ec514fb31d558c933ef.tar.gz | |
Revert "avcodec/cbs_av1: keep separate reference frame state for reading and writing"
This reverts commit 4e2bef6a82b356772a5919c51c9be1530268bd79.
It's no longer needed now that all the bsfs use separate contexts
for reading and writing.
| -rw-r--r-- | libavcodec/cbs_av1.c | 4 | ||||
| -rw-r--r-- | libavcodec/cbs_av1.h | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index b2a1d2ded1..75e9cb78df 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -939,8 +939,6 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, priv->spatial_id = 0; } - priv->ref = (AV1ReferenceFrameState *)&priv->read_ref; - switch (obu->header.obu_type) { case AV1_OBU_SEQUENCE_HEADER: { @@ -1084,8 +1082,6 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, td = NULL; start_pos = put_bits_count(pbc); - priv->ref = (AV1ReferenceFrameState *)&priv->write_ref; - switch (obu->header.obu_type) { case AV1_OBU_SEQUENCE_HEADER: { diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index fdc629b00c..f5fed220a5 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -441,9 +441,7 @@ typedef struct CodedBitstreamAV1Context { int tile_cols; int tile_rows; - AV1ReferenceFrameState *ref; - AV1ReferenceFrameState read_ref[AV1_NUM_REF_FRAMES]; - AV1ReferenceFrameState write_ref[AV1_NUM_REF_FRAMES]; + AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES]; } CodedBitstreamAV1Context; |