diff mbox

[FFmpeg-devel,1/1] oma: move some constants into libavcodec

Message ID 20171223054251.51068-2-misty@brew.sh
State Superseded
Headers show

Commit Message

misty@brew.sh Dec. 23, 2017, 5:42 a.m. UTC 
From: Misty De Meo <mistydemeo@gmail.com>

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%)

Comments

Moritz Barsnick Dec. 23, 2017, 1:08 p.m. UTC | #1 
On Sat, Dec 23, 2017 at 13:42:51 +0800, misty@brew.sh wrote:
> --- a/Changelog
> +++ b/Changelog
> @@ -27,6 +27,7 @@ version <next>:
>  - video setrange filter
>  - nsp demuxer
>  - support LibreSSL (via libtls)
> +- Move some OMA constants from libavformat into libavcodec

I believe such an internal change doesn't deserve a Changelog entry.

Moritz
misty@brew.sh Dec. 24, 2017, 4:48 a.m. UTC | #2 
From: Misty De Meo <mistydemeo@gmail.com>

> I believe such an internal change doesn't deserve a Changelog entry.

Sure; I've updated the patch set to remove that change from the Changelog.

Maxim Poliakovski (1):
  mpeg: add experimental support for PSMF audio.

Misty De Meo (4):
  oma: move some constants into libavcodec
  atrac3plus_parser: use libavcodec's oma
  Fix detecting ATRAC3 audio from MPS files
  mpeg: fix use of deprecated struct

 Changelog                             |   1 +
 libavcodec/Makefile                   |   1 +
 libavcodec/allcodecs.c                |   1 +
 libavcodec/atrac3plus_parser.c        | 153 ++++++++++++++++++++++++++++++++++
 libavformat/oma.c => libavcodec/oma.h |  27 +++---
 libavcodec/version.h                  |   2 +-
 libavformat/Makefile                  |   4 +-
 libavformat/mpeg.c                    |  15 ++++
 libavformat/mpeg.h                    |   1 +
 libavformat/oma.h                     |  21 ++---
 libavformat/omadec.c                  |   1 +
 libavformat/omaenc.c                  |   1 +
 libavformat/version.h                 |   2 +-
 13 files changed, 200 insertions(+), 30 deletions(-)
 create mode 100644 libavcodec/atrac3plus_parser.c
 rename libavformat/oma.c => libavcodec/oma.h (65%)
diff mbox

Patch

diff --git a/Changelog b/Changelog
index ee48876128..31e720091c 100644
--- a/Changelog
+++ b/Changelog
@@ -27,6 +27,7 @@  version <next>:
 - 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 <stdint.h>
+
 #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 <stdint.h>
-
 #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, \