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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Michael Niedermayer 13 years ago
parent c2a016ad4d 908f12f342
commit 7c1aba4f01
27 changed files with 610 additions and 522 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Changelog
  2. 331
      avconv.c
  3. 108
      cmdutils.c
  4. 5
      cmdutils.h
  5. 5
      configure
  6. 3
      doc/avconv.texi
  7. 341
      ffmpeg.c
  8. 1
      ffplay.c
  9. 1
      ffprobe.c
  10. 1
      ffserver.c
  11. 4
      libavcodec/flacdec.c
  12. 95
      libavcodec/libgsm.c
  13. 2
      libavcodec/version.h
  14. 126
      libavcodec/ws-snd1.c
  15. 26
      libavformat/oggparsecelt.c
  16. 24
      libavformat/rtp.c
  17. 10
      libavformat/rtp.h
  18. 4
      libavformat/rtpenc.c
  19. 2
      libavformat/sdp.c
  20. 2
      libavformat/sol.c
  21. 16
      libavformat/utils.c
  22. 2
      libavutil/avutil.h
  23. 2
      libavutil/cpu.c
  24. 2
      libavutil/cpu.h
  25. 9
      libavutil/x86/cpu.c
  26. 7
      tests/Makefile
  27. 2
      tests/fate.mak

1
Changelog
Unescape View File

@ -59,6 +59,7 @@ easier to use. The changes are:
- audio support to lavfi input device added - audio support to lavfi input device added
- libcdio-paranoia input device for audio CD grabbing - libcdio-paranoia input device for audio CD grabbing
- Apple ProRes decoder - Apple ProRes decoder
- CELT in Ogg demuxing
version 0.8: version 0.8:

331
avconv.c
Unescape View File

