summaryrefslogtreecommitdiff
path: root/libavformat/oggparsespeex.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-10-12 21:30:03 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-10-12 21:30:03 +0000
commit15299b3821bff66ab89895c95cc06d0908f8ec7b (patch)
tree6848af47a4dcab535b775f5eefbbfc2dddbe071b /libavformat/oggparsespeex.c
parent933e8667350b118d9fda540e73bfae59e09b925b (diff)
downloadffmpeg-15299b3821bff66ab89895c95cc06d0908f8ec7b.tar.gz
Calculate correct packet durations when demuxing Ogg/Speex. This involves
determining if there is any delay in the first packet and/or any truncation in the final packet. Originally committed as revision 20216 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/oggparsespeex.c')
-rw-r--r--libavformat/oggparsespeex.c50
1 files changed, 49 insertions, 1 deletions
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index cc00dd2207..f6174749f2 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -30,6 +30,10 @@
#include "avformat.h"
#include "oggdec.h"
+struct speex_params {
+ int final_packet_duration;
+};
+
static int speex_header(AVFormatContext *s, int idx) {
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
@@ -69,8 +73,52 @@ static int speex_header(AVFormatContext *s, int idx) {
return 1;
}
+static int ogg_page_packets(struct ogg_stream *os)
+{
+ int i;
+ int packets = 0;
+ for (i = 0; i < os->nsegs; i++)
+ if (os->segments[i] < 255)
+ packets++;
+ return packets;
+}
+
+static int speex_packet(AVFormatContext *s, int idx)
+{
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
+ struct speex_params *spxp = os->private;
+ int packet_size = s->streams[idx]->codec->frame_size;
+
+ if (!spxp) {
+ spxp = av_mallocz(sizeof(*spxp));
+ os->private = spxp;
+ }
+
+ if (os->flags & OGG_FLAG_EOS && os->lastgp != -1 && os->granule > 0) {
+ /* first packet of final page. we have to calculate the final packet
+ duration here because it is the only place we know the next-to-last
+ granule position. */
+ spxp->final_packet_duration = os->granule - os->lastgp -
+ packet_size * (ogg_page_packets(os) - 1);
+ }
+
+ if (!os->lastgp && os->granule > 0)
+ /* first packet */
+ os->pduration = os->granule - packet_size * (ogg_page_packets(os) - 1);
+ else if (os->flags & OGG_FLAG_EOS && os->segp == os->nsegs &&
+ spxp->final_packet_duration)
+ /* final packet */
+ os->pduration = spxp->final_packet_duration;
+ else
+ os->pduration = packet_size;
+
+ return 0;
+}
+
const struct ogg_codec ff_speex_codec = {
.magic = "Speex ",
.magicsize = 8,
- .header = speex_header
+ .header = speex_header,
+ .packet = speex_packet
};