diff options
author | Anton Khirnov <anton@khirnov.net> | 2024-01-17 11:09:27 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2024-01-30 09:52:00 +0100 |
commit | a3a9c4ae66e474c51aa36b9c0b8ee5c1419559f1 (patch) | |
tree | 89375b21ead845e91e7a533848b53cc53134af8c | |
parent | ebb8a58c8f24ddc548388500b6d9e9bacd241c05 (diff) |
fftools/ffmpeg: move hwaccel_retrieve_data() from ffmpeg_hw to ffmpeg_dec
This function is decoding-only and has no interaction with the rest of
ffmpeg_hw. It thus belongs more properly in ffmpeg_dec.
-rw-r--r-- | fftools/ffmpeg.h | 2 | ||||
-rw-r--r-- | fftools/ffmpeg_dec.c | 42 | ||||
-rw-r--r-- | fftools/ffmpeg_hw.c | 42 |
3 files changed, 42 insertions, 44 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index e87af70698..80c09d1662 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -731,8 +731,6 @@ void hw_device_free_all(void); */ AVBufferRef *hw_device_for_filter(void); -int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); - /** * @param dec_opts Dictionary filled with decoder options. Its ownership * is transferred to the decoder. diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 6eb3213161..b66c0e35ee 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -265,6 +265,48 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr return FFMAX(dp->last_frame_duration_est, 1); } +static int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input) +{ + InputStream *ist = avctx->opaque; + AVFrame *output = NULL; + enum AVPixelFormat output_format = ist->hwaccel_output_format; + int err; + + if (input->format == output_format) { + // Nothing to do. + return 0; + } + + output = av_frame_alloc(); + if (!output) + return AVERROR(ENOMEM); + + output->format = output_format; + + err = av_hwframe_transfer_data(output, input, 0); + if (err < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to transfer data to " + "output frame: %d.\n", err); + goto fail; + } + + err = av_frame_copy_props(output, input); + if (err < 0) { + av_frame_unref(output); + goto fail; + } + + av_frame_unref(input); + av_frame_move_ref(input, output); + av_frame_free(&output); + + return 0; + +fail: + av_frame_free(&output); + return err; +} + static int video_frame_process(InputStream *ist, AVFrame *frame) { DecoderPriv *dp = dp_from_dec(ist->decoder); diff --git a/fftools/ffmpeg_hw.c b/fftools/ffmpeg_hw.c index 46bc7e39c2..8608d24517 100644 --- a/fftools/ffmpeg_hw.c +++ b/fftools/ffmpeg_hw.c @@ -297,48 +297,6 @@ void hw_device_free_all(void) nb_hw_devices = 0; } -int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input) -{ - InputStream *ist = avctx->opaque; - AVFrame *output = NULL; - enum AVPixelFormat output_format = ist->hwaccel_output_format; - int err; - - if (input->format == output_format) { - // Nothing to do. - return 0; - } - - output = av_frame_alloc(); - if (!output) - return AVERROR(ENOMEM); - - output->format = output_format; - - err = av_hwframe_transfer_data(output, input, 0); - if (err < 0) { - av_log(avctx, AV_LOG_ERROR, "Failed to transfer data to " - "output frame: %d.\n", err); - goto fail; - } - - err = av_frame_copy_props(output, input); - if (err < 0) { - av_frame_unref(output); - goto fail; - } - - av_frame_unref(input); - av_frame_move_ref(input, output); - av_frame_free(&output); - - return 0; - -fail: - av_frame_free(&output); - return err; -} - AVBufferRef *hw_device_for_filter(void) { // Pick the last hardware device if the user doesn't pick the device for |