diff --git a/apps/plugins/mpegplayer/vlc.h b/apps/plugins/mpegplayer/vlc.h index 7098ee0f9b..dbef8f881f 100644 --- a/apps/plugins/mpegplayer/vlc.h +++ b/apps/plugins/mpegplayer/vlc.h @@ -98,14 +98,14 @@ typedef struct { #define INTRA MACROBLOCK_INTRA #define QUANT MACROBLOCK_QUANT -static const MBtab MB_I [] = { +static const MBtab MB_I [] ICONST_ATTR = { {INTRA|QUANT, 2}, {INTRA, 1} }; #define MC MACROBLOCK_MOTION_FORWARD #define CODED MACROBLOCK_PATTERN -static const MBtab MB_P [] = { +static const MBtab MB_P [] ICONST_ATTR = { {INTRA|QUANT, 6}, {CODED|QUANT, 5}, {MC|CODED|QUANT, 5}, {INTRA, 5}, {MC, 3}, {MC, 3}, {MC, 3}, {MC, 3}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, @@ -120,7 +120,7 @@ static const MBtab MB_P [] = { #define BWD MACROBLOCK_MOTION_BACKWARD #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD -static const MBtab MB_B [] = { +static const MBtab MB_B [] ICONST_ATTR = { {0, 0}, {INTRA|QUANT, 6}, {BWD|CODED|QUANT, 6}, {FWD|CODED|QUANT, 6}, {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5}, @@ -150,11 +150,11 @@ static const MBtab MB_B [] = { #undef INTER -static const MVtab MV_4 [] = { +static const MVtab MV_4 [] ICONST_ATTR = { { 3, 6}, { 2, 4}, { 1, 3}, { 1, 3}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2} }; -static const MVtab MV_10 [] = { +static const MVtab MV_10 [] ICONST_ATTR = { { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, {15,10}, {14,10}, {13,10}, {12,10}, {11,10}, {10,10}, { 9, 9}, { 9, 9}, { 8, 9}, { 8, 9}, { 7, 9}, { 7, 9}, @@ -164,12 +164,12 @@ static const MVtab MV_10 [] = { }; -static const DMVtab DMV_2 [] = { +static const DMVtab DMV_2 [] ICONST_ATTR = { { 0, 1}, { 0, 1}, { 1, 2}, {-1, 2} }; -static const CBPtab CBP_7 [] = { +static const CBPtab CBP_7 [] ICONST_ATTR = { {0x11, 7}, {0x12, 7}, {0x14, 7}, {0x18, 7}, {0x21, 7}, {0x22, 7}, {0x24, 7}, {0x28, 7}, {0x3f, 6}, {0x3f, 6}, {0x30, 6}, {0x30, 6}, @@ -200,7 +200,7 @@ static const CBPtab CBP_7 [] = { {0x0f, 3}, {0x0f, 3}, {0x0f, 3}, {0x0f, 3} }; -static const CBPtab CBP_9 [] = { +static const CBPtab CBP_9 [] ICONST_ATTR = { {0, 0}, {0x00, 9}, {0x39, 9}, {0x36, 9}, {0x37, 9}, {0x3b, 9}, {0x3d, 9}, {0x3e, 9}, {0x17, 8}, {0x17, 8}, {0x1b, 8}, {0x1b, 8}, @@ -220,21 +220,21 @@ static const CBPtab CBP_9 [] = { }; -static const DCtab DC_lum_5 [] = { +static const DCtab DC_lum_5 [] ICONST_ATTR = { {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {5, 4}, {5, 4}, {6, 5} }; -static const DCtab DC_chrom_5 [] = { +static const DCtab DC_chrom_5 [] ICONST_ATTR = { {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {4, 4}, {4, 4}, {5, 5} }; -static const DCtab DC_long [] = { +static const DCtab DC_long [] ICONST_ATTR = { {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, { 6, 5}, { 6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, { 6, 5}, { 6, 5}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, { 7, 6}, { 7, 6}, @@ -242,7 +242,7 @@ static const DCtab DC_long [] = { }; -static const DCTtab DCT_16 [] = { +static const DCTtab DCT_16 [] ICONST_ATTR = { {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, @@ -253,7 +253,7 @@ static const DCTtab DCT_16 [] = { { 31, 1, 0}, { 30, 1, 0}, { 29, 1, 0}, { 28, 1, 0} }; -static const DCTtab DCT_15 [] = { +static const DCTtab DCT_15 [] ICONST_ATTR = { { 1,40,15}, { 1,39,15}, { 1,38,15}, { 1,37,15}, { 1,36,15}, { 1,35,15}, { 1,34,15}, { 1,33,15}, { 1,32,15}, { 2,14,15}, { 2,13,15}, { 2,12,15}, @@ -268,7 +268,7 @@ static const DCTtab DCT_15 [] = { { 1,17,14}, { 1,17,14}, { 1,16,14}, { 1,16,14} }; -static const DCTtab DCT_13 [] = { +static const DCTtab DCT_13 [] ICONST_ATTR = { { 11, 2,13}, { 10, 2,13}, { 6, 3,13}, { 4, 4,13}, { 3, 5,13}, { 2, 7,13}, { 2, 6,13}, { 1,15,13}, { 1,14,13}, { 1,13,13}, { 1,12,13}, { 27, 1,13}, @@ -283,12 +283,12 @@ static const DCTtab DCT_13 [] = { { 7, 2,12}, { 7, 2,12}, { 18, 1,12}, { 18, 1,12} }; -static const DCTtab DCT_B14_10 [] = { +static const DCTtab DCT_B14_10 [] ICONST_ATTR = { { 17, 1,10}, { 6, 2,10}, { 1, 7,10}, { 3, 3,10}, { 2, 4,10}, { 16, 1,10}, { 15, 1,10}, { 5, 2,10} }; -static const DCTtab DCT_B14_8 [] = { +static const DCTtab DCT_B14_8 [] ICONST_ATTR = { { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 3, 2, 7}, { 3, 2, 7}, { 10, 1, 7}, { 10, 1, 7}, { 1, 4, 7}, { 1, 4, 7}, { 9, 1, 7}, { 9, 1, 7}, @@ -300,7 +300,7 @@ static const DCTtab DCT_B14_8 [] = { { 4, 2, 8}, { 2, 3, 8}, { 1, 5, 8}, { 11, 1, 8} }; -static const DCTtab DCT_B14AC_5 [] = { +static const DCTtab DCT_B14AC_5 [] ICONST_ATTR = { { 1, 3, 5}, { 5, 1, 5}, { 4, 1, 5}, { 1, 2, 4}, { 1, 2, 4}, { 3, 1, 4}, { 3, 1, 4}, { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, @@ -310,7 +310,7 @@ static const DCTtab DCT_B14AC_5 [] = { { 1, 1, 2}, { 1, 1, 2}, { 1, 1, 2}, { 1, 1, 2} }; -static const DCTtab DCT_B14DC_5 [] = { +static const DCTtab DCT_B14DC_5 [] ICONST_ATTR = { { 1, 3, 5}, { 5, 1, 5}, { 4, 1, 5}, { 1, 2, 4}, { 1, 2, 4}, { 3, 1, 4}, { 3, 1, 4}, { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, @@ -320,12 +320,12 @@ static const DCTtab DCT_B14DC_5 [] = { { 1, 1, 1}, { 1, 1, 1}, { 1, 1, 1}, { 1, 1, 1} }; -static const DCTtab DCT_B15_10 [] = { +static const DCTtab DCT_B15_10 [] ICONST_ATTR = { { 6, 2, 9}, { 6, 2, 9}, { 15, 1, 9}, { 15, 1, 9}, { 3, 4,10}, { 17, 1,10}, { 16, 1, 9}, { 16, 1, 9} }; -static const DCTtab DCT_B15_8 [] = { +static const DCTtab DCT_B15_8 [] ICONST_ATTR = { { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 8, 1, 7}, { 8, 1, 7}, { 9, 1, 7}, { 9, 1, 7}, { 7, 1, 7}, { 7, 1, 7}, { 3, 2, 7}, { 3, 2, 7}, @@ -392,14 +392,14 @@ static const DCTtab DCT_B15_8 [] = { }; -static const MBAtab MBA_5 [] = { +static const MBAtab MBA_5 [] ICONST_ATTR = { {6, 5}, {5, 5}, {4, 4}, {4, 4}, {3, 4}, {3, 4}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1} }; -static const MBAtab MBA_11 [] = { +static const MBAtab MBA_11 [] ICONST_ATTR = { {32, 11}, {31, 11}, {30, 11}, {29, 11}, {28, 11}, {27, 11}, {26, 11}, {25, 11}, {24, 11}, {23, 11}, {22, 11}, {21, 11},