Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: replace OutputStream.source_index with a pointer to InputStream

Browse Source 
This is simpler. The indirection via an index exists for historical
reasons that longer apply.
pull/388/head
Anton Khirnov 2 years ago
parent bda06c60fe
commit 4c40581614
3 changed files with 38 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      fftools/ffmpeg.c
  2. 7
      fftools/ffmpeg.h
  3. 37
      fftools/ffmpeg_mux_init.c

42
fftools/ffmpeg.c
Unescape View File

@ -1122,15 +1122,12 @@ static void do_video_out(OutputFile *of,
double delta, delta0;
double duration = 0;
double sync_ipts = AV_NOPTS_VALUE;
InputStream *ist = NULL;
InputStream *ist = ost->ist;
AVFilterContext *filter = ost->filter->filter;
init_output_stream_wrapper(ost, next_picture, 1);
sync_ipts = adjust_frame_pts_to_encoder_tb(of, ost, next_picture);
if (ost->source_index >= 0)
ist = input_streams[ost->source_index];
frame_rate = av_buffersink_get_frame_rate(filter);
if (frame_rate.num > 0 && frame_rate.den > 0)
duration = 1/(av_q2d(frame_rate) * av_q2d(enc->time_base));
@ -1764,9 +1761,8 @@ static void flush_encoders(void)
static int check_output_constraints(InputStream *ist, OutputStream *ost)
{
OutputFile *of = output_files[ost->file_index];
int ist_index = input_files[ist->file_index]->ist_index + ist->st->index;
if (ost->source_index != ist_index)
if (ost->ist != ist)
return 0;
if (ost->finished & MUXER_FINISHED)
@ -2610,13 +2606,6 @@ static int init_input_stream(int ist_index, char *error, int error_len)
return 0;
}
static InputStream *get_input_stream(OutputStream *ost)
{
if (ost->source_index >= 0)
return input_streams[ost->source_index];
return NULL;
}
static int compare_int64(const void *a, const void *b)
{
return FFDIFFSIGN(*(const int64_t *)a, *(const int64_t *)b);
@ -2625,7 +2614,7 @@ static int compare_int64(const void *a, const void *b)
static int init_output_stream_streamcopy(OutputStream *ost)
{
OutputFile *of = output_files[ost->file_index];
InputStream *ist = get_input_stream(ost);
InputStream *ist = ost->ist;
InputFile *ifile = input_files[ist->file_index];
AVCodecParameters *par = ost->st->codecpar;
AVCodecContext *codec_ctx;
@ -2838,7 +2827,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
static void init_encoder_time_base(OutputStream *ost, AVRational default_time_base)
{
InputStream *ist = get_input_stream(ost);
InputStream *ist = ost->ist;
AVCodecContext *enc_ctx = ost->enc_ctx;
if (ost->enc_timebase.num > 0) {
@ -2862,7 +2851,7 @@ static void init_encoder_time_base(OutputStream *ost, AVRational default_time_ba
static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
{
InputStream *ist = get_input_stream(ost);
InputStream *ist = ost->ist;
AVCodecContext *enc_ctx = ost->enc_ctx;
AVCodecContext *dec_ctx = NULL;
OutputFile *of = output_files[ost->file_index];
@ -3006,8 +2995,8 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
case AVMEDIA_TYPE_SUBTITLE:
enc_ctx->time_base = AV_TIME_BASE_Q;
if (!enc_ctx->width) {
enc_ctx->width = input_streams[ost->source_index]->par->width;
enc_ctx->height = input_streams[ost->source_index]->par->height;
enc_ctx->width = ost->ist->par->width;
enc_ctx->height = ost->ist->par->height;
}
if (dec_ctx && dec_ctx->subtitle_header) {
/* ASS code assumes this buffer is null terminated so add extra byte. */
@ -3063,13 +3052,12 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
if (ost->enc_ctx) {
const AVCodec *codec = ost->enc_ctx->codec;
InputStream *ist;
InputStream *ist = ost->ist;
ret = init_output_stream_encode(ost, frame);
if (ret < 0)
return ret;
ist = get_input_stream(ost);
if (!av_dict_get(ost->encoder_opts, "threads", NULL, 0))
av_dict_set(&ost->encoder_opts, "threads", "auto", 0);
@ -3150,7 +3138,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
// copy estimated duration as a hint to the muxer
if (ost->st->duration <= 0 && ist && ist->st->duration > 0)
ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base);
} else if (ost->source_index >= 0) {
} else if (ost->ist) {
ret = init_output_stream_streamcopy(ost);
if (ret < 0)
return ret;
@ -3257,12 +3245,12 @@ static int transcode_init(void)
}
av_log(NULL, AV_LOG_INFO, " Stream #%d:%d -> #%d:%d",
input_streams[ost->source_index]->file_index,
input_streams[ost->source_index]->st->index,
ost->ist->file_index,
ost->ist->st->index,
ost->file_index,
ost->index);
if (ost->enc_ctx) {
const AVCodec *in_codec = input_streams[ost->source_index]->dec;
const AVCodec *in_codec = ost->ist->dec;
const AVCodec *out_codec = ost->enc_ctx->codec;
const char *decoder_name = "?";
const char *in_codec_name = "?";
@ -3648,7 +3636,7 @@ static int process_input(int file_index)
/* mark all outputs that don't go through lavfi as finished */
for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) {
if (ost->source_index == ifile->ist_index + i &&
if (ost->ist == ist &&
(!ost->enc_ctx || ost->enc_ctx->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
OutputFile *of = output_files[ost->file_index];
of_output_packet(of, ost->pkt, ost, 1);
@ -3837,8 +3825,8 @@ static int transcode_step(void)
return 0;
}
} else {
av_assert0(ost->source_index >= 0);
ist = input_streams[ost->source_index];
ist = ost->ist;
av_assert0(ist);
}
ret = process_input(ist->file_index);

7
fftools/ffmpeg.h
Unescape View File

@ -486,7 +486,12 @@ typedef enum {
typedef struct OutputStream {
int file_index; /* file index */
int index; /* stream index in the output file */
int source_index; /* InputStream index */
/* input stream that is the source for this output stream;
* may be NULL for streams with no well-defined source, e.g.
* attachments or outputs from complex filtergraphs */
InputStream *ist;
AVStream *st; /* stream in the output file */
/* number of frames emitted by the video-encoding sync code */
int64_t vsync_frame_number;

37
fftools/ffmpeg_mux_init.c
Unescape View File

@ -354,10 +354,10 @@ static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o,
if (ost->enc_ctx && av_get_exact_bits_per_sample(ost->enc_ctx->codec_id) == 24)
av_dict_set(&ost->swr_opts, "output_sample_bits", "24", 0);
ost->source_index = source_index;
if (source_index >= 0) {
input_streams[source_index]->discard = 0;
input_streams[source_index]->st->discard = input_streams[source_index]->user_set_discard;
ost->ist = input_streams[source_index];
ost->ist->discard = 0;
ost->ist->st->discard = ost->ist->user_set_discard;
}
ost->last_mux_dts = AV_NOPTS_VALUE;
ost->last_filter_pts = AV_NOPTS_VALUE;
@ -631,9 +631,8 @@ static OutputStream *new_video_stream(Muxer *mux, const OptionsContext *o, int s
VSYNC_CFR;
}
if (ost->source_index >= 0 && ost->vsync_method == VSYNC_CFR) {
const InputStream *ist = input_streams[ost->source_index];
const InputFile *ifile = input_files[ist->file_index];
if (ost->ist && ost->vsync_method == VSYNC_CFR) {
const InputFile *ifile = input_files[ost->ist->file_index];
if (ifile->nb_streams == 1 && ifile->input_ts_offset == 0)
ost->vsync_method = VSYNC_VSCFR;
@ -730,12 +729,12 @@ static OutputStream *new_audio_stream(Muxer *mux, const OptionsContext *o, int s
if (map->channel_idx == -1) {
ist = NULL;
} else if (ost->source_index < 0) {
} else if (!ost->ist) {
av_log(NULL, AV_LOG_FATAL, "Cannot determine input stream for channel mapping %d.%d\n",
ost->file_index, ost->st->index);
continue;
} else {
ist = input_streams[ost->source_index];
ist = ost->ist;
}
if (!ist || (ist->file_index == map->file_idx && ist->st->index == map->stream_idx)) {
@ -1648,11 +1647,10 @@ static void copy_meta(Muxer *mux, const OptionsContext *o)
if (!metadata_streams_manual)
for (int i = 0; i < of->nb_streams; i++) {
OutputStream *ost = of->streams[i];
InputStream *ist;
if (ost->source_index < 0) /* this is true e.g. for attached files */
if (!ost->ist) /* this is true e.g. for attached files */
continue;
ist = input_streams[ost->source_index];
av_dict_copy(&ost->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE);
av_dict_copy(&ost->st->metadata, ost->ist->st->metadata, AV_DICT_DONT_OVERWRITE);
if (ost->enc_ctx) {
av_dict_set(&ost->st->metadata, "encoder", NULL, 0);
}
@ -1673,8 +1671,8 @@ static int set_dispositions(OutputFile *of, AVFormatContext *ctx)
have_manual |= !!ost->disposition;
if (ost->source_index >= 0) {
ost->st->disposition = input_streams[ost->source_index]->st->disposition;
if (ost->ist) {
ost->st->disposition = ost->ist->st->disposition;
if (ost->st->disposition & AV_DISPOSITION_DEFAULT)
have_default[ost->st->codecpar->codec_type] = 1;
@ -1846,8 +1844,8 @@ int of_open(const OptionsContext *o, const char *filename)
for (int i = 0; i < of->nb_streams; i++) {
OutputStream *ost = of->streams[i];
if (ost->enc_ctx && ost->source_index >= 0) {
InputStream *ist = input_streams[ost->source_index];
if (ost->enc_ctx && ost->ist) {
InputStream *ist = ost->ist;
ist->decoding_needed |= DECODING_FOR_OST;
ist->processing_needed = 1;
@ -1857,14 +1855,13 @@ int of_open(const OptionsContext *o, const char *filename)
if (err < 0) {
av_log(NULL, AV_LOG_ERROR,
"Error initializing a simple filtergraph between streams "
"%d:%d->%d:%d\n", ist->file_index, ost->source_index,
"%d:%d->%d:%d\n", ist->file_index, ist->st->index,
nb_output_files - 1, ost->st->index);
exit_program(1);
}
}
} else if (ost->source_index >= 0) {
InputStream *ist = input_streams[ost->source_index];
ist->processing_needed = 1;
} else if (ost->ist) {
ost->ist->processing_needed = 1;
}
/* set the filter output constraints */

Write Preview
Loading…
Cancel
Save