RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/cbs_av1: infer loop filter delta parameters from reference frames

Browse Source 
Partially implements setup_past_independence() and load_previous().
These ensures they are always set, even if the values were not coded
in the input bitstream and will not be coded in the output bitstream.

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-10-20 17:48:31 -03:00
parent 744b7f2e91
commit 5d1238f77f
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/cbs_av1.h
View File

@ -413,6 +413,9 @@ typedef struct AV1ReferenceFrameState {
int subsampling_y; // RefSubsamplingY int subsampling_y; // RefSubsamplingY
int bit_depth; // RefBitDepth int bit_depth; // RefBitDepth
int order_hint; // RefOrderHint int order_hint; // RefOrderHint
int8_t loop_filter_ref_deltas[AV1_TOTAL_REFS_PER_FRAME];
int8_t loop_filter_mode_deltas[2];
} AV1ReferenceFrameState; } AV1ReferenceFrameState;
typedef struct CodedBitstreamAV1Context { typedef struct CodedBitstreamAV1Context {

56
libavcodec/cbs_av1_syntax_template.c
View File

@ -837,6 +837,9 @@ static int FUNC(loop_filter_params)(CodedBitstreamContext *ctx, RWContext *rw,
AV1RawFrameHeader *current) AV1RawFrameHeader *current)
{ {
CodedBitstreamAV1Context *priv = ctx->priv_data; CodedBitstreamAV1Context *priv = ctx->priv_data;
static const int8_t default_loop_filter_ref_deltas[AV1_TOTAL_REFS_PER_FRAME] =
{ 1, 0, 0, 0, -1, 0, -1, -1 };
static const int8_t default_loop_filter_mode_deltas[2] = { 0, 0 };
int i, err; int i, err;
if (priv->coded_lossless || current->allow_intrabc) { if (priv->coded_lossless || current->allow_intrabc) {
@ -870,19 +873,44 @@ static int FUNC(loop_filter_params)(CodedBitstreamContext *ctx, RWContext *rw,
flag(loop_filter_delta_enabled); flag(loop_filter_delta_enabled);
if (current->loop_filter_delta_enabled) { if (current->loop_filter_delta_enabled) {
flag(loop_filter_delta_update); const int8_t *ref_loop_filter_ref_deltas, *ref_loop_filter_mode_deltas;
if (current->loop_filter_delta_update) {
for (i = 0; i < AV1_TOTAL_REFS_PER_FRAME; i++) { if (current->primary_ref_frame == AV1_PRIMARY_REF_NONE) {
flags(update_ref_delta[i], 1, i); ref_loop_filter_ref_deltas = default_loop_filter_ref_deltas;
if (current->update_ref_delta[i]) ref_loop_filter_mode_deltas = default_loop_filter_mode_deltas;
sus(1 + 6, loop_filter_ref_deltas[i], 1, i); } else {
} ref_loop_filter_ref_deltas =
for (i = 0; i < 2; i++) { priv->ref[current->ref_frame_idx[current->primary_ref_frame]].loop_filter_ref_deltas;
flags(update_mode_delta[i], 1, i); ref_loop_filter_mode_deltas =
if (current->update_mode_delta[i]) priv->ref[current->ref_frame_idx[current->primary_ref_frame]].loop_filter_mode_deltas;
sus(1 + 6, loop_filter_mode_deltas[i], 1, i);
}
} }
flag(loop_filter_delta_update);
for (i = 0; i < AV1_TOTAL_REFS_PER_FRAME; i++) {
if (current->loop_filter_delta_update)
flags(update_ref_delta[i], 1, i);
else
infer(update_ref_delta[i], 0);
if (current->update_ref_delta[i])
sus(1 + 6, loop_filter_ref_deltas[i], 1, i);
else
infer(loop_filter_ref_deltas[i], ref_loop_filter_ref_deltas[i]);
}
for (i = 0; i < 2; i++) {
if (current->loop_filter_delta_update)
flags(update_mode_delta[i], 1, i);
else
infer(update_mode_delta[i], 0);
if (current->update_mode_delta[i])
sus(1 + 6, loop_filter_mode_deltas[i], 1, i);
else
infer(loop_filter_mode_deltas[i], ref_loop_filter_mode_deltas[i]);
}
} else {
for (i = 0; i < AV1_TOTAL_REFS_PER_FRAME; i++)
infer(loop_filter_ref_deltas[i], default_loop_filter_ref_deltas[i]);
for (i = 0; i < 2; i++)
infer(loop_filter_mode_deltas[i], default_loop_filter_mode_deltas[i]);
} }
return 0; return 0;
@ -1613,6 +1641,10 @@ update_refs:
.bit_depth = priv->bit_depth, .bit_depth = priv->bit_depth,
.order_hint = priv->order_hint, .order_hint = priv->order_hint,
}; };
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,
sizeof(current->loop_filter_mode_deltas));
} }
} }