flvenc: only write the framerate tag based on avg_frame_rate

[ffmpeg] / libavformat / pcmdec.c

diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index fce0418f3798d6bc7143ed70d5e0f668397b9e6b..1bbbc66d176e1fa19c7b7c3cbe2b15dda2d916c2 100644 (file)
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -20,14 +20,47 @@
  */
 
 #include "avformat.h"
-#include "rawdec.h"
+#include "internal.h"
 #include "pcm.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 
 #define RAW_SAMPLES     1024
 
-static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
+typedef struct PCMAudioDemuxerContext {
+    AVClass *class;
+    int sample_rate;
+    int channels;
+} PCMAudioDemuxerContext;
+
+static int pcm_read_header(AVFormatContext *s)
+{
+    PCMAudioDemuxerContext *s1 = s->priv_data;
+    AVStream *st;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+
+    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codec->codec_id    = s->iformat->raw_codec_id;
+    st->codec->sample_rate = s1->sample_rate;
+    st->codec->channels    = s1->channels;
+
+    st->codec->bits_per_coded_sample =
+        av_get_bits_per_sample(st->codec->codec_id);
+
+    assert(st->codec->bits_per_coded_sample > 0);
+
+    st->codec->block_align =
+        st->codec->bits_per_coded_sample * st->codec->channels / 8;
+
+    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+    return 0;
+}
+
+static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, size, bps;
     //    AVStream *st = s->streams[0];
@@ -41,7 +74,11 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
         return ret;
 
     bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
-    assert(bps); // if false there IS a bug elsewhere (NOT in this function)
+    if (!bps) {
+        av_log(s, AV_LOG_ERROR, "Unknown number of bytes per sample.\n");
+        return AVERROR(EINVAL);
+    }
+
     pkt->dts=
     pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
 
@@ -49,8 +86,8 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
 }
 
 static const AVOption pcm_options[] = {
-    { "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
-    { "channels",    "", offsetof(RawAudioDemuxerContext, channels),    AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+    { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+    { "channels",    "", offsetof(PCMAudioDemuxerContext, channels),    AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
     { NULL },
 };
 
@@ -64,9 +101,9 @@ static const AVClass name_ ## _demuxer_class = {            \
 AVInputFormat ff_pcm_ ## name_ ## _demuxer = {              \
     .name           = #name_,                               \
     .long_name      = NULL_IF_CONFIG_SMALL(long_name_),     \
-    .priv_data_size = sizeof(RawAudioDemuxerContext),       \
-    .read_header    = ff_raw_read_header,                   \
-    .read_packet    = raw_read_packet,                      \
+    .priv_data_size = sizeof(PCMAudioDemuxerContext),       \
+    .read_header    = pcm_read_header,                      \
+    .read_packet    = pcm_read_packet,                      \
     .read_seek      = ff_pcm_read_seek,                     \
     .flags          = AVFMT_GENERIC_INDEX,                  \
     .extensions     = ext,                                  \
@@ -75,61 +112,61 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = {              \
 };
 
 PCMDEF(f64be, "PCM 64-bit floating-point big-endian",
-       NULL, CODEC_ID_PCM_F64BE)
+       NULL, AV_CODEC_ID_PCM_F64BE)
 
 PCMDEF(f64le, "PCM 64-bit floating-point little-endian",
-       NULL, CODEC_ID_PCM_F64LE)
+       NULL, AV_CODEC_ID_PCM_F64LE)
 
 PCMDEF(f32be, "PCM 32-bit floating-point big-endian",
-       NULL, CODEC_ID_PCM_F32BE)
+       NULL, AV_CODEC_ID_PCM_F32BE)
 
 PCMDEF(f32le, "PCM 32-bit floating-point little-endian",
-       NULL, CODEC_ID_PCM_F32LE)
+       NULL, AV_CODEC_ID_PCM_F32LE)
 
 PCMDEF(s32be, "PCM signed 32-bit big-endian",
-       NULL, CODEC_ID_PCM_S32BE)
+       NULL, AV_CODEC_ID_PCM_S32BE)
 
 PCMDEF(s32le, "PCM signed 32-bit little-endian",
-       NULL, CODEC_ID_PCM_S32LE)
+       NULL, AV_CODEC_ID_PCM_S32LE)
 
 PCMDEF(s24be, "PCM signed 24-bit big-endian",
-       NULL, CODEC_ID_PCM_S24BE)
+       NULL, AV_CODEC_ID_PCM_S24BE)
 
 PCMDEF(s24le, "PCM signed 24-bit little-endian",
-       NULL, CODEC_ID_PCM_S24LE)
+       NULL, AV_CODEC_ID_PCM_S24LE)
 
 PCMDEF(s16be, "PCM signed 16-bit big-endian",
-       AV_NE("sw", NULL), CODEC_ID_PCM_S16BE)
+       AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE)
 
 PCMDEF(s16le, "PCM signed 16-bit little-endian",
-       AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE)
+       AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE)
 
 PCMDEF(s8, "PCM signed 8-bit",
-       "sb", CODEC_ID_PCM_S8)
+       "sb", AV_CODEC_ID_PCM_S8)
 
 PCMDEF(u32be, "PCM unsigned 32-bit big-endian",
-       NULL, CODEC_ID_PCM_U32BE)
+       NULL, AV_CODEC_ID_PCM_U32BE)
 
 PCMDEF(u32le, "PCM unsigned 32-bit little-endian",
-       NULL, CODEC_ID_PCM_U32LE)
+       NULL, AV_CODEC_ID_PCM_U32LE)
 
 PCMDEF(u24be, "PCM unsigned 24-bit big-endian",
-       NULL, CODEC_ID_PCM_U24BE)
+       NULL, AV_CODEC_ID_PCM_U24BE)
 
 PCMDEF(u24le, "PCM unsigned 24-bit little-endian",
-       NULL, CODEC_ID_PCM_U24LE)
+       NULL, AV_CODEC_ID_PCM_U24LE)
 
 PCMDEF(u16be, "PCM unsigned 16-bit big-endian",
-       AV_NE("uw", NULL), CODEC_ID_PCM_U16BE)
+       AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE)
 
 PCMDEF(u16le, "PCM unsigned 16-bit little-endian",
-       AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE)
+       AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE)
 
 PCMDEF(u8, "PCM unsigned 8-bit",
-       "ub", CODEC_ID_PCM_U8)
+       "ub", AV_CODEC_ID_PCM_U8)
 
 PCMDEF(alaw, "PCM A-law",
-       "al", CODEC_ID_PCM_ALAW)
+       "al", AV_CODEC_ID_PCM_ALAW)
 
 PCMDEF(mulaw, "PCM mu-law",
-       "ul", CODEC_ID_PCM_MULAW)
+       "ul", AV_CODEC_ID_PCM_MULAW)