[FFmpeg-cvslog] avcodec/mlp_parser: split off shared code to its own file
James Almer
git at videolan.org
Tue May 7 23:44:51 EEST 2019
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat May 4 15:15:50 2019 -0300| [109b0d7c0f29462b6937df47e64a06f65b69bfbf] | committer: James Almer
avcodec/mlp_parser: split off shared code to its own file
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=109b0d7c0f29462b6937df47e64a06f65b69bfbf
---
libavcodec/Makefile | 4 +-
libavcodec/mlp_parse.c | 215 +++++++++++++++++++++++++++++++
libavcodec/{mlp_parser.h => mlp_parse.h} | 15 +--
libavcodec/mlp_parser.c | 193 +--------------------------
libavcodec/mlpdec.c | 2 +-
libavcodec/truehd_core_bsf.c | 2 +-
6 files changed, 223 insertions(+), 208 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f37135fc07..edccd73037 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1042,7 +1042,7 @@ OBJS-$(CONFIG_H263_PARSER) += h263_parser.o
OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o
OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o
OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o
-OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o
+OBJS-$(CONFIG_MLP_PARSER) += mlp_parse.o mlp_parser.o mlp.o
OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \
mpeg4videodec.o mpeg4video.o \
ituh263dec.o h263dec.o h263data.o
@@ -1097,7 +1097,7 @@ OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o
OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o
OBJS-$(CONFIG_TRACE_HEADERS_BSF) += trace_headers_bsf.o
-OBJS-$(CONFIG_TRUEHD_CORE_BSF) += truehd_core_bsf.o mlp_parser.o mlp.o
+OBJS-$(CONFIG_TRUEHD_CORE_BSF) += truehd_core_bsf.o mlp_parse.o mlp.o
OBJS-$(CONFIG_VP9_METADATA_BSF) += vp9_metadata_bsf.o
OBJS-$(CONFIG_VP9_RAW_REORDER_BSF) += vp9_raw_reorder_bsf.o
OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += vp9_superframe_bsf.o
diff --git a/libavcodec/mlp_parse.c b/libavcodec/mlp_parse.c
new file mode 100644
index 0000000000..067735303c
--- /dev/null
+++ b/libavcodec/mlp_parse.c
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2007 Ian Caulfield
+ *
+ * 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
+ */
+
+#include <stdint.h>
+
+#include "libavutil/channel_layout.h"
+#include "get_bits.h"
+#include "mlp_parse.h"
+#include "mlp.h"
+
+static const uint8_t mlp_quants[16] = {
+ 16, 20, 24, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const uint8_t mlp_channels[32] = {
+ 1, 2, 3, 4, 3, 4, 5, 3, 4, 5, 4, 5, 6, 4, 5, 4,
+ 5, 6, 5, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const uint64_t mlp_layout[32] = {
+ AV_CH_LAYOUT_MONO,
+ AV_CH_LAYOUT_STEREO,
+ AV_CH_LAYOUT_2_1,
+ AV_CH_LAYOUT_QUAD,
+ AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_2_1|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_SURROUND,
+ AV_CH_LAYOUT_4POINT0,
+ AV_CH_LAYOUT_5POINT0_BACK,
+ AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_5POINT1_BACK,
+ AV_CH_LAYOUT_4POINT0,
+ AV_CH_LAYOUT_5POINT0_BACK,
+ AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_5POINT1_BACK,
+ AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY,
+ AV_CH_LAYOUT_5POINT0_BACK,
+ AV_CH_LAYOUT_5POINT1_BACK,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static const uint8_t thd_chancount[13] = {
+// LR C LFE LRs LRvh LRc LRrs Cs Ts LRsd LRw Cvh LFE2
+ 2, 1, 1, 2, 2, 2, 2, 1, 1, 2, 2, 1, 1
+};
+
+static const uint64_t thd_layout[13] = {
+ AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT, // LR
+ AV_CH_FRONT_CENTER, // C
+ AV_CH_LOW_FREQUENCY, // LFE
+ AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs
+ AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh
+ AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRc
+ AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs
+ AV_CH_BACK_CENTER, // Cs
+ AV_CH_TOP_CENTER, // Ts
+ AV_CH_SURROUND_DIRECT_LEFT|AV_CH_SURROUND_DIRECT_RIGHT, // LRsd
+ AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT, // LRw
+ AV_CH_TOP_FRONT_CENTER, // Cvh
+ AV_CH_LOW_FREQUENCY_2, // LFE2
+};
+
+static int mlp_samplerate(int in)
+{
+ if (in == 0xF)
+ return 0;
+
+ return (in & 8 ? 44100 : 48000) << (in & 7) ;
+}
+
+static int truehd_channels(int chanmap)
+{
+ int channels = 0, i;
+
+ for (i = 0; i < 13; i++)
+ channels += thd_chancount[i] * ((chanmap >> i) & 1);
+
+ return channels;
+}
+
+static uint64_t truehd_layout(int chanmap)
+{
+ int i;
+ uint64_t layout = 0;
+
+ for (i = 0; i < 13; i++)
+ layout |= thd_layout[i] * ((chanmap >> i) & 1);
+
+ return layout;
+}
+
+static int mlp_get_major_sync_size(const uint8_t * buf, int bufsize)
+{
+ int has_extension, extensions = 0;
+ int size = 28;
+ if (bufsize < 28)
+ return -1;
+
+ if (AV_RB32(buf) == 0xf8726fba) {
+ has_extension = buf[25] & 1;
+ if (has_extension) {
+ extensions = buf[26] >> 4;
+ size += 2 + extensions * 2;
+ }
+ }
+ return size;
+}
+
+/** Read a major sync info header - contains high level information about
+ * the stream - sample rate, channel arrangement etc. Most of this
+ * information is not actually necessary for decoding, only for playback.
+ * gb must be a freshly initialized GetBitContext with no bits read.
+ */
+
+int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
+{
+ int ratebits, channel_arrangement, header_size;
+ uint16_t checksum;
+
+ av_assert1(get_bits_count(gb) == 0);
+
+ header_size = mlp_get_major_sync_size(gb->buffer, gb->size_in_bits >> 3);
+ if (header_size < 0 || gb->size_in_bits < header_size << 3) {
+ av_log(log, AV_LOG_ERROR, "packet too short, unable to read major sync\n");
+ return -1;
+ }
+
+ checksum = ff_mlp_checksum16(gb->buffer, header_size - 2);
+ if (checksum != AV_RL16(gb->buffer+header_size-2)) {
+ av_log(log, AV_LOG_ERROR, "major sync info header checksum error\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (get_bits_long(gb, 24) != 0xf8726f) /* Sync words */
+ return AVERROR_INVALIDDATA;
+
+ mh->stream_type = get_bits(gb, 8);
+ mh->header_size = header_size;
+
+ if (mh->stream_type == 0xbb) {
+ mh->group1_bits = mlp_quants[get_bits(gb, 4)];
+ mh->group2_bits = mlp_quants[get_bits(gb, 4)];
+
+ ratebits = get_bits(gb, 4);
+ mh->group1_samplerate = mlp_samplerate(ratebits);
+ mh->group2_samplerate = mlp_samplerate(get_bits(gb, 4));
+
+ skip_bits(gb, 11);
+
+ mh->channel_arrangement=
+ channel_arrangement = get_bits(gb, 5);
+ mh->channels_mlp = mlp_channels[channel_arrangement];
+ mh->channel_layout_mlp = mlp_layout[channel_arrangement];
+ } else if (mh->stream_type == 0xba) {
+ mh->group1_bits = 24; // TODO: Is this information actually conveyed anywhere?
+ mh->group2_bits = 0;
+
+ ratebits = get_bits(gb, 4);
+ mh->group1_samplerate = mlp_samplerate(ratebits);
+ mh->group2_samplerate = 0;
+
+ skip_bits(gb, 4);
+
+ mh->channel_modifier_thd_stream0 = get_bits(gb, 2);
+ mh->channel_modifier_thd_stream1 = get_bits(gb, 2);
+
+ mh->channel_arrangement=
+ channel_arrangement = get_bits(gb, 5);
+ mh->channels_thd_stream1 = truehd_channels(channel_arrangement);
+ mh->channel_layout_thd_stream1 = truehd_layout(channel_arrangement);
+
+ mh->channel_modifier_thd_stream2 = get_bits(gb, 2);
+
+ channel_arrangement = get_bits(gb, 13);
+ mh->channels_thd_stream2 = truehd_channels(channel_arrangement);
+ mh->channel_layout_thd_stream2 = truehd_layout(channel_arrangement);
+ } else
+ return AVERROR_INVALIDDATA;
+
+ mh->access_unit_size = 40 << (ratebits & 7);
+ mh->access_unit_size_pow2 = 64 << (ratebits & 7);
+
+ skip_bits_long(gb, 48);
+
+ mh->is_vbr = get_bits1(gb);
+
+ mh->peak_bitrate = (get_bits(gb, 15) * mh->group1_samplerate + 8) >> 4;
+
+ mh->num_substreams = get_bits(gb, 4);
+
+ skip_bits_long(gb, 4 + (header_size - 17) * 8);
+
+ return 0;
+}
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parse.h
similarity index 92%
rename from libavcodec/mlp_parser.h
rename to libavcodec/mlp_parse.h
index c5a2883920..c6025d1a18 100644
--- a/libavcodec/mlp_parser.h
+++ b/libavcodec/mlp_parse.h
@@ -1,5 +1,4 @@
/*
- * MLP parser prototypes
* Copyright (c) 2007 Ian Caulfield
*
* This file is part of FFmpeg.
@@ -19,13 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/**
- * @file
- * MLP parser prototypes
- */
-
-#ifndef AVCODEC_MLP_PARSER_H
-#define AVCODEC_MLP_PARSER_H
+#ifndef AVCODEC_MLP_PARSE_H
+#define AVCODEC_MLP_PARSE_H
#include "get_bits.h"
@@ -64,8 +58,5 @@ typedef struct MLPHeaderInfo
int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb);
-uint64_t ff_truehd_layout(int chanmap);
-
-extern const uint64_t ff_mlp_layout[32];
-#endif /* AVCODEC_MLP_PARSER_H */
+#endif /* AVCODEC_MLP_PARSE_H */
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index eb3435b6cb..9a076f6a7f 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -26,203 +26,12 @@
#include <stdint.h>
-#include "libavutil/channel_layout.h"
-#include "libavutil/crc.h"
#include "libavutil/internal.h"
#include "get_bits.h"
#include "parser.h"
-#include "mlp_parser.h"
+#include "mlp_parse.h"
#include "mlp.h"
-static const uint8_t mlp_quants[16] = {
- 16, 20, 24, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const uint8_t mlp_channels[32] = {
- 1, 2, 3, 4, 3, 4, 5, 3, 4, 5, 4, 5, 6, 4, 5, 4,
- 5, 6, 5, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-const uint64_t ff_mlp_layout[32] = {
- AV_CH_LAYOUT_MONO,
- AV_CH_LAYOUT_STEREO,
- AV_CH_LAYOUT_2_1,
- AV_CH_LAYOUT_QUAD,
- AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_2_1|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_SURROUND,
- AV_CH_LAYOUT_4POINT0,
- AV_CH_LAYOUT_5POINT0_BACK,
- AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_5POINT1_BACK,
- AV_CH_LAYOUT_4POINT0,
- AV_CH_LAYOUT_5POINT0_BACK,
- AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_5POINT1_BACK,
- AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY,
- AV_CH_LAYOUT_5POINT0_BACK,
- AV_CH_LAYOUT_5POINT1_BACK,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const uint8_t thd_chancount[13] = {
-// LR C LFE LRs LRvh LRc LRrs Cs Ts LRsd LRw Cvh LFE2
- 2, 1, 1, 2, 2, 2, 2, 1, 1, 2, 2, 1, 1
-};
-
-static const uint64_t thd_layout[13] = {
- AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT, // LR
- AV_CH_FRONT_CENTER, // C
- AV_CH_LOW_FREQUENCY, // LFE
- AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs
- AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh
- AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRc
- AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs
- AV_CH_BACK_CENTER, // Cs
- AV_CH_TOP_CENTER, // Ts
- AV_CH_SURROUND_DIRECT_LEFT|AV_CH_SURROUND_DIRECT_RIGHT, // LRsd
- AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT, // LRw
- AV_CH_TOP_FRONT_CENTER, // Cvh
- AV_CH_LOW_FREQUENCY_2, // LFE2
-};
-
-static int mlp_samplerate(int in)
-{
- if (in == 0xF)
- return 0;
-
- return (in & 8 ? 44100 : 48000) << (in & 7) ;
-}
-
-static int truehd_channels(int chanmap)
-{
- int channels = 0, i;
-
- for (i = 0; i < 13; i++)
- channels += thd_chancount[i] * ((chanmap >> i) & 1);
-
- return channels;
-}
-
-uint64_t ff_truehd_layout(int chanmap)
-{
- int i;
- uint64_t layout = 0;
-
- for (i = 0; i < 13; i++)
- layout |= thd_layout[i] * ((chanmap >> i) & 1);
-
- return layout;
-}
-
-static int mlp_get_major_sync_size(const uint8_t * buf, int bufsize)
-{
- int has_extension, extensions = 0;
- int size = 28;
- if (bufsize < 28)
- return -1;
-
- if (AV_RB32(buf) == 0xf8726fba) {
- has_extension = buf[25] & 1;
- if (has_extension) {
- extensions = buf[26] >> 4;
- size += 2 + extensions * 2;
- }
- }
- return size;
-}
-
-/** Read a major sync info header - contains high level information about
- * the stream - sample rate, channel arrangement etc. Most of this
- * information is not actually necessary for decoding, only for playback.
- * gb must be a freshly initialized GetBitContext with no bits read.
- */
-
-int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
-{
- int ratebits, channel_arrangement, header_size;
- uint16_t checksum;
-
- av_assert1(get_bits_count(gb) == 0);
-
- header_size = mlp_get_major_sync_size(gb->buffer, gb->size_in_bits >> 3);
- if (header_size < 0 || gb->size_in_bits < header_size << 3) {
- av_log(log, AV_LOG_ERROR, "packet too short, unable to read major sync\n");
- return -1;
- }
-
- checksum = ff_mlp_checksum16(gb->buffer, header_size - 2);
- if (checksum != AV_RL16(gb->buffer+header_size-2)) {
- av_log(log, AV_LOG_ERROR, "major sync info header checksum error\n");
- return AVERROR_INVALIDDATA;
- }
-
- if (get_bits_long(gb, 24) != 0xf8726f) /* Sync words */
- return AVERROR_INVALIDDATA;
-
- mh->stream_type = get_bits(gb, 8);
- mh->header_size = header_size;
-
- if (mh->stream_type == 0xbb) {
- mh->group1_bits = mlp_quants[get_bits(gb, 4)];
- mh->group2_bits = mlp_quants[get_bits(gb, 4)];
-
- ratebits = get_bits(gb, 4);
- mh->group1_samplerate = mlp_samplerate(ratebits);
- mh->group2_samplerate = mlp_samplerate(get_bits(gb, 4));
-
- skip_bits(gb, 11);
-
- mh->channel_arrangement=
- channel_arrangement = get_bits(gb, 5);
- mh->channels_mlp = mlp_channels[channel_arrangement];
- mh->channel_layout_mlp = ff_mlp_layout[channel_arrangement];
- } else if (mh->stream_type == 0xba) {
- mh->group1_bits = 24; // TODO: Is this information actually conveyed anywhere?
- mh->group2_bits = 0;
-
- ratebits = get_bits(gb, 4);
- mh->group1_samplerate = mlp_samplerate(ratebits);
- mh->group2_samplerate = 0;
-
- skip_bits(gb, 4);
-
- mh->channel_modifier_thd_stream0 = get_bits(gb, 2);
- mh->channel_modifier_thd_stream1 = get_bits(gb, 2);
-
- mh->channel_arrangement=
- channel_arrangement = get_bits(gb, 5);
- mh->channels_thd_stream1 = truehd_channels(channel_arrangement);
- mh->channel_layout_thd_stream1 = ff_truehd_layout(channel_arrangement);
-
- mh->channel_modifier_thd_stream2 = get_bits(gb, 2);
-
- channel_arrangement = get_bits(gb, 13);
- mh->channels_thd_stream2 = truehd_channels(channel_arrangement);
- mh->channel_layout_thd_stream2 = ff_truehd_layout(channel_arrangement);
- } else
- return AVERROR_INVALIDDATA;
-
- mh->access_unit_size = 40 << (ratebits & 7);
- mh->access_unit_size_pow2 = 64 << (ratebits & 7);
-
- skip_bits_long(gb, 48);
-
- mh->is_vbr = get_bits1(gb);
-
- mh->peak_bitrate = (get_bits(gb, 15) * mh->group1_samplerate + 8) >> 4;
-
- mh->num_substreams = get_bits(gb, 4);
-
- skip_bits_long(gb, 4 + (header_size - 17) * 8);
-
- return 0;
-}
-
typedef struct MLPParseContext
{
ParseContext pc;
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 3139a0172f..39c40914cd 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "libavutil/crc.h"
#include "parser.h"
-#include "mlp_parser.h"
+#include "mlp_parse.h"
#include "mlpdsp.h"
#include "mlp.h"
#include "config.h"
diff --git a/libavcodec/truehd_core_bsf.c b/libavcodec/truehd_core_bsf.c
index 309e6624ac..9e3ee07eed 100644
--- a/libavcodec/truehd_core_bsf.c
+++ b/libavcodec/truehd_core_bsf.c
@@ -21,7 +21,7 @@
#include "avcodec.h"
#include "bsf.h"
#include "get_bits.h"
-#include "mlp_parser.h"
+#include "mlp_parse.h"
#include "mlp.h"
typedef struct AccessUnit {
More information about the ffmpeg-cvslog
mailing list