highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: drop unnecessary indirection

Browse Source 
init_output_stream() can print log messages directly, there is no need
to ship them to the caller.
This commit is contained in:
Anton Khirnov
2023-03-24 17:26:04 +01:00
parent 237f9b9682
commit e1e0c2c7f2
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fftools/ffmpeg.c
View File

@@ -724,23 +724,18 @@ early_exit:
return float_pts; return float_pts;
} }
static int init_output_stream(OutputStream *ost, AVFrame *frame, static int init_output_stream(OutputStream *ost, AVFrame *frame);
char *error, int error_len);
static int init_output_stream_wrapper(OutputStream *ost, AVFrame *frame, static int init_output_stream_wrapper(OutputStream *ost, AVFrame *frame,
unsigned int fatal) unsigned int fatal)
{ {
int ret = AVERROR_BUG; int ret = AVERROR_BUG;
char error[1024] = {0};
if (ost->initialized) if (ost->initialized)
return 0; return 0;
ret = init_output_stream(ost, frame, error, sizeof(error)); ret = init_output_stream(ost, frame);
if (ret < 0) { if (ret < 0) {
av_log(ost, AV_LOG_ERROR, "Error initializing output stream: %s\n",
error);
if (fatal) if (fatal)
exit_program(1); exit_program(1);
} }
@@ -3188,8 +3183,7 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
return 0; return 0;
} }
static int init_output_stream(OutputStream *ost, AVFrame *frame, static int init_output_stream(OutputStream *ost, AVFrame *frame)
char *error, int error_len)
{ {
int ret = 0; int ret = 0;
@@ -3212,19 +3206,16 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
ret = hw_device_setup_for_encode(ost); ret = hw_device_setup_for_encode(ost);
if (ret < 0) { if (ret < 0) {
snprintf(error, error_len, "Device setup failed for " av_log(ost, AV_LOG_ERROR,
"encoder on output stream #%d:%d : %s", "Encoding hardware device setup failed: %s\n", av_err2str(ret));
ost->file_index, ost->index, av_err2str(ret));
return ret; return ret;
} }
if ((ret = avcodec_open2(ost->enc_ctx, codec, &ost->encoder_opts)) < 0) { if ((ret = avcodec_open2(ost->enc_ctx, codec, &ost->encoder_opts)) < 0) {
if (ret == AVERROR_EXPERIMENTAL) if (ret == AVERROR_EXPERIMENTAL)
abort_codec_experimental(codec, 1); abort_codec_experimental(codec, 1);
snprintf(error, error_len, av_log(ost, AV_LOG_ERROR, "Error while opening encoder - maybe "
"Error while opening encoder for output stream #%d:%d - " "incorrect parameters such as bit_rate, rate, width or height.\n");
"maybe incorrect parameters such as bit_rate, rate, width or height",
ost->file_index, ost->index);
return ret; return ret;
} }