@ -138,7 +138,6 @@ static int audio_volume = 256;
static int exit_on_error = 0; static int exit_on_error = 0;
static int using_stdin = 0; static int using_stdin = 0;
static int verbose = 1;
static int run_as_daemon = 0; static int run_as_daemon = 0;
static int q_pressed = 0; static int q_pressed = 0;
static int64_t video_size = 0; static int64_t video_size = 0;
@ -622,9 +621,8 @@ void exit_program(int ret)
#endif #endif
if (received_sigterm) { if (received_sigterm) {
fprintf(stderr, av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
"Received signal %d: terminating.\n", (int) received_sigterm);
(int) received_sigterm);
exit (255); exit (255);
} }
@ -635,7 +633,7 @@ static void assert_avoptions(AVDictionary *m)
{ {
AVDictionaryEntry *t; AVDictionaryEntry *t;
if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) { if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key); av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
exit_program(1); exit_program(1);
} }
} }
@ -646,12 +644,12 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
AVCodec *codec; AVCodec *codec;
if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL && if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL &&
c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(NULL, AV_LOG_ERROR, "%s '%s' is experimental and might produce bad " av_log(NULL, AV_LOG_FATAL, "%s '%s' is experimental and might produce bad "
"results.\nAdd '-strict experimental' if you want to use it.\n", "results.\nAdd '-strict experimental' if you want to use it.\n",
codec_string, c->codec->name); codec_string, c->codec->name);
codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id); codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL)) if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n", av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
codec_string, codec->name); codec_string, codec->name);
exit_program(1); exit_program(1);
} }
@ -747,9 +745,9 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx
av_free_packet(pkt); av_free_packet(pkt);
new_pkt.destruct= av_destruct_packet; new_pkt.destruct= av_destruct_packet;
} else if(a<0){ } else if(a<0){
fprintf(stderr, "%s failed for stream %d, codec %s", av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
bsfc->filter->name, pkt->stream_index, bsfc->filter->name, pkt->stream_index,
avctx->codec ? avctx->codec->name : "copy"); avctx->codec ? avctx->codec->name : "copy");
print_error("", a); print_error("", a);
if (exit_on_error) if (exit_on_error)
exit_program(1); exit_program(1);
@ -795,14 +793,14 @@ need_realloc:
audio_out_size += FF_MIN_BUFFER_SIZE; audio_out_size += FF_MIN_BUFFER_SIZE;
if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){ if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
fprintf(stderr, "Buffer sizes too large\n"); av_log(NULL, AV_LOG_FATAL, "Buffer sizes too large\n");
exit_program(1); exit_program(1);
} }
av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size); av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size); av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
if (!audio_buf || !audio_out){ if (!audio_buf || !audio_out){
fprintf(stderr, "Out of memory in do_audio_out\n"); av_log(NULL, AV_LOG_FATAL, "Out of memory in do_audio_out\n");
exit_program(1); exit_program(1);
} }
@ -834,15 +832,15 @@ need_realloc:
ost->audio_resample = 0; ost->audio_resample = 0;
} else { } else {
if (dec->sample_fmt != AV_SAMPLE_FMT_S16) if (dec->sample_fmt != AV_SAMPLE_FMT_S16)
fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n"); av_log(NULL, AV_LOG_WARNING, "Using s16 intermediate sample format for resampling\n");
ost->resample = av_audio_resample_init(enc->channels, dec->channels, ost->resample = av_audio_resample_init(enc->channels, dec->channels,
enc->sample_rate, dec->sample_rate, enc->sample_rate, dec->sample_rate,
enc->sample_fmt, dec->sample_fmt, enc->sample_fmt, dec->sample_fmt,
16, 10, 0, 0.8); 16, 10, 0, 0.8);
if (!ost->resample) { if (!ost->resample) {
fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n", av_log(NULL, AV_LOG_FATAL, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
dec->channels, dec->sample_rate, dec->channels, dec->sample_rate,
enc->channels, enc->sample_rate); enc->channels, enc->sample_rate);
exit_program(1); exit_program(1);
} }
} }
@ -856,9 +854,9 @@ need_realloc:
ost->reformat_ctx = av_audio_convert_alloc(enc->sample_fmt, 1, ost->reformat_ctx = av_audio_convert_alloc(enc->sample_fmt, 1,
dec->sample_fmt, 1, NULL, 0); dec->sample_fmt, 1, NULL, 0);
if (!ost->reformat_ctx) { if (!ost->reformat_ctx) {
fprintf(stderr, "Cannot convert %s sample format to %s sample format\n", av_log(NULL, AV_LOG_FATAL, "Cannot convert %s sample format to %s sample format\n",
av_get_sample_fmt_name(dec->sample_fmt), av_get_sample_fmt_name(dec->sample_fmt),
av_get_sample_fmt_name(enc->sample_fmt)); av_get_sample_fmt_name(enc->sample_fmt));
exit_program(1); exit_program(1);
} }
ost->reformat_pair=MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt); ost->reformat_pair=MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt);
@ -877,8 +875,7 @@ need_realloc:
byte_delta= FFMAX(byte_delta, -size); byte_delta= FFMAX(byte_delta, -size);
size += byte_delta; size += byte_delta;
buf -= byte_delta; buf -= byte_delta;
if(verbose > 2) av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio samples\n", (int)-delta);
fprintf(stderr, "discarding %d audio samples\n", (int)-delta);
if(!size) if(!size)
return; return;
ist->is_start=0; ist->is_start=0;
@ -896,14 +893,13 @@ need_realloc:
memcpy(input_tmp + byte_delta, buf, size); memcpy(input_tmp + byte_delta, buf, size);
buf= input_tmp; buf= input_tmp;
size += byte_delta; size += byte_delta;
if(verbose > 2) av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", (int)delta);
fprintf(stderr, "adding %d audio samples of silence\n", (int)delta);
} }
}else if(audio_sync_method>1){ }else if(audio_sync_method>1){
int comp= av_clip(delta, -audio_sync_method, audio_sync_method); int comp= av_clip(delta, -audio_sync_method, audio_sync_method);
av_assert0(ost->audio_resample); av_assert0(ost->audio_resample);
if(verbose > 2) av_log(NULL, AV_LOG_VERBOSE, "compensating audio timestamp drift:%f compensation:%d in:%d\n",
fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate); delta, comp, enc->sample_rate);
// fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2)); // fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2));
av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate); av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate);
} }
@ -943,7 +939,7 @@ need_realloc:
if (enc->frame_size > 1) { if (enc->frame_size > 1) {
/* output resampled raw samples */ /* output resampled raw samples */
if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) { if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) {
fprintf(stderr, "av_fifo_realloc2() failed\n"); av_log(NULL, AV_LOG_FATAL, "av_fifo_realloc2() failed\n");
exit_program(1); exit_program(1);
} }
av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL); av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL);
@ -961,7 +957,7 @@ need_realloc:
ret = avcodec_encode_audio(enc, audio_out, audio_out_size, ret = avcodec_encode_audio(enc, audio_out, audio_out_size,
(short *)audio_buf); (short *)audio_buf);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
exit_program(1); exit_program(1);
} }
audio_size += ret; audio_size += ret;
@ -988,7 +984,7 @@ need_realloc:
size_out = size_out*coded_bps/8; size_out = size_out*coded_bps/8;
if(size_out > audio_out_size){ if(size_out > audio_out_size){
fprintf(stderr, "Internal error, buffer size too small\n"); av_log(NULL, AV_LOG_FATAL, "Internal error, buffer size too small\n");
exit_program(1); exit_program(1);
} }
@ -996,7 +992,7 @@ need_realloc:
ret = avcodec_encode_audio(enc, audio_out, size_out, ret = avcodec_encode_audio(enc, audio_out, size_out,
(short *)buftmp); (short *)buftmp);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
exit_program(1); exit_program(1);
} }
audio_size += ret; audio_size += ret;
@ -1035,7 +1031,7 @@ static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void *
if(avpicture_deinterlace(picture2, picture, if(avpicture_deinterlace(picture2, picture,
dec->pix_fmt, dec->width, dec->height) < 0) { dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not deinterlace */ /* if error, do not deinterlace */
fprintf(stderr, "Deinterlacing failed\n"); av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
av_free(buf); av_free(buf);
buf = NULL; buf = NULL;
picture2 = picture; picture2 = picture;
@ -1062,7 +1058,7 @@ static void do_subtitle_out(AVFormatContext *s,
AVPacket pkt; AVPacket pkt;
if (pts == AV_NOPTS_VALUE) { if (pts == AV_NOPTS_VALUE) {
fprintf(stderr, "Subtitle packets must have a pts\n"); av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
if (exit_on_error) if (exit_on_error)
exit_program(1); exit_program(1);
return; return;
@ -1091,7 +1087,7 @@ static void do_subtitle_out(AVFormatContext *s,
subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
subtitle_out_max_size, sub); subtitle_out_max_size, sub);
if (subtitle_out_size < 0) { if (subtitle_out_size < 0) {
fprintf(stderr, "Subtitle encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
exit_program(1); exit_program(1);
} }
@ -1163,7 +1159,7 @@ static void do_video_resample(OutputStream *ost,
enc->width, enc->height, enc->pix_fmt, enc->width, enc->height, enc->pix_fmt,
ost->sws_flags, NULL, NULL, NULL); ost->sws_flags, NULL, NULL, NULL);
if (ost->img_resample_ctx == NULL) { if (ost->img_resample_ctx == NULL) {
fprintf(stderr, "Cannot get resampling context\n"); av_log(NULL, AV_LOG_FATAL, "Cannot get resampling context\n");
exit_program(1); exit_program(1);
} }
} }
@ -1174,7 +1170,7 @@ static void do_video_resample(OutputStream *ost,
if (resample_changed) { if (resample_changed) {
avfilter_graph_free(&ost->graph); avfilter_graph_free(&ost->graph);
if (configure_video_filters(ist, ost)) { if (configure_video_filters(ist, ost)) {
fprintf(stderr, "Error reinitializing filters!\n"); av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
exit_program(1); exit_program(1);
} }
} }
@ -1226,12 +1222,10 @@ static void do_video_out(AVFormatContext *s,
//fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames); //fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames);
if (nb_frames == 0){ if (nb_frames == 0){
++nb_frames_drop; ++nb_frames_drop;
if (verbose>2) av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
fprintf(stderr, "*** drop!\n");
}else if (nb_frames > 1) { }else if (nb_frames > 1) {
nb_frames_dup += nb_frames - 1; nb_frames_dup += nb_frames - 1;
if (verbose>2) av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames-1);
fprintf(stderr, "*** %d dup!\n", nb_frames-1);
} }
}else }else
ost->sync_opts= lrintf(sync_ipts); ost->sync_opts= lrintf(sync_ipts);
@ -1292,7 +1286,7 @@ static void do_video_out(AVFormatContext *s,
bit_buffer, bit_buffer_size, bit_buffer, bit_buffer_size,
&big_picture); &big_picture);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Video encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
exit_program(1); exit_program(1);
} }
@ -1378,6 +1372,7 @@ static void print_report(OutputFile *output_files,
int64_t pts = INT64_MAX; int64_t pts = INT64_MAX;
static int64_t last_time = -1; static int64_t last_time = -1;
static int qp_histogram[52]; static int qp_histogram[52];
int hours, mins, secs, us;
if (!is_last_report) { if (!is_last_report) {
int64_t cur_time; int64_t cur_time;
@ -1454,43 +1449,39 @@ static void print_report(OutputFile *output_files,
ost->st->time_base, AV_TIME_BASE_Q)); ost->st->time_base, AV_TIME_BASE_Q));
} }
if (verbose > 0 || is_last_report) { secs = pts / AV_TIME_BASE;
int hours, mins, secs, us; us = pts % AV_TIME_BASE;
secs = pts / AV_TIME_BASE; mins = secs / 60;
us = pts % AV_TIME_BASE; secs %= 60;
mins = secs / 60; hours = mins / 60;
secs %= 60; mins %= 60;
hours = mins / 60;
mins %= 60; bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"size=%8.0fkB time=", total_size / 1024.0);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"size=%8.0fkB time=", total_size / 1024.0); "%02d:%02d:%02d.%02d ", hours, mins, secs,
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), (100 * us) / AV_TIME_BASE);
"%02d:%02d:%02d.%02d ", hours, mins, secs, snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
(100 * us) / AV_TIME_BASE); "bitrate=%6.1fkbits/s", bitrate);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"bitrate=%6.1fkbits/s", bitrate); if (nb_frames_dup || nb_frames_drop)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
if (nb_frames_dup || nb_frames_drop) nb_frames_dup, nb_frames_drop);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
nb_frames_dup, nb_frames_drop);
if (verbose >= 0)
fprintf(stderr, "%s \r", buf);
fflush(stderr);
}
if (is_last_report && verbose >= 0){ av_log(NULL, is_last_report ? AV_LOG_WARNING : AV_LOG_INFO, "%s \r", buf);
fflush(stderr);
if (is_last_report) {
int64_t raw= audio_size + video_size + extra_size; int64_t raw= audio_size + video_size + extra_size;
fprintf(stderr, "\n"); av_log(NULL, AV_LOG_INFO, "\n");
fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n", av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
video_size/1024.0, video_size/1024.0,
audio_size/1024.0, audio_size/1024.0,
extra_size/1024.0, extra_size/1024.0,
100.0*(total_size - raw)/raw 100.0*(total_size - raw)/raw
); );
} }
} }
@ -1554,7 +1545,7 @@ static void flush_encoders(OutputStream *ost_table, int nb_ostreams)
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL); ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
} }
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
exit_program(1); exit_program(1);
} }
audio_size += ret; audio_size += ret;
@ -1563,7 +1554,7 @@ static void flush_encoders(OutputStream *ost_table, int nb_ostreams)
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL); ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Video encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
exit_program(1); exit_program(1);
} }
video_size += ret; video_size += ret;
@ -1635,11 +1626,10 @@ static int output_packet(InputStream *ist, int ist_index,
handle_eof: handle_eof:
ist->pts= ist->next_pts; ist->pts= ist->next_pts;
if(avpkt.size && avpkt.size != pkt->size && if(avpkt.size && avpkt.size != pkt->size)
((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){ av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index); "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning=1; ist->showed_multi_packet_warning=1;
}
/* decode the packet if needed */ /* decode the packet if needed */
decoded_data_buf = NULL; /* fail safe */ decoded_data_buf = NULL; /* fail safe */
@ -1981,7 +1971,7 @@ static int transcode_init(OutputFile *output_files,
os = output_files[i].ctx; os = output_files[i].ctx;
if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) { if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
av_dump_format(os, i, os->filename, 1); av_dump_format(os, i, os->filename, 1);
fprintf(stderr, "Output file #%d does not contain any stream\n", i); av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
} }
@ -2046,7 +2036,7 @@ static int transcode_init(OutputFile *output_files,
switch(codec->codec_type) { switch(codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if(audio_volume != 256) { if(audio_volume != 256) {
fprintf(stderr,"-acodec copy and -vol are incompatible (frames are not decoded)\n"); av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
exit_program(1); exit_program(1);
} }
codec->channel_layout = icodec->channel_layout; codec->channel_layout = icodec->channel_layout;
@ -2120,7 +2110,7 @@ static int transcode_init(OutputFile *output_files,
choose_pixel_fmt(ost->st, ost->enc); choose_pixel_fmt(ost->st, ost->enc);
if (ost->st->codec->pix_fmt == PIX_FMT_NONE) { if (ost->st->codec->pix_fmt == PIX_FMT_NONE) {
fprintf(stderr, "Video pixel format is unknown, stream cannot be encoded\n"); av_log(NULL, AV_LOG_FATAL, "Video pixel format is unknown, stream cannot be encoded\n");
exit_program(1); exit_program(1);
} }
@ -2157,7 +2147,7 @@ static int transcode_init(OutputFile *output_files,
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if (configure_video_filters(ist, ost)) { if (configure_video_filters(ist, ost)) {
fprintf(stderr, "Error opening filters!\n"); av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
exit(1); exit(1);
} }
#endif #endif
@ -2182,7 +2172,8 @@ static int transcode_init(OutputFile *output_files,
if (codec->flags & CODEC_FLAG_PASS1) { if (codec->flags & CODEC_FLAG_PASS1) {
f = fopen(logfilename, "wb"); f = fopen(logfilename, "wb");
if (!f) { if (!f) {
fprintf(stderr, "Cannot write log file '%s' for pass-1 encoding: %s\n", logfilename, strerror(errno)); av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
logfilename, strerror(errno));
exit_program(1); exit_program(1);
} }
ost->logfile = f; ost->logfile = f;
@ -2190,7 +2181,8 @@ static int transcode_init(OutputFile *output_files,
char *logbuffer; char *logbuffer;
size_t logbuffer_size; size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename); av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
logfilename);
exit_program(1); exit_program(1);
} }
codec->stats_in = logbuffer; codec->stats_in = logbuffer;
@ -2207,8 +2199,8 @@ static int transcode_init(OutputFile *output_files,
if (!bit_buffer) if (!bit_buffer)
bit_buffer = av_malloc(bit_buffer_size); bit_buffer = av_malloc(bit_buffer_size);
if (!bit_buffer) { if (!bit_buffer) {
fprintf(stderr, "Cannot allocate %d bytes output buffer\n", av_log(NULL, AV_LOG_ERROR, "Cannot allocate %d bytes output buffer\n",
bit_buffer_size); bit_buffer_size);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -2294,31 +2286,29 @@ static int transcode_init(OutputFile *output_files,
} }
/* dump the stream mapping */ /* dump the stream mapping */
if (verbose >= 0) { av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
fprintf(stderr, "Stream mapping:\n"); for (i = 0; i < nb_output_streams; i++) {
for (i = 0; i < nb_output_streams;i ++) { ost = &output_streams[i];
ost = &output_streams[i]; av_log(NULL, AV_LOG_INFO, " Stream #%d.%d -> #%d.%d",
fprintf(stderr, " Stream #%d.%d -> #%d.%d", input_streams[ost->source_index].file_index,
input_streams[ost->source_index].file_index, input_streams[ost->source_index].st->index,
input_streams[ost->source_index].st->index, ost->file_index,
ost->file_index, ost->index);
ost->index); if (ost->sync_ist != &input_streams[ost->source_index])
if (ost->sync_ist != &input_streams[ost->source_index]) av_log(NULL, AV_LOG_INFO, " [sync #%d.%d]",
fprintf(stderr, " [sync #%d.%d]", ost->sync_ist->file_index,
ost->sync_ist->file_index, ost->sync_ist->st->index);
ost->sync_ist->st->index); if (ost->st->stream_copy)
if (ost->st->stream_copy) av_log(NULL, AV_LOG_INFO, " (copy)");
fprintf(stderr, " (copy)"); else
else av_log(NULL, AV_LOG_INFO, " (%s -> %s)", input_streams[ost->source_index].dec ?
fprintf(stderr, " (%s -> %s)", input_streams[ost->source_index].dec ? input_streams[ost->source_index].dec->name : "?",
input_streams[ost->source_index].dec->name : "?", ost->enc ? ost->enc->name : "?");
ost->enc ? ost->enc->name : "?"); av_log(NULL, AV_LOG_INFO, "\n");
fprintf(stderr, "\n");
}
} }
if (ret) { if (ret) {
fprintf(stderr, "%s\n", error); av_log(NULL, AV_LOG_ERROR, "%s\n", error);
return ret; return ret;
} }
@ -2354,8 +2344,7 @@ static int transcode(OutputFile *output_files,
goto fail; goto fail;
if (!using_stdin) { if (!using_stdin) {
if(verbose >= 0) av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
fprintf(stderr, "Press [q] to stop, [?] for help\n");
avio_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
} }
term_init(); term_init();
@ -2378,8 +2367,8 @@ static int transcode(OutputFile *output_files,
key = read_key(); key = read_key();
if (key == 'q') if (key == 'q')
break; break;
if (key == '+') verbose++; if (key == '+') av_log_set_level(av_log_get_level()+10);
if (key == '-') verbose--; if (key == '-') av_log_set_level(av_log_get_level()-10);
if (key == 's') qp_hist ^= 1; if (key == 's') qp_hist ^= 1;
if (key == 'h'){ if (key == 'h'){
if (do_hex_dump){ if (do_hex_dump){
@ -2515,9 +2504,8 @@ static int transcode(OutputFile *output_files,
int64_t delta= pkt_dts - ist->next_pts; int64_t delta= pkt_dts - ist->next_pts;
if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || pkt_dts+1<ist->pts)&& !copy_ts){ if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || pkt_dts+1<ist->pts)&& !copy_ts){
input_files[ist->file_index].ts_offset -= delta; input_files[ist->file_index].ts_offset -= delta;
if (verbose > 2) av_log(NULL, AV_LOG_DEBUG, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
fprintf(stderr, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", delta, input_files[ist->file_index].ts_offset);
delta, input_files[ist->file_index].ts_offset);
pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
if(pkt.pts != AV_NOPTS_VALUE) if(pkt.pts != AV_NOPTS_VALUE)
pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
@ -2527,9 +2515,8 @@ static int transcode(OutputFile *output_files,
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size); //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) { if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) {
if (verbose >= 0) av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d.%d\n",
fprintf(stderr, "Error while decoding stream #%d.%d\n", ist->file_index, ist->st->index);
ist->file_index, ist->st->index);
if (exit_on_error) if (exit_on_error)
exit_program(1); exit_program(1);
av_free_packet(&pkt); av_free_packet(&pkt);
@ -2620,7 +2607,7 @@ static int transcode(OutputFile *output_files,
static int opt_verbose(const char *opt, const char *arg) static int opt_verbose(const char *opt, const char *arg)
{ {
verbose = parse_number_or_die(opt, arg, OPT_INT64, -10, 10); av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -loglevel\n", opt);
return 0; return 0;
} }
@ -2642,7 +2629,7 @@ static double parse_frame_aspect_ratio(const char *arg)
ar = strtod(arg, NULL); ar = strtod(arg, NULL);
if (!ar) { if (!ar) {
fprintf(stderr, "Incorrect aspect ratio specification.\n"); av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n");
exit_program(1); exit_program(1);
} }
return ar; return ar;
@ -2687,7 +2674,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
*sync = 0; *sync = 0;
sync_file_idx = strtol(sync + 1, &sync, 0); sync_file_idx = strtol(sync + 1, &sync, 0);
if (sync_file_idx >= nb_input_files || sync_file_idx < 0) { if (sync_file_idx >= nb_input_files || sync_file_idx < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid sync file index: %d.\n", sync_file_idx); av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
exit_program(1); exit_program(1);
} }
if (*sync) if (*sync)
@ -2699,7 +2686,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
break; break;
} }
if (i == input_files[sync_file_idx].nb_streams) { if (i == input_files[sync_file_idx].nb_streams) {
av_log(NULL, AV_LOG_ERROR, "Sync stream specification in map %s does not " av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
"match any streams.\n", arg); "match any streams.\n", arg);
exit_program(1); exit_program(1);
} }
@ -2708,7 +2695,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
file_idx = strtol(map, &p, 0); file_idx = strtol(map, &p, 0);
if (file_idx >= nb_input_files || file_idx < 0) { if (file_idx >= nb_input_files || file_idx < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid input file index: %d.\n", file_idx); av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
exit_program(1); exit_program(1);
} }
if (negative) if (negative)
@ -2742,7 +2729,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
} }
if (!m) { if (!m) {
av_log(NULL, AV_LOG_ERROR, "Stream map '%s' matches no streams.\n", arg); av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
exit_program(1); exit_program(1);
} }
@ -2764,7 +2751,7 @@ static void parse_meta_type(char *arg, char *type, int *index)
*index = strtol(++arg, NULL, 0); *index = strtol(++arg, NULL, 0);
break; break;
default: default:
fprintf(stderr, "Invalid metadata type %c.\n", *arg); av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
exit_program(1); exit_program(1);
} }
} else } else
@ -2810,11 +2797,11 @@ static enum CodecID find_codec_or_die(const char *name, enum AVMediaType type, i
avcodec_find_encoder_by_name(name) : avcodec_find_encoder_by_name(name) :
avcodec_find_decoder_by_name(name); avcodec_find_decoder_by_name(name);
if(!codec) { if(!codec) {
av_log(NULL, AV_LOG_ERROR, "Unknown %s '%s'\n", codec_string, name); av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
exit_program(1); exit_program(1);
} }
if(codec->type != type) { if(codec->type != type) {
av_log(NULL, AV_LOG_ERROR, "Invalid %s type '%s'\n", codec_string, name); av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
exit_program(1); exit_program(1);
} }
return codec->id; return codec->id;
@ -2888,11 +2875,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) { if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) {
if (verbose >= 0) av_log(NULL, AV_LOG_INFO,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num,
i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num, (float)rfps / rfps_base, rfps, rfps_base);
(float)rfps / rfps_base, rfps, rfps_base);
} }
if (o->video_disable) if (o->video_disable)
@ -2929,7 +2914,7 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
if (o->format) { if (o->format) {
if (!(file_iformat = av_find_input_format(o->format))) { if (!(file_iformat = av_find_input_format(o->format))) {
fprintf(stderr, "Unknown input format: '%s'\n", o->format); av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
exit_program(1); exit_program(1);
} }
} }
@ -2984,8 +2969,8 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
/* If not enough info to get the stream parameters, we decode the /* If not enough info to get the stream parameters, we decode the
first frames to get it. (used in mpeg case for example) */ first frames to get it. (used in mpeg case for example) */
ret = avformat_find_stream_info(ic, opts); ret = avformat_find_stream_info(ic, opts);
if (ret < 0 && verbose >= 0) { if (ret < 0) {
fprintf(stderr, "%s: could not find codec parameters\n", filename); av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
av_close_input_file(ic); av_close_input_file(ic);
exit_program(1); exit_program(1);
} }
@ -2999,8 +2984,8 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
if (o->start_time != 0) { if (o->start_time != 0) {
ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "%s: could not seek to position %0.3f\n", av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
filename, (double)timestamp / AV_TIME_BASE); filename, (double)timestamp / AV_TIME_BASE);
} }
} }
@ -3008,8 +2993,7 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
add_input_streams(o, ic); add_input_streams(o, ic);
/* dump the file content */ /* dump the file content */
if (verbose >= 0) av_dump_format(ic, nb_input_files, filename, 0);
av_dump_format(ic, nb_input_files, filename, 0);
input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
input_files[nb_input_files - 1].ctx = ic; input_files[nb_input_files - 1].ctx = ic;
@ -3060,7 +3044,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
double qscale = -1; double qscale = -1;
if (!st) { if (!st) {
av_log(NULL, AV_LOG_ERROR, "Could not alloc stream.\n"); av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
exit_program(1); exit_program(1);
} }
@ -3087,7 +3071,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
if (next = strchr(bsf, ',')) if (next = strchr(bsf, ','))
*next++ = 0; *next++ = 0;
if (!(bsfc = av_bitstream_filter_init(bsf))) { if (!(bsfc = av_bitstream_filter_init(bsf))) {
av_log(NULL, AV_LOG_ERROR, "Unknown bitstream filter %s\n", bsf); av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
exit_program(1); exit_program(1);
} }
if (bsfc_prev) if (bsfc_prev)
@ -3127,7 +3111,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
break; break;
p = strchr(p, ','); p = strchr(p, ',');
if(!p) { if(!p) {
fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i); av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
exit_program(1); exit_program(1);
} }
p++; p++;
@ -3157,13 +3141,13 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) { if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid framerate value: %s\n", frame_rate); av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
exit_program(1); exit_program(1);
} }
MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) { if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid frame size: %s.\n", frame_size); av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
exit_program(1); exit_program(1);
} }
@ -3173,7 +3157,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st); MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) { if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) {
av_log(NULL, AV_LOG_ERROR, "Unknown pixel format requested: %s.\n", frame_pix_fmt); av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
exit_program(1); exit_program(1);
} }
st->sample_aspect_ratio = video_enc->sample_aspect_ratio; st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
@ -3181,7 +3165,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st); MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st);
if (intra_matrix) { if (intra_matrix) {
if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) { if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
av_log(NULL, AV_LOG_ERROR, "Could not allocate memory for intra matrix.\n"); av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
exit_program(1); exit_program(1);
} }
parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix); parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
@ -3189,7 +3173,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st); MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st);
if (inter_matrix) { if (inter_matrix) {
if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) { if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
av_log(NULL, AV_LOG_ERROR, "Could not allocate memory for inter matrix.\n"); av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n");
exit_program(1); exit_program(1);
} }
parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix); parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
@ -3200,7 +3184,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
int start, end, q; int start, end, q;
int e=sscanf(p, "%d,%d,%d", &start, &end, &q); int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
if(e!=3){ if(e!=3){
fprintf(stderr, "error parsing rc_override\n"); av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
exit_program(1); exit_program(1);
} }
video_enc->rc_override= video_enc->rc_override=
@ -3276,7 +3260,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st); MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st);
if (sample_fmt && if (sample_fmt &&
(audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) { (audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) {
av_log(NULL, AV_LOG_ERROR, "Invalid sample format '%s'\n", sample_fmt); av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt);
exit_program(1); exit_program(1);
} }
@ -3296,7 +3280,7 @@ static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc)
st = ost->st; st = ost->st;
data_enc = st->codec; data_enc = st->codec;
if (!st->stream_copy) { if (!st->stream_copy) {
fprintf(stderr, "Data stream encoding not supported yet (only streamcopy)\n"); av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
exit_program(1); exit_program(1);
} }
@ -3336,9 +3320,9 @@ static int opt_streamid(OptionsContext *o, const char *opt, const char *arg)
av_strlcpy(idx_str, arg, sizeof(idx_str)); av_strlcpy(idx_str, arg, sizeof(idx_str));
p = strchr(idx_str, ':'); p = strchr(idx_str, ':');
if (!p) { if (!p) {
fprintf(stderr, av_log(NULL, AV_LOG_FATAL,
"Invalid value '%s' for option '%s', required syntax is 'index:value'\n", "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
arg, opt); arg, opt);
exit_program(1); exit_program(1);
} }
*p++ = '\0'; *p++ = '\0';
@ -3512,7 +3496,7 @@ static void opt_output_file(void *optctx, const char *filename)
case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break; case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break;
case AVMEDIA_TYPE_DATA: ost = new_data_stream(o, oc); break; case AVMEDIA_TYPE_DATA: ost = new_data_stream(o, oc); break;
default: default:
av_log(NULL, AV_LOG_ERROR, "Cannot map stream #%d.%d - unsupported type.\n", av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d.%d - unsupported type.\n",
map->file_index, map->stream_index); map->file_index, map->stream_index);
exit_program(1); exit_program(1);
} }
@ -3583,7 +3567,7 @@ static void opt_output_file(void *optctx, const char *filename)
break; break;
} }
} else { } else {
av_log(NULL, AV_LOG_ERROR, "Invalid input file index %d in chapter mapping.\n", av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
o->chapters_input_file); o->chapters_input_file);
exit_program(1); exit_program(1);
} }
@ -3600,7 +3584,7 @@ static void opt_output_file(void *optctx, const char *filename)
#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ #define METADATA_CHECK_INDEX(index, nb_elems, desc)\
if ((index) < 0 || (index) >= (nb_elems)) {\ if ((index) < 0 || (index) >= (nb_elems)) {\
av_log(NULL, AV_LOG_ERROR, "Invalid %s index %d while processing metadata maps\n",\ av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps\n",\
(desc), (index));\ (desc), (index));\
exit_program(1);\ exit_program(1);\
} }
@ -3656,7 +3640,7 @@ static void opt_output_file(void *optctx, const char *filename)
val = strchr(o->metadata[i].u.str, '='); val = strchr(o->metadata[i].u.str, '=');
if (!val) { if (!val) {
av_log(NULL, AV_LOG_ERROR, "No '=' character in metadata string %s.\n", av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n",
o->metadata[i].u.str); o->metadata[i].u.str);
exit_program(1); exit_program(1);
} }
@ -3669,20 +3653,20 @@ static void opt_output_file(void *optctx, const char *filename)
break; break;
case 's': case 's':
if (index < 0 || index >= oc->nb_streams) { if (index < 0 || index >= oc->nb_streams) {
av_log(NULL, AV_LOG_ERROR, "Invalid stream index %d in metadata specifier.\n", index); av_log(NULL, AV_LOG_FATAL, "Invalid stream index %d in metadata specifier.\n", index);
exit_program(1); exit_program(1);
} }
m = &oc->streams[index]->metadata; m = &oc->streams[index]->metadata;
break; break;
case 'c': case 'c':
if (index < 0 || index >= oc->nb_chapters) { if (index < 0 || index >= oc->nb_chapters) {
av_log(NULL, AV_LOG_ERROR, "Invalid chapter index %d in metadata specifier.\n", index); av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index);
exit_program(1); exit_program(1);
} }
m = &oc->chapters[index]->metadata; m = &oc->chapters[index]->metadata;
break; break;
default: default:
av_log(NULL, AV_LOG_ERROR, "Invalid metadata specifier %s.\n", o->metadata[i].specifier); av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier);
exit_program(1); exit_program(1);
} }
@ -3854,14 +3838,14 @@ static int opt_target(OptionsContext *o, const char *opt, const char *arg)
break; break;
} }
} }
if(verbose > 0 && norm != UNKNOWN) if (norm != UNKNOWN)
fprintf(stderr, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC"); av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC");
} }
if(norm == UNKNOWN) { if(norm == UNKNOWN) {
fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
fprintf(stderr, "or set a framerate with \"-r xxx\".\n"); av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
exit_program(1); exit_program(1);
} }
@ -3948,7 +3932,7 @@ static int opt_target(OptionsContext *o, const char *opt, const char *arg)
parse_option(o, "ac", "2", options); parse_option(o, "ac", "2", options);
} else { } else {
fprintf(stderr, "Unknown target: %s\n", arg); av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
return 0; return 0;
@ -4049,7 +4033,7 @@ static const OptionDef options[] = {
{ "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump},
"when dumping packets, also dump the payload" }, "when dumping packets, also dump the payload" },
{ "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" }, { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" },
{ "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" }, { "v", HAS_ARG, {(void*)opt_verbose}, "deprecated, use -loglevel instead", "number" },
{ "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
{ "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" }, { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
{ "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
@ -4140,10 +4124,10 @@ int main(int argc, char **argv)
reset_options(&o); reset_options(&o);
av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_flags(AV_LOG_SKIP_REPEATED);
parse_loglevel(argc, argv, options);
if(argc>1 && !strcmp(argv[1], "-d")){ if(argc>1 && !strcmp(argv[1], "-d")){
run_as_daemon=1; run_as_daemon=1;
verbose=-1;
av_log_set_callback(log_callback_null); av_log_set_callback(log_callback_null);
argc--; argc--;
argv++; argv++;
@ -4163,15 +4147,14 @@ int main(int argc, char **argv)
avio_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
#endif #endif
if(verbose>=0) show_banner();
show_banner();
/* parse options */ /* parse options */
parse_options(&o, argc, argv, options, opt_output_file); parse_options(&o, argc, argv, options, opt_output_file);
if(nb_output_files <= 0 && nb_input_files == 0) { if(nb_output_files <= 0 && nb_input_files == 0) {
show_usage(); show_usage();
fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name); av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
exit_program(1); exit_program(1);
} }
@ -4182,7 +4165,7 @@ int main(int argc, char **argv)
} }
if (nb_input_files == 0) { if (nb_input_files == 0) {
fprintf(stderr, "At least one input file must be specified\n"); av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
exit_program(1); exit_program(1);
} }

108
cmdutils.c
Unescape View File

@ -91,7 +91,7 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
error= "Expected int for %s but found %s\n"; error= "Expected int for %s but found %s\n";
else else
return d; return d;
fprintf(stderr, error, context, numstr, min, max); av_log(NULL, AV_LOG_FATAL, error, context, numstr, min, max);
exit_program(1); exit_program(1);
return 0; return 0;
} }
@ -100,8 +100,8 @@ int64_t parse_time_or_die(const char *context, const char *timestr, int is_durat
{ {
int64_t us; int64_t us;
if (av_parse_time(&us, timestr, is_duration) < 0) { if (av_parse_time(&us, timestr, is_duration) < 0) {
fprintf(stderr, "Invalid %s specification for %s: %s\n", av_log(NULL, AV_LOG_FATAL, "Invalid %s specification for %s: %s\n",
is_duration ? "duration" : "date", context, timestr); is_duration ? "duration" : "date", context, timestr);
exit_program(1); exit_program(1);
} }
return us; return us;
@ -305,6 +305,41 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
} }
} }
/*
* Return index of option opt in argv or 0 if not found.
*/
static int locate_option(int argc, char **argv, const OptionDef *options, const char *optname)
{
const OptionDef *po;
int i;
for (i = 1; i < argc; i++) {
const char *cur_opt = argv[i];
if (*cur_opt++ != '-')
continue;
po = find_option(options, cur_opt);
if (!po->name && cur_opt[0] == 'n' && cur_opt[1] == 'o')
po = find_option(options, cur_opt + 2);
if ((!po->name && !strcmp(cur_opt, optname)) ||
(po->name && !strcmp(optname, po->name)))
return i;
if (!po || po->flags & HAS_ARG)
i++;
}
return 0;
}
void parse_loglevel(int argc, char **argv, const OptionDef *options)
{
int idx = locate_option(argc, argv, options, "loglevel");
if (idx && argv[idx + 1])
opt_loglevel("loglevel", argv[idx + 1]);
}
#define FLAGS(o) ((o)->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0 #define FLAGS(o) ((o)->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
int opt_default(const char *opt, const char *arg) int opt_default(const char *opt, const char *arg)
{ {
@ -337,7 +372,7 @@ int opt_default(const char *opt, const char *arg)
if (oc || of || os) if (oc || of || os)
return 0; return 0;
fprintf(stderr, "Unrecognized option '%s'\n", opt); av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
return AVERROR_OPTION_NOT_FOUND; return AVERROR_OPTION_NOT_FOUND;
} }
@ -366,10 +401,10 @@ int opt_loglevel(const char *opt, const char *arg)
level = strtol(arg, &tail, 10); level = strtol(arg, &tail, 10);
if (*tail) { if (*tail) {
fprintf(stderr, "Invalid loglevel \"%s\". " av_log(NULL, AV_LOG_FATAL, "Invalid loglevel \"%s\". "
"Possible levels are numbers or:\n", arg); "Possible levels are numbers or:\n", arg);
for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++) for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++)
fprintf(stderr, "\"%s\"\n", log_levels[i].name); av_log(NULL, AV_LOG_FATAL, "\"%s\"\n", log_levels[i].name);
exit_program(1); exit_program(1);
} }
av_log_set_level(level); av_log_set_level(level);
@ -384,7 +419,7 @@ int opt_timelimit(const char *opt, const char *arg)
if (setrlimit(RLIMIT_CPU, &rl)) if (setrlimit(RLIMIT_CPU, &rl))
perror("setrlimit"); perror("setrlimit");
#else #else
fprintf(stderr, "Warning: -%s not implemented on this OS\n", opt); av_log(NULL, AV_LOG_WARNING, "-%s not implemented on this OS\n", opt);
#endif #endif
return 0; return 0;
} }
@ -396,7 +431,7 @@ void print_error(const char *filename, int err)
if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
errbuf_ptr = strerror(AVUNERROR(err)); errbuf_ptr = strerror(AVUNERROR(err));
fprintf(stderr, "%s: %s\n", filename, errbuf_ptr); av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
} }
static int warned_cfg = 0; static int warned_cfg = 0;
@ -405,58 +440,59 @@ static int warned_cfg = 0;
#define SHOW_VERSION 2 #define SHOW_VERSION 2
#define SHOW_CONFIG 4 #define SHOW_CONFIG 4
#define PRINT_LIB_INFO(outstream,libname,LIBNAME,flags) \ #define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \
if (CONFIG_##LIBNAME) { \ if (CONFIG_##LIBNAME) { \
const char *indent = flags & INDENT? " " : ""; \ const char *indent = flags & INDENT? " " : ""; \
if (flags & SHOW_VERSION) { \ if (flags & SHOW_VERSION) { \
unsigned int version = libname##_version(); \ unsigned int version = libname##_version(); \
fprintf(outstream, "%slib%-9s %2d.%3d.%2d / %2d.%3d.%2d\n", \ av_log(NULL, level, "%slib%-9s %2d.%3d.%2d / %2d.%3d.%2d\n",\
indent, #libname, \ indent, #libname, \
LIB##LIBNAME##_VERSION_MAJOR, \ LIB##LIBNAME##_VERSION_MAJOR, \
LIB##LIBNAME##_VERSION_MINOR, \ LIB##LIBNAME##_VERSION_MINOR, \
LIB##LIBNAME##_VERSION_MICRO, \ LIB##LIBNAME##_VERSION_MICRO, \
version >> 16, version >> 8 & 0xff, version & 0xff); \ version >> 16, version >> 8 & 0xff, version & 0xff); \
} \ } \
if (flags & SHOW_CONFIG) { \ if (flags & SHOW_CONFIG) { \
const char *cfg = libname##_configuration(); \ const char *cfg = libname##_configuration(); \
if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \ if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \
if (!warned_cfg) { \ if (!warned_cfg) { \
fprintf(outstream, \ av_log(NULL, level, \
"%sWARNING: library configuration mismatch\n", \ "%sWARNING: library configuration mismatch\n", \
indent); \ indent); \
warned_cfg = 1; \ warned_cfg = 1; \
} \ } \
fprintf(stderr, "%s%-11s configuration: %s\n", \ av_log(NULL, level, "%s%-11s configuration: %s\n", \
indent, #libname, cfg); \ indent, #libname, cfg); \
} \ } \
} \ } \
} \ } \
static void print_all_libs_info(FILE* outstream, int flags) static void print_all_libs_info(int flags, int level)
{ {
PRINT_LIB_INFO(outstream, avutil, AVUTIL, flags); PRINT_LIB_INFO(avutil, AVUTIL, flags, level);
PRINT_LIB_INFO(outstream, avcodec, AVCODEC, flags); PRINT_LIB_INFO(avcodec, AVCODEC, flags, level);
PRINT_LIB_INFO(outstream, avformat, AVFORMAT, flags); PRINT_LIB_INFO(avformat, AVFORMAT, flags, level);
PRINT_LIB_INFO(outstream, avdevice, AVDEVICE, flags); PRINT_LIB_INFO(avdevice, AVDEVICE, flags, level);
PRINT_LIB_INFO(outstream, avfilter, AVFILTER, flags); PRINT_LIB_INFO(avfilter, AVFILTER, flags, level);
PRINT_LIB_INFO(outstream, swscale, SWSCALE, flags); PRINT_LIB_INFO(swscale, SWSCALE, flags, level);
PRINT_LIB_INFO(outstream, postproc, POSTPROC, flags); PRINT_LIB_INFO(postproc, POSTPROC, flags, level);
} }
void show_banner(void) void show_banner(void)
{ {
fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n", av_log(NULL, AV_LOG_INFO, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",
program_name, program_birth_year, this_year); program_name, program_birth_year, this_year);
fprintf(stderr, " built on %s %s with %s %s\n", av_log(NULL, AV_LOG_INFO, " built on %s %s with %s %s\n",
__DATE__, __TIME__, CC_TYPE, CC_VERSION); __DATE__, __TIME__, CC_TYPE, CC_VERSION);
fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); av_log(NULL, AV_LOG_VERBOSE, " configuration: " FFMPEG_CONFIGURATION "\n");
print_all_libs_info(stderr, INDENT|SHOW_CONFIG); print_all_libs_info(INDENT|SHOW_CONFIG, AV_LOG_VERBOSE);
print_all_libs_info(stderr, INDENT|SHOW_VERSION); print_all_libs_info(INDENT|SHOW_VERSION, AV_LOG_VERBOSE);
} }
int opt_version(const char *opt, const char *arg) { int opt_version(const char *opt, const char *arg) {
av_log_set_callback(log_callback_help);
printf("%s " FFMPEG_VERSION "\n", program_name); printf("%s " FFMPEG_VERSION "\n", program_name);
print_all_libs_info(stdout, SHOW_VERSION); print_all_libs_info(SHOW_VERSION, AV_LOG_INFO);
return 0; return 0;
} }
@ -758,7 +794,7 @@ int read_file(const char *filename, char **bufptr, size_t *size)
FILE *f = fopen(filename, "rb"); FILE *f = fopen(filename, "rb");
if (!f) { if (!f) {
fprintf(stderr, "Cannot read file '%s': %s\n", filename, strerror(errno)); av_log(NULL, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename, strerror(errno));
return AVERROR(errno); return AVERROR(errno);
} }
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
@ -766,7 +802,7 @@ int read_file(const char *filename, char **bufptr, size_t *size)
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
*bufptr = av_malloc(*size + 1); *bufptr = av_malloc(*size + 1);
if (!*bufptr) { if (!*bufptr) {
fprintf(stderr, "Could not allocate file buffer\n"); av_log(NULL, AV_LOG_ERROR, "Could not allocate file buffer\n");
fclose(f); fclose(f);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }

5
cmdutils.h
Unescape View File

@ -178,6 +178,11 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
*/ */
int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options); int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);
/**
* Find the '-loglevel' option in the commandline args and apply it.
*/
void parse_loglevel(int argc, char **argv, const OptionDef *options);
/** /**
* Check if the given stream matches a stream specifier. * Check if the given stream matches a stream specifier.
* *

5
configure vendored
Unescape View File

@ -1630,11 +1630,14 @@ test_deps(){
dep=${v%=*} dep=${v%=*}
tests=${v#*=} tests=${v#*=}
for name in ${tests}; do for name in ${tests}; do
eval ${name}_test_deps="'${dep}$suf1 ${dep}$suf2'" append ${name}_test_deps ${dep}$suf1 ${dep}$suf2
done done
done done
} }
mxf_d10_test_deps="avfilter"
seek_lavf_mxf_d10_test_deps="mxf_d10_test"
test_deps _encoder _decoder \ test_deps _encoder _decoder \
adpcm_g726=g726 \ adpcm_g726=g726 \
adpcm_ima_qt \ adpcm_ima_qt \

3
doc/avconv.texi
Unescape View File

@ -154,7 +154,8 @@ avconv -i INPUT -metadata:s:1 language=eng OUTPUT
@end example @end example
@item -v @var{number} (@emph{global}) @item -v @var{number} (@emph{global})
Set the logging verbosity level. This option is deprecated and has no effect, use -loglevel
to set verbosity level.
@item -target @var{type} (@emph{output}) @item -target @var{type} (@emph{output})
Specify target file type ("vcd", "svcd", "dvd", "dv", "dv50", "pal-vcd", Specify target file type ("vcd", "svcd", "dvd", "dv", "dv50", "pal-vcd",

341
ffmpeg.c
Unescape View File

@ -145,7 +145,6 @@ static int audio_volume = 256;
static int exit_on_error = 0; static int exit_on_error = 0;
static int using_stdin = 0; static int using_stdin = 0;
static int verbose = 1;
static int run_as_daemon = 0; static int run_as_daemon = 0;
static int q_pressed = 0; static int q_pressed = 0;
static int64_t video_size = 0; static int64_t video_size = 0;
@ -659,9 +658,8 @@ void exit_program(int ret)
av_freep(&input_tmp); av_freep(&input_tmp);
if (received_sigterm) { if (received_sigterm) {
fprintf(stderr, av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
"Received signal %d: terminating.\n", (int) received_sigterm);
(int) received_sigterm);
exit (255); exit (255);
} }
@ -672,7 +670,7 @@ static void assert_avoptions(AVDictionary *m)
{ {
AVDictionaryEntry *t; AVDictionaryEntry *t;
if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) { if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key); av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
exit_program(1); exit_program(1);
} }
} }
@ -683,12 +681,12 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
AVCodec *codec; AVCodec *codec;
if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL && if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL &&
c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(NULL, AV_LOG_ERROR, "%s '%s' is experimental and might produce bad " av_log(NULL, AV_LOG_FATAL, "%s '%s' is experimental and might produce bad "
"results.\nAdd '-strict experimental' if you want to use it.\n", "results.\nAdd '-strict experimental' if you want to use it.\n",
codec_string, c->codec->name); codec_string, c->codec->name);
codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id); codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL)) if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n", av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
codec_string, codec->name); codec_string, codec->name);
exit_program(1); exit_program(1);
} }
@ -784,9 +782,9 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx
av_free_packet(pkt); av_free_packet(pkt);
new_pkt.destruct= av_destruct_packet; new_pkt.destruct= av_destruct_packet;
} else if(a<0){ } else if(a<0){
fprintf(stderr, "%s failed for stream %d, codec %s", av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
bsfc->filter->name, pkt->stream_index, bsfc->filter->name, pkt->stream_index,
avctx->codec ? avctx->codec->name : "copy"); avctx->codec ? avctx->codec->name : "copy");
print_error("", a); print_error("", a);
if (exit_on_error) if (exit_on_error)
exit_program(1); exit_program(1);
@ -832,14 +830,14 @@ need_realloc:
audio_out_size += FF_MIN_BUFFER_SIZE; audio_out_size += FF_MIN_BUFFER_SIZE;
if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){ if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
fprintf(stderr, "Buffer sizes too large\n"); av_log(NULL, AV_LOG_FATAL, "Buffer sizes too large\n");
exit_program(1); exit_program(1);
} }
av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size); av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size); av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
if (!audio_buf || !audio_out){ if (!audio_buf || !audio_out){
fprintf(stderr, "Out of memory in do_audio_out\n"); av_log(NULL, AV_LOG_FATAL, "Out of memory in do_audio_out\n");
exit_program(1); exit_program(1);
} }
@ -878,12 +876,12 @@ need_realloc:
av_set_int(ost->swr, "och", enc->channels); av_set_int(ost->swr, "och", enc->channels);
if(audio_sync_method>1) av_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE); if(audio_sync_method>1) av_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE);
if(ost->swr && swr_init(ost->swr) < 0){ if(ost->swr && swr_init(ost->swr) < 0){
fprintf(stderr, "swr_init() failed\n"); av_log(NULL, AV_LOG_FATAL, "swr_init() failed\n");
swr_free(&ost->swr); swr_free(&ost->swr);
} }
if (!ost->swr) { if (!ost->swr) {
fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n", av_log(NULL, AV_LOG_FATAL, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
dec->channels, dec->sample_rate, dec->channels, dec->sample_rate,
enc->channels, enc->sample_rate); enc->channels, enc->sample_rate);
exit_program(1); exit_program(1);
@ -906,8 +904,7 @@ need_realloc:
byte_delta= FFMAX(byte_delta, -size); byte_delta= FFMAX(byte_delta, -size);
size += byte_delta; size += byte_delta;
buf -= byte_delta; buf -= byte_delta;
if(verbose > 2) av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio samples\n", (int)-delta);
fprintf(stderr, "discarding %d audio samples\n", (int)-delta);
if(!size) if(!size)
return; return;
ist->is_start=0; ist->is_start=0;
@ -924,14 +921,13 @@ need_realloc:
memcpy(input_tmp + byte_delta, buf, size); memcpy(input_tmp + byte_delta, buf, size);
buf= input_tmp; buf= input_tmp;
size += byte_delta; size += byte_delta;
if(verbose > 2) av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", (int)delta);
fprintf(stderr, "adding %d audio samples of silence\n", (int)delta);
} }
}else if(audio_sync_method>1){ }else if(audio_sync_method>1){
int comp= av_clip(delta, -audio_sync_method, audio_sync_method); int comp= av_clip(delta, -audio_sync_method, audio_sync_method);
av_assert0(ost->audio_resample); av_assert0(ost->audio_resample);
if(verbose > 2) av_log(NULL, AV_LOG_VERBOSE, "compensating audio timestamp drift:%f compensation:%d in:%d\n",
fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate); delta, comp, enc->sample_rate);
// fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2)); // fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2));
swr_compensate(ost->swr, comp, enc->sample_rate); swr_compensate(ost->swr, comp, enc->sample_rate);
} }
@ -956,7 +952,7 @@ need_realloc:
if (enc->frame_size > 1) { if (enc->frame_size > 1) {
/* output resampled raw samples */ /* output resampled raw samples */
if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) { if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) {
fprintf(stderr, "av_fifo_realloc2() failed\n"); av_log(NULL, AV_LOG_FATAL, "av_fifo_realloc2() failed\n");
exit_program(1); exit_program(1);
} }
av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL); av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL);
@ -974,7 +970,7 @@ need_realloc:
ret = avcodec_encode_audio(enc, audio_out, audio_out_size, ret = avcodec_encode_audio(enc, audio_out, audio_out_size,
(short *)audio_buf); (short *)audio_buf);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
exit_program(1); exit_program(1);
} }
audio_size += ret; audio_size += ret;
@ -1001,7 +997,7 @@ need_realloc:
size_out = size_out*coded_bps/8; size_out = size_out*coded_bps/8;
if(size_out > audio_out_size){ if(size_out > audio_out_size){
fprintf(stderr, "Internal error, buffer size too small\n"); av_log(NULL, AV_LOG_FATAL, "Internal error, buffer size too small\n");
exit_program(1); exit_program(1);
} }
@ -1009,7 +1005,7 @@ need_realloc:
ret = avcodec_encode_audio(enc, audio_out, size_out, ret = avcodec_encode_audio(enc, audio_out, size_out,
(short *)buftmp); (short *)buftmp);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
exit_program(1); exit_program(1);
} }
audio_size += ret; audio_size += ret;
@ -1048,7 +1044,7 @@ static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void *
if(avpicture_deinterlace(picture2, picture, if(avpicture_deinterlace(picture2, picture,
dec->pix_fmt, dec->width, dec->height) < 0) { dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not deinterlace */ /* if error, do not deinterlace */
fprintf(stderr, "Deinterlacing failed\n"); av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
av_free(buf); av_free(buf);
buf = NULL; buf = NULL;
picture2 = picture; picture2 = picture;
@ -1075,7 +1071,7 @@ static void do_subtitle_out(AVFormatContext *s,
AVPacket pkt; AVPacket pkt;
if (pts == AV_NOPTS_VALUE) { if (pts == AV_NOPTS_VALUE) {
fprintf(stderr, "Subtitle packets must have a pts\n"); av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
if (exit_on_error) if (exit_on_error)
exit_program(1); exit_program(1);
return; return;
@ -1104,7 +1100,7 @@ static void do_subtitle_out(AVFormatContext *s,
subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
subtitle_out_max_size, sub); subtitle_out_max_size, sub);
if (subtitle_out_size < 0) { if (subtitle_out_size < 0) {
fprintf(stderr, "Subtitle encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
exit_program(1); exit_program(1);
} }
@ -1166,7 +1162,7 @@ static void do_video_resample(OutputStream *ost,
avcodec_get_frame_defaults(&ost->resample_frame); avcodec_get_frame_defaults(&ost->resample_frame);
if (avpicture_alloc((AVPicture *)&ost->resample_frame, enc->pix_fmt, if (avpicture_alloc((AVPicture *)&ost->resample_frame, enc->pix_fmt,
enc->width, enc->height)) { enc->width, enc->height)) {
fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n"); av_log(NULL, AV_LOG_FATAL, "Cannot allocate temp picture, check pix fmt\n");
exit_program(1); exit_program(1);
} }
} }
@ -1176,7 +1172,7 @@ static void do_video_resample(OutputStream *ost,
enc->width, enc->height, enc->pix_fmt, enc->width, enc->height, enc->pix_fmt,
ost->sws_flags, NULL, NULL, NULL); ost->sws_flags, NULL, NULL, NULL);
if (ost->img_resample_ctx == NULL) { if (ost->img_resample_ctx == NULL) {
fprintf(stderr, "Cannot get resampling context\n"); av_log(NULL, AV_LOG_FATAL, "Cannot get resampling context\n");
exit_program(1); exit_program(1);
} }
} }
@ -1235,12 +1231,10 @@ static void do_video_out(AVFormatContext *s,
//fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames); //fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames);
if (nb_frames == 0){ if (nb_frames == 0){
++nb_frames_drop; ++nb_frames_drop;
if (verbose>2) av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
fprintf(stderr, "*** drop!\n");
}else if (nb_frames > 1) { }else if (nb_frames > 1) {
nb_frames_dup += nb_frames - 1; nb_frames_dup += nb_frames - 1;
if (verbose>2) av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames-1);
fprintf(stderr, "*** %d dup!\n", nb_frames-1);
} }
}else }else
ost->sync_opts= lrintf(sync_ipts); ost->sync_opts= lrintf(sync_ipts);
@ -1301,7 +1295,7 @@ static void do_video_out(AVFormatContext *s,
bit_buffer, bit_buffer_size, bit_buffer, bit_buffer_size,
&big_picture); &big_picture);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Video encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
exit_program(1); exit_program(1);
} }
@ -1388,6 +1382,7 @@ static void print_report(OutputFile *output_files,
int64_t pts = INT64_MAX; int64_t pts = INT64_MAX;
static int64_t last_time = -1; static int64_t last_time = -1;
static int qp_histogram[52]; static int qp_histogram[52];
int hours, mins, secs, us;
if (!is_last_report) { if (!is_last_report) {
int64_t cur_time; int64_t cur_time;
@ -1464,43 +1459,39 @@ static void print_report(OutputFile *output_files,
ost->st->time_base, AV_TIME_BASE_Q)); ost->st->time_base, AV_TIME_BASE_Q));
} }
if (verbose > 0 || is_last_report) { secs = pts / AV_TIME_BASE;
int hours, mins, secs, us; us = pts % AV_TIME_BASE;
secs = pts / AV_TIME_BASE; mins = secs / 60;
us = pts % AV_TIME_BASE; secs %= 60;
mins = secs / 60; hours = mins / 60;
secs %= 60; mins %= 60;
hours = mins / 60;
mins %= 60; bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"size=%8.0fkB time=", total_size / 1024.0);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"size=%8.0fkB time=", total_size / 1024.0); "%02d:%02d:%02d.%02d ", hours, mins, secs,
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), (100 * us) / AV_TIME_BASE);
"%02d:%02d:%02d.%02d ", hours, mins, secs, snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
(100 * us) / AV_TIME_BASE); "bitrate=%6.1fkbits/s", bitrate);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"bitrate=%6.1fkbits/s", bitrate); if (nb_frames_dup || nb_frames_drop)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
if (nb_frames_dup || nb_frames_drop) nb_frames_dup, nb_frames_drop);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
nb_frames_dup, nb_frames_drop);
if (verbose >= 0)
fprintf(stderr, "%s \r", buf);
fflush(stderr);
}
if (is_last_report && verbose >= 0){ av_log(NULL, is_last_report ? AV_LOG_WARNING : AV_LOG_INFO, "%s \r", buf);
fflush(stderr);
if (is_last_report) {
int64_t raw= audio_size + video_size + extra_size; int64_t raw= audio_size + video_size + extra_size;
fprintf(stderr, "\n"); av_log(NULL, AV_LOG_INFO, "\n");
fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n", av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
video_size/1024.0, video_size/1024.0,
audio_size/1024.0, audio_size/1024.0,
extra_size/1024.0, extra_size/1024.0,
100.0*(total_size - raw)/raw 100.0*(total_size - raw)/raw
); );
} }
} }
@ -1564,7 +1555,7 @@ static void flush_encoders(OutputStream *ost_table, int nb_ostreams)
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL); ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
} }
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Audio encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
exit_program(1); exit_program(1);
} }
audio_size += ret; audio_size += ret;
@ -1573,7 +1564,7 @@ static void flush_encoders(OutputStream *ost_table, int nb_ostreams)
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL); ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Video encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
exit_program(1); exit_program(1);
} }
video_size += ret; video_size += ret;
@ -1645,11 +1636,10 @@ static int output_packet(InputStream *ist, int ist_index,
handle_eof: handle_eof:
ist->pts= ist->next_pts; ist->pts= ist->next_pts;
if(avpkt.size && avpkt.size != pkt->size && if(avpkt.size && avpkt.size != pkt->size)
((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){ av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index); "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning=1; ist->showed_multi_packet_warning=1;
}
/* decode the packet if needed */ /* decode the packet if needed */
decoded_data_buf = NULL; /* fail safe */ decoded_data_buf = NULL; /* fail safe */
@ -1995,7 +1985,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
os = output_files[i].ctx; os = output_files[i].ctx;
if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) { if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
av_dump_format(os, i, os->filename, 1); av_dump_format(os, i, os->filename, 1);
fprintf(stderr, "Output file #%d does not contain any stream\n", i); av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
} }
@ -2060,7 +2050,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
switch(codec->codec_type) { switch(codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if(audio_volume != 256) { if(audio_volume != 256) {
fprintf(stderr,"-acodec copy and -vol are incompatible (frames are not decoded)\n"); av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
exit_program(1); exit_program(1);
} }
codec->channel_layout = icodec->channel_layout; codec->channel_layout = icodec->channel_layout;
@ -2135,7 +2125,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
choose_pixel_fmt(ost->st, ost->enc); choose_pixel_fmt(ost->st, ost->enc);
if (ost->st->codec->pix_fmt == PIX_FMT_NONE) { if (ost->st->codec->pix_fmt == PIX_FMT_NONE) {
fprintf(stderr, "Video pixel format is unknown, stream cannot be encoded\n"); av_log(NULL, AV_LOG_FATAL, "Video pixel format is unknown, stream cannot be encoded\n");
exit_program(1); exit_program(1);
} }
@ -2172,7 +2162,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if (configure_video_filters(ist, ost)) { if (configure_video_filters(ist, ost)) {
fprintf(stderr, "Error opening filters!\n"); av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
exit(1); exit(1);
} }
#endif #endif
@ -2197,7 +2187,8 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
if (codec->flags & CODEC_FLAG_PASS1) { if (codec->flags & CODEC_FLAG_PASS1) {
f = fopen(logfilename, "wb"); f = fopen(logfilename, "wb");
if (!f) { if (!f) {
fprintf(stderr, "Cannot write log file '%s' for pass-1 encoding: %s\n", logfilename, strerror(errno)); av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
logfilename, strerror(errno));
exit_program(1); exit_program(1);
} }
ost->logfile = f; ost->logfile = f;
@ -2205,7 +2196,8 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
char *logbuffer; char *logbuffer;
size_t logbuffer_size; size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename); av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
logfilename);
exit_program(1); exit_program(1);
} }
codec->stats_in = logbuffer; codec->stats_in = logbuffer;
@ -2222,8 +2214,8 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
if (!bit_buffer) if (!bit_buffer)
bit_buffer = av_malloc(bit_buffer_size); bit_buffer = av_malloc(bit_buffer_size);
if (!bit_buffer) { if (!bit_buffer) {
fprintf(stderr, "Cannot allocate %d bytes output buffer\n", av_log(NULL, AV_LOG_ERROR, "Cannot allocate %d bytes output buffer\n",
bit_buffer_size); bit_buffer_size);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -2309,31 +2301,29 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
} }
/* dump the stream mapping */ /* dump the stream mapping */
if (verbose >= 0) { av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
fprintf(stderr, "Stream mapping:\n"); for (i = 0; i < nb_output_streams; i++) {
for (i = 0; i < nb_output_streams;i ++) { ost = &output_streams[i];
ost = &output_streams[i]; av_log(NULL, AV_LOG_INFO, " Stream #%d.%d -> #%d.%d",
fprintf(stderr, " Stream #%d.%d -> #%d.%d", input_streams[ost->source_index].file_index,
input_streams[ost->source_index].file_index, input_streams[ost->source_index].st->index,
input_streams[ost->source_index].st->index, ost->file_index,
ost->file_index, ost->index);
ost->index); if (ost->sync_ist != &input_streams[ost->source_index])
if (ost->sync_ist != &input_streams[ost->source_index]) av_log(NULL, AV_LOG_INFO, " [sync #%d.%d]",
fprintf(stderr, " [sync #%d.%d]", ost->sync_ist->file_index,
ost->sync_ist->file_index, ost->sync_ist->st->index);
ost->sync_ist->st->index); if (ost->st->stream_copy)
if (ost->st->stream_copy) av_log(NULL, AV_LOG_INFO, " (copy)");
fprintf(stderr, " (copy)"); else
else av_log(NULL, AV_LOG_INFO, " (%s -> %s)", input_streams[ost->source_index].dec ?
fprintf(stderr, " (%s -> %s)", input_streams[ost->source_index].dec ? input_streams[ost->source_index].dec->name : "?",
input_streams[ost->source_index].dec->name : "?", ost->enc ? ost->enc->name : "?");
ost->enc ? ost->enc->name : "?"); av_log(NULL, AV_LOG_INFO, "\n");
fprintf(stderr, "\n");
}
} }
if (ret) { if (ret) {
fprintf(stderr, "%s\n", error); av_log(NULL, AV_LOG_ERROR, "%s\n", error);
return ret; return ret;
} }
@ -2367,8 +2357,7 @@ static int transcode(OutputFile *output_files, int nb_output_files,
goto fail; goto fail;
if (!using_stdin) { if (!using_stdin) {
if(verbose >= 0) av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
fprintf(stderr, "Press [q] to stop, [?] for help\n");
avio_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
} }
term_init(); term_init();
@ -2391,8 +2380,8 @@ static int transcode(OutputFile *output_files, int nb_output_files,
key = read_key(); key = read_key();
if (key == 'q') if (key == 'q')
break; break;
if (key == '+') verbose++; if (key == '+') av_log_set_level(av_log_get_level()+10);
if (key == '-') verbose--; if (key == '-') av_log_set_level(av_log_get_level()-10);
if (key == 's') qp_hist ^= 1; if (key == 's') qp_hist ^= 1;
if (key == 'h'){ if (key == 'h'){
if (do_hex_dump){ if (do_hex_dump){
@ -2566,9 +2555,8 @@ static int transcode(OutputFile *output_files, int nb_output_files,
ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) || ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
pkt_dts+1<ist->pts)&& !copy_ts){ pkt_dts+1<ist->pts)&& !copy_ts){
input_files[ist->file_index].ts_offset -= delta; input_files[ist->file_index].ts_offset -= delta;
if (verbose > 2) av_log(NULL, AV_LOG_DEBUG, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
fprintf(stderr, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", delta, input_files[ist->file_index].ts_offset);
delta, input_files[ist->file_index].ts_offset);
pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
if(pkt.pts != AV_NOPTS_VALUE) if(pkt.pts != AV_NOPTS_VALUE)
pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
@ -2578,9 +2566,8 @@ static int transcode(OutputFile *output_files, int nb_output_files,
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size); //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) { if (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) {
if (verbose >= 0) av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d.%d\n",
fprintf(stderr, "Error while decoding stream #%d.%d\n", ist->file_index, ist->st->index);
ist->file_index, ist->st->index);
if (exit_on_error) if (exit_on_error)
exit_program(1); exit_program(1);
av_free_packet(&pkt); av_free_packet(&pkt);
@ -2668,19 +2655,19 @@ static int transcode(OutputFile *output_files, int nb_output_files,
static int opt_verbose(const char *opt, const char *arg) static int opt_verbose(const char *opt, const char *arg)
{ {
verbose = parse_number_or_die(opt, arg, OPT_INT64, -10, 10); av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -loglevel\n", opt);
return 0; return 0;
} }
static int opt_frame_crop(const char *opt, const char *arg) static int opt_frame_crop(const char *opt, const char *arg)
{ {
fprintf(stderr, "Option '%s' has been removed, use the crop filter instead\n", opt); av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the crop filter instead\n", opt);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
static int opt_pad(const char *opt, const char *arg) static int opt_pad(const char *opt, const char *arg)
{ {
fprintf(stderr, "Option '%s' has been removed, use the pad filter instead\n", opt); av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the pad filter instead\n", opt);
return -1; return -1;
} }
@ -2702,7 +2689,7 @@ static double parse_frame_aspect_ratio(const char *arg)
ar = strtod(arg, NULL); ar = strtod(arg, NULL);
if (!ar) { if (!ar) {
fprintf(stderr, "Incorrect aspect ratio specification.\n"); av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n");
exit_program(1); exit_program(1);
} }
return ar; return ar;
@ -2762,7 +2749,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
*sync = 0; *sync = 0;
sync_file_idx = strtol(sync + 1, &sync, 0); sync_file_idx = strtol(sync + 1, &sync, 0);
if (sync_file_idx >= nb_input_files || sync_file_idx < 0) { if (sync_file_idx >= nb_input_files || sync_file_idx < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid sync file index: %d.\n", sync_file_idx); av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
exit_program(1); exit_program(1);
} }
if (*sync) if (*sync)
@ -2774,7 +2761,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
break; break;
} }
if (i == input_files[sync_file_idx].nb_streams) { if (i == input_files[sync_file_idx].nb_streams) {
av_log(NULL, AV_LOG_ERROR, "Sync stream specification in map %s does not " av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
"match any streams.\n", arg); "match any streams.\n", arg);
exit_program(1); exit_program(1);
} }
@ -2783,7 +2770,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
file_idx = strtol(map, &p, 0); file_idx = strtol(map, &p, 0);
if (file_idx >= nb_input_files || file_idx < 0) { if (file_idx >= nb_input_files || file_idx < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid input file index: %d.\n", file_idx); av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
exit_program(1); exit_program(1);
} }
if (negative) if (negative)
@ -2817,7 +2804,7 @@ static int opt_map(OptionsContext *o, const char *opt, const char *arg)
} }
if (!m) { if (!m) {
av_log(NULL, AV_LOG_ERROR, "Stream map '%s' matches no streams.\n", arg); av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
exit_program(1); exit_program(1);
} }
@ -2839,7 +2826,7 @@ static void parse_meta_type(char *arg, char *type, int *index)
*index = strtol(++arg, NULL, 0); *index = strtol(++arg, NULL, 0);
break; break;
default: default:
fprintf(stderr, "Invalid metadata type %c.\n", *arg); av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
exit_program(1); exit_program(1);
} }
} else } else
@ -2876,7 +2863,7 @@ static int opt_map_metadata(OptionsContext *o, const char *opt, const char *arg)
static int opt_map_meta_data(OptionsContext *o, const char *opt, const char *arg) static int opt_map_meta_data(OptionsContext *o, const char *opt, const char *arg)
{ {
fprintf(stderr, "-map_meta_data is deprecated and will be removed soon. " av_log(NULL, AV_LOG_WARNING, "-map_meta_data is deprecated and will be removed soon. "
"Use -map_metadata instead.\n"); "Use -map_metadata instead.\n");
return opt_map_metadata(o, opt, arg); return opt_map_metadata(o, opt, arg);
} }
@ -2905,11 +2892,11 @@ static enum CodecID find_codec_or_die(const char *name, enum AVMediaType type, i
avcodec_find_encoder_by_name(name) : avcodec_find_encoder_by_name(name) :
avcodec_find_decoder_by_name(name); avcodec_find_decoder_by_name(name);
if(!codec) { if(!codec) {
av_log(NULL, AV_LOG_ERROR, "Unknown %s '%s'\n", codec_string, name); av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
exit_program(1); exit_program(1);
} }
if(codec->type != type) { if(codec->type != type) {
av_log(NULL, AV_LOG_ERROR, "Invalid %s type '%s'\n", codec_string, name); av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
exit_program(1); exit_program(1);
} }
return codec->id; return codec->id;
@ -2983,11 +2970,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) { if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) {
if (verbose >= 0) av_log(NULL, AV_LOG_INFO,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num,
i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num, (float)rfps / rfps_base, rfps, rfps_base);
(float)rfps / rfps_base, rfps, rfps_base);
} }
if (o->video_disable) if (o->video_disable)
@ -3024,7 +3009,7 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
if (o->format) { if (o->format) {
if (!(file_iformat = av_find_input_format(o->format))) { if (!(file_iformat = av_find_input_format(o->format))) {
fprintf(stderr, "Unknown input format: '%s'\n", o->format); av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
exit_program(1); exit_program(1);
} }
} }
@ -3084,8 +3069,8 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
/* If not enough info to get the stream parameters, we decode the /* If not enough info to get the stream parameters, we decode the
first frames to get it. (used in mpeg case for example) */ first frames to get it. (used in mpeg case for example) */
ret = avformat_find_stream_info(ic, opts); ret = avformat_find_stream_info(ic, opts);
if (ret < 0 && verbose >= 0) { if (ret < 0) {
fprintf(stderr, "%s: could not find codec parameters\n", filename); av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
av_close_input_file(ic); av_close_input_file(ic);
exit_program(1); exit_program(1);
} }
@ -3099,8 +3084,8 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
if (o->start_time != 0) { if (o->start_time != 0) {
ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "%s: could not seek to position %0.3f\n", av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
filename, (double)timestamp / AV_TIME_BASE); filename, (double)timestamp / AV_TIME_BASE);
} }
} }
@ -3108,8 +3093,7 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
add_input_streams(o, ic); add_input_streams(o, ic);
/* dump the file content */ /* dump the file content */
if (verbose >= 0) av_dump_format(ic, nb_input_files, filename, 0);
av_dump_format(ic, nb_input_files, filename, 0);
input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
input_files[nb_input_files - 1].ctx = ic; input_files[nb_input_files - 1].ctx = ic;
@ -3159,7 +3143,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
double qscale = -1; double qscale = -1;
if (!st) { if (!st) {
av_log(NULL, AV_LOG_ERROR, "Could not alloc stream.\n"); av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
exit_program(1); exit_program(1);
} }
@ -3186,7 +3170,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
if (next = strchr(bsf, ',')) if (next = strchr(bsf, ','))
*next++ = 0; *next++ = 0;
if (!(bsfc = av_bitstream_filter_init(bsf))) { if (!(bsfc = av_bitstream_filter_init(bsf))) {
av_log(NULL, AV_LOG_ERROR, "Unknown bitstream filter %s\n", bsf); av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
exit_program(1); exit_program(1);
} }
if (bsfc_prev) if (bsfc_prev)
@ -3226,7 +3210,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
break; break;
p = strchr(p, ','); p = strchr(p, ',');
if(!p) { if(!p) {
fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i); av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
exit_program(1); exit_program(1);
} }
p++; p++;
@ -3256,13 +3240,13 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) { if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid framerate value: %s\n", frame_rate); av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
exit_program(1); exit_program(1);
} }
MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) { if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid frame size: %s.\n", frame_size); av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
exit_program(1); exit_program(1);
} }
@ -3273,7 +3257,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
video_enc->bits_per_raw_sample = frame_bits_per_raw_sample; video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st); MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) { if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) {
av_log(NULL, AV_LOG_ERROR, "Unknown pixel format requested: %s.\n", frame_pix_fmt); av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
exit_program(1); exit_program(1);
} }
st->sample_aspect_ratio = video_enc->sample_aspect_ratio; st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
@ -3283,7 +3267,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st); MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st);
if (intra_matrix) { if (intra_matrix) {
if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) { if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
av_log(NULL, AV_LOG_ERROR, "Could not allocate memory for intra matrix.\n"); av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
exit_program(1); exit_program(1);
} }
parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix); parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
@ -3291,7 +3275,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st); MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st);
if (inter_matrix) { if (inter_matrix) {
if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) { if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
av_log(NULL, AV_LOG_ERROR, "Could not allocate memory for inter matrix.\n"); av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n");
exit_program(1); exit_program(1);
} }
parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix); parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
@ -3302,7 +3286,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
int start, end, q; int start, end, q;
int e=sscanf(p, "%d,%d,%d", &start, &end, &q); int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
if(e!=3){ if(e!=3){
fprintf(stderr, "error parsing rc_override\n"); av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
exit_program(1); exit_program(1);
} }
video_enc->rc_override= video_enc->rc_override=
@ -3378,7 +3362,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc)
MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st); MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st);
if (sample_fmt && if (sample_fmt &&
(audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) { (audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) {
av_log(NULL, AV_LOG_ERROR, "Invalid sample format '%s'\n", sample_fmt); av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt);
exit_program(1); exit_program(1);
} }
@ -3398,7 +3382,7 @@ static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc)
st = ost->st; st = ost->st;
data_enc = st->codec; data_enc = st->codec;
if (!st->stream_copy) { if (!st->stream_copy) {
fprintf(stderr, "Data stream encoding not supported yet (only streamcopy)\n"); av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
exit_program(1); exit_program(1);
} }
@ -3438,9 +3422,9 @@ static int opt_streamid(OptionsContext *o, const char *opt, const char *arg)
av_strlcpy(idx_str, arg, sizeof(idx_str)); av_strlcpy(idx_str, arg, sizeof(idx_str));
p = strchr(idx_str, ':'); p = strchr(idx_str, ':');
if (!p) { if (!p) {
fprintf(stderr, av_log(NULL, AV_LOG_FATAL,
"Invalid value '%s' for option '%s', required syntax is 'index:value'\n", "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
arg, opt); arg, opt);
exit_program(1); exit_program(1);
} }
*p++ = '\0'; *p++ = '\0';
@ -3613,7 +3597,7 @@ static void opt_output_file(void *optctx, const char *filename)
case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break; case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break;
case AVMEDIA_TYPE_DATA: ost = new_data_stream(o, oc); break; case AVMEDIA_TYPE_DATA: ost = new_data_stream(o, oc); break;
default: default:
av_log(NULL, AV_LOG_ERROR, "Cannot map stream #%d.%d - unsupported type.\n", av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d.%d - unsupported type.\n",
map->file_index, map->stream_index); map->file_index, map->stream_index);
exit_program(1); exit_program(1);
} }
@ -3652,12 +3636,12 @@ static void opt_output_file(void *optctx, const char *filename)
fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename); fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
fflush(stderr); fflush(stderr);
if (!read_yesno()) { if (!read_yesno()) {
fprintf(stderr, "Not overwriting - exiting\n"); av_log(0, AV_LOG_FATAL, "Not overwriting - exiting\n");
exit_program(1); exit_program(1);
} }
} }
else { else {
fprintf(stderr,"File '%s' already exists. Exiting.\n", filename); av_log(0, AV_LOG_FATAL,"File '%s' already exists. Exiting.\n", filename);
exit_program(1); exit_program(1);
} }
} }
@ -3689,7 +3673,7 @@ static void opt_output_file(void *optctx, const char *filename)
break; break;
} }
} else { } else {
av_log(NULL, AV_LOG_ERROR, "Invalid input file index %d in chapter mapping.\n", av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
o->chapters_input_file); o->chapters_input_file);
exit_program(1); exit_program(1);
} }
@ -3706,7 +3690,7 @@ static void opt_output_file(void *optctx, const char *filename)
#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ #define METADATA_CHECK_INDEX(index, nb_elems, desc)\
if ((index) < 0 || (index) >= (nb_elems)) {\ if ((index) < 0 || (index) >= (nb_elems)) {\
av_log(NULL, AV_LOG_ERROR, "Invalid %s index %d while processing metadata maps\n",\ av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps\n",\
(desc), (index));\ (desc), (index));\
exit_program(1);\ exit_program(1);\
} }
@ -3765,7 +3749,7 @@ static void opt_output_file(void *optctx, const char *filename)
val = strchr(o->metadata[i].u.str, '='); val = strchr(o->metadata[i].u.str, '=');
if (!val) { if (!val) {
av_log(NULL, AV_LOG_ERROR, "No '=' character in metadata string %s.\n", av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n",
o->metadata[i].u.str); o->metadata[i].u.str);
exit_program(1); exit_program(1);
} }
@ -3778,20 +3762,20 @@ static void opt_output_file(void *optctx, const char *filename)
break; break;
case 's': case 's':
if (index < 0 || index >= oc->nb_streams) { if (index < 0 || index >= oc->nb_streams) {
av_log(NULL, AV_LOG_ERROR, "Invalid stream index %d in metadata specifier.\n", index); av_log(NULL, AV_LOG_FATAL, "Invalid stream index %d in metadata specifier.\n", index);
exit_program(1); exit_program(1);
} }
m = &oc->streams[index]->metadata; m = &oc->streams[index]->metadata;
break; break;
case 'c': case 'c':
if (index < 0 || index >= oc->nb_chapters) { if (index < 0 || index >= oc->nb_chapters) {
av_log(NULL, AV_LOG_ERROR, "Invalid chapter index %d in metadata specifier.\n", index); av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index);
exit_program(1); exit_program(1);
} }
m = &oc->chapters[index]->metadata; m = &oc->chapters[index]->metadata;
break; break;
default: default:
av_log(NULL, AV_LOG_ERROR, "Invalid metadata specifier %s.\n", o->metadata[i].specifier); av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier);
exit_program(1); exit_program(1);
} }
@ -3963,14 +3947,14 @@ static int opt_target(OptionsContext *o, const char *opt, const char *arg)
break; break;
} }
} }
if(verbose > 0 && norm != UNKNOWN) if (norm != UNKNOWN)
fprintf(stderr, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC"); av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC");
} }
if(norm == UNKNOWN) { if(norm == UNKNOWN) {
fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
fprintf(stderr, "or set a framerate with \"-r xxx\".\n"); av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
exit_program(1); exit_program(1);
} }
@ -4059,7 +4043,7 @@ static int opt_target(OptionsContext *o, const char *opt, const char *arg)
parse_option(o, "ac", "2", options); parse_option(o, "ac", "2", options);
} else { } else {
fprintf(stderr, "Unknown target: %s\n", arg); av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
return 0; return 0;
@ -4108,9 +4092,9 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) { if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) {
if(!strncmp(arg, "libx264-lossless", strlen("libx264-lossless"))){ if(!strncmp(arg, "libx264-lossless", strlen("libx264-lossless"))){
fprintf(stderr, "Please use -preset <speed> -qp 0\n"); av_log(0, AV_LOG_FATAL, "Please use -preset <speed> -qp 0\n");
}else }else
fprintf(stderr, "File for preset '%s' not found\n", arg); av_log(0, AV_LOG_FATAL, "File for preset '%s' not found\n", arg);
exit_program(1); exit_program(1);
} }
@ -4120,7 +4104,7 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
continue; continue;
e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2; e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
if(e){ if(e){
fprintf(stderr, "%s: Invalid syntax: '%s'\n", filename, line); av_log(0, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line);
exit_program(1); exit_program(1);
} }
if(!strcmp(tmp, "acodec")){ if(!strcmp(tmp, "acodec")){
@ -4132,7 +4116,7 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
}else if(!strcmp(tmp, "dcodec")){ }else if(!strcmp(tmp, "dcodec")){
opt_data_codec(o, tmp, tmp2); opt_data_codec(o, tmp, tmp2);
}else if(opt_default(tmp, tmp2) < 0){ }else if(opt_default(tmp, tmp2) < 0){
fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2); av_log(0, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
exit_program(1); exit_program(1);
} }
} }
@ -4210,7 +4194,7 @@ static const OptionDef options[] = {
{ "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" }, { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" },
{ "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "deprecated, use -loop" }, { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "deprecated, use -loop" },
{ "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "deprecated, use -loop", "" }, { "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "deprecated, use -loop", "" },
{ "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" }, { "v", HAS_ARG, {(void*)opt_verbose}, "deprecated, use -loglevel instead", "number" },
{ "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
{ "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" }, { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
{ "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
@ -4321,10 +4305,10 @@ int main(int argc, char **argv)
reset_options(&o, 0); reset_options(&o, 0);
av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_flags(AV_LOG_SKIP_REPEATED);
parse_loglevel(argc, argv, options);
if(argc>1 && !strcmp(argv[1], "-d")){ if(argc>1 && !strcmp(argv[1], "-d")){
run_as_daemon=1; run_as_daemon=1;
verbose=-1;
av_log_set_callback(log_callback_null); av_log_set_callback(log_callback_null);
argc--; argc--;
argv++; argv++;
@ -4344,26 +4328,25 @@ int main(int argc, char **argv)
avio_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
#endif #endif
if(verbose>=0) show_banner();
show_banner();
/* parse options */ /* parse options */
parse_options(&o, argc, argv, options, opt_output_file); parse_options(&o, argc, argv, options, opt_output_file);
if(nb_output_files <= 0 && nb_input_files == 0) { if(nb_output_files <= 0 && nb_input_files == 0) {
show_usage(); show_usage();
fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name); av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
exit_program(1); exit_program(1);
} }
/* file converter / grab */ /* file converter / grab */
if (nb_output_files <= 0) { if (nb_output_files <= 0) {
fprintf(stderr, "At least one output file must be specified\n"); av_log(NULL, AV_LOG_FATAL, "At least one output file must be specified\n");
exit_program(1); exit_program(1);
} }
if (nb_input_files == 0) { if (nb_input_files == 0) {
fprintf(stderr, "At least one input file must be specified\n"); av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
exit_program(1); exit_program(1);
} }

1
ffplay.c
Unescape View File

@ -3043,6 +3043,7 @@ int main(int argc, char **argv)
VideoState *is; VideoState *is;
av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_flags(AV_LOG_SKIP_REPEATED);
parse_loglevel(argc, argv, options);
/* register all codecs, demux and protocols */ /* register all codecs, demux and protocols */
avcodec_register_all(); avcodec_register_all();

1
ffprobe.c
Unescape View File

@ -669,6 +669,7 @@ int main(int argc, char **argv)
{ {
int ret; int ret;
parse_loglevel(argc, argv, options);
av_register_all(); av_register_all();
init_opts(); init_opts();
#if CONFIG_AVDEVICE #if CONFIG_AVDEVICE

1
ffserver.c
Unescape View File

@ -4669,6 +4669,7 @@ int main(int argc, char **argv)
{ {
struct sigaction sigact; struct sigaction sigact;
parse_loglevel(argc, argv, options);
av_register_all(); av_register_all();
show_banner(); show_banner();

4
libavcodec/flacdec.c
Unescape View File

@ -226,9 +226,11 @@ static int get_metadata_size(const uint8_t *buf, int buf_size)
buf += 4; buf += 4;
do { do {
if (buf_end - buf < 4)
return 0;
ff_flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size); ff_flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size);
buf += 4; buf += 4;
if (buf + metadata_size > buf_end) { if (buf_end - buf < metadata_size) {
/* need more data in order to read the complete header */ /* need more data in order to read the complete header */
return 0; return 0;
} }

95
libavcodec/libgsm.c
Unescape View File

@ -35,36 +35,26 @@
#define GSM_MS_BLOCK_SIZE 65 #define GSM_MS_BLOCK_SIZE 65
#define GSM_FRAME_SIZE 160 #define GSM_FRAME_SIZE 160
static av_cold int libgsm_init(AVCodecContext *avctx) { static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
if (avctx->channels > 1) { if (avctx->channels > 1) {
av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n", av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
avctx->channels); avctx->channels);
return -1; return -1;
} }
if(avctx->codec->decode){ if (avctx->sample_rate != 8000) {
if(!avctx->channels) av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
avctx->channels= 1; avctx->sample_rate);
if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
if(!avctx->sample_rate) return -1;
avctx->sample_rate= 8000; }
if (avctx->bit_rate != 13000 /* Official */ &&
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->bit_rate != 13200 /* Very common */ &&
}else{ avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
if (avctx->sample_rate != 8000) { av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n", avctx->bit_rate);
avctx->sample_rate); if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) return -1;
return -1;
}
if (avctx->bit_rate != 13000 /* Official */ &&
avctx->bit_rate != 13200 /* Very common */ &&
avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
avctx->bit_rate);
if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
return -1;
}
} }
avctx->priv_data = gsm_create(); avctx->priv_data = gsm_create();
@ -88,7 +78,7 @@ static av_cold int libgsm_init(AVCodecContext *avctx) {
return 0; return 0;
} }
static av_cold int libgsm_close(AVCodecContext *avctx) { static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
av_freep(&avctx->coded_frame); av_freep(&avctx->coded_frame);
gsm_destroy(avctx->priv_data); gsm_destroy(avctx->priv_data);
avctx->priv_data = NULL; avctx->priv_data = NULL;
@ -116,9 +106,9 @@ AVCodec ff_libgsm_encoder = {
.name = "libgsm", .name = "libgsm",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_GSM, .id = CODEC_ID_GSM,
.init = libgsm_init, .init = libgsm_encode_init,
.encode = libgsm_encode_frame, .encode = libgsm_encode_frame,
.close = libgsm_close, .close = libgsm_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
}; };
@ -127,13 +117,52 @@ AVCodec ff_libgsm_ms_encoder = {
.name = "libgsm_ms", .name = "libgsm_ms",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_GSM_MS, .id = CODEC_ID_GSM_MS,
.init = libgsm_init, .init = libgsm_encode_init,
.encode = libgsm_encode_frame, .encode = libgsm_encode_frame,
.close = libgsm_close, .close = libgsm_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
}; };
static av_cold int libgsm_decode_init(AVCodecContext *avctx) {
if (avctx->channels > 1) {
av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
avctx->channels);
return -1;
}
if (!avctx->channels)
avctx->channels = 1;
if (!avctx->sample_rate)
avctx->sample_rate = 8000;
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
avctx->priv_data = gsm_create();
switch(avctx->codec_id) {
case CODEC_ID_GSM:
avctx->frame_size = GSM_FRAME_SIZE;
avctx->block_align = GSM_BLOCK_SIZE;
break;
case CODEC_ID_GSM_MS: {
int one = 1;
gsm_option(avctx->priv_data, GSM_OPT_WAV49, &one);
avctx->frame_size = 2 * GSM_FRAME_SIZE;
avctx->block_align = GSM_MS_BLOCK_SIZE;
}
}
return 0;
}
static av_cold int libgsm_decode_close(AVCodecContext *avctx) {
gsm_destroy(avctx->priv_data);
avctx->priv_data = NULL;
return 0;
}
static int libgsm_decode_frame(AVCodecContext *avctx, static int libgsm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
AVPacket *avpkt) { AVPacket *avpkt) {
@ -158,8 +187,8 @@ AVCodec ff_libgsm_decoder = {
.name = "libgsm", .name = "libgsm",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_GSM, .id = CODEC_ID_GSM,
.init = libgsm_init, .init = libgsm_decode_init,
.close = libgsm_close, .close = libgsm_decode_close,
.decode = libgsm_decode_frame, .decode = libgsm_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
}; };
@ -168,8 +197,8 @@ AVCodec ff_libgsm_ms_decoder = {
.name = "libgsm_ms", .name = "libgsm_ms",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_GSM_MS, .id = CODEC_ID_GSM_MS,
.init = libgsm_init, .init = libgsm_decode_init,
.close = libgsm_close, .close = libgsm_decode_close,
.decode = libgsm_decode_frame, .decode = libgsm_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
}; };

2
libavcodec/version.h
Unescape View File

@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 17 #define LIBAVCODEC_VERSION_MINOR 18
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

126
libavcodec/ws-snd1.c
Unescape View File

@ -25,47 +25,50 @@
/** /**
* @file * @file
* Westwood SNDx codecs. * Westwood SNDx codecs
* *
* Reference documents about VQA format and its audio codecs * Reference documents about VQA format and its audio codecs
* can be found here: * can be found here:
* http://www.multimedia.cx * http://www.multimedia.cx
*/ */
static const int8_t ws_adpcm_2bit[] = { -2, -1, 0, 1};
static const int8_t ws_adpcm_4bit[] = { static const int8_t ws_adpcm_4bit[] = {
-9, -8, -6, -5, -4, -3, -2, -1, -9, -8, -6, -5, -4, -3, -2, -1,
0, 1, 2, 3, 4, 5, 6, 8 }; 0, 1, 2, 3, 4, 5, 6, 8
};
#define CLIP8(a) if(a>127)a=127;if(a<-128)a=-128;
static av_cold int ws_snd_decode_init(AVCodecContext * avctx) static av_cold int ws_snd_decode_init(AVCodecContext *avctx)
{ {
// WSSNDContext *c = avctx->priv_data; if (avctx->channels != 1) {
av_log_ask_for_sample(avctx, "unsupported number of channels\n");
return AVERROR(EINVAL);
}
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_U8;
return 0; return 0;
} }
static int ws_snd_decode_frame(AVCodecContext *avctx, static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
void *data, int *data_size, int *data_size, AVPacket *avpkt)
AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
// WSSNDContext *c = avctx->priv_data;
int in_size, out_size; int in_size, out_size;
int sample = 0; int sample = 128;
int i; uint8_t *samples = data;
short *samples = data; uint8_t *samples_end;
if (!buf_size) if (!buf_size)
return 0; return 0;
if (buf_size < 4) {
av_log(avctx, AV_LOG_ERROR, "packet is too small\n");
return AVERROR(EINVAL);
}
out_size = AV_RL16(&buf[0]); out_size = AV_RL16(&buf[0]);
*data_size = out_size * 2; in_size = AV_RL16(&buf[2]);
in_size = AV_RL16(&buf[2]);
buf += 4; buf += 4;
if (out_size > *data_size) { if (out_size > *data_size) {
@ -76,47 +79,63 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n"); av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n");
return -1; return -1;
} }
samples_end = samples + out_size;
if (in_size == out_size) { if (in_size == out_size) {
for (i = 0; i < out_size; i++) memcpy(samples, buf, out_size);
*samples++ = (*buf++ - 0x80) << 8; *data_size = out_size;
return buf_size; return buf_size;
} }
while (out_size > 0) { while (samples < samples_end && buf - avpkt->data < buf_size) {
int code; int code, smp, size;
uint8_t count; uint8_t count;
code = (*buf) >> 6; code = *buf >> 6;
count = (*buf) & 0x3F; count = *buf & 0x3F;
buf++; buf++;
switch(code) {
/* make sure we don't write past the output buffer */
switch (code) {
case 0: smp = 4; break;
case 1: smp = 2; break;
case 2: smp = (count & 0x20) ? 1 : count + 1; break;
default: smp = count + 1; break;
}
if (samples_end - samples < smp)
break;
/* make sure we don't read past the input buffer */
size = ((code == 2 && (count & 0x20)) || code == 3) ? 0 : count + 1;
if ((buf - avpkt->data) + size > buf_size)
break;
switch (code) {
case 0: /* ADPCM 2-bit */ case 0: /* ADPCM 2-bit */
for (count++; count > 0; count--) { for (count++; count > 0; count--) {
code = *buf++; code = *buf++;
sample += ws_adpcm_2bit[code & 0x3]; sample += ( code & 0x3) - 2;
CLIP8(sample); sample = av_clip_uint8(sample);
*samples++ = sample << 8; *samples++ = sample;
sample += ws_adpcm_2bit[(code >> 2) & 0x3]; sample += ((code >> 2) & 0x3) - 2;
CLIP8(sample); sample = av_clip_uint8(sample);
*samples++ = sample << 8; *samples++ = sample;
sample += ws_adpcm_2bit[(code >> 4) & 0x3]; sample += ((code >> 4) & 0x3) - 2;
CLIP8(sample); sample = av_clip_uint8(sample);
*samples++ = sample << 8; *samples++ = sample;
sample += ws_adpcm_2bit[(code >> 6) & 0x3]; sample += (code >> 6) - 2;
CLIP8(sample); sample = av_clip_uint8(sample);
*samples++ = sample << 8; *samples++ = sample;
out_size -= 4;
} }
break; break;
case 1: /* ADPCM 4-bit */ case 1: /* ADPCM 4-bit */
for (count++; count > 0; count--) { for (count++; count > 0; count--) {
code = *buf++; code = *buf++;
sample += ws_adpcm_4bit[code & 0xF]; sample += ws_adpcm_4bit[code & 0xF];
CLIP8(sample); sample = av_clip_uint8(sample);
*samples++ = sample << 8; *samples++ = sample;
sample += ws_adpcm_4bit[code >> 4]; sample += ws_adpcm_4bit[code >> 4];
CLIP8(sample); sample = av_clip_uint8(sample);
*samples++ = sample << 8; *samples++ = sample;
out_size -= 2;
} }
break; break;
case 2: /* no compression */ case 2: /* no compression */
@ -125,24 +144,23 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
t = count; t = count;
t <<= 3; t <<= 3;
sample += t >> 3; sample += t >> 3;
*samples++ = sample << 8; sample = av_clip_uint8(sample);
out_size--; *samples++ = sample;
} else { /* copy */ } else { /* copy */
for (count++; count > 0; count--) { memcpy(samples, buf, smp);
*samples++ = (*buf++ - 0x80) << 8; samples += smp;
out_size--; buf += smp;
} sample = buf[-1];
sample = buf[-1] - 0x80;
} }
break; break;
default: /* run */ default: /* run */
for(count++; count > 0; count--) { memset(samples, sample, smp);
*samples++ = sample << 8; samples += smp;
out_size--;
}
} }
} }
*data_size = samples - (uint8_t *)data;
return buf_size; return buf_size;
} }

