Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
998aa66a
Unverified
Commit
998aa66a
authored
Mar 17, 2024
by
Lynne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
av1dec: add AV1_REF_FRAME_NONE
parent
cafb4c55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
av1.h
libavcodec/av1.h
+1
-0
cbs_av1_syntax_template.c
libavcodec/cbs_av1_syntax_template.c
+6
-6
No files found.
libavcodec/av1.h
View file @
998aa66a
...
@@ -58,6 +58,7 @@ enum {
...
@@ -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
,
...
...
libavcodec/cbs_av1_syntax_template.c
View file @
998aa66a
...
@@ -360,7 +360,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment