-/*
+/*
* Yamaha SMAF format
* Copyright (c) 2005 Vidar Madsen
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "avi.h"
+#include "raw.h"
+#include "riff.h"
typedef struct {
offset_t atrpos, atsqpos, awapos;
offset_t data_size;
} MMFContext;
-#ifdef CONFIG_MUXERS
-static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
+static const 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_MMF_MUXER
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];
-}
-
/* 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;
av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d\n", s->streams[0]->codec->sample_rate);
return -1;
}
-
+
put_tag(pb, "MMMD");
put_be32(pb, 0);
pos = start_tag(pb, "CNTI");
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);
}
return 0;
}
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_MMF_MUXER */
static int mmf_probe(AVProbeData *p)
{
/* check file header */
- if (p->buf_size <= 32)
- return 0;
if (p->buf[0] == 'M' && p->buf[1] == 'M' &&
p->buf[2] == 'M' && p->buf[3] == 'D' &&
p->buf[8] == 'C' && p->buf[9] == 'N' &&
{
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;
}
/* Tag = "ATRx", where "x" = track number */
+ if ((tag & 0xffffff) == MKTAG('M', 'T', 'R', 0)) {
+ av_log(s, AV_LOG_ERROR, "MIDI like format found, unsupported\n");
+ return -1;
+ }
if ((tag & 0xffffff) != MKTAG('A', 'T', 'R', 0)) {
av_log(s, AV_LOG_ERROR, "Unsupported SMAF chunk %08x\n", tag);
return -1;
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;
st->codec->sample_rate = rate;
st->codec->channels = 1;
- st->codec->bits_per_sample = 4;
- st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample;
+ st->codec->bits_per_coded_sample = 4;
+ st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
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 ret;
}
-static int mmf_read_close(AVFormatContext *s)
-{
- 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);
-}
-
-
-static AVInputFormat mmf_iformat = {
+#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,
+ NULL,
+ pcm_read_seek,
};
-
-#ifdef CONFIG_MUXERS
-static AVOutputFormat mmf_oformat = {
+#endif
+#ifdef CONFIG_MMF_MUXER
+AVOutputFormat mmf_muxer = {
"mmf",
- "mmf format",
+ NULL_IF_CONFIG_SMALL("mmf format"),
"application/vnd.smaf",
"mmf",
sizeof(MMFContext),
mmf_write_packet,
mmf_write_trailer,
};
-#endif //CONFIG_MUXERS
-
-int ff_mmf_init(void)
-{
- av_register_input_format(&mmf_iformat);
-#ifdef CONFIG_MUXERS
- av_register_output_format(&mmf_oformat);
-#endif //CONFIG_MUXERS
- return 0;
-}
-
+#endif
projects / ffmpeg / blobdiff