From patchwork Mon Jul 10 14:11:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: foo86 X-Patchwork-Id: 4285 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp3618463vsb; Mon, 10 Jul 2017 07:28:46 -0700 (PDT) X-Received: by 10.28.127.14 with SMTP id a14mr8283933wmd.91.1499696926021; Mon, 10 Jul 2017 07:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499696925; cv=none; d=google.com; s=arc-20160816; b=vztUggXV+TKMFvIPKO1nDnW/jDyWG7DMWev3mYyPFJIHSs/Muve3zD/diEFj6lX+Hs nP15wO/SBs2hIU+u+vRkb4ZgMdrMfH3iiaekAvMIKXvO9Nw2H3Yf8l1u6wfcRL9dfs9Y C9KjjskYFmpTBtXbMdGmeOFbDizaqV9PQUD+QaqX63/RkPU1uupQRh3iEyIh4B/wjheH lkf8MA4xl108fD2BwVehNIPK/XVLFgn8E8NXoqfNyFfki0UlP1zUQwIgAQKiCSSmYU1O kDU/IOUroyAyqK6PkRCiC3e/Uj3Uz7Qq1lW31KqoxkuLGteDERdz4n8EneloB94vj02S IliQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XuDMYZ7UfqVkkVE6bBj4qg+N0Y24SQMwNDn/YruQlGY=; b=wYpcxPQIbs/EPOQhj7KjutZk4yoWogrqybzEkL9TNgMs8m77lTdnXit4AxFdWYVap/ v6CMbqv8M07kv8tHCAdfHGyYh+4O7eRRx8yI4Ar9mSal3hfO/9JkzqJ8Tj7g/ouzSAAO zmf6RNSS9QNKVVRR6rSby+/ChH3pjomcBMQKgYg2vF8MAcwo/Ssncp3tVpah7k8Xs+Py LPpHmrEjiSQCDsePlTGkYudEtdraSBhnyxZWUINDrfJ8cKe9hoeBb88MnmSTinRxsxOS j4huu0FxWvkM/qKIQXLMTeF4s8JgqqJsS7b7pL324adsPbNfv4hIW0hLgDot8deR7laZ R76Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=jytAw4ZY; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y62si8684262wrb.286.2017.07.10.07.28.45; Mon, 10 Jul 2017 07:28:45 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=jytAw4ZY; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7924F689DE1; Mon, 10 Jul 2017 17:28:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90C87689DB4 for ; Mon, 10 Jul 2017 17:28:29 +0300 (EEST) Received: by mail-lf0-f51.google.com with SMTP id h22so62658657lfk.3 for ; Mon, 10 Jul 2017 07:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=mqWPL8DS/6yva+C6IohCiPAZmeuqWAayeCwxLU0z81g=; b=jytAw4ZYSOkQAbFa4L6vUhe0kbQZdbiVBB6/9ZcvijAS4M+Ah/YkQbIawYbz5QGBzh kWsOZYi/9CWx8zoomVrZgka8Y7a3rp2xph891vtSavs4fyFScBfHaXRXFZ2FG9h1yBr5 cmYH2ovCMPjJEBurgfMxIKKQDnZWAaLDmdwc0L6MclGy9euTjCU6NC1N8qSbF+gwh45p TQVinm9yVNPjW3H6OLHLEFXdYhUAgX6jqTjFERkk9tngWYHGFzoJMuxhP/9nKeaKs7I5 alz9O7X7KPUZ5L1NL5KtRMuMBJtMGDl2sRFjHwPJn2buZll8qnC3kRiQuXe0OtCvQX4G Qqrw== 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:in-reply-to :references; bh=mqWPL8DS/6yva+C6IohCiPAZmeuqWAayeCwxLU0z81g=; b=KCBXsFp5CPM8uhSQnYj/pLsv7SxUMUEvx2h+5pQ/JdLiJNhXxLDjcYy/BTjGsrJL5P 6K0FuaBdyxX+0bs1Pjg3hb0O03xmyZb5HaMLt9O5OlNsb5pan4+RJftMxT5VigZHbfTU AenHQQCBALpYQnlsTQGlMNj4dV0Yc4R0XtqaP5hKk7TpKF8Ju5pdLiooTc5NgpI6Si89 szkzr/Nq9qDGg9ZMC6f7BnYud7zPnjMKdebNzhBaCeLlEnPEOGaCykzVE4S6YrBMsJY1 UbKt8Qg5SZTectFMc09oSIayOf9O1vlF4O7iURaVQlFO28VYqVcSWBWYIWjHFrkEu0D4 UJLw== X-Gm-Message-State: AIVw112OCv9ar1LzoROm1C1Ko+A4YFhVxTZDkr4SWueNiTpnuvuw3jZZ 0ieR6HGepAptxQ9l X-Received: by 10.46.70.1 with SMTP id t1mr4563298lja.66.1499696525910; Mon, 10 Jul 2017 07:22:05 -0700 (PDT) Received: from foohost.foodomain ([2001:470:28:661::4]) by smtp.gmail.com with ESMTPSA id v196sm2722713lfa.16.2017.07.10.07.22.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 07:22:05 -0700 (PDT) From: foo86 To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2017 17:11:32 +0300 Message-Id: <20170710141140.20075-2-foobaz86@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170710141140.20075-1-foobaz86@gmail.com> References: <20170710141140.20075-1-foobaz86@gmail.com> Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/dca: move bits per sample array to dca.c 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" It will be used by the parser. This change avoids unwanted parser dependency on dcadata. --- libavcodec/dca.c | 4 ++++ libavcodec/dca.h | 2 ++ libavcodec/dcadata.c | 4 ---- libavcodec/dcadata.h | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 58f340e6da..fb796191d6 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -45,6 +45,10 @@ const uint8_t ff_dca_freq_ranges[16] = { 0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4 }; +const uint8_t ff_dca_bits_per_sample[8] = { + 16, 16, 20, 20, 0, 24, 24, 0 +}; + int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, int max_size) { diff --git a/libavcodec/dca.h b/libavcodec/dca.h index bd96bc9ee3..1d10de4b94 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -156,6 +156,8 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16]; extern const uint32_t ff_dca_sampling_freqs[16]; extern const uint8_t ff_dca_freq_ranges[16]; +extern const uint8_t ff_dca_bits_per_sample[8]; + /** * Convert bitstream to one representation based on sync marker diff --git a/libavcodec/dcadata.c b/libavcodec/dcadata.c index eaef01875a..1b646a7aa6 100644 --- a/libavcodec/dcadata.c +++ b/libavcodec/dcadata.c @@ -42,10 +42,6 @@ const uint8_t ff_dca_channels[16] = { 1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8 }; -const uint8_t ff_dca_bits_per_sample[8] = { - 16, 16, 20, 20, 0, 24, 24, 0 -}; - const uint8_t ff_dca_dmix_primary_nch[8] = { 1, 2, 2, 3, 3, 4, 4, 0 }; diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 9dd6eba7f1..5aa85b3414 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -32,8 +32,6 @@ extern const uint32_t ff_dca_bit_rates[32]; extern const uint8_t ff_dca_channels[16]; -extern const uint8_t ff_dca_bits_per_sample[8]; - extern const uint8_t ff_dca_dmix_primary_nch[8]; extern const uint8_t ff_dca_quant_index_sel_nbits[DCA_CODE_BOOKS];