Combine deprecation guards where appropriate

[ffmpeg] / libavformat / oggparsespeex.c

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 1612f2e632c7ac08ff33656ab6d12317239fb8df..2430cd742b0f7f407a20aa7e65d8d6293b0a35ee 100644 (file)
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -23,39 +23,116 @@
 **/
 
 #include <stdlib.h>
+
 #include "libavutil/bswap.h"
 #include "libavutil/avstring.h"
-#include "libavcodec/bitstream.h"
+#include "libavutil/channel_layout.h"
+
 #include "libavcodec/bytestream.h"
+
 #include "avformat.h"
+#include "internal.h"
 #include "oggdec.h"
 
+struct speex_params {
+    int packet_size;
+    int final_packet_duration;
+    int seq;
+};
+
 static int speex_header(AVFormatContext *s, int idx) {
-    ogg_t *ogg = s->priv_data;
-    ogg_stream_t *os = ogg->streams + idx;
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    struct speex_params *spxp = os->private;
     AVStream *st = s->streams[idx];
     uint8_t *p = os->buf + os->pstart;
 
-    if (os->psize < 80)
-        return 1;
+    if (!spxp) {
+        spxp = av_mallocz(sizeof(*spxp));
+        if (!spxp)
+            return AVERROR(ENOMEM);
+        os->private = spxp;
+    }
+
+    if (spxp->seq > 1)
+        return 0;
+
+    if (spxp->seq == 0) {
+        int frames_per_packet;
+        st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+        st->codecpar->codec_id = AV_CODEC_ID_SPEEX;
+
+        st->codecpar->sample_rate = AV_RL32(p + 36);
+        st->codecpar->channels = AV_RL32(p + 48);
+        if (st->codecpar->channels < 1 || st->codecpar->channels > 2) {
+            av_log(s, AV_LOG_ERROR, "invalid channel count. Speex must be mono or stereo.\n");
+            return AVERROR_INVALIDDATA;
+        }
+        st->codecpar->channel_layout = st->codecpar->channels == 1 ? AV_CH_LAYOUT_MONO :
+                                                                     AV_CH_LAYOUT_STEREO;
+
+        spxp->packet_size  = AV_RL32(p + 56);
+        frames_per_packet  = AV_RL32(p + 64);
+        if (frames_per_packet)
+            spxp->packet_size *= frames_per_packet;
+
+        st->codecpar->extradata_size = os->psize;
+        st->codecpar->extradata = av_malloc(st->codecpar->extradata_size
+                                            + AV_INPUT_BUFFER_PADDING_SIZE);
+        memcpy(st->codecpar->extradata, p, st->codecpar->extradata_size);
+
+        avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+    } else
+        ff_vorbis_stream_comment(s, st, p, os->psize);
+
+    spxp->seq++;
+    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;
+}
 
-    st->codec->codec_type = CODEC_TYPE_AUDIO;
-    st->codec->codec_id = CODEC_ID_SPEEX;
+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 = spxp->packet_size;
 
-    st->codec->sample_rate = AV_RL32(p + 36);
-    st->codec->channels = AV_RL32(p + 48);
-    st->codec->extradata_size = os->psize;
-    st->codec->extradata = av_malloc(st->codec->extradata_size);
-    memcpy(st->codec->extradata, p, st->codec->extradata_size);
+    if (os->flags & OGG_FLAG_EOS && os->lastpts != AV_NOPTS_VALUE &&
+        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->lastpts -
+                                      packet_size * (ogg_page_packets(os) - 1);
+    }
 
-    st->time_base.num = 1;
-    st->time_base.den = st->codec->sample_rate;
+    if (!os->lastpts && os->granule > 0)
+        /* first packet */
+        os->lastpts = os->lastdts = os->granule - packet_size *
+                                    ogg_page_packets(os);
+    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 ogg_codec_t speex_codec = {
+const struct ogg_codec ff_speex_codec = {
     .magic = "Speex   ",
     .magicsize = 8,
-    .header = speex_header
+    .header = speex_header,
+    .packet = speex_packet,
+    .nb_header = 2,
 };