aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-01-19 20:43:40 +0100
committerPaul B Mahol <onemda@gmail.com>2017-01-20 13:58:41 +0100
commit5d2609929d481c7c137370b64d5d495cd024ee61 (patch)
treef28d9ab56ee108f735f60778ee9f325f11c93f9a
parent96fe4432f55b19c482d9fef82cd2e360d62bd646 (diff)
downloadffmpeg-5d2609929d481c7c137370b64d5d495cd024ee61.tar.gz
avcodec: add XMA2 parser
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavcodec/allcodecs.c1
-rw-r--r--libavcodec/version.h2
-rw-r--r--libavcodec/xma_parser.c62
4 files changed, 65 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 01ffe07afe..43a6add317 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -950,6 +950,7 @@ OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \
OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o
OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o
OBJS-$(CONFIG_VP9_PARSER) += vp9_parser.o
+OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o
# bitstream filters
OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o aacadtsdec.o \
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 703c552f5f..f92b2b7496 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -709,4 +709,5 @@ void avcodec_register_all(void)
REGISTER_PARSER(VP3, vp3);
REGISTER_PARSER(VP8, vp8);
REGISTER_PARSER(VP9, vp9);
+ REGISTER_PARSER(XMA, xma);
}
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 45e4488db8..c038e4b093 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 74
+#define LIBAVCODEC_VERSION_MINOR 75
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavcodec/xma_parser.c b/libavcodec/xma_parser.c
new file mode 100644
index 0000000000..0513679272
--- /dev/null
+++ b/libavcodec/xma_parser.c
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * XMA2 audio parser
+ */
+
+#include "parser.h"
+
+typedef struct XMAParserContext{
+ int skip_packets;
+} XMAParserContext;
+
+static int xma_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
+ const uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size)
+{
+ XMAParserContext *s = s1->priv_data;
+
+ if (buf_size % 2048 == 0) {
+ int duration = 0, packet, nb_packets = buf_size / 2048;
+
+ for (packet = 0; packet < nb_packets; packet++) {
+ if (s->skip_packets == 0) {
+ duration += buf[packet * 2048] * 128;
+ s->skip_packets = buf[packet * 2048 + 3] + 1;
+ }
+ s->skip_packets--;
+ }
+
+ s1->duration = duration;
+ s1->key_frame = !!duration;
+ }
+
+ /* always return the full packet. this parser isn't doing any splitting or
+ combining, only packet analysis */
+ *poutbuf = buf;
+ *poutbuf_size = buf_size;
+ return buf_size;
+}
+
+AVCodecParser ff_xma_parser = {
+ .codec_ids = { AV_CODEC_ID_XMA2 },
+ .priv_data_size = sizeof(XMAParserContext),
+ .parser_parse = xma_parse,
+};