Add spectral extension to the E-AC-3 decoder.

[ffmpeg] / libavcodec / cavsdata.h

diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index 745b3a140ad48e68f4287d29a4f5fbd1e0035faa..b597da1986786722767549094abaea348355b23c 100644 (file)
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@@ -59,22 +59,6 @@ const uint8_t ff_cavs_partition_flags[30] = {
 
 const uint8_t ff_cavs_scan3x3[4] = {4,5,7,8};
 
-static const uint8_t mv_scan[4] = {
-    MV_FWD_X0,MV_FWD_X1,
-    MV_FWD_X2,MV_FWD_X3
-};
-
-static const uint8_t cbp_tab[64][2] = {
-  {63, 0},{15,15},{31,63},{47,31},{ 0,16},{14,32},{13,47},{11,13},
-  { 7,14},{ 5,11},{10,12},{ 8, 5},{12,10},{61, 7},{ 4,48},{55, 3},
-  { 1, 2},{ 2, 8},{59, 4},{ 3, 1},{62,61},{ 9,55},{ 6,59},{29,62},
-  {45,29},{51,27},{23,23},{39,19},{27,30},{46,28},{53, 9},{30, 6},
-  {43,60},{37,21},{60,44},{16,26},{21,51},{28,35},{19,18},{35,20},
-  {42,24},{26,53},{44,17},{32,37},{58,39},{24,45},{20,58},{17,43},
-  {18,42},{48,46},{22,36},{33,33},{25,34},{49,40},{40,52},{36,49},
-  {34,50},{50,56},{52,25},{54,22},{41,54},{56,57},{38,41},{57,38}
-};
-
 const uint8_t ff_cavs_chroma_qp[64] = {
   0,  1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
   16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
@@ -106,18 +90,18 @@ const uint16_t ff_cavs_dequant_mul[64] = {
 
 /** marks block as unavailable, i.e. out of picture
     or not yet decoded */
-const vector_t ff_cavs_un_mv    = {0,0,1,NOT_AVAIL};
+const cavs_vector ff_cavs_un_mv    = {0,0,1,NOT_AVAIL};
 
 /** marks block as "no prediction from this direction"
     e.g. forward motion vector in BWD partition */
-const vector_t ff_cavs_dir_mv   = {0,0,1,REF_DIR};
+const cavs_vector ff_cavs_dir_mv   = {0,0,1,REF_DIR};
 
 /** marks block as using intra prediction */
-const vector_t ff_cavs_intra_mv = {0,0,1,REF_INTRA};
+const cavs_vector ff_cavs_intra_mv = {0,0,1,REF_INTRA};
 
 #define EOB 0,0,0
 
-const dec_2dvlc_t ff_cavs_intra_dec[7] = {
+const struct dec_2dvlc ff_cavs_intra_dec[7] = {
   {
     { //level / run / table_inc
       {  1, 1, 1},{ -1, 1, 1},{  1, 2, 1},{ -1, 2, 1},{  1, 3, 1},{ -1, 3, 1},
@@ -254,7 +238,7 @@ const dec_2dvlc_t ff_cavs_intra_dec[7] = {
   }
 };
 
-const dec_2dvlc_t ff_cavs_inter_dec[7] = {
+const struct dec_2dvlc ff_cavs_inter_dec[7] = {
   {
     { //level / run
       {  1, 1, 1},{ -1, 1, 1},{  1, 2, 1},{ -1, 2, 1},{  1, 3, 1},{ -1, 3, 1},
@@ -391,7 +375,7 @@ const dec_2dvlc_t ff_cavs_inter_dec[7] = {
   }
 };
 
-const dec_2dvlc_t ff_cavs_chroma_dec[5] = {
+const struct dec_2dvlc ff_cavs_chroma_dec[5] = {
   {
     { //level / run
       {  1, 1, 1},{ -1, 1, 1},{  1, 2, 1},{ -1, 2, 1},{  1, 3, 1},{ -1, 3, 1},
@@ -518,4 +502,4 @@ const int_fast8_t ff_top_modifier_l[8]  = {-1, 1, 5,-1,-1, 5, 7, 7};
 const int_fast8_t ff_left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
 const int_fast8_t ff_top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};
 
-#endif // AVCODEC_CAVSDATA_H
+#endif /* AVCODEC_CAVSDATA_H */