X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=avconv.c;h=ea736066ecb4e9516de8e472e9b0d4b7f82dc961;hb=91ff4e83ca7f8cb64540ef2eb2c7e48b7e2cc8f7;hp=e6ace30151db745d44ef954ef1aa73eb1cdb9f72;hpb=c0fbf9713c5e167501007351532de2400060c7e6;p=ffmpeg diff --git a/avconv.c b/avconv.c index e6ace30151d..ea736066ecb 100644 --- a/avconv.c +++ b/avconv.c @@ -183,6 +183,7 @@ void exit_program(int ret) av_freep(&output_streams[i]->forced_keyframes); av_freep(&output_streams[i]->avfilter); + av_freep(&output_streams[i]->logfile_prefix); av_freep(&output_streams[i]->filtered_frame); av_freep(&output_streams[i]); } @@ -345,7 +346,7 @@ static int check_recording_time(OutputStream *ost) if (of->recording_time != INT64_MAX && av_compare_ts(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, of->recording_time, AV_TIME_BASE_Q) >= 0) { - ost->is_past_recording_time = 1; + ost->finished = 1; return 0; } return 1; @@ -719,7 +720,7 @@ static int poll_filter(OutputStream *ost) */ static int poll_filters(void) { - int i, ret = 0; + int i, j, ret = 0; while (ret >= 0 && !received_sigterm) { OutputStream *ost = NULL; @@ -729,8 +730,7 @@ static int poll_filters(void) for (i = 0; i < nb_output_streams; i++) { int64_t pts = output_streams[i]->sync_opts; - if (!output_streams[i]->filter || - output_streams[i]->is_past_recording_time) + if (!output_streams[i]->filter || output_streams[i]->finished) continue; pts = av_rescale_q(pts, output_streams[i]->st->codec->time_base, @@ -747,10 +747,14 @@ static int poll_filters(void) ret = poll_filter(ost); if (ret == AVERROR_EOF) { - ost->is_past_recording_time = 1; + OutputFile *of = output_files[ost->file_index]; - if (opt_shortest) - return ret; + ost->finished = 1; + + if (of->shortest) { + for (j = 0; j < of->ctx->nb_streams; j++) + output_streams[of->ost_index + j]->finished = 1; + } ret = 0; } else if (ret == AVERROR(EAGAIN)) @@ -821,7 +825,7 @@ static void print_report(int is_last_report, int64_t timer_start) if (qp >= 0 && qp < FF_ARRAY_ELEMS(qp_histogram)) qp_histogram[qp]++; for (j = 0; j < 32; j++) - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log(qp_histogram[j] + 1) / log(2))); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log2(qp_histogram[j] + 1))); } if (enc->flags&CODEC_FLAG_PSNR) { int j; @@ -983,7 +987,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p if (of->recording_time != INT64_MAX && ist->last_dts >= of->recording_time + of->start_time) { - ost->is_past_recording_time = 1; + ost->finished = 1; return; } @@ -1069,15 +1073,11 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) decoded_frame = ist->decoded_frame; ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt); - if (ret < 0) { - return ret; - } - - if (!*got_output) { - /* no audio frame */ - if (!pkt->size) + if (!*got_output || ret < 0) { + if (!pkt->size) { for (i = 0; i < ist->nb_filters; i++) av_buffersrc_buffer(ist->filters[i]->filter, NULL); + } return ret; } @@ -1216,17 +1216,15 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) ret = avcodec_decode_video2(ist->st->codec, decoded_frame, got_output, pkt); - if (ret < 0) - return ret; - - quality = same_quant ? decoded_frame->quality : 0; - if (!*got_output) { - /* no picture yet */ - if (!pkt->size) + if (!*got_output || ret < 0) { + if (!pkt->size) { for (i = 0; i < ist->nb_filters; i++) av_buffersrc_buffer(ist->filters[i]->filter, NULL); + } return ret; } + + quality = same_quant ? decoded_frame->quality : 0; decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pkt_pts, decoded_frame->pkt_dts); pkt->size = 0; @@ -1530,7 +1528,7 @@ static int transcode_init(void) { int ret = 0, i, j, k; AVFormatContext *oc; - AVCodecContext *codec, *icodec; + AVCodecContext *codec; OutputStream *ost; InputStream *ist; char error[1024]; @@ -1561,6 +1559,7 @@ static int transcode_init(void) /* for each output stream, we compute the right encoding parameters */ for (i = 0; i < nb_output_streams; i++) { + AVCodecContext *icodec = NULL; ost = output_streams[i]; oc = output_files[ost->file_index]->ctx; ist = get_input_stream(ost); @@ -1684,7 +1683,11 @@ static int transcode_init(void) (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & (AVFMT_NOTIMESTAMPS | AVFMT_VARIABLE_FPS))))) { - ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1}; + ost->frame_rate = ist->framerate.num ? ist->framerate : + ist->st->avg_frame_rate.num ? + ist->st->avg_frame_rate : + (AVRational){25, 1}; + if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) { int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates); ost->frame_rate = ost->enc->supported_framerates[idx]; @@ -1721,9 +1724,10 @@ static int transcode_init(void) ost->filter->filter->inputs[0]->sample_aspect_ratio; codec->pix_fmt = ost->filter->filter->inputs[0]->format; - if (codec->width != icodec->width || - codec->height != icodec->height || - codec->pix_fmt != icodec->pix_fmt) { + if (icodec && + (codec->width != icodec->width || + codec->height != icodec->height || + codec->pix_fmt != icodec->pix_fmt)) { codec->bits_per_raw_sample = 0; } @@ -1744,7 +1748,8 @@ static int transcode_init(void) FILE *f; snprintf(logfilename, sizeof(logfilename), "%s-%d.log", - pass_logfilename_prefix ? pass_logfilename_prefix : DEFAULT_PASS_LOGFILENAME_PREFIX, + ost->logfile_prefix ? ost->logfile_prefix : + DEFAULT_PASS_LOGFILENAME_PREFIX, i); if (!strcmp(ost->enc->name, "libx264")) { av_dict_set(&ost->opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE); @@ -1938,13 +1943,13 @@ static int need_output(void) OutputFile *of = output_files[ost->file_index]; AVFormatContext *os = output_files[ost->file_index]->ctx; - if (ost->is_past_recording_time || + if (ost->finished || (os->pb && avio_tell(os->pb) >= of->limit_filesize)) continue; if (ost->frame_number >= ost->max_frames) { int j; for (j = 0; j < of->ctx->nb_streams; j++) - output_streams[of->ost_index + j]->is_past_recording_time = 1; + output_streams[of->ost_index + j]->finished = 1; continue; } @@ -1954,10 +1959,11 @@ static int need_output(void) return 0; } -static int select_input_file(void) +static InputFile *select_input_file(void) { + InputFile *ifile = NULL; int64_t ipts_min = INT64_MAX; - int i, file_index = -1; + int i; for (i = 0; i < nb_input_streams; i++) { InputStream *ist = input_streams[i]; @@ -1968,12 +1974,12 @@ static int select_input_file(void) if (!input_files[ist->file_index]->eof_reached) { if (ipts < ipts_min) { ipts_min = ipts; - file_index = ist->file_index; + ifile = input_files[ist->file_index]; } } } - return file_index; + return ifile; } #if HAVE_PTHREADS @@ -2111,13 +2117,134 @@ static void reset_eagain(void) input_files[i]->eagain = 0; } +/** + * Read one packet from an input file and send it for + * - decoding -> lavfi (audio/video) + * - decoding -> encoding -> muxing (subtitles) + * - muxing (streamcopy) + * + * @return + * - 0 -- one packet was read and processed + * - AVERROR(EAGAIN) -- no packets were available for selected file, + * this function should be called again + * - AVERROR_EOF -- this function should not be called again + */ +static int process_input(void) +{ + InputFile *ifile; + AVFormatContext *is; + InputStream *ist; + AVPacket pkt; + int ret, i, j; + + /* select the stream that we must read now */ + ifile = select_input_file(); + /* if none, if is finished */ + if (!ifile) { + if (got_eagain()) { + reset_eagain(); + av_usleep(10000); + return AVERROR(EAGAIN); + } + av_log(NULL, AV_LOG_VERBOSE, "No more inputs to read from.\n"); + return AVERROR_EOF; + } + + is = ifile->ctx; + ret = get_input_packet(ifile, &pkt); + + if (ret == AVERROR(EAGAIN)) { + ifile->eagain = 1; + return ret; + } + if (ret < 0) { + if (ret != AVERROR_EOF) { + print_error(is->filename, ret); + if (exit_on_error) + exit_program(1); + } + ifile->eof_reached = 1; + + for (i = 0; i < ifile->nb_streams; i++) { + ist = input_streams[ifile->ist_index + i]; + if (ist->decoding_needed) + output_packet(ist, NULL); + + /* mark all outputs that don't go through lavfi as finished */ + for (j = 0; j < nb_output_streams; j++) { + OutputStream *ost = output_streams[j]; + + if (ost->source_index == ifile->ist_index + i && + (ost->stream_copy || ost->enc->type == AVMEDIA_TYPE_SUBTITLE)) + ost->finished= 1; + } + } + + return AVERROR(EAGAIN); + } + + reset_eagain(); + + if (do_pkt_dump) { + av_pkt_dump_log2(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump, + is->streams[pkt.stream_index]); + } + /* the following test is needed in case new streams appear + dynamically in stream : we ignore them */ + if (pkt.stream_index >= ifile->nb_streams) + goto discard_packet; + + ist = input_streams[ifile->ist_index + pkt.stream_index]; + if (ist->discard) + goto discard_packet; + + if (pkt.dts != AV_NOPTS_VALUE) + pkt.dts += av_rescale_q(ifile->ts_offset, AV_TIME_BASE_Q, ist->st->time_base); + if (pkt.pts != AV_NOPTS_VALUE) + pkt.pts += av_rescale_q(ifile->ts_offset, AV_TIME_BASE_Q, ist->st->time_base); + + if (pkt.pts != AV_NOPTS_VALUE) + pkt.pts *= ist->ts_scale; + if (pkt.dts != AV_NOPTS_VALUE) + pkt.dts *= ist->ts_scale; + + if (pkt.dts != AV_NOPTS_VALUE && ist->next_dts != AV_NOPTS_VALUE && + (is->iformat->flags & AVFMT_TS_DISCONT)) { + int64_t pkt_dts = av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q); + int64_t delta = pkt_dts - ist->next_dts; + + if ((FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || pkt_dts + 1 < ist->last_dts) && !copy_ts) { + ifile->ts_offset -= delta; + av_log(NULL, AV_LOG_DEBUG, + "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", + delta, ifile->ts_offset); + pkt.dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); + if (pkt.pts != AV_NOPTS_VALUE) + pkt.pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); + } + } + + ret = output_packet(ist, &pkt); + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n", + ist->file_index, ist->st->index); + if (exit_on_error) + exit_program(1); + } + +discard_packet: + av_free_packet(&pkt); + + return 0; +} + /* * The following code is the main loop of the file converter */ static int transcode(void) { - int ret, i; - AVFormatContext *is, *os; + int ret, i, need_input = 1; + AVFormatContext *os; OutputStream *ost; InputStream *ist; int64_t timer_start; @@ -2137,107 +2264,28 @@ static int transcode(void) #endif while (!received_sigterm) { - int file_index, ist_index; - AVPacket pkt; - /* check if there's any stream where output is still needed */ if (!need_output()) { av_log(NULL, AV_LOG_VERBOSE, "No more output streams to write to, finishing.\n"); break; } - /* select the stream that we must read now */ - file_index = select_input_file(); - /* if none, if is finished */ - if (file_index < 0) { - if (got_eagain()) { - reset_eagain(); - av_usleep(10000); - continue; - } - av_log(NULL, AV_LOG_VERBOSE, "No more inputs to read from, finishing.\n"); - break; + /* read and process one input packet if needed */ + if (need_input) { + ret = process_input(); + if (ret == AVERROR_EOF) + need_input = 0; } - is = input_files[file_index]->ctx; - ret = get_input_packet(input_files[file_index], &pkt); - - if (ret == AVERROR(EAGAIN)) { - input_files[file_index]->eagain = 1; - continue; - } + ret = poll_filters(); if (ret < 0) { - if (ret != AVERROR_EOF) { - print_error(is->filename, ret); - if (exit_on_error) - exit_program(1); - } - input_files[file_index]->eof_reached = 1; - - for (i = 0; i < input_files[file_index]->nb_streams; i++) { - ist = input_streams[input_files[file_index]->ist_index + i]; - if (ist->decoding_needed) - output_packet(ist, NULL); - } - - if (opt_shortest) - break; - else + if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) continue; - } - - reset_eagain(); - - if (do_pkt_dump) { - av_pkt_dump_log2(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump, - is->streams[pkt.stream_index]); - } - /* the following test is needed in case new streams appear - dynamically in stream : we ignore them */ - if (pkt.stream_index >= input_files[file_index]->nb_streams) - goto discard_packet; - ist_index = input_files[file_index]->ist_index + pkt.stream_index; - ist = input_streams[ist_index]; - if (ist->discard) - goto discard_packet; - - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts += av_rescale_q(input_files[ist->file_index]->ts_offset, AV_TIME_BASE_Q, ist->st->time_base); - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts += av_rescale_q(input_files[ist->file_index]->ts_offset, AV_TIME_BASE_Q, ist->st->time_base); - - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts *= ist->ts_scale; - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts *= ist->ts_scale; - - if (pkt.dts != AV_NOPTS_VALUE && ist->next_dts != AV_NOPTS_VALUE - && (is->iformat->flags & AVFMT_TS_DISCONT)) { - int64_t pkt_dts = av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q); - int64_t delta = pkt_dts - ist->next_dts; - if ((FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || pkt_dts + 1 < ist->last_dts) && !copy_ts) { - input_files[ist->file_index]->ts_offset -= delta; - av_log(NULL, AV_LOG_DEBUG, - "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", - delta, input_files[ist->file_index]->ts_offset); - pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); - } - } - if (output_packet(ist, &pkt) < 0 || poll_filters() < 0) { - av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n", - ist->file_index, ist->st->index); - if (exit_on_error) - exit_program(1); - av_free_packet(&pkt); - continue; + av_log(NULL, AV_LOG_ERROR, "Error while filtering.\n"); + break; } - discard_packet: - av_free_packet(&pkt); - /* dump report by using the output first video and audio streams */ print_report(0, timer_start); } @@ -2350,7 +2398,7 @@ static void parse_cpuflags(int argc, char **argv, const OptionDef *options) { int idx = locate_option(argc, argv, options, "cpuflags"); if (idx && argv[idx + 1]) - opt_cpuflags("cpuflags", argv[idx + 1]); + opt_cpuflags(NULL, "cpuflags", argv[idx + 1]); } int main(int argc, char **argv) @@ -2390,11 +2438,6 @@ int main(int argc, char **argv) exit_program(1); } - if (nb_input_files == 0) { - av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n"); - exit_program(1); - } - ti = getutime(); if (transcode() < 0) exit_program(1);