@@ -685,3 +685,19 @@ int ff_hw_base_encode_init(AVCodecContext *avctx)
return 0;
}
+
+int ff_hw_base_encode_close(AVCodecContext *avctx)
+{
+ HWBaseEncodeContext *ctx = avctx->priv_data;
+
+ av_fifo_freep2(&ctx->encode_fifo);
+
+ av_frame_free(&ctx->frame);
+ av_packet_free(&ctx->tail_pkt);
+
+ av_buffer_unref(&ctx->device_ref);
+ av_buffer_unref(&ctx->input_frames_ref);
+ av_buffer_unref(&ctx->recon_frames_ref);
+
+ return 0;
+}
@@ -209,6 +209,8 @@ int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t ref_l0, uint32
int ff_hw_base_encode_init(AVCodecContext *avctx);
+int ff_hw_base_encode_close(AVCodecContext *avctx);
+
#define HW_BASE_ENCODE_COMMON_OPTIONS \
{ "idr_interval", \
"Distance (in I-frames) between key frames", \
@@ -2397,16 +2397,10 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx)
ctx->va_config = VA_INVALID_ID;
}
- av_frame_free(&base_ctx->frame);
- av_packet_free(&base_ctx->tail_pkt);
-
av_freep(&ctx->codec_sequence_params);
av_freep(&ctx->codec_picture_params);
- av_fifo_freep2(&base_ctx->encode_fifo);
- av_buffer_unref(&base_ctx->recon_frames_ref);
- av_buffer_unref(&base_ctx->input_frames_ref);
- av_buffer_unref(&base_ctx->device_ref);
+ ff_hw_base_encode_close(avctx);
return 0;
}