virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

av1dec: add AV1_REF_FRAME_NONE

Browse Source
This commit is contained in:
Lynne 2024-03-17 19:31:17 +01:00
parent cafb4c5548
commit 998aa66a10
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/av1.h
View File

@ -58,6 +58,7 @@ enum {
// Reference frames (section 6.10.24). // Reference frames (section 6.10.24).
enum { enum {
AV1_REF_FRAME_NONE = -1,
AV1_REF_FRAME_INTRA = 0, AV1_REF_FRAME_INTRA = 0,
AV1_REF_FRAME_LAST = 1, AV1_REF_FRAME_LAST = 1,
AV1_REF_FRAME_LAST2 = 2, AV1_REF_FRAME_LAST2 = 2,

12
libavcodec/cbs_av1_syntax_template.c
View File

@ -360,7 +360,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw,
int i, j; int i, j;
for (i = 0; i < AV1_REFS_PER_FRAME; i++) 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_LAST - AV1_REF_FRAME_LAST] = current->last_frame_idx;
ref_frame_idx[AV1_REF_FRAME_GOLDEN - AV1_REF_FRAME_LAST] = current->golden_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]; latest_order_hint = shifted_order_hints[current->last_frame_idx];
earliest_order_hint = shifted_order_hints[current->golden_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++) { for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
int hint = shifted_order_hints[i]; int hint = shifted_order_hints[i];
if (!used_frame[i] && hint >= cur_frame_hint && 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; used_frame[ref] = 1;
} }
ref = -1; ref = AV1_REF_FRAME_NONE;
for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
int hint = shifted_order_hints[i]; int hint = shifted_order_hints[i];
if (!used_frame[i] && hint >= cur_frame_hint && 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; used_frame[ref] = 1;
} }
ref = -1; ref = AV1_REF_FRAME_NONE;
for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
int hint = shifted_order_hints[i]; int hint = shifted_order_hints[i];
if (!used_frame[i] && hint >= cur_frame_hint && 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++) { for (i = 0; i < AV1_REFS_PER_FRAME - 2; i++) {
int ref_frame = ref_frame_list[i]; int ref_frame = ref_frame_list[i];
if (ref_frame_idx[ref_frame - AV1_REF_FRAME_LAST] < 0 ) { 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++) { for (j = 0; j < AV1_NUM_REF_FRAMES; j++) {
int hint = shifted_order_hints[j]; int hint = shifted_order_hints[j];
if (!used_frame[j] && hint < cur_frame_hint && 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++) { for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
int hint = shifted_order_hints[i]; int hint = shifted_order_hints[i];
if (ref < 0 || hint < earliest_order_hint) { if (ref < 0 || hint < earliest_order_hint) {