History

avcodec/av1dec: Make av1_frame_replace() out of av1_frame_ref()

Andreas Rheinhardt committed 2 years ago

Commit 20206e11 parent 0f8763f1 file · +8 −13Browse files

Unified · Split

libavcodec/av1dec.c+8−13
@@ -683,16 +683,15 @@ static void av1_frame_unref(AV1Frame *f) · 682 unmodified lines
683683 f->coded_lossless = 0;
684684 }
685685
686−static void av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src)
686+static void av1_frame_replace(AV1Frame *dst, const AV1Frame *src)
687687 {
688+ av_assert1(dst != src);
689+
688690 ff_refstruct_replace(&dst->header_ref, src->header_ref);
689691
690692 dst->raw_frame_header = src->raw_frame_header;
691693
692− if (!src->f)
693− return;
694−
695− ff_progress_frame_ref(&dst->pf, &src->pf);
694+ ff_progress_frame_replace(&dst->pf, &src->pf);
696695
697696 ff_refstruct_replace(&dst->hwaccel_picture_private,
698697 src->hwaccel_picture_private);
@@ -1191,10 +1190,8 @@ static void update_reference_list(AVCodecContext *avctx) · 492 unmodified lines
11911190 const AV1RawFrameHeader *header = s->raw_frame_header;
11921191
11931192 for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) {
1194− if (header->refresh_frame_flags & (1 << i)) {
1195− av1_frame_unref(&s->ref[i]);
1196− av1_frame_ref(avctx, &s->ref[i], &s->cur_frame);
1197− }
1193+ if (header->refresh_frame_flags & (1 << i))
1194+ av1_frame_replace(&s->ref[i], &s->cur_frame);
11981195 }
11991196 }
12001197
@@ -1324,10 +1321,8 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) · 123 unmodified lines
13241321 s->raw_frame_header = &obu->obu.frame_header;
13251322
13261323 if (s->raw_frame_header->show_existing_frame) {
1327− av1_frame_unref(&s->cur_frame);
1328−
1329− av1_frame_ref(avctx, &s->cur_frame,
1330− &s->ref[s->raw_frame_header->frame_to_show_map_idx]);
1324+ av1_frame_replace(&s->cur_frame,
1325+ &s->ref[s->raw_frame_header->frame_to_show_map_idx]);
13311326
13321327 update_reference_list(avctx);
13331328

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t