[FFmpeg-cvslog] dca: Move all tables into dcadata.h
Diego Biurrun
git at videolan.org
Sat Feb 14 22:46:33 CET 2015
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Sep 22 18:05:40 2014 +0200| [2a9c6fae927964b5dd0b5d3d9292f5621bd21664] | committer: Diego Biurrun
dca: Move all tables into dcadata.h
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a9c6fae927964b5dd0b5d3d9292f5621bd21664
---
libavcodec/dcadata.h | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/dcadec.c | 89 --------------------------------------------------
2 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h
index 7c37d3a..8be4475 100644
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@@ -7663,4 +7663,93 @@ static const float dca_default_coeffs[10][6][2] = {
* where Ch(n) represents the subband samples in the (n)th audio channel.
*/
+static const int8_t dca_lfe_index[] = {
+ 1, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 1, 3, 2, 3
+};
+
+static const int8_t dca_channel_reorder_lfe[][9] = {
+ { 0, -1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 4, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, 4, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 4, 5, -1, -1, -1, -1 },
+ { 3, 4, 0, 1, 5, 6, -1, -1, -1 },
+ { 2, 0, 1, 4, 5, 6, -1, -1, -1 },
+ { 0, 6, 4, 5, 2, 3, -1, -1, -1 },
+ { 4, 2, 5, 0, 1, 6, 7, -1, -1 },
+ { 5, 6, 0, 1, 7, 3, 8, 4, -1 },
+ { 4, 2, 5, 0, 1, 6, 8, 7, -1 },
+};
+
+static const int8_t dca_channel_reorder_lfe_xch[][9] = {
+ { 0, 2, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 4, -1, -1, -1, -1, -1 },
+ { 0, 1, 3, 4, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 4, 5, -1, -1, -1, -1 },
+ { 0, 1, 4, 5, 3, -1, -1, -1, -1 },
+ { 2, 0, 1, 5, 6, 4, -1, -1, -1 },
+ { 3, 4, 0, 1, 6, 7, 5, -1, -1 },
+ { 2, 0, 1, 4, 5, 6, 7, -1, -1 },
+ { 0, 6, 4, 5, 2, 3, 7, -1, -1 },
+ { 4, 2, 5, 0, 1, 7, 8, 6, -1 },
+ { 5, 6, 0, 1, 8, 3, 9, 4, 7 },
+ { 4, 2, 5, 0, 1, 6, 9, 8, 7 },
+};
+
+static const int8_t dca_channel_reorder_nolfe[][9] = {
+ { 0, -1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 3, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, 3, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 3, 4, -1, -1, -1, -1 },
+ { 2, 3, 0, 1, 4, 5, -1, -1, -1 },
+ { 2, 0, 1, 3, 4, 5, -1, -1, -1 },
+ { 0, 5, 3, 4, 1, 2, -1, -1, -1 },
+ { 3, 2, 4, 0, 1, 5, 6, -1, -1 },
+ { 4, 5, 0, 1, 6, 2, 7, 3, -1 },
+ { 3, 2, 4, 0, 1, 5, 7, 6, -1 },
+};
+
+static const int8_t dca_channel_reorder_nolfe_xch[][9] = {
+ { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 3, -1, -1, -1, -1, -1 },
+ { 0, 1, 2, 3, -1, -1, -1, -1, -1 },
+ { 2, 0, 1, 3, 4, -1, -1, -1, -1 },
+ { 0, 1, 3, 4, 2, -1, -1, -1, -1 },
+ { 2, 0, 1, 4, 5, 3, -1, -1, -1 },
+ { 2, 3, 0, 1, 5, 6, 4, -1, -1 },
+ { 2, 0, 1, 3, 4, 5, 6, -1, -1 },
+ { 0, 5, 3, 4, 1, 2, 6, -1, -1 },
+ { 3, 2, 4, 0, 1, 6, 7, 5, -1 },
+ { 4, 5, 0, 1, 7, 2, 8, 3, 6 },
+ { 3, 2, 4, 0, 1, 5, 8, 7, 6 },
+};
+
+static const uint16_t dca_vlc_offs[] = {
+ 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364,
+ 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508,
+ 5572, 5604, 5668, 5796, 5860, 5892, 6412, 6668, 6796, 7308, 7564,
+ 7820, 8076, 8620, 9132, 9388, 9910, 10166, 10680, 11196, 11726, 12240,
+ 12752, 13298, 13810, 14326, 14840, 15500, 16022, 16540, 17158, 17678, 18264,
+ 18796, 19352, 19926, 20468, 21472, 22398, 23014, 23622,
+};
+
#endif /* AVCODEC_DCADATA_H */
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c4e31eb..e7bb191 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -125,86 +125,6 @@ static const uint64_t dca_core_channel_layout[] = {
AV_CH_SIDE_LEFT | AV_CH_BACK_CENTER | AV_CH_SIDE_RIGHT, ///< 8, CL + C + CR + L + R + SL + S + SR
};
-static const int8_t dca_lfe_index[] = {
- 1, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 1, 3, 2, 3
-};
-
-static const int8_t dca_channel_reorder_lfe[][9] = {
- { 0, -1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 2, 0, 1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 4, -1, -1, -1, -1, -1 },
- { 0, 1, 3, 4, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 4, 5, -1, -1, -1, -1 },
- { 3, 4, 0, 1, 5, 6, -1, -1, -1 },
- { 2, 0, 1, 4, 5, 6, -1, -1, -1 },
- { 0, 6, 4, 5, 2, 3, -1, -1, -1 },
- { 4, 2, 5, 0, 1, 6, 7, -1, -1 },
- { 5, 6, 0, 1, 7, 3, 8, 4, -1 },
- { 4, 2, 5, 0, 1, 6, 8, 7, -1 },
-};
-
-static const int8_t dca_channel_reorder_lfe_xch[][9] = {
- { 0, 2, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 3, -1, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 4, -1, -1, -1, -1, -1 },
- { 0, 1, 3, 4, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 4, 5, -1, -1, -1, -1 },
- { 0, 1, 4, 5, 3, -1, -1, -1, -1 },
- { 2, 0, 1, 5, 6, 4, -1, -1, -1 },
- { 3, 4, 0, 1, 6, 7, 5, -1, -1 },
- { 2, 0, 1, 4, 5, 6, 7, -1, -1 },
- { 0, 6, 4, 5, 2, 3, 7, -1, -1 },
- { 4, 2, 5, 0, 1, 7, 8, 6, -1 },
- { 5, 6, 0, 1, 8, 3, 9, 4, 7 },
- { 4, 2, 5, 0, 1, 6, 9, 8, 7 },
-};
-
-static const int8_t dca_channel_reorder_nolfe[][9] = {
- { 0, -1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 2, 0, 1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 3, -1, -1, -1, -1, -1 },
- { 0, 1, 2, 3, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 3, 4, -1, -1, -1, -1 },
- { 2, 3, 0, 1, 4, 5, -1, -1, -1 },
- { 2, 0, 1, 3, 4, 5, -1, -1, -1 },
- { 0, 5, 3, 4, 1, 2, -1, -1, -1 },
- { 3, 2, 4, 0, 1, 5, 6, -1, -1 },
- { 4, 5, 0, 1, 6, 2, 7, 3, -1 },
- { 3, 2, 4, 0, 1, 5, 7, 6, -1 },
-};
-
-static const int8_t dca_channel_reorder_nolfe_xch[][9] = {
- { 0, 1, -1, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
- { 0, 1, 2, -1, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 3, -1, -1, -1, -1, -1 },
- { 0, 1, 2, 3, -1, -1, -1, -1, -1 },
- { 2, 0, 1, 3, 4, -1, -1, -1, -1 },
- { 0, 1, 3, 4, 2, -1, -1, -1, -1 },
- { 2, 0, 1, 4, 5, 3, -1, -1, -1 },
- { 2, 3, 0, 1, 5, 6, 4, -1, -1 },
- { 2, 0, 1, 3, 4, 5, 6, -1, -1 },
- { 0, 5, 3, 4, 1, 2, 6, -1, -1 },
- { 3, 2, 4, 0, 1, 6, 7, 5, -1 },
- { 4, 5, 0, 1, 7, 2, 8, 3, 6 },
- { 3, 2, 4, 0, 1, 5, 8, 7, 6 },
-};
-
#define DCA_DOLBY 101 /* FIXME */
#define DCA_CHANNEL_BITS 6
@@ -236,15 +156,6 @@ static av_always_inline int get_bitalloc(GetBitContext *gb, BitAlloc *ba,
ba->offset;
}
-static const uint16_t dca_vlc_offs[] = {
- 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364,
- 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508,
- 5572, 5604, 5668, 5796, 5860, 5892, 6412, 6668, 6796, 7308, 7564,
- 7820, 8076, 8620, 9132, 9388, 9910, 10166, 10680, 11196, 11726, 12240,
- 12752, 13298, 13810, 14326, 14840, 15500, 16022, 16540, 17158, 17678, 18264,
- 18796, 19352, 19926, 20468, 21472, 22398, 23014, 23622,
-};
-
static av_cold void dca_init_vlcs(void)
{
static int vlcs_initialized = 0;
More information about the ffmpeg-cvslog
mailing list