From patchwork Sat Dec 23 05:42:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 6917 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp3209319jad; Fri, 22 Dec 2017 21:43:37 -0800 (PST) X-Google-Smtp-Source: ACJfBosYoAjIDqbTllYr/0ESJXV2Bts1sRVLPmvH42+TVq4YiwzTczal30cEJHOqOaU09QrT9PmX X-Received: by 10.223.168.48 with SMTP id l45mr17934573wrc.261.1514007817721; Fri, 22 Dec 2017 21:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514007817; cv=none; d=google.com; s=arc-20160816; b=YFDL6q+Duna0yO3Pk9+fHEkkI8Mccim6tEhsrYfdm0GvXOCAFInQg+BOXP9Llp+qMh CoR2+yNH1YshgywMG3lCxBBPQ9t0sk0bia3TbVcKjDUiflvm/g5cM3eYPuUv5SWsLqXl OBmmDtoecDQOut/pkZw/zrwaqJ6a7kcdvIu1Kq5R00wdueLrJyOrDBF0dSpaDOJ+FIaZ X2RshJ4ZKexKN6YqtXDxcOS02JVaFp167TWsKzUCp4lFiqEbDFugv/x0nfw9OSC5q1pC L5VfWqgx36jCrmYANADhuiHJrnp9lZY+qwm0fNceZRdqELDVenfIT3MD8ev9BG/b0OBm LN8g== 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:cc: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=6wm/1i1A1uwCqtk2b24H/0FcJGA8Ub60nAEJgUo8ShM=; b=cyb4XxQr1xmqywZQuV3Og9ENF73hZ5wggeBXOpdaKyuK4TzKBgcACvlIBFpouPa/kW 3TSs6qckeNPmGKRNgzqdhqsZI7NwRrWxAMQhLNvpSN3lDkdes69dM/5RpuTgl5x93tOv AP+h0ffgIwhV97USFrJpwsWScrCV8ck9D48RPUTDFcbioU6LNe7pxpegkKvGrn3AQYP/ VUytieXuX0pmO7AOEQxiaUAMHBQEcVunG3exVbS6qo58RWz++pqOxEbwPOYtV1aiOkMD gGFsIM+wufkYZdTpFtblH4SqS2/9yg9k/5/+SS4ohSf4oNBmrmGMLDYtFfKAMN2uGOLg /zMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NHcPvKUP; 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 v24si10541375wrd.315.2017.12.22.21.43.37; Fri, 22 Dec 2017 21:43:37 -0800 (PST) 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.s=20161025 header.b=NHcPvKUP; 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 2A0E4680D03; Sat, 23 Dec 2017 07:43:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f44.google.com (mail-pg0-f44.google.com [74.125.83.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 128E968090C for ; Sat, 23 Dec 2017 07:43:14 +0200 (EET) Received: by mail-pg0-f44.google.com with SMTP id 77so1875113pgd.8 for ; Fri, 22 Dec 2017 21:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lA61Wa9RL+N6tPwbTaNg1dFFGUZIlG/mpaL8uwyoTwQ=; b=NHcPvKUPyClCxpMqWEScq6L4NIQuf0TxpTkcw5bB51fKlLD0UIXRNwGU5vUQLWs5tA 3iDKiTzVozGYz33ZrAxjAmDaUdefhOCkk1BlsSRU0G7Ef93yWylZJ7soTnR/c+OmVRO9 pr2TTqmPTBmAuTXcez9+v3l4vXcyjSgDVwCrIRFp9UNzQJID5Ylkpk6L99qcAX+PzDQN 28Do42aXAdOniqsIKvh3KCEwgSYMlf4f2O3cQnDOdyEbRJ41RU/53ZHS/N9Ki4XkpgZI /Aa2qy7Y5Z7LRiU7sFsOgi6/d1JaU4EJ53JR24ZVWkWI4jfPXa/D7DBnnU23a6EcCzk/ tIdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=lA61Wa9RL+N6tPwbTaNg1dFFGUZIlG/mpaL8uwyoTwQ=; b=lV6vKmM7IXZ6H70yGy0lR+++ZJyj6XGbqytOMRbS0av1A+xTV5mYk7NNzTBdO7e3xo kVphkM3phxk1FgRWxjN6tAgx6Xjn8KCne6/+58Hglur6hH3k3VMONsQ4MqKR3irwCH7I cWkPoJRtpGWCR+4tNlcmSdLNflacHkDHABvTkkSjMH/tE7P6+OXnBOfeg0PQuJrX2DCz GV/q2RKQ4kES6NsqboqqsqHgAqP7eYjEedjL/VOxwJES1FtgNbbrPslL2PxMQwMr15U0 dhp4lfbf3mrIg0x8oiVsyFjyglcEmjRy1cx0RFXsLvhBMHZkZ+bSvGi6FZFVwRHGih+U UD6A== X-Gm-Message-State: AKGB3mKpyVrP9aWtVKhnXCJxXbQlOw3UNaHpEgMW2icHSyB6thujRVzf i6HADPJlMIg/LHqHU0KtxKvTU8+i X-Received: by 10.99.117.93 with SMTP id f29mr14561140pgn.90.1514007804223; Fri, 22 Dec 2017 21:43:24 -0800 (PST) Received: from localhost.localdomain (220-253-129-240.dyn.iinet.net.au. [220.253.129.240]) by smtp.gmail.com with ESMTPSA id n12sm49327019pfb.5.2017.12.22.21.43.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Dec 2017 21:43:23 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Dec 2017 13:42:51 +0800 Message-Id: <20171223054251.51068-2-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171223054251.51068-1-misty@brew.sh> References: <20171222212000.399a1fc9@debian> <20171223054251.51068-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 1/1] oma: move some constants into libavcodec 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 Cc: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo Most of the constants in libavcodec/oma aren't specific to libavformat; moving them into libavcodec makes them available to libavcodec as well as keeping them compatible with libavformat. ff_oma_codec_tags uses a libavformat-specific type, so it has been left in libavformat. --- Changelog | 1 + libavformat/oma.c => libavcodec/oma.h | 27 +++++++++++++-------------- libavcodec/version.h | 2 +- libavformat/Makefile | 4 ++-- libavformat/oma.h | 21 +++++++++------------ libavformat/omadec.c | 1 + libavformat/omaenc.c | 1 + libavformat/version.h | 2 +- 8 files changed, 29 insertions(+), 30 deletions(-) rename libavformat/oma.c => libavcodec/oma.h (65%) diff --git a/Changelog b/Changelog index ee48876128..31e720091c 100644 --- a/Changelog +++ b/Changelog @@ -27,6 +27,7 @@ version : - video setrange filter - nsp demuxer - support LibreSSL (via libtls) +- Move some OMA constants from libavformat into libavcodec version 3.4: diff --git a/libavformat/oma.c b/libavcodec/oma.h similarity index 65% rename from libavformat/oma.c rename to libavcodec/oma.h index f7ae3c9948..176f93ed22 100644 --- a/libavformat/oma.c +++ b/libavcodec/oma.h @@ -18,25 +18,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVCODEC_OMA_H +#define AVCODEC_OMA_H + +#include + #include "internal.h" -#include "oma.h" -#include "libavcodec/avcodec.h" #include "libavutil/channel_layout.h" -const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 }; +#define EA3_HEADER_SIZE 96 +#define ID3v2_EA3_MAGIC "ea3" +#define OMA_ENC_HEADER_SIZE 16 -const AVCodecTag ff_oma_codec_tags[] = { - { AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, - { AV_CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P }, - { AV_CODEC_ID_MP3, OMA_CODECID_MP3 }, - { AV_CODEC_ID_PCM_S16BE, OMA_CODECID_LPCM }, - { AV_CODEC_ID_ATRAC3PAL, OMA_CODECID_ATRAC3PAL }, - { AV_CODEC_ID_ATRAC3AL, OMA_CODECID_ATRAC3AL }, - { 0 }, -}; +static const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 }; /** map ATRAC-X channel id to internal channel layout */ -const uint64_t ff_oma_chid_to_native_layout[7] = { +static const uint64_t ff_oma_chid_to_native_layout[7] = { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND, @@ -47,4 +44,6 @@ const uint64_t ff_oma_chid_to_native_layout[7] = { }; /** map ATRAC-X channel id to total number of channels */ -const int ff_oma_chid_to_num_channels[7] = {1, 2, 3, 4, 6, 7, 8}; +static const int ff_oma_chid_to_num_channels[7] = {1, 2, 3, 4, 6, 7, 8}; + +#endif /* AVCODEC_OMA_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index d55de89797..d48857578d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 8 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/Makefile b/libavformat/Makefile index cb70eac920..ef0365e6e2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -358,8 +358,8 @@ OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \ vorbiscomment.o OBJS-$(CONFIG_OGV_MUXER) += oggenc.o \ vorbiscomment.o -OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o -OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o oma.o id3v2enc.o +OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o +OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_OPUS_MUXER) += oggenc.o \ vorbiscomment.o OBJS-$(CONFIG_PAF_DEMUXER) += paf.o diff --git a/libavformat/oma.h b/libavformat/oma.h index 36fd0125e4..ccd57d779e 100644 --- a/libavformat/oma.h +++ b/libavformat/oma.h @@ -21,14 +21,8 @@ #ifndef AVFORMAT_OMA_H #define AVFORMAT_OMA_H -#include - #include "internal.h" -#define EA3_HEADER_SIZE 96 -#define ID3v2_EA3_MAGIC "ea3" -#define OMA_ENC_HEADER_SIZE 16 - enum { OMA_CODECID_ATRAC3 = 0, OMA_CODECID_ATRAC3P = 1, @@ -39,11 +33,14 @@ enum { OMA_CODECID_ATRAC3AL = 34, }; -extern const uint16_t ff_oma_srate_tab[8]; - -extern const AVCodecTag ff_oma_codec_tags[]; - -extern const uint64_t ff_oma_chid_to_native_layout[7]; -extern const int ff_oma_chid_to_num_channels[7]; +static const AVCodecTag ff_oma_codec_tags[] = { + { AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, + { AV_CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P }, + { AV_CODEC_ID_MP3, OMA_CODECID_MP3 }, + { AV_CODEC_ID_PCM_S16BE, OMA_CODECID_LPCM }, + { AV_CODEC_ID_ATRAC3PAL, OMA_CODECID_ATRAC3PAL }, + { AV_CODEC_ID_ATRAC3AL, OMA_CODECID_ATRAC3AL }, + { 0 }, +}; #endif /* AVFORMAT_OMA_H */ diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 423d52b3aa..ccefd6c1bc 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -48,6 +48,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/des.h" #include "libavutil/mathematics.h" +#include "libavcodec/oma.h" #include "oma.h" #include "pcm.h" #include "id3v2.h" diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c index 7952808bf8..6e72c3ee85 100644 --- a/libavformat/omaenc.c +++ b/libavformat/omaenc.c @@ -24,6 +24,7 @@ #include "avio_internal.h" #include "id3v2.h" #include "internal.h" +#include "libavcodec/oma.h" #include "oma.h" #include "rawenc.h" diff --git a/libavformat/version.h b/libavformat/version.h index 5ced041f0a..6453d4559f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 #define LIBAVFORMAT_VERSION_MINOR 3 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \