mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg: move OutputStream.max_frames to MuxStream
It no longer needs to be visible outside of the muxing code.
This commit is contained in:
parent
25620b69e0
commit
0fb7d111e8
|
@ -508,7 +508,6 @@ typedef struct OutputStream {
|
||||||
AVRational enc_timebase;
|
AVRational enc_timebase;
|
||||||
|
|
||||||
AVCodecContext *enc_ctx;
|
AVCodecContext *enc_ctx;
|
||||||
int64_t max_frames;
|
|
||||||
AVFrame *filtered_frame;
|
AVFrame *filtered_frame;
|
||||||
AVFrame *last_frame;
|
AVFrame *last_frame;
|
||||||
AVFrame *sq_frame;
|
AVFrame *sq_frame;
|
||||||
|
|
|
@ -45,11 +45,6 @@ static Muxer *mux_from_of(OutputFile *of)
|
||||||
return (Muxer*)of;
|
return (Muxer*)of;
|
||||||
}
|
}
|
||||||
|
|
||||||
static MuxStream *ms_from_ost(OutputStream *ost)
|
|
||||||
{
|
|
||||||
return (MuxStream*)ost;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int64_t filesize(AVIOContext *pb)
|
static int64_t filesize(AVIOContext *pb)
|
||||||
{
|
{
|
||||||
int64_t ret = -1;
|
int64_t ret = -1;
|
||||||
|
|
|
@ -42,6 +42,8 @@ typedef struct MuxStream {
|
||||||
|
|
||||||
AVBSFContext *bsf_ctx;
|
AVBSFContext *bsf_ctx;
|
||||||
|
|
||||||
|
int64_t max_frames;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The size of the AVPackets' buffers in queue.
|
* The size of the AVPackets' buffers in queue.
|
||||||
* Updated when a packet is either pushed or pulled from the queue.
|
* Updated when a packet is either pushed or pulled from the queue.
|
||||||
|
@ -84,4 +86,9 @@ extern int want_sdp;
|
||||||
|
|
||||||
int mux_check_init(Muxer *mux);
|
int mux_check_init(Muxer *mux);
|
||||||
|
|
||||||
|
static MuxStream *ms_from_ost(OutputStream *ost)
|
||||||
|
{
|
||||||
|
return (MuxStream*)ost;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* FFTOOLS_FFMPEG_MUX_H */
|
#endif /* FFTOOLS_FFMPEG_MUX_H */
|
||||||
|
|
|
@ -295,8 +295,8 @@ static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o,
|
||||||
ost->enc_timebase = q;
|
ost->enc_timebase = q;
|
||||||
}
|
}
|
||||||
|
|
||||||
ost->max_frames = INT64_MAX;
|
ms->max_frames = INT64_MAX;
|
||||||
MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st);
|
MATCH_PER_STREAM_OPT(max_frames, i64, ms->max_frames, oc, st);
|
||||||
for (i = 0; i<o->nb_max_frames; i++) {
|
for (i = 0; i<o->nb_max_frames; i++) {
|
||||||
char *p = o->max_frames[i].specifier;
|
char *p = o->max_frames[i].specifier;
|
||||||
if (!*p && type != AVMEDIA_TYPE_VIDEO) {
|
if (!*p && type != AVMEDIA_TYPE_VIDEO) {
|
||||||
|
@ -1165,6 +1165,7 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u
|
||||||
|
|
||||||
for (int i = 0; i < oc->nb_streams; i++) {
|
for (int i = 0; i < oc->nb_streams; i++) {
|
||||||
OutputStream *ost = of->streams[i];
|
OutputStream *ost = of->streams[i];
|
||||||
|
MuxStream *ms = ms_from_ost(ost);
|
||||||
enum AVMediaType type = ost->st->codecpar->codec_type;
|
enum AVMediaType type = ost->st->codecpar->codec_type;
|
||||||
|
|
||||||
ost->sq_idx_encode = -1;
|
ost->sq_idx_encode = -1;
|
||||||
|
@ -1173,8 +1174,8 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u
|
||||||
nb_interleaved += IS_INTERLEAVED(type);
|
nb_interleaved += IS_INTERLEAVED(type);
|
||||||
nb_av_enc += IS_AV_ENC(ost, type);
|
nb_av_enc += IS_AV_ENC(ost, type);
|
||||||
|
|
||||||
limit_frames |= ost->max_frames < INT64_MAX;
|
limit_frames |= ms->max_frames < INT64_MAX;
|
||||||
limit_frames_av_enc |= (ost->max_frames < INT64_MAX) && IS_AV_ENC(ost, type);
|
limit_frames_av_enc |= (ms->max_frames < INT64_MAX) && IS_AV_ENC(ost, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!((nb_interleaved > 1 && of->shortest) ||
|
if (!((nb_interleaved > 1 && of->shortest) ||
|
||||||
|
@ -1191,13 +1192,14 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u
|
||||||
|
|
||||||
for (int i = 0; i < oc->nb_streams; i++) {
|
for (int i = 0; i < oc->nb_streams; i++) {
|
||||||
OutputStream *ost = of->streams[i];
|
OutputStream *ost = of->streams[i];
|
||||||
|
MuxStream *ms = ms_from_ost(ost);
|
||||||
enum AVMediaType type = ost->st->codecpar->codec_type;
|
enum AVMediaType type = ost->st->codecpar->codec_type;
|
||||||
|
|
||||||
if (!IS_AV_ENC(ost, type))
|
if (!IS_AV_ENC(ost, type))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
ost->sq_idx_encode = sq_add_stream(of->sq_encode,
|
ost->sq_idx_encode = sq_add_stream(of->sq_encode,
|
||||||
of->shortest || ost->max_frames < INT64_MAX);
|
of->shortest || ms->max_frames < INT64_MAX);
|
||||||
if (ost->sq_idx_encode < 0)
|
if (ost->sq_idx_encode < 0)
|
||||||
return ost->sq_idx_encode;
|
return ost->sq_idx_encode;
|
||||||
|
|
||||||
|
@ -1205,8 +1207,8 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u
|
||||||
if (!ost->sq_frame)
|
if (!ost->sq_frame)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
if (ost->max_frames != INT64_MAX)
|
if (ms->max_frames != INT64_MAX)
|
||||||
sq_limit_frames(of->sq_encode, ost->sq_idx_encode, ost->max_frames);
|
sq_limit_frames(of->sq_encode, ost->sq_idx_encode, ms->max_frames);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1223,18 +1225,19 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u
|
||||||
|
|
||||||
for (int i = 0; i < oc->nb_streams; i++) {
|
for (int i = 0; i < oc->nb_streams; i++) {
|
||||||
OutputStream *ost = of->streams[i];
|
OutputStream *ost = of->streams[i];
|
||||||
|
MuxStream *ms = ms_from_ost(ost);
|
||||||
enum AVMediaType type = ost->st->codecpar->codec_type;
|
enum AVMediaType type = ost->st->codecpar->codec_type;
|
||||||
|
|
||||||
if (!IS_INTERLEAVED(type))
|
if (!IS_INTERLEAVED(type))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
ost->sq_idx_mux = sq_add_stream(mux->sq_mux,
|
ost->sq_idx_mux = sq_add_stream(mux->sq_mux,
|
||||||
of->shortest || ost->max_frames < INT64_MAX);
|
of->shortest || ms->max_frames < INT64_MAX);
|
||||||
if (ost->sq_idx_mux < 0)
|
if (ost->sq_idx_mux < 0)
|
||||||
return ost->sq_idx_mux;
|
return ost->sq_idx_mux;
|
||||||
|
|
||||||
if (ost->max_frames != INT64_MAX)
|
if (ms->max_frames != INT64_MAX)
|
||||||
sq_limit_frames(mux->sq_mux, ost->sq_idx_mux, ost->max_frames);
|
sq_limit_frames(mux->sq_mux, ost->sq_idx_mux, ms->max_frames);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue