diff options
Diffstat (limited to 'media/ffvpx/libavcodec/cbs_av1_syntax_template.c')
| -rw-r--r-- | media/ffvpx/libavcodec/cbs_av1_syntax_template.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/media/ffvpx/libavcodec/cbs_av1_syntax_template.c b/media/ffvpx/libavcodec/cbs_av1_syntax_template.c index 3be1f2d30f..3f4b13a177 100644 --- a/media/ffvpx/libavcodec/cbs_av1_syntax_template.c +++ b/media/ffvpx/libavcodec/cbs_av1_syntax_template.c @@ -360,7 +360,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, int i, j; for (i = 0; i < AV1_REFS_PER_FRAME; i++) - ref_frame_idx[i] = -1; + ref_frame_idx[i] = AV1_REF_FRAME_NONE; ref_frame_idx[AV1_REF_FRAME_LAST - AV1_REF_FRAME_LAST] = current->last_frame_idx; ref_frame_idx[AV1_REF_FRAME_GOLDEN - AV1_REF_FRAME_LAST] = current->golden_frame_idx; @@ -378,7 +378,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, latest_order_hint = shifted_order_hints[current->last_frame_idx]; earliest_order_hint = shifted_order_hints[current->golden_frame_idx]; - ref = -1; + ref = AV1_REF_FRAME_NONE; for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { int hint = shifted_order_hints[i]; if (!used_frame[i] && hint >= cur_frame_hint && @@ -392,7 +392,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, used_frame[ref] = 1; } - ref = -1; + ref = AV1_REF_FRAME_NONE; for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { int hint = shifted_order_hints[i]; if (!used_frame[i] && hint >= cur_frame_hint && @@ -406,7 +406,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, used_frame[ref] = 1; } - ref = -1; + ref = AV1_REF_FRAME_NONE; for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { int hint = shifted_order_hints[i]; if (!used_frame[i] && hint >= cur_frame_hint && @@ -423,7 +423,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, for (i = 0; i < AV1_REFS_PER_FRAME - 2; i++) { int ref_frame = ref_frame_list[i]; if (ref_frame_idx[ref_frame - AV1_REF_FRAME_LAST] < 0 ) { - ref = -1; + ref = AV1_REF_FRAME_NONE; for (j = 0; j < AV1_NUM_REF_FRAMES; j++) { int hint = shifted_order_hints[j]; if (!used_frame[j] && hint < cur_frame_hint && @@ -439,7 +439,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, } } - ref = -1; + ref = AV1_REF_FRAME_NONE; for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { int hint = shifted_order_hints[i]; if (ref < 0 || hint < earliest_order_hint) { @@ -1414,6 +1414,8 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, priv->ref[i].valid = 0; priv->ref[i].order_hint = 0; } + for (i = 0; i < AV1_REFS_PER_FRAME; i++) + priv->order_hints[i + AV1_REF_FRAME_LAST] = 0; } flag(disable_cdf_update); @@ -1568,11 +1570,20 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, else flag(use_ref_frame_mvs); - infer(allow_intrabc, 0); - } + for (i = 0; i < AV1_REFS_PER_FRAME; i++) { + int ref_frame = AV1_REF_FRAME_LAST + i; + int hint = priv->ref[current->ref_frame_idx[i]].order_hint; + priv->order_hints[ref_frame] = hint; + if (!seq->enable_order_hint) { + priv->ref_frame_sign_bias[ref_frame] = 0; + } else { + priv->ref_frame_sign_bias[ref_frame] = + cbs_av1_get_relative_dist(seq, hint, + current->order_hint) > 0; + } + } - if (!frame_is_intra) { - // Derive reference frame sign biases. + infer(allow_intrabc, 0); } if (seq->reduced_still_picture_header || current->disable_cdf_update) @@ -1674,6 +1685,12 @@ update_refs: .bit_depth = priv->bit_depth, .order_hint = priv->order_hint, }; + + for (int j = 0; j < AV1_REFS_PER_FRAME; j++) { + priv->ref[i].saved_order_hints[j + AV1_REF_FRAME_LAST] = + priv->order_hints[j + AV1_REF_FRAME_LAST]; + } + memcpy(priv->ref[i].loop_filter_ref_deltas, current->loop_filter_ref_deltas, sizeof(current->loop_filter_ref_deltas)); memcpy(priv->ref[i].loop_filter_mode_deltas, current->loop_filter_mode_deltas, |