26
libavformat/oggparsecelt.c
Unescape View File

@ -20,9 +20,10 @@
*/ */
#include <string.h> #include <string.h>
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "oggdec.h" #include "oggdec.h"
#include "libavutil/intreadwrite.h"
struct oggcelt_private { struct oggcelt_private {
int extra_headers_left; int extra_headers_left;
@ -38,11 +39,10 @@ static int celt_header(AVFormatContext *s, int idx)
if (os->psize == 60 && if (os->psize == 60 &&
!memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) { !memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) {
/* Main header */ /* Main header */
uint32_t version, header_size av_unused, sample_rate, nb_channels, frame_size; uint32_t version, sample_rate, nb_channels, frame_size;
uint32_t overlap, bytes_per_packet av_unused, extra_headers; uint32_t overlap, extra_headers;
uint8_t *extradata; uint8_t *extradata;
extradata = av_malloc(2 * sizeof(uint32_t) + extradata = av_malloc(2 * sizeof(uint32_t) +
@ -54,12 +54,12 @@ static int celt_header(AVFormatContext *s, int idx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
version = AV_RL32(p + 28); version = AV_RL32(p + 28);
header_size = AV_RL32(p + 32); /* unused */ /* unused header size field skipped */
sample_rate = AV_RL32(p + 36); sample_rate = AV_RL32(p + 36);
nb_channels = AV_RL32(p + 40); nb_channels = AV_RL32(p + 40);
frame_size = AV_RL32(p + 44); frame_size = AV_RL32(p + 44);
overlap = AV_RL32(p + 48); overlap = AV_RL32(p + 48);
bytes_per_packet = AV_RL32(p + 52); /* unused */ /* unused bytes per packet field skipped */
extra_headers = AV_RL32(p + 56); extra_headers = AV_RL32(p + 56);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_CELT; st->codec->codec_id = CODEC_ID_CELT;
@ -67,25 +67,23 @@ static int celt_header(AVFormatContext *s, int idx)
st->codec->channels = nb_channels; st->codec->channels = nb_channels;
st->codec->frame_size = frame_size; st->codec->frame_size = frame_size;
st->codec->sample_fmt = AV_SAMPLE_FMT_S16; st->codec->sample_fmt = AV_SAMPLE_FMT_S16;
av_set_pts_info(st, 64, 1, sample_rate); av_free(st->codec->extradata);
st->codec->extradata = extradata;
st->codec->extradata_size = 2 * sizeof(uint32_t);
if (sample_rate)
av_set_pts_info(st, 64, 1, sample_rate);
priv->extra_headers_left = 1 + extra_headers; priv->extra_headers_left = 1 + extra_headers;
av_free(os->private); av_free(os->private);
os->private = priv; os->private = priv;
AV_WL32(extradata + 0, overlap); AV_WL32(extradata + 0, overlap);
AV_WL32(extradata + 4, version); AV_WL32(extradata + 4, version);
av_free(st->codec->extradata);
st->codec->extradata = extradata;
st->codec->extradata_size = 2 * sizeof(uint32_t);
return 1; return 1;
} else if (priv && priv->extra_headers_left) {
} else if(priv && priv->extra_headers_left) {
/* Extra headers (vorbiscomment) */ /* Extra headers (vorbiscomment) */
ff_vorbis_comment(s, &st->metadata, p, os->psize); ff_vorbis_comment(s, &st->metadata, p, os->psize);
priv->extra_headers_left--; priv->extra_headers_left--;
return 1; return 1;
} else { } else {
return 0; return 0;
} }

24
libavformat/rtp.c
Unescape View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <libavutil/opt.h>
#include "avformat.h" #include "avformat.h"
#include "rtp.h" #include "rtp.h"
@ -89,26 +90,31 @@ int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type)
return -1; return -1;
} }
int ff_rtp_get_payload_type(AVCodecContext *codec) int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
{ {
int i, payload_type; int i;
AVOutputFormat *ofmt = fmt ? fmt->oformat : NULL;
/* Was the payload type already specified for the RTP muxer? */
if (ofmt && ofmt->priv_class) {
int payload_type = av_get_int(fmt->priv_data, "payload_type", NULL);
if (payload_type >= 0)
return payload_type;
}
/* compute the payload type */ /* static payload type */
for (payload_type = -1, i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i) for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i)
if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) { if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) {
if (codec->codec_id == CODEC_ID_H263) if (codec->codec_id == CODEC_ID_H263)
continue; continue;
if (codec->codec_id == CODEC_ID_PCM_S16BE) if (codec->codec_id == CODEC_ID_PCM_S16BE)
if (codec->channels != AVRtpPayloadTypes[i].audio_channels) if (codec->channels != AVRtpPayloadTypes[i].audio_channels)
continue; continue;
payload_type = AVRtpPayloadTypes[i].pt; return AVRtpPayloadTypes[i].pt;
} }
/* dynamic payload type */ /* dynamic payload type */
if (payload_type < 0) return RTP_PT_PRIVATE + (codec->codec_type == AVMEDIA_TYPE_AUDIO);
payload_type = RTP_PT_PRIVATE + (codec->codec_type == AVMEDIA_TYPE_AUDIO);
return payload_type;
} }
const char *ff_rtp_enc_name(int payload_type) const char *ff_rtp_enc_name(int payload_type)

