X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsol.c;h=d02373c65a7de9ea82d717fea359dd529cc74d46;hb=c9024a9fd7ea7980f876a65816da8da78dd9d88d;hp=4f6a8934c0bab88f52e8c0db3811e467383000c8;hpb=115329f16062074e11ccf3b89ead6176606c9696;p=ffmpeg

diff --git a/libavformat/sol.c b/libavformat/sol.c
index 4f6a8934c0b..d02373c65a7 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -1,40 +1,40 @@
 /*
- * Sierra SOL decoder
- * Copyright Konstantin Shishkov.
+ * Sierra SOL demuxer
+ * Copyright Konstantin Shishkov
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*
  * Based on documents from Game Audio Player and own research
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
-#include "avi.h"
-#include "bswap.h"
+#include "internal.h"
+#include "pcm.h"
 
 /* if we don't know the size in advance */
-#define AU_UNKOWN_SIZE ((uint32_t)(~0))
+#define AU_UNKNOWN_SIZE ((uint32_t)(~0))
 
 static int sol_probe(AVProbeData *p)
 {
     /* check file header */
-    uint16_t magic;
-    if (p->buf_size <= 14)
-        return 0;
-    magic=le2me_16(*((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,7 +47,7 @@ static int sol_probe(AVProbeData *p)
 #define SOL_16BIT   4
 #define SOL_STEREO 16
 
-static int sol_codec_id(int magic, int type)
+static enum CodecID sol_codec_id(int magic, int type)
 {
     if (magic == 0x0B8D)
     {
@@ -82,25 +82,24 @@ 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)
 {
-    int size;
     unsigned int magic,tag;
-    ByteIOContext *pb = &s->pb;
-    unsigned int id, codec, channels, rate, type;
+    AVIOContext *pb = s->pb;
+    unsigned int id, channels, rate, type;
+    enum CodecID codec;
     AVStream *st;
 
     /* check ".snd" header */
-    magic = get_le16(pb);
-    tag = get_le32(pb);
+    magic = avio_rl16(pb);
+    tag = avio_rl32(pb);
     if (tag != MKTAG('S', 'O', 'L', 0))
         return -1;
-    rate = get_le16(pb);
-    type = get_byte(pb);
-    size = get_le32(pb);
+    rate = avio_rl16(pb);
+    type = avio_r8(pb);
+    avio_skip(pb, 4); /* size */
     if (magic != 0x0B8D)
-        get_byte(pb); /* newer SOLs contain padding byte */
+        avio_r8(pb); /* newer SOLs contain padding byte */
 
     codec = sol_codec_id(magic, type);
     channels = sol_channels(magic, type);
@@ -110,15 +109,15 @@ static int sol_read_header(AVFormatContext *s,
     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 = CODEC_TYPE_AUDIO;
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_tag = id;
     st->codec->codec_id = codec;
     st->codec->channels = channels;
     st->codec->sample_rate = rate;
-    av_set_pts_info(st, 64, 1, rate);
+    avpriv_set_pts_info(st, 64, 1, rate);
     return 0;
 }
 
@@ -129,9 +128,11 @@ static int sol_read_packet(AVFormatContext *s,
 {
     int ret;
 
-    if (url_feof(&s->pb))
-        return -EIO;
-    ret= av_get_packet(&s->pb, pkt, MAX_SIZE);
+    if (s->pb->eof_reached)
+        return AVERROR(EIO);
+    ret= av_get_packet(s->pb, pkt, MAX_SIZE);
+    if (ret < 0)
+        return ret;
     pkt->stream_index = 0;
 
     /* note: we need to modify the packet size here to handle the last
@@ -140,24 +141,11 @@ static int sol_read_packet(AVFormatContext *s,
     return 0;
 }
 
-static int sol_read_close(AVFormatContext *s)
-{
-    return 0;
-}
-
-static AVInputFormat sol_iformat = {
-    "sol",
-    "Sierra SOL Format",
-    0,
-    sol_probe,
-    sol_read_header,
-    sol_read_packet,
-    sol_read_close,
-    pcm_read_seek,
+AVInputFormat ff_sol_demuxer = {
+    .name           = "sol",
+    .long_name      = NULL_IF_CONFIG_SMALL("Sierra SOL format"),
+    .read_probe     = sol_probe,
+    .read_header    = sol_read_header,
+    .read_packet    = sol_read_packet,
+    .read_seek      = ff_pcm_read_seek,
 };
-
-int sol_init(void)
-{
-    av_register_input_format(&sol_iformat);
-    return 0;
-}