har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: move some stream initialization code to ffmpeg_mux

Browse Source 
The code in question is muxing-specific and so belongs there. This will
allow make some objects private to the muxer in future commits.
This commit is contained in:
Anton Khirnov 2022-10-11 13:38:17 +02:00
parent 731246ae8f
commit 965bff37b6
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fftools/ffmpeg.c
View File

@ -3115,7 +3115,6 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
static int init_output_stream(OutputStream *ost, AVFrame *frame,
char *error, int error_len)
{
OutputFile *of = output_files[ost->file_index];
int ret = 0;
if (ost->enc_ctx) {
@ -3220,12 +3219,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
if (ret < 0)
return ret;
if (ost->sq_idx_mux >= 0)
sq_set_tb(of->sq_mux, ost->sq_idx_mux, ost->mux_timebase);
ost->initialized = 1;
ret = of_check_init(output_files[ost->file_index]);
ret = of_stream_init(output_files[ost->file_index], ost);
if (ret < 0)
return ret;

10
fftools/ffmpeg.h
View File

@ -720,8 +720,14 @@ int hwaccel_decode_init(AVCodecContext *avctx);
int of_muxer_init(OutputFile *of, AVFormatContext *fc,
AVDictionary *opts, int64_t limit_filesize,
int thread_queue_size);
/* open the muxer when all the streams are initialized */
int of_check_init(OutputFile *of);
/*
* Initialize muxing state for the given stream, should be called
* after the codec/streamcopy setup has been done.
*
* Open the muxer once all the streams have been initialized.
*/
int of_stream_init(OutputFile *of, OutputStream *ost);
int of_write_trailer(OutputFile *of);
void of_close(OutputFile **pof);

15
fftools/ffmpeg_mux.c
View File

@ -516,8 +516,7 @@ fail:
return ret;
}
/* open the muxer when all the streams are initialized */
int of_check_init(OutputFile *of)
static int mux_check_init(OutputFile *of)
{
AVFormatContext *fc = of->mux->fc;
int ret, i;
@ -565,6 +564,16 @@ int of_check_init(OutputFile *of)
return 0;
}
int of_stream_init(OutputFile *of, OutputStream *ost)
{
if (ost->sq_idx_mux >= 0)
sq_set_tb(of->sq_mux, ost->sq_idx_mux, ost->mux_timebase);
ost->initialized = 1;
return mux_check_init(of);
}
int of_write_trailer(OutputFile *of)
{
AVFormatContext *fc = of->mux->fc;
@ -710,7 +719,7 @@ int of_muxer_init(OutputFile *of, AVFormatContext *fc,
/* write the header for files with no streams */
if (of->format->flags & AVFMT_NOSTREAMS && fc->nb_streams == 0) {
ret = of_check_init(of);
ret = mux_check_init(of);
if (ret < 0)
goto fail;
}