starred/ffmpeg-rockchip-nyanmisaka-1
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 18:11:11 +01:00
Code Issues Projects Packages Wiki Activity Actions

fixup! lavc/rkmppenc: add RKMPP H264 and HEVC encoder

Browse source 
fix using vf_hwmap filter with RKMPP encoders.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2025-06-03 00:45:02 +08:00
parent 08b9691e33
commit 13668da03c
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/rkmppenc.c
View file

@ -741,6 +741,8 @@ static MPPEncFrame *rkmpp_submit_frame(AVCodecContext *avctx, AVFrame *frame)
drm_frame = frame;
mpp_enc_frame->frame = av_frame_clone(drm_frame);
} else {
AVBufferRef *hw_frames_ctx = frame->hw_frames_ctx;
drm_frame = av_frame_alloc();
if (!drm_frame) {
goto exit;
@ -749,15 +751,19 @@ static MPPEncFrame *rkmpp_submit_frame(AVCodecContext *avctx, AVFrame *frame)
av_log(avctx, AV_LOG_ERROR, "Cannot allocate an internal frame: %d\n", ret);
goto exit;
}
frame->hw_frames_ctx = NULL; /* clear hwfc to avoid HW -> HW transfer */
if ((ret = av_hwframe_transfer_data(drm_frame, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "av_hwframe_transfer_data failed: %d\n", ret);
frame->hw_frames_ctx = hw_frames_ctx;
goto exit;
}
if ((ret = av_frame_copy_props(drm_frame, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "av_frame_copy_props failed: %d\n", ret);
frame->hw_frames_ctx = hw_frames_ctx;
goto exit;
}
mpp_enc_frame->frame = drm_frame;
frame->hw_frames_ctx = hw_frames_ctx; /* restore hwfc */
}
drm_desc = (AVDRMFrameDescriptor *)drm_frame->data[0];