From patchwork Wed Jun 27 18:11:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9521 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1152526jad; Wed, 27 Jun 2018 11:12:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfcR7WaFHkLuURmKruysi5aVGWzd6s85xUmGku4aLwOLso1BaYKJvRFvk1jv78B0aRWdDPc X-Received: by 2002:adf:a3c3:: with SMTP id m3-v6mr5810385wrb.208.1530123134885; Wed, 27 Jun 2018 11:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530123134; cv=none; d=google.com; s=arc-20160816; b=vb7gZt6PQIQOW1t8f4N1fQuVnDuGQo06JAd2+Rmrrm2KxPz+BoN5TCGgAfteuqDliP Z4YAv6R6zGqPOuK/B3kAN0bZn+jnhqrznaa7z3H9CsoFiResbC6Qkd5N7drLIyVN737N jdsAsVgYA2UeXSu0KAgrMXS61e8YuUFr7KeSBucOLs177x3Xsd+xtwWpUPu0xjoZVSNv ZVeZ7crGpZm/suGSHDHhS7VH/Swt20sx0eWRaLjuZjZnaN4nehGkfTZJKPV1V67Rz21i Y/IklZXn2V9fPOIazexYjZ5PUT5fLlXHr7wfZcZEIgXPmgRxUNxD+0K8eN0x++rrLdPa rMng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=er665J9igjO35b2pCIy1vgpgTn60y+Oyg941z7kf13k=; b=ebOnu9UZixo/Q7k3olJH9Kygk+FrUU9DwuyhgAtcrK9QLOF1GiCjihkyMotb9d35lV m/7b7Z5BeOzEAEO314YJaFMVPgg78jdGlS4cm6aBD9wUwhkOmADLtIrRAElNkXB7QRIz U+zhRzKYnFQTFnS/vZ4KKNwR4P7tIloqBDWMfkspRImX4/Oj8I8L+tsY25uhQ6/1BiJP WF47sbak04dwurWt/pHMdYDjkcMFhSGfGk8F1qR/NbtMF3+rhfBVb8wRv7KEP1zdKoy9 4T4ozcd9SXQtE98zBk7IfAM5mV02huaIBxmJCuJbO4DeEYIhiVDieWS8eud/D3dyw5Iz iwrQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s198-v6si1676888wme.133.2018.06.27.11.12.14; Wed, 27 Jun 2018 11:12:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50ACE68A3B8; Wed, 27 Jun 2018 21:12:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-2.mx.upcmail.net (vie01a-dmta-pe07-2.mx.upcmail.net [84.116.36.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0520F689CBE for ; Wed, 27 Jun 2018 21:12:06 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fYEvH-0006iD-1V for ffmpeg-devel@ffmpeg.org; Wed, 27 Jun 2018 20:12:07 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 3uC41y02K0S5wYM01uC5oK; Wed, 27 Jun 2018 20:12:06 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 27 Jun 2018 20:11:14 +0200 Message-Id: <20180627181121.30735-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH 1/8] avcodec/eac3dec: Check that channel_map does not contain more than EAC3_MAX_CHANNELS 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/ac3dec.c | 27 ++++----------------------- libavcodec/ac3tab.c | 18 ++++++++++++++++++ libavcodec/ac3tab.h | 2 ++ libavcodec/eac3dec.c | 14 ++++++++++++-- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index dfa025cbcc..b1239a1845 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -106,25 +106,6 @@ static const uint8_t ac3_default_coeffs[8][5][2] = { { { 2, 7 }, { 5, 5 }, { 7, 2 }, { 6, 7 }, { 7, 6 }, }, }; -static const uint64_t custom_channel_map_locations[16][2] = { - { 1, AV_CH_FRONT_LEFT }, - { 1, AV_CH_FRONT_CENTER }, - { 1, AV_CH_FRONT_RIGHT }, - { 1, AV_CH_SIDE_LEFT }, - { 1, AV_CH_SIDE_RIGHT }, - { 0, AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER }, - { 0, AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT }, - { 0, AV_CH_BACK_CENTER }, - { 0, AV_CH_TOP_CENTER }, - { 0, AV_CH_SURROUND_DIRECT_LEFT | AV_CH_SURROUND_DIRECT_RIGHT }, - { 0, AV_CH_WIDE_LEFT | AV_CH_WIDE_RIGHT }, - { 0, AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT}, - { 0, AV_CH_TOP_FRONT_CENTER }, - { 0, AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT }, - { 0, AV_CH_LOW_FREQUENCY_2 }, - { 1, AV_CH_LOW_FREQUENCY }, -}; - /** * Symmetrical Dequantization * reference: Section 7.3.3 Expansion of Mantissas for Symmetrical Quantization @@ -1699,7 +1680,7 @@ dependent_frame: channel_layout = ich_layout; for (ch = 0; ch < 16; ch++) { if (s->channel_map & (1 << (EAC3_MAX_CHANNELS - ch - 1))) { - channel_layout |= custom_channel_map_locations[ch][1]; + channel_layout |= ff_eac3_custom_channel_map_locations[ch][1]; } } if (av_get_channel_layout_nb_channels(channel_layout) > EAC3_MAX_CHANNELS) { @@ -1713,9 +1694,9 @@ dependent_frame: for (ch = 0; ch < EAC3_MAX_CHANNELS; ch++) { if (s->channel_map & (1 << (EAC3_MAX_CHANNELS - ch - 1))) { - if (custom_channel_map_locations[ch][0]) { + if (ff_eac3_custom_channel_map_locations[ch][0]) { int index = av_get_channel_layout_channel_index(channel_layout, - custom_channel_map_locations[ch][1]); + ff_eac3_custom_channel_map_locations[ch][1]); if (index < 0) return AVERROR_INVALIDDATA; extended_channel_map[index] = offset + channel_map[extend++]; @@ -1723,7 +1704,7 @@ dependent_frame: int i; for (i = 0; i < 64; i++) { - if ((1LL << i) & custom_channel_map_locations[ch][1]) { + if ((1LL << i) & ff_eac3_custom_channel_map_locations[ch][1]) { int index = av_get_channel_layout_channel_index(channel_layout, 1LL << i); if (index < 0) diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index d62d8bfbf5..bd88f32d92 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -314,3 +314,21 @@ const uint16_t ff_eac3_default_chmap[8] = { AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR, AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR }; +const uint64_t ff_eac3_custom_channel_map_locations[16][2] = { + { 1, AV_CH_FRONT_LEFT }, + { 1, AV_CH_FRONT_CENTER }, + { 1, AV_CH_FRONT_RIGHT }, + { 1, AV_CH_SIDE_LEFT }, + { 1, AV_CH_SIDE_RIGHT }, + { 0, AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER }, + { 0, AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT }, + { 0, AV_CH_BACK_CENTER }, + { 0, AV_CH_TOP_CENTER }, + { 0, AV_CH_SURROUND_DIRECT_LEFT | AV_CH_SURROUND_DIRECT_RIGHT }, + { 0, AV_CH_WIDE_LEFT | AV_CH_WIDE_RIGHT }, + { 0, AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT}, + { 0, AV_CH_TOP_FRONT_CENTER }, + { 0, AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT }, + { 0, AV_CH_LOW_FREQUENCY_2 }, + { 1, AV_CH_LOW_FREQUENCY }, +}; diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index ade6fb15e7..aa71acbce1 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -50,6 +50,8 @@ extern const uint16_t ff_ac3_fast_gain_tab[8]; extern const uint16_t ff_eac3_default_chmap[8]; extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1]; extern const uint8_t ff_ac3_bin_to_band_tab[253]; +extern const uint64_t ff_eac3_custom_channel_map_locations[16][2]; + /** Custom channel map locations bitmask * Other channels described in documentation: diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index fe97d29032..73067ded9d 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -349,8 +349,18 @@ static int ff_eac3_parse_header(AC3DecodeContext *s) /* dependent stream channel map */ if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT) { if (get_bits1(gbc)) { - s->channel_map = get_bits(gbc, 16); - av_log(s->avctx, AV_LOG_DEBUG, "channel_map: %0X\n", s->channel_map); + int64_t channel_layout = 0; + int channel_map = get_bits(gbc, 16); + av_log(s->avctx, AV_LOG_DEBUG, "channel_map: %0X\n", channel_map); + + for (i = 0; i < 16; i++) + if (channel_map & (1 << (EAC3_MAX_CHANNELS - i - 1))) + channel_layout |= ff_eac3_custom_channel_map_locations[i][1]; + + if (av_popcount64(channel_layout) > EAC3_MAX_CHANNELS) { + return AVERROR_INVALIDDATA; + } + s->channel_map = channel_map; } }