aacdec: Lower the number of frames required to detect ADTS

[ffmpeg] / libavformat / oggparsespeex.c

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 435ed0cedf9ca5617aca42d44c6f201053a7eedd..42480a3a2766ec8fef81dce2e33297ed222ff54f 100644 (file)
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include "libavutil/bswap.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
@@ -55,10 +56,16 @@ static int speex_header(AVFormatContext *s, int idx) {
     if (spxp->seq == 0) {
         int frames_per_packet;
         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-        st->codec->codec_id = CODEC_ID_SPEEX;
+        st->codec->codec_id = AV_CODEC_ID_SPEEX;
 
         st->codec->sample_rate = AV_RL32(p + 36);
         st->codec->channels = AV_RL32(p + 48);
+        if (st->codec->channels < 1 || st->codec->channels > 2) {
+            av_log(s, AV_LOG_ERROR, "invalid channel count. Speex must be mono or stereo.\n");
+            return AVERROR_INVALIDDATA;
+        }
+        st->codec->channel_layout = st->codec->channels == 1 ? AV_CH_LAYOUT_MONO :
+                                                               AV_CH_LAYOUT_STEREO;
 
         spxp->packet_size  = AV_RL32(p + 56);
         frames_per_packet  = AV_RL32(p + 64);
@@ -122,5 +129,6 @@ const struct ogg_codec ff_speex_codec = {
     .magic = "Speex   ",
     .magicsize = 8,
     .header = speex_header,
-    .packet = speex_packet
+    .packet = speex_packet,
+    .nb_header = 2,
 };