From patchwork Sat May 4 19:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12985 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C00A5446CB3 for ; Sat, 4 May 2019 22:05:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99A2268A407; Sat, 4 May 2019 22:05:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72E41680905 for ; Sat, 4 May 2019 22:05:08 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id g190so1621049qkf.8 for ; Sat, 04 May 2019 12:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NXIea+u7IRjiQLze0APrAPHdmxgNEYMZnf4KOiupSbw=; b=K5ljfxoucLb/SDAQRZvg8xK+vjs4CYNeDnyrZ2LhEu6HJNqlCUZMVQSYGHOcFTBDCM vEO2RDNuG/XMQITKt/gHICuKs02BC+76RKFHo4Dg0pJODXCYCwk56eTf6JaUlUZTC1hM BNn7N4uYyJKbguvvja4zQ0y8o6e9erpbRGVEZRXA/ahu3Mjk2S9Z2P8lpqdZamyaEdbZ BQCwE30WUpRh146hfduQfxFfCfggqSsWz4yLjnWK+nM+fUuCBx9DULxr01m1wrF44XNw hrqcxZKaiv8TEyn3CuYpJabe9WQe3IAEdYsRh+QMSqzFguUILKWbwweoSYUcxsPcK7O0 g2hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NXIea+u7IRjiQLze0APrAPHdmxgNEYMZnf4KOiupSbw=; b=b2QizrJ7VFOIy34SOzCm7H0siJzTy+2YgoOSmrBPUPTlAUAeJ/4N9dvvUqk3ui/VZQ SCL2qH1uulXa1ISRllCLiwJrgI/v1msFl+5iAaKJ1HpAVFyU7IGIrOd8mXqw7BM9hOVA 0KwliOlnAiIxln+WxBE11a+KFEcEMi47AyDENHBU5YjZdweZSzWBoWXTKW97nTOQgIla djBFjnTxdSvgqn+e186gRJJBjvTMmSlokoJqyv1WVyM8wg+LuFkElAvzVDeJ/NYbFnz+ wlWVzSv1t7aZkithCl6j7GhJ1un8YvBiCDiITd1LhGuv8PIS3oNXTdh4mb6Yr4Cu1lBa 8LeQ== X-Gm-Message-State: APjAAAWuftbeBs7dF2782qwYZViyQv7WKcj4O8/81CwoEmWygoxpSdqZ bqxY7F8+tckWS62F1cOpxSA7cxyk X-Google-Smtp-Source: APXvYqz8la7OTqjOY+Zp/h06kEY0SfWAUB+u5ZsORM5y/5a09mokdypIiwdlxOO/+Pdgg8qt1wQaWA== X-Received: by 2002:a05:620a:381:: with SMTP id q1mr13305574qkm.217.1556996706687; Sat, 04 May 2019 12:05:06 -0700 (PDT) Received: from localhost.localdomain ([191.83.215.181]) by smtp.gmail.com with ESMTPSA id r47sm1552771qte.70.2019.05.04.12.05.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 May 2019 12:05:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 May 2019 16:04:53 -0300 Message-Id: <20190504190453.2160-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mlp_parser: split off shared code to its own file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/Makefile | 4 +- libavcodec/mlp_parse.c | 213 +++++++++++++++++++++++ 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, 221 insertions(+), 208 deletions(-) create mode 100644 libavcodec/mlp_parse.c rename libavcodec/{mlp_parser.h => mlp_parse.h} (92%) 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..db2531f665 --- /dev/null +++ b/libavcodec/mlp_parse.c @@ -0,0 +1,213 @@ +/* + * 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 + +#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 -#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 dd40e1e0c3..409e570eec 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 {