aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-07-25 17:46:00 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-07-26 00:30:38 +0200
commit6bf87785e8e92da4d2223741a3d7d13428cbae8b (patch)
treed26f7e4bce396a79dbc4b661d58498a116591044 /ffmpeg.c
parentd0d9272580283645f9ac47a55dd471674c1bc9a4 (diff)
downloadandroid_external_ffmpeg-6bf87785e8e92da4d2223741a3d7d13428cbae8b.tar.gz
android_external_ffmpeg-6bf87785e8e92da4d2223741a3d7d13428cbae8b.tar.bz2
android_external_ffmpeg-6bf87785e8e92da4d2223741a3d7d13428cbae8b.zip
ffmpeg: warn about new streams after startup.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2619fe0d3b..ff17ba3b0c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -267,6 +267,7 @@ typedef struct InputFile {
int64_t ts_offset;
int nb_streams; /* number of stream that ffmpeg is aware of; may be different
from ctx.nb_streams if new streams appear during av_read_frame() */
+ int nb_streams_warn; /* number of streams that the user was warned of */
int rate_emu;
#if HAVE_PTHREADS
@@ -2873,6 +2874,21 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
}
}
+static void report_new_stream(int input_index, AVPacket *pkt)
+{
+ InputFile *file = input_files[input_index];
+ AVStream *st = file->ctx->streams[pkt->stream_index];
+
+ if (pkt->stream_index < file->nb_streams_warn)
+ return;
+ av_log(file->ctx, AV_LOG_WARNING,
+ "New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n",
+ av_get_media_type_string(st->codec->codec_type),
+ input_index, pkt->stream_index,
+ pkt->pos, av_ts2timestr(pkt->dts, &st->time_base));
+ file->nb_streams_warn = pkt->stream_index + 1;
+}
+
static int transcode_init(void)
{
int ret = 0, i, j, k;
@@ -3732,8 +3748,10 @@ static int transcode(void)
}
/* 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)
+ if (pkt.stream_index >= input_files[file_index]->nb_streams) {
+ report_new_stream(file_index, &pkt);
goto discard_packet;
+ }
ist_index = input_files[file_index]->ist_index + pkt.stream_index;
ist = input_streams[ist_index];
if (ist->discard)