X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpeg4data.h;h=87bb5391b14c000cb70c29611b318442e937dadf;hb=3d8c80b611aa1e2f800dd9c8d8f350407f95c042;hp=61797ee319c5cc9514bccb3c8aa66bca0d714ee0;hpb=ca334dd14b957c4af7fcab5e97b6ed675c97caad;p=ffmpeg diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index 61797ee319c..87bb5391b14 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -3,25 +3,25 @@ * H263+ support * copyright (c) 2002-2004 Michael Niedermayer * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libavcodec/mpeg4data.h + * @file * mpeg4 tables. */ @@ -32,19 +32,19 @@ #include "mpegvideo.h" /* dc encoding for mpeg4 */ -const uint8_t DCtab_lum[13][2] = +const uint8_t ff_mpeg4_DCtab_lum[13][2] = { {3,3}, {3,2}, {2,2}, {2,3}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, {1,8}, {1,9}, {1,10}, {1,11}, }; -const uint8_t DCtab_chrom[13][2] = +const uint8_t ff_mpeg4_DCtab_chrom[13][2] = { {3,2}, {2,2}, {1,2}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, {1,8}, {1,9}, {1,10}, {1,11}, {1,12}, }; -const uint16_t intra_vlc[103][2] = { +const uint16_t ff_mpeg4_intra_vlc[103][2] = { { 0x2, 2 }, { 0x6, 3 },{ 0xf, 4 },{ 0xd, 5 },{ 0xc, 5 }, { 0x15, 6 },{ 0x13, 6 },{ 0x12, 6 },{ 0x17, 7 }, @@ -74,7 +74,7 @@ const uint16_t intra_vlc[103][2] = { { 0x5f, 12 },{ 0x3, 7 }, }; -const int8_t intra_level[102] = { +const int8_t ff_mpeg4_intra_level[102] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, @@ -90,7 +90,7 @@ const int8_t intra_level[102] = { 1, 1, 1, 1, 1, 1, }; -const int8_t intra_run[102] = { +const int8_t ff_mpeg4_intra_run[102] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -106,16 +106,16 @@ const int8_t intra_run[102] = { 15, 16, 17, 18, 19, 20, }; -RLTable rl_intra = { +RLTable ff_mpeg4_rl_intra = { 102, 67, - intra_vlc, - intra_run, - intra_level, + ff_mpeg4_intra_vlc, + ff_mpeg4_intra_run, + ff_mpeg4_intra_level, }; /* Note this is identical to the intra rvlc except that it is reordered. */ -const uint16_t inter_rvlc[170][2]={ +static const uint16_t inter_rvlc[170][2]={ {0x0006, 3},{0x0001, 4},{0x0004, 5},{0x001C, 7}, {0x003C, 8},{0x003D, 8},{0x007C, 9},{0x00FC, 10}, {0x00FD, 10},{0x01FC, 11},{0x01FD, 11},{0x03FC, 12}, @@ -161,7 +161,7 @@ const uint16_t inter_rvlc[170][2]={ {0x3F7C, 15},{0x3F7D, 15},{0x0000, 4} }; -const int8_t inter_rvlc_run[169]={ +static const int8_t inter_rvlc_run[169]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, @@ -186,7 +186,7 @@ const int8_t inter_rvlc_run[169]={ 43, 44, }; -const int8_t inter_rvlc_level[169]={ +static const int8_t inter_rvlc_level[169]={ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 1, 2, 3, 4, 5, @@ -211,7 +211,7 @@ const int8_t inter_rvlc_level[169]={ 1, 1, }; -RLTable rvlc_rl_inter = { +RLTable ff_rvlc_rl_inter = { 169, 103, inter_rvlc, @@ -219,7 +219,7 @@ RLTable rvlc_rl_inter = { inter_rvlc_level, }; -const uint16_t intra_rvlc[170][2]={ +static const uint16_t intra_rvlc[170][2]={ {0x0006, 3},{0x0007, 3},{0x000A, 4},{0x0009, 5}, {0x0014, 6},{0x0015, 6},{0x0034, 7},{0x0074, 8}, {0x0075, 8},{0x00DD, 9},{0x00EC, 9},{0x01EC, 10}, @@ -265,7 +265,7 @@ const uint16_t intra_rvlc[170][2]={ {0x3F7C, 15},{0x3F7D, 15},{0x0000, 4} }; -const int8_t intra_rvlc_run[169]={ +static const int8_t intra_rvlc_run[169]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -290,7 +290,7 @@ const int8_t intra_rvlc_run[169]={ 43, 44, }; -const int8_t intra_rvlc_level[169]={ +static const int8_t intra_rvlc_level[169]={ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, @@ -315,7 +315,7 @@ const int8_t intra_rvlc_level[169]={ 1, 1, }; -RLTable rvlc_rl_intra = { +RLTable ff_rvlc_rl_intra = { 169, 103, intra_rvlc, @@ -323,13 +323,13 @@ RLTable rvlc_rl_intra = { intra_rvlc_level, }; -const uint16_t sprite_trajectory_tab[15][2] = { +const uint16_t ff_sprite_trajectory_tab[15][2] = { {0x00, 2}, {0x02, 3}, {0x03, 3}, {0x04, 3}, {0x05, 3}, {0x06, 3}, {0x0E, 4}, {0x1E, 5}, {0x3E, 6}, {0x7E, 7}, {0xFE, 8}, {0x1FE, 9},{0x3FE, 10},{0x7FE, 11},{0xFFE, 12}, }; -const uint8_t mb_type_b_tab[4][2] = { +const uint8_t ff_mb_type_b_tab[4][2] = { {1, 1}, {1, 2}, {1, 3}, {1, 4}, }; @@ -369,7 +369,7 @@ const uint16_t ff_mpeg4_resync_prefix[8]={ 0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000 }; -const uint8_t mpeg4_dc_threshold[8]={ +const uint8_t ff_mpeg4_dc_threshold[8]={ 99, 13, 15, 17, 19, 21, 23, 0 };