virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

fftools/ffmpeg_hw: inline hwaccel_decode_init() into its caller

Browse Source 
The function is now trivial and cannot fail, so all error handling in
its caller can be removed.
This commit is contained in:
Anton Khirnov 2023-06-06 12:54:25 +02:00
parent 6c9cbf7507
commit 25d96ab6c0
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -805,7 +805,7 @@ void hw_device_free_all(void);
*/ */
AVBufferRef *hw_device_for_filter(void); AVBufferRef *hw_device_for_filter(void);
int hwaccel_decode_init(AVCodecContext *avctx); int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input);
int dec_open(InputStream *ist); int dec_open(InputStream *ist);
void dec_free(Decoder **pdec); void dec_free(Decoder **pdec);

15
fftools/ffmpeg_dec.c
View File

@ -538,7 +538,6 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
{ {
InputStream *ist = s->opaque; InputStream *ist = s->opaque;
const enum AVPixelFormat *p; const enum AVPixelFormat *p;
int ret;
for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(*p); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(*p);
@ -562,19 +561,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
} }
} }
if (config && config->device_type == ist->hwaccel_device_type) { if (config && config->device_type == ist->hwaccel_device_type) {
ret = hwaccel_decode_init(s); ist->hwaccel_retrieve_data = hwaccel_retrieve_data;
if (ret < 0) {
if (ist->hwaccel_id == HWACCEL_GENERIC) {
av_log(NULL, AV_LOG_FATAL,
"%s hwaccel requested for input stream #%d:%d, "
"but cannot be initialized.\n",
av_hwdevice_get_type_name(config->device_type),
ist->file_index, ist->index);
return AV_PIX_FMT_NONE;
}
continue;
}
ist->hwaccel_pix_fmt = *p; ist->hwaccel_pix_fmt = *p;
break; break;
} }

11
fftools/ffmpeg_hw.c
View File

@ -297,7 +297,7 @@ void hw_device_free_all(void)
nb_hw_devices = 0; nb_hw_devices = 0;
} }
static int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input) int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input)
{ {
InputStream *ist = avctx->opaque; InputStream *ist = avctx->opaque;
AVFrame *output = NULL; AVFrame *output = NULL;
@ -339,15 +339,6 @@ fail:
return err; return err;
} }
int hwaccel_decode_init(AVCodecContext *avctx)
{
InputStream *ist = avctx->opaque;
ist->hwaccel_retrieve_data = &hwaccel_retrieve_data;
return 0;
}
AVBufferRef *hw_device_for_filter(void) AVBufferRef *hw_device_for_filter(void)
{ {
// Pick the last hardware device if the user doesn't pick the device for // Pick the last hardware device if the user doesn't pick the device for