X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsol.c;h=92599b163d69ce691a8f694d24059da511a85070;hb=66aabd76a9c0eaa65baad72453ca09eb161fee25;hp=951ec6eb9ab34d3e4ba69187417a97e9ecc5c567;hpb=9ff85412ad4fd7a4f338f938f6b72e889f7d87f3;p=ffmpeg diff --git a/libavformat/sol.c b/libavformat/sol.c index 951ec6eb9ab..92599b163d6 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -1,21 +1,21 @@ /* * Sierra SOL demuxer - * Copyright Konstantin Shishkov. + * Copyright Konstantin Shishkov * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * 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.1 of the License, or (at your option) any later version. * - * FFmpeg 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -23,10 +23,11 @@ * Based on documents from Game Audio Player and own research */ +#include "libavutil/channel_layout.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" -#include "allformats.h" -#include "riff.h" -#include "bswap.h" +#include "internal.h" +#include "pcm.h" /* if we don't know the size in advance */ #define AU_UNKNOWN_SIZE ((uint32_t)(~0)) @@ -34,10 +35,7 @@ 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) @@ -50,21 +48,21 @@ 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 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) @@ -85,43 +83,44 @@ 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 AVCodecID 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); - 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 = 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->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; } @@ -132,9 +131,11 @@ static int sol_read_packet(AVFormatContext *s, { int ret; - if (url_feof(&s->pb)) + if (s->pb->eof_reached) return AVERROR(EIO); - ret= av_get_packet(&s->pb, pkt, MAX_SIZE); + 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 @@ -143,18 +144,11 @@ static int sol_read_packet(AVFormatContext *s, return 0; } -static int sol_read_close(AVFormatContext *s) -{ - return 0; -} - -AVInputFormat sol_demuxer = { - "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"), + .read_probe = sol_probe, + .read_header = sol_read_header, + .read_packet = sol_read_packet, + .read_seek = ff_pcm_read_seek, };