virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg: move output file opts into private context

Browse Source 
It is private to the muxer, no reason to access it from outside.
This commit is contained in:
Anton Khirnov
2021-12-13 15:50:36 +01:00
parent ec00b005f9
commit 52fee96ae9
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@@ -584,7 +584,6 @@ typedef struct OutputFile {
const AVOutputFormat *format; const AVOutputFormat *format;
AVFormatContext *ctx; AVFormatContext *ctx;
AVDictionary *opts;
int ost_index; /* index of the first stream in output_streams */ int ost_index; /* index of the first stream in output_streams */
int64_t recording_time; ///< desired length of the resulting file in microseconds == AV_TIME_BASE units int64_t recording_time; ///< desired length of the resulting file in microseconds == AV_TIME_BASE units
int64_t start_time; ///< start time in microseconds == AV_TIME_BASE units int64_t start_time; ///< start time in microseconds == AV_TIME_BASE units
@@ -688,7 +687,7 @@ int hw_device_setup_for_filter(FilterGraph *fg);
int hwaccel_decode_init(AVCodecContext *avctx); int hwaccel_decode_init(AVCodecContext *avctx);
int of_muxer_init(OutputFile *of, int64_t limit_filesize); int of_muxer_init(OutputFile *of, AVDictionary *opts, int64_t limit_filesize);
/* open the muxer when all the streams are initialized */ /* open the muxer when all the streams are initialized */
int of_check_init(OutputFile *of); int of_check_init(OutputFile *of);
int of_write_trailer(OutputFile *of); int of_write_trailer(OutputFile *of);

9
fftools/ffmpeg_mux.c
View File

@@ -46,6 +46,8 @@ typedef struct MuxStream {
struct Muxer { struct Muxer {
MuxStream *streams; MuxStream *streams;
AVDictionary *opts;
/* filesize limit expressed in bytes */ /* filesize limit expressed in bytes */
int64_t limit_filesize; int64_t limit_filesize;
int64_t final_filesize; int64_t final_filesize;
@@ -281,7 +283,7 @@ int of_check_init(OutputFile *of)
return 0; return 0;
} }
ret = avformat_write_header(of->ctx, &of->opts); ret = avformat_write_header(of->ctx, &of->mux->opts);
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Could not write header for output file #%d " "Could not write header for output file #%d "
@@ -374,6 +376,7 @@ static void mux_free(Muxer **pmux, int nb_streams)
av_fifo_freep2(&ms->muxing_queue); av_fifo_freep2(&ms->muxing_queue);
} }
av_freep(&mux->streams); av_freep(&mux->streams);
av_dict_free(&mux->opts);
av_freep(pmux); av_freep(pmux);
} }
@@ -393,12 +396,11 @@ void of_close(OutputFile **pof)
if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE)) if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE))
avio_closep(&s->pb); avio_closep(&s->pb);
avformat_free_context(s); avformat_free_context(s);
av_dict_free(&of->opts);
av_freep(pof); av_freep(pof);
} }
int of_muxer_init(OutputFile *of, int64_t limit_filesize) int of_muxer_init(OutputFile *of, AVDictionary *opts, int64_t limit_filesize)
{ {
Muxer *mux = av_mallocz(sizeof(*mux)); Muxer *mux = av_mallocz(sizeof(*mux));
int ret = 0; int ret = 0;
@@ -424,6 +426,7 @@ int of_muxer_init(OutputFile *of, int64_t limit_filesize)
} }
mux->limit_filesize = limit_filesize; mux->limit_filesize = limit_filesize;
mux->opts = opts;
if (strcmp(of->format->name, "rtp")) if (strcmp(of->format->name, "rtp"))
want_sdp = 0; want_sdp = 0;

12
fftools/ffmpeg_opt.c
View File

@@ -2391,7 +2391,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
OutputFile *of; OutputFile *of;
OutputStream *ost; OutputStream *ost;
InputStream *ist; InputStream *ist;
AVDictionary *unused_opts = NULL; AVDictionary *unused_opts = NULL, *format_opts = NULL;
const AVDictionaryEntry *e = NULL; const AVDictionaryEntry *e = NULL;
if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) { if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) {
@@ -2416,7 +2416,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
of->recording_time = o->recording_time; of->recording_time = o->recording_time;
of->start_time = o->start_time; of->start_time = o->start_time;
of->shortest = o->shortest; of->shortest = o->shortest;
av_dict_copy(&of->opts, o->g->format_opts, 0); av_dict_copy(&format_opts, o->g->format_opts, 0);
if (!strcmp(filename, "-")) if (!strcmp(filename, "-"))
filename = "pipe:"; filename = "pipe:";
@@ -2438,7 +2438,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
oc->flags |= AVFMT_FLAG_BITEXACT; oc->flags |= AVFMT_FLAG_BITEXACT;
of->bitexact = 1; of->bitexact = 1;
} else { } else {
of->bitexact = check_opt_bitexact(oc, of->opts, "fflags", of->bitexact = check_opt_bitexact(oc, format_opts, "fflags",
AVFMT_FLAG_BITEXACT); AVFMT_FLAG_BITEXACT);
} }
@@ -2819,7 +2819,7 @@ loop_end:
/* open the file */ /* open the file */
if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE,
&oc->interrupt_callback, &oc->interrupt_callback,
&of->opts)) < 0) { &format_opts)) < 0) {
print_error(filename, err); print_error(filename, err);
exit_program(1); exit_program(1);
} }
@@ -2827,7 +2827,7 @@ loop_end:
assert_file_overwrite(filename); assert_file_overwrite(filename);
if (o->mux_preload) { if (o->mux_preload) {
av_dict_set_int(&of->opts, "preload", o->mux_preload*AV_TIME_BASE, 0); av_dict_set_int(&format_opts, "preload", o->mux_preload*AV_TIME_BASE, 0);
} }
oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE); oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE);
@@ -3021,7 +3021,7 @@ loop_end:
exit_program(1); exit_program(1);
} }
err = of_muxer_init(of, o->limit_filesize); err = of_muxer_init(of, format_opts, o->limit_filesize);
if (err < 0) { if (err < 0) {
av_log(NULL, AV_LOG_FATAL, "Error initializing internal muxing state\n"); av_log(NULL, AV_LOG_FATAL, "Error initializing internal muxing state\n");
exit_program(1); exit_program(1);