ffmpeg | branch: master | James Almer <[email protected]> | Tue Aug 25 14:53:42 2020 -0300| [97819f15a8b776e3450cc10217f646da40013bf1] | committer: James Almer
avcodec/cbs_av1: use a more appropiate AV1ReferenceFrameState pointer variable name frame is more commonly used for AV1RawFrameHeader and AV1RawFrame. Signed-off-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97819f15a8b776e3450cc10217f646da40013bf1 --- libavcodec/cbs_av1_syntax_template.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 18be6ca4a5..a492b02792 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1273,12 +1273,12 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, flag(show_existing_frame); if (current->show_existing_frame) { - AV1ReferenceFrameState *frame; + AV1ReferenceFrameState *ref; fb(3, frame_to_show_map_idx); - frame = &priv->ref[current->frame_to_show_map_idx]; + ref = &priv->ref[current->frame_to_show_map_idx]; - if (!frame->valid) { + if (!ref->valid) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Missing reference frame needed for " "show_existing_frame (frame_to_show_map_idx = %d).\n", current->frame_to_show_map_idx); @@ -1294,26 +1294,26 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, if (seq->frame_id_numbers_present_flag) fb(id_len, display_frame_id); - infer(frame_type, frame->frame_type); + infer(frame_type, ref->frame_type); if (current->frame_type == AV1_FRAME_KEY) { infer(refresh_frame_flags, all_frames); // Section 7.21 - infer(current_frame_id, frame->frame_id); - priv->upscaled_width = frame->upscaled_width; - priv->frame_width = frame->frame_width; - priv->frame_height = frame->frame_height; - priv->render_width = frame->render_width; - priv->render_height = frame->render_height; - priv->bit_depth = frame->bit_depth; - priv->order_hint = frame->order_hint; + infer(current_frame_id, ref->frame_id); + priv->upscaled_width = ref->upscaled_width; + priv->frame_width = ref->frame_width; + priv->frame_height = ref->frame_height; + priv->render_width = ref->render_width; + priv->render_height = ref->render_height; + priv->bit_depth = ref->bit_depth; + priv->order_hint = ref->order_hint; } else infer(refresh_frame_flags, 0); - infer(frame_width_minus_1, frame->upscaled_width - 1); - infer(frame_height_minus_1, frame->frame_height - 1); - infer(render_width_minus_1, frame->render_width - 1); - infer(render_height_minus_1, frame->render_height - 1); + infer(frame_width_minus_1, ref->upscaled_width - 1); + infer(frame_height_minus_1, ref->frame_height - 1); + infer(render_width_minus_1, ref->render_width - 1); + infer(render_height_minus_1, ref->render_height - 1); // Section 7.20 goto update_refs; _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
