mp3dec: Fix VBR bit rate parsing

[ffmpeg] / libavformat / sol.c

diff --git a/libavformat/sol.c b/libavformat/sol.c
index 920582f3d164b0760ee23b21858bc91910e8394d..92599b163d69ce691a8f694d24059da511a85070 100644 (file)
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -23,8 +23,10 @@
  * Based on documents from Game Audio Player and own research
  */
 
-#include "libavutil/bswap.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
+#include "internal.h"
 #include "pcm.h"
 
 /* if we don't know the size in advance */
@@ -33,8 +35,7 @@
 static int sol_probe(AVProbeData *p)
 {
     /* check file header */
-    uint16_t magic;
-    magic=av_le2ne16(*((uint16_t*)p->buf));
+    uint16_t magic = AV_RL32(p->buf);
     if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) &&
         p->buf[2] == 'S' && p->buf[3] == 'O' &&
         p->buf[4] == 'L' && p->buf[5] == 0)
@@ -47,21 +48,21 @@ static int sol_probe(AVProbeData *p)
 #define SOL_16BIT   4
 #define SOL_STEREO 16
 
-static enum CodecID sol_codec_id(int magic, int type)
+static enum AVCodecID sol_codec_id(int magic, int type)
 {
     if (magic == 0x0B8D)
     {
-        if (type & SOL_DPCM) return CODEC_ID_SOL_DPCM;
-        else return CODEC_ID_PCM_U8;
+        if (type & SOL_DPCM) return AV_CODEC_ID_SOL_DPCM;
+        else return AV_CODEC_ID_PCM_U8;
     }
     if (type & SOL_DPCM)
     {
-        if (type & SOL_16BIT) return CODEC_ID_SOL_DPCM;
-        else if (magic == 0x0C8D) return CODEC_ID_SOL_DPCM;
-        else return CODEC_ID_SOL_DPCM;
+        if (type & SOL_16BIT) return AV_CODEC_ID_SOL_DPCM;
+        else if (magic == 0x0C8D) return AV_CODEC_ID_SOL_DPCM;
+        else return AV_CODEC_ID_SOL_DPCM;
     }
-    if (type & SOL_16BIT) return CODEC_ID_PCM_S16LE;
-    return CODEC_ID_PCM_U8;
+    if (type & SOL_16BIT) return AV_CODEC_ID_PCM_S16LE;
+    return AV_CODEC_ID_PCM_U8;
 }
 
 static int sol_codec_type(int magic, int type)
@@ -82,13 +83,12 @@ static int sol_channels(int magic, int type)
     return 2;
 }
 
-static int sol_read_header(AVFormatContext *s,
-                          AVFormatParameters *ap)
+static int sol_read_header(AVFormatContext *s)
 {
     unsigned int magic,tag;
     AVIOContext *pb = s->pb;
     unsigned int id, channels, rate, type;
-    enum CodecID codec;
+    enum AVCodecID codec;
     AVStream *st;
 
     /* check ".snd" header */
@@ -105,20 +105,22 @@ static int sol_read_header(AVFormatContext *s,
     codec = sol_codec_id(magic, type);
     channels = sol_channels(magic, type);
 
-    if (codec == CODEC_ID_SOL_DPCM)
+    if (codec == AV_CODEC_ID_SOL_DPCM)
         id = sol_codec_type(magic, type);
     else id = 0;
 
     /* now we are ready: build format streams */
-    st = av_new_stream(s, 0);
+    st = avformat_new_stream(s, NULL);
     if (!st)
         return -1;
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_tag = id;
     st->codec->codec_id = codec;
     st->codec->channels = channels;
+    st->codec->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO :
+                                                AV_CH_LAYOUT_STEREO;
     st->codec->sample_rate = rate;
-    av_set_pts_info(st, 64, 1, rate);
+    avpriv_set_pts_info(st, 64, 1, rate);
     return 0;
 }
 
@@ -144,9 +146,9 @@ static int sol_read_packet(AVFormatContext *s,
 
 AVInputFormat ff_sol_demuxer = {
     .name           = "sol",
-    .long_name      = NULL_IF_CONFIG_SMALL("Sierra SOL format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("Sierra SOL"),
     .read_probe     = sol_probe,
     .read_header    = sol_read_header,
     .read_packet    = sol_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
 };