#include "libavformat/rtsp.h"
#include "libavdevice/avdevice.h"
#include "libswscale/swscale.h"
+#include "libavcodec/audioconvert.h"
-#include "version.h"
#include "cmdutils.h"
#include <SDL.h>
#undef exit
const char program_name[] = "FFplay";
-static const int program_birth_year = 2003;
+const int program_birth_year = 2003;
//#define DEBUG_SYNC
int audio_hw_buf_size;
/* samples output by the codec. we reserve more space for avsync
compensation */
- DECLARE_ALIGNED(16,uint8_t,audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]);
+ DECLARE_ALIGNED(16,uint8_t,audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]);
+ DECLARE_ALIGNED(16,uint8_t,audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]);
+ uint8_t *audio_buf;
unsigned int audio_buf_size; /* in bytes */
int audio_buf_index; /* in bytes */
AVPacket audio_pkt;
uint8_t *audio_pkt_data;
int audio_pkt_size;
+ enum SampleFormat audio_src_fmt;
+ AVAudioConvert *reformat_ctx;
int show_audio; /* if true, display audio samples */
int16_t sample_array[SAMPLE_ARRAY_SIZE];
}
/* decode one audio frame and returns its uncompressed size */
-static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, int buf_size, double *pts_ptr)
+static int audio_decode_frame(VideoState *is, double *pts_ptr)
{
AVPacket *pkt = &is->audio_pkt;
+ AVCodecContext *dec= is->audio_st->codec;
int n, len1, data_size;
double pts;
for(;;) {
/* NOTE: the audio packet can contain several frames */
while (is->audio_pkt_size > 0) {
- data_size = buf_size;
- len1 = avcodec_decode_audio2(is->audio_st->codec,
- (int16_t *)audio_buf, &data_size,
+ data_size = sizeof(is->audio_buf1);
+ len1 = avcodec_decode_audio2(dec,
+ (int16_t *)is->audio_buf1, &data_size,
is->audio_pkt_data, is->audio_pkt_size);
if (len1 < 0) {
/* if error, we skip the frame */
is->audio_pkt_size -= len1;
if (data_size <= 0)
continue;
+
+ if (dec->sample_fmt != is->audio_src_fmt) {
+ if (is->reformat_ctx)
+ av_audio_convert_free(is->reformat_ctx);
+ is->reformat_ctx= av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
+ dec->sample_fmt, 1, NULL, 0);
+ if (!is->reformat_ctx) {
+ fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
+ avcodec_get_sample_fmt_name(dec->sample_fmt),
+ avcodec_get_sample_fmt_name(SAMPLE_FMT_S16));
+ break;
+ }
+ is->audio_src_fmt= dec->sample_fmt;
+ }
+
+ if (is->reformat_ctx) {
+ const void *ibuf[6]= {is->audio_buf1};
+ void *obuf[6]= {is->audio_buf2};
+ int istride[6]= {av_get_bits_per_sample_format(dec->sample_fmt)/8};
+ int ostride[6]= {2};
+ int len= data_size/istride[0];
+ if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) {
+ printf("av_audio_convert() failed\n");
+ break;
+ }
+ is->audio_buf= is->audio_buf2;
+ /* FIXME: existing code assume that data_size equals framesize*channels*2
+ remove this legacy cruft */
+ data_size= len*2;
+ }else{
+ is->audio_buf= is->audio_buf1;
+ }
+
/* if no pts, then compute it */
pts = is->audio_clock;
*pts_ptr = pts;
- n = 2 * is->audio_st->codec->channels;
+ n = 2 * dec->channels;
is->audio_clock += (double)data_size /
- (double)(n * is->audio_st->codec->sample_rate);
+ (double)(n * dec->sample_rate);
#if defined(DEBUG_SYNC)
{
static double last_clock;
if (packet_queue_get(&is->audioq, pkt, 1) < 0)
return -1;
if(pkt->data == flush_pkt.data){
- avcodec_flush_buffers(is->audio_st->codec);
+ avcodec_flush_buffers(dec);
continue;
}
while (len > 0) {
if (is->audio_buf_index >= is->audio_buf_size) {
- audio_size = audio_decode_frame(is, is->audio_buf, sizeof(is->audio_buf), &pts);
+ audio_size = audio_decode_frame(is, &pts);
if (audio_size < 0) {
/* if error, just output silence */
is->audio_buf_size = 1024;
return -1;
}
is->audio_hw_buf_size = spec.size;
+ is->audio_src_fmt= SAMPLE_FMT_S16;
}
if(thread_count>1)
SDL_CloseAudio();
packet_queue_end(&is->audioq);
+ if (is->reformat_ctx)
+ av_audio_convert_free(is->reformat_ctx);
break;
case CODEC_TYPE_VIDEO:
packet_queue_abort(&is->videoq);
frame_pix_fmt = avcodec_get_pix_fmt(arg);
}
-static void opt_sync(const char *arg)
+static int opt_sync(const char *opt, const char *arg)
{
if (!strcmp(arg, "audio"))
av_sync_type = AV_SYNC_AUDIO_MASTER;
else if (!strcmp(arg, "ext"))
av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
else {
- show_help();
+ fprintf(stderr, "Unknown value for %s: %s\n", opt, arg);
exit(1);
}
+ return 0;
}
static int opt_seek(const char *opt, const char *arg)
return 0;
}
-static void opt_show_help(void)
-{
- show_help();
- exit(0);
-}
-
-static void opt_show_version(void)
-{
- show_version();
- exit(0);
-}
-
static const OptionDef options[] = {
- { "h", 0, {(void*)opt_show_help}, "show help" },
- { "version", 0, {(void*)opt_show_version}, "show version" },
+ { "h", OPT_EXIT, {(void*)show_help}, "show help" },
+ { "version", OPT_EXIT, {(void*)show_version}, "show version" },
+ { "L", OPT_EXIT, {(void*)show_license}, "show license" },
+ { "formats", OPT_EXIT, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
{ "x", HAS_ARG | OPT_FUNC2, {(void*)opt_width}, "force displayed width", "width" },
{ "y", HAS_ARG | OPT_FUNC2, {(void*)opt_height}, "force displayed height", "height" },
{ "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
{ "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo", "algo" },
{ "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_resilience}, "set error detection threshold (0-4)", "threshold" },
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" },
- { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
+ { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
{ NULL, },
};
avdevice_register_all();
av_register_all();
- show_banner(program_name, program_birth_year);
+ show_banner();
parse_options(argc, argv, options, opt_input_file);