* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
#include "riff.h"
typedef struct {
static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
+static int mmf_rate(int code)
+{
+ if((code < 0) || (code > 4))
+ return -1;
+ return mmf_rates[code];
+}
+
+#ifdef CONFIG_MUXERS
static int mmf_rate_code(int rate)
{
int i;
return -1;
}
-static int mmf_rate(int code)
-{
- if((code < 0) || (code > 4))
- return -1;
- return mmf_rates[code];
-}
-
-#ifdef CONFIG_MUXERS
/* Copy of end_tag() from avienc.c, but for big-endian chunk size */
static void end_tag_be(ByteIOContext *pb, offset_t start)
{
static int mmf_write_header(AVFormatContext *s)
{
MMFContext *mmf = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
offset_t pos;
int rate;
static int mmf_write_packet(AVFormatContext *s, AVPacket *pkt)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
put_buffer(pb, pkt->data, pkt->size);
return 0;
}
static int mmf_write_trailer(AVFormatContext *s)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
MMFContext *mmf = s->priv_data;
offset_t pos, size;
int gatetime;
- if (!url_is_streamed(&s->pb)) {
+ if (!url_is_streamed(s->pb)) {
/* Fill in length fields */
end_tag_be(pb, mmf->awapos);
end_tag_be(pb, mmf->atrpos);
{
MMFContext *mmf = s->priv_data;
unsigned int tag;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
offset_t file_size, size;
int rate, params;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA;
AVStream *st;
int ret, size;
- if (url_feof(&s->pb))
- return AVERROR_IO;
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
st = s->streams[0];
size = MAX_SIZE;
size = mmf->data_size;
if(!size)
- return AVERROR_IO;
+ return AVERROR(EIO);
if (av_new_packet(pkt, size))
- return AVERROR_IO;
+ return AVERROR(EIO);
pkt->stream_index = 0;
- ret = get_buffer(&s->pb, pkt->data, pkt->size);
+ ret = get_buffer(s->pb, pkt->data, pkt->size);
if (ret < 0)
av_free_packet(pkt);
return 0;
}
-static int mmf_read_seek(AVFormatContext *s,
- int stream_index, int64_t timestamp, int flags)
-{
- return pcm_read_seek(s, stream_index, timestamp, flags);
-}
-
#ifdef CONFIG_MMF_DEMUXER
AVInputFormat mmf_demuxer = {
"mmf",
- "mmf format",
+ NULL_IF_CONFIG_SMALL("mmf format"),
sizeof(MMFContext),
mmf_probe,
mmf_read_header,
mmf_read_packet,
mmf_read_close,
- mmf_read_seek,
+ pcm_read_seek,
};
#endif
#ifdef CONFIG_MMF_MUXER
AVOutputFormat mmf_muxer = {
"mmf",
- "mmf format",
+ NULL_IF_CONFIG_SMALL("mmf format"),
"application/vnd.smaf",
"mmf",
sizeof(MMFContext),