Core Audio Format demuxer

Originally committed as revision 19879 to svn://svn.ffmpeg.org/ffmpeg/trunk

Changelog

@@ -37,6 +37,7 @@ version <next>:
 - Bluray (PGS) subtitle decoder
 - LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
 - Wmapro decoder
+- Core Audio Format demuxer
 
 
 

doc/general.texi

@@ -63,6 +63,8 @@ library:
     @tab Used in the game Cyberia from Interplay.
 @item Delphine Software International CIN @tab   @tab X
     @tab Multimedia format used by Delphine Software games.
+@item Core Audio Format         @tab   @tab X
+    @tab Apple Core Audio Format
 @item CRC testing format        @tab X @tab
 @item Creative Voice            @tab X @tab X
     @tab Created for the Sound Blaster Pro.

libavformat/Makefile

@@ -32,6 +32,7 @@ OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o
 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
 OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
 OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
+OBJS-$(CONFIG_CAF_DEMUXER)               += cafdec.o caf.o mov.o riff.o isom.o
 OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o

libavformat/allformats.c

@@ -65,6 +65,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (BETHSOFTVID, bethsoftvid);
     REGISTER_DEMUXER  (BFI, bfi);
     REGISTER_DEMUXER  (C93, c93);
+    REGISTER_DEMUXER  (CAF, caf);
     REGISTER_DEMUXER  (CAVSVIDEO, cavsvideo);
     REGISTER_MUXER    (CRC, crc);
     REGISTER_MUXDEMUX (DAUD, daud);

libavformat/caf.c

+/*
+ * CAF common code
+ * Copyright (c) 2007  Justin Ruggles
+ *
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavformat/caf.c
+ * CAF common code
+ */
+
+#include "avformat.h"
+#include "riff.h"
+#include "caf.h"
+
+/**
+ * Known codec tags for CAF
+ */
+const AVCodecTag ff_codec_caf_tags[] = {
+    { CODEC_ID_AAC,             MKBETAG('a','a','c',' ') },
+    { CODEC_ID_AC3,             MKBETAG('a','c','-','3') },
+    { CODEC_ID_ALAC,            MKBETAG('a','l','a','c') },
+  /* FIXME: use DV demuxer, as done in MOV */
+  /*{ CODEC_ID_DVAUDIO,         MKBETAG('v','d','v','a') },*/
+  /*{ CODEC_ID_DVAUDIO,         MKBETAG('d','v','c','a') },*/
+    { CODEC_ID_ADPCM_IMA_QT,    MKBETAG('i','m','a','4') },
+    { CODEC_ID_MACE3,           MKBETAG('M','A','C','3') },
+    { CODEC_ID_MACE6,           MKBETAG('M','A','C','6') },
+    { CODEC_ID_MP3,             MKBETAG('.','m','p','3') },
+    { CODEC_ID_MP2,             MKBETAG('.','m','p','2') },
+    { CODEC_ID_MP1,             MKBETAG('.','m','p','1') },
+    { CODEC_ID_PCM_ALAW,        MKBETAG('a','l','a','w') },
+    { CODEC_ID_PCM_MULAW,       MKBETAG('u','l','a','w') },
+    { CODEC_ID_QCELP,           MKBETAG('Q','c','l','p') },
+    { CODEC_ID_QDM2,            MKBETAG('Q','D','M','2') },
+    { CODEC_ID_QDM2,            MKBETAG('Q','D','M','C') },
+  /* currently unsupported codecs */
+  /*{ AC-3 over S/PDIF          MKBETAG('c','a','c','3') },*/
+  /*{ MPEG4CELP                 MKBETAG('c','e','l','p') },*/
+  /*{ MPEG4HVXC                 MKBETAG('h','v','x','c') },*/
+  /*{ MPEG4TwinVQ               MKBETAG('t','w','v','q') },*/
+    { 0, 0 },
+};

libavformat/caf.h

+/*
+ * CAF common code
+ * Copyright (c) 2007  Justin Ruggles
+ *
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavformat/caf.h
+ * CAF common code
+ */
+
+#ifndef AVFORMAT_CAF_H
+#define AVFORMAT_CAF_H
+
+#include "avformat.h"
+
+extern const AVCodecTag ff_codec_caf_tags[];
+
+#endif /* AVFORMAT_CAF_H */