aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-12-03 17:22:21 +0000
committerPaul B Mahol <onemda@gmail.com>2012-12-05 12:40:57 +0000
commit93dc8ed0a113ba0c66fe1191f942766d82664514 (patch)
tree449842e60d6ce4671b0c510c981b8fa49043591f
parent99efd596267248ba5eae1b0e540d880368a402c3 (diff)
downloadffmpeg-93dc8ed0a113ba0c66fe1191f942766d82664514.tar.gz
pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers
While here remove pts/dts code, it is apparently not needed and cause problems for demuxers that will use such function. Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavformat/pcm.c18
-rw-r--r--libavformat/pcm.h1
-rw-r--r--libavformat/pcmdec.c26
3 files changed, 20 insertions, 25 deletions
diff --git a/libavformat/pcm.c b/libavformat/pcm.c
index bba741de53..71f6a4f653 100644
--- a/libavformat/pcm.c
+++ b/libavformat/pcm.c
@@ -23,6 +23,24 @@
#include "avformat.h"
#include "pcm.h"
+#define RAW_SAMPLES 1024
+
+int ff_pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ int ret, size;
+
+ size= RAW_SAMPLES*s->streams[0]->codec->block_align;
+
+ ret= av_get_packet(s->pb, pkt, size);
+
+ pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
+ pkt->stream_index = 0;
+ if (ret < 0)
+ return ret;
+
+ return ret;
+}
+
int ff_pcm_read_seek(AVFormatContext *s,
int stream_index, int64_t timestamp, int flags)
{
diff --git a/libavformat/pcm.h b/libavformat/pcm.h
index 60d8eb3da0..9af36d5a2e 100644
--- a/libavformat/pcm.h
+++ b/libavformat/pcm.h
@@ -24,6 +24,7 @@
#include "avformat.h"
+int ff_pcm_read_packet(AVFormatContext *s, AVPacket *pkt);
int ff_pcm_read_seek(AVFormatContext *s,
int stream_index, int64_t timestamp, int flags);
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index 30f69d3ff0..f4264d91c3 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -26,8 +26,6 @@
#include "libavutil/opt.h"
#include "libavutil/avassert.h"
-#define RAW_SAMPLES 1024
-
typedef struct PCMAudioDemuxerContext {
AVClass *class;
int sample_rate;
@@ -61,28 +59,6 @@ static int pcm_read_header(AVFormatContext *s)
return 0;
}
-static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
- int ret, size, bps;
- // AVStream *st = s->streams[0];
-
- size= RAW_SAMPLES*s->streams[0]->codec->block_align;
-
- ret= av_get_packet(s->pb, pkt, size);
-
- pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
- pkt->stream_index = 0;
- if (ret < 0)
- return ret;
-
- bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
- av_assert1(bps); // if false there IS a bug elsewhere (NOT in this function)
- pkt->dts=
- pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
-
- return ret;
-}
-
static const AVOption pcm_options[] = {
{ "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 44100}, 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 },
@@ -101,7 +77,7 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
.priv_data_size = sizeof(PCMAudioDemuxerContext), \
.read_header = pcm_read_header, \
- .read_packet = pcm_read_packet, \
+ .read_packet = ff_pcm_read_packet, \
.read_seek = ff_pcm_read_seek, \
.flags = AVFMT_GENERIC_INDEX, \
.extensions = ext, \