---
This is not meant to be pushed, much less as-is.
mov.c is huge and it could probably use some splitting. What the
best way to split it might be, I have no idea.
This also fixes standalone compilation of the CAF demuxer, for
completely nonobvious reasons.
libavformat/Makefile | 3 +--
libavformat/mov.c | 36 ------------------------------
libavformat/mov_common.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 38 deletions(-)
create mode 100644 libavformat/mov_common.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index c555380..34dca28 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -93,8 +93,7 @@ OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o
OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
OBJS-$(CONFIG_BMV_DEMUXER) += bmv.o
OBJS-$(CONFIG_C93_DEMUXER) += c93.o voc_packet.o voc.o
-OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o mov_chan.o \
- replaygain.o
+OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov_chan.o
mov_common.o
OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o
OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o
diff --git a/libavformat/mov.c b/libavformat/mov.c
index c6e7a38..f124a2c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -674,28 +674,6 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
return 0;
}
-int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb)
-{
- AVStream *st;
- int tag;
-
- if (fc->nb_streams < 1)
- return 0;
- st = fc->streams[fc->nb_streams-1];
-
- avio_rb32(pb); /* version + flags */
- ff_mp4_read_descr(fc, pb, &tag);
- if (tag == MP4ESDescrTag) {
- ff_mp4_parse_es_descr(pb, NULL);
- } else
- avio_rb16(pb); /* ID */
-
- ff_mp4_read_descr(fc, pb, &tag);
- if (tag == MP4DecConfigDescrTag)
- ff_mp4_read_dec_config_descr(fc, st, pb);
- return 0;
-}
-
static int mov_read_esds(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
return ff_mov_read_esds(c->fc, pb);
@@ -1377,20 +1355,6 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
return 0;
}
-/**
- * Compute codec id for 'lpcm' tag.
- * See CoreAudioTypes and AudioStreamBasicDescription at Apple.
- */
-enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags)
-{
- /* lpcm flags:
- * 0x1 = float
- * 0x2 = big-endian
- * 0x4 = signed
- */
- return ff_get_pcm_codec_id(bps, flags & 1, flags & 2, flags & 4 ? -1 : 0);
-}
-
static int mov_codec_id(AVStream *st, uint32_t format)
{
int id = ff_codec_get_id(ff_codec_movaudio_tags, format);
diff --git a/libavformat/mov_common.c b/libavformat/mov_common.c
new file mode 100644
index 0000000..c0bc445
--- /dev/null
+++ b/libavformat/mov_common.c
@@ -0,0 +1,58 @@
+/*
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+#include "avio.h"
+#include "internal.h"
+#include "isom.h"
+
+/**
+ * Compute codec id for 'lpcm' tag.
+ * See CoreAudioTypes and AudioStreamBasicDescription at Apple.
+ */
+enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags)
+{
+ /* lpcm flags:
+ * 0x1 = float
+ * 0x2 = big-endian
+ * 0x4 = signed
+ */
+ return ff_get_pcm_codec_id(bps, flags & 1, flags & 2, flags & 4 ? -1 : 0);
+}
+
+int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb)
+{
+ AVStream *st;
+ int tag;
+
+ if (fc->nb_streams < 1)
+ return 0;
+ st = fc->streams[fc->nb_streams-1];
+
+ avio_rb32(pb); /* version + flags */
+ ff_mp4_read_descr(fc, pb, &tag);
+ if (tag == MP4ESDescrTag) {
+ ff_mp4_parse_es_descr(pb, NULL);
+ } else
+ avio_rb16(pb); /* ID */
+
+ ff_mp4_read_descr(fc, pb, &tag);
+ if (tag == MP4DecConfigDescrTag)
+ ff_mp4_read_dec_config_descr(fc, st, pb);
+ return 0;
+}
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