10
libavformat/rtp.h
Unescape View File

@ -21,17 +21,17 @@
#ifndef AVFORMAT_RTP_H #ifndef AVFORMAT_RTP_H
#define AVFORMAT_RTP_H #define AVFORMAT_RTP_H
#include "libavformat/avformat.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
/** /**
* Return the payload type for a given codec. * Return the payload type for a given codec used in the given format context.
* *
* @param fmt The context of the format
* @param codec The context of the codec * @param codec The context of the codec
* @return In case of unknown payload type or dynamic payload type, a * @return The payload type (the 'PT' field in the RTP header).
* negative value is returned; otherwise, the payload type (the 'PT' field
* in the RTP header) is returned.
*/ */
int ff_rtp_get_payload_type(AVCodecContext *codec); int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec);
/** /**
* Initialize a codec context based on the payload type. * Initialize a codec context based on the payload type.

4
libavformat/rtpenc.c
Unescape View File

@ -32,6 +32,7 @@
static const AVOption options[] = { static const AVOption options[] = {
FF_RTP_FLAG_OPTS(RTPMuxContext, flags), FF_RTP_FLAG_OPTS(RTPMuxContext, flags),
{ "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), FF_OPT_TYPE_INT, {.dbl = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
{ NULL }, { NULL },
}; };
@ -92,7 +93,8 @@ static int rtp_write_header(AVFormatContext *s1)
return -1; return -1;
} }
s->payload_type = ff_rtp_get_payload_type(st->codec); if (s->payload_type < 0)
s->payload_type = ff_rtp_get_payload_type(s1, st->codec);
s->base_timestamp = av_get_random_seed(); s->base_timestamp = av_get_random_seed();
s->timestamp = s->base_timestamp; s->timestamp = s->base_timestamp;
s->cur_timestamp = 0; s->cur_timestamp = 0;

2
libavformat/sdp.c
Unescape View File

@ -532,7 +532,7 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
const char *type; const char *type;
int payload_type; int payload_type;
payload_type = ff_rtp_get_payload_type(c); payload_type = ff_rtp_get_payload_type(fmt, c);
switch (c->codec_type) { switch (c->codec_type) {
case AVMEDIA_TYPE_VIDEO : type = "video" ; break; case AVMEDIA_TYPE_VIDEO : type = "video" ; break;

2
libavformat/sol.c
Unescape View File

@ -132,6 +132,8 @@ static int sol_read_packet(AVFormatContext *s,
if (url_feof(s->pb)) if (url_feof(s->pb))
return AVERROR(EIO); return AVERROR(EIO);
ret= av_get_packet(s->pb, pkt, MAX_SIZE); ret= av_get_packet(s->pb, pkt, MAX_SIZE);
if (ret < 0)
return ret;
pkt->stream_index = 0; pkt->stream_index = 0;
/* note: we need to modify the packet size here to handle the last /* note: we need to modify the packet size here to handle the last

16
libavformat/utils.c
Unescape View File

@ -2122,14 +2122,14 @@ static int has_codec_parameters(AVCodecContext *avctx)
switch (avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE; val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE;
if(!avctx->frame_size && if (!avctx->frame_size &&
(avctx->codec_id == CODEC_ID_VORBIS || (avctx->codec_id == CODEC_ID_VORBIS ||
avctx->codec_id == CODEC_ID_AAC || avctx->codec_id == CODEC_ID_AAC ||
avctx->codec_id == CODEC_ID_MP1 || avctx->codec_id == CODEC_ID_MP1 ||
avctx->codec_id == CODEC_ID_MP2 || avctx->codec_id == CODEC_ID_MP2 ||
avctx->codec_id == CODEC_ID_MP3 || avctx->codec_id == CODEC_ID_MP3 ||
avctx->codec_id == CODEC_ID_SPEEX || avctx->codec_id == CODEC_ID_SPEEX ||
avctx->codec_id == CODEC_ID_CELT)) avctx->codec_id == CODEC_ID_CELT))
return 0; return 0;
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:

2
libavutil/avutil.h
Unescape View File

@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR 17 #define LIBAVUTIL_VERSION_MINOR 18
#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

2
libavutil/cpu.c
Unescape View File

@ -65,6 +65,8 @@ static const struct {
{ AV_CPU_FLAG_SSE4, "sse4.1" }, { AV_CPU_FLAG_SSE4, "sse4.1" },
{ AV_CPU_FLAG_SSE42, "sse4.2" }, { AV_CPU_FLAG_SSE42, "sse4.2" },
{ AV_CPU_FLAG_AVX, "avx" }, { AV_CPU_FLAG_AVX, "avx" },
{ AV_CPU_FLAG_XOP, "xop" },
{ AV_CPU_FLAG_FMA4, "fma4" },
{ AV_CPU_FLAG_3DNOW, "3dnow" }, { AV_CPU_FLAG_3DNOW, "3dnow" },
{ AV_CPU_FLAG_3DNOWEXT, "3dnowext" }, { AV_CPU_FLAG_3DNOWEXT, "3dnowext" },
#endif #endif

2
libavutil/cpu.h
Unescape View File

@ -38,6 +38,8 @@
#define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions #define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
#define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions #define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
#define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used #define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
#define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
#define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
#define AV_CPU_FLAG_IWMMXT 0x0100 ///< XScale IWMMXT #define AV_CPU_FLAG_IWMMXT 0x0100 ///< XScale IWMMXT
#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard

9
libavutil/x86/cpu.c
Unescape View File

@ -133,6 +133,15 @@ int ff_get_cpu_flags_x86(void)
rval & AV_CPU_FLAG_SSE2 && !(ecx & 0x00000040)) { rval & AV_CPU_FLAG_SSE2 && !(ecx & 0x00000040)) {
rval |= AV_CPU_FLAG_SSE2SLOW; rval |= AV_CPU_FLAG_SSE2SLOW;
} }
/* XOP and FMA4 use the AVX instruction coding scheme, so they can't be
* used unless the OS has AVX support. */
if (rval & AV_CPU_FLAG_AVX) {
if (ecx & 0x00000800)
rval |= AV_CPU_FLAG_XOP;
if (ecx & 0x00010000)
rval |= AV_CPU_FLAG_FMA4;
}
} }
if (!strncmp(vendor.c, "GenuineIntel", 12)) { if (!strncmp(vendor.c, "GenuineIntel", 12)) {

7
tests/Makefile
Unescape View File

@ -54,9 +54,12 @@ FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%)
FATE = $(FATE_ACODEC) \ FATE = $(FATE_ACODEC) \
$(FATE_VCODEC) \ $(FATE_VCODEC) \
$(FATE_LAVF) \ $(FATE_LAVF) \
$(FATE_LAVFI) \
$(FATE_SEEK) \ $(FATE_SEEK) \
FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI)
FATE += $(FATE-yes)
$(filter-out %-aref,$(FATE_ACODEC)): $(AREF) $(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
$(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref $(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref
$(filter-out %-vref,$(FATE_VSYNTH2)): fate-vsynth2-vref $(filter-out %-vref,$(FATE_VSYNTH2)): fate-vsynth2-vref
@ -79,7 +82,7 @@ fate-lavfi: $(FATE_LAVFI)
fate-seek: $(FATE_SEEK) fate-seek: $(FATE_SEEK)
ifdef SAMPLES ifdef SAMPLES
FATE += $(FATE_TESTS) FATE += $(FATE_TESTS) $(FATE_TESTS-yes)
fate-rsync: fate-rsync:
rsync -vaLW rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES) rsync -vaLW rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES)
else else

2
tests/fate.mak
Unescape View File

@ -128,7 +128,7 @@ FATE_TESTS += fate-id-cin-video
fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
FATE_TESTS += fate-idroq-video-dpcm FATE_TESTS += fate-idroq-video-dpcm
fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
FATE_TESTS += fate-idroq-video-encode FATE_TESTS-$(CONFIG_AVFILTER) += fate-idroq-video-encode
fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2 fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2
FATE_TESTS += fate-iff-byterun1 FATE_TESTS += fate-iff-byterun1
fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24

Write Preview
Loading…
Cancel
Save