[cvs] / xvidcore / src / bitstream / vlc_codes.h Repository:
ViewVC logotype

Diff of /xvidcore/src/bitstream/vlc_codes.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.6, Wed Jun 12 20:38:40 2002 UTC revision 1.7, Sun Sep 8 13:44:11 2002 UTC
# Line 1  Line 1 
1    /*****************************************************************************
2     *
3     *  XVID MPEG-4 VIDEO CODEC
4     *  - Vector Length Coding tables -
5     *
6     *  Copyright(C) 2002 Michael Militzer
7     *
8     *
9     *  This program is an implementation of a part of one or more MPEG-4
10     *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
11     *  to use this software module in hardware or software products are
12     *  advised that its use may infringe existing patents or copyrights, and
13     *  any such use would be at such party's own risk.  The original
14     *  developer of this software module and his/her company, and subsequent
15     *  editors and their companies, will have no liability for use of this
16     *  software or modifications or derivatives thereof.
17     *
18     *  This program is free software; you can redistribute it and/or modify
19     *  it under the terms of the GNU General Public License as published by
20     *  the Free Software Foundation; either version 2 of the License, or
21     *  (at your option) any later version.
22     *
23     *  This program is distributed in the hope that it will be useful,
24     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
25     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
26     *  GNU General Public License for more details.
27     *
28     *  You should have received a copy of the GNU General Public License
29     *  along with this program; if not, write to the Free Software
30     *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
31     *
32     * $Id$
33     *
34     ****************************************************************************/
35    
36  #ifndef _VLC_CODES_H_  #ifndef _VLC_CODES_H_
37  #define _VLC_CODES_H_  #define _VLC_CODES_H_
38    
# Line 7  Line 42 
42  #define VLC_ERROR       (-1)  #define VLC_ERROR       (-1)
43  #define ESCAPE 7167  #define ESCAPE 7167
44    
45    /*****************************************************************************
46     * The Vector Length Coding structure
47     ****************************************************************************/
48    
49  typedef struct  typedef struct
50  {  {
51          uint32_t code;          uint32_t code;
# Line 17  Line 56 
56  static VLC *DCT3D[2];  static VLC *DCT3D[2];
57    
58    
59  /******************************************************************  /*****************************************************************************
60   * common tables between encoder/decoder                          *   * common tables between encoder/decoder
61   ******************************************************************/   ****************************************************************************/
62    
63  /* constants taken from momusys/vm_common/inlcude/max_level.h */  /* constants taken from momusys/vm_common/inlcude/max_level.h */
64  static char max_level[4][64] = {  static char max_level[4][64] = {
65          {                                                       // intra, last = 0          /* intra, last = 0 */
66            {
67           27, 10, 5, 4, 3, 3, 3, 3,           27, 10, 5, 4, 3, 3, 3, 3,
68           2, 2, 1, 1, 1, 1, 1, 0,           2, 2, 1, 1, 1, 1, 1, 0,
69           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
# Line 31  Line 71 
71           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
72           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
73           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
74           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
75           },           },
76    
77          {                                                       // intra, last = 1          /* intra, last = 1 */
78            {
79           8, 3, 2, 2, 2, 2, 2, 1,           8, 3, 2, 2, 2, 2, 2, 1,
80           1, 1, 1, 1, 1, 1, 1, 1,           1, 1, 1, 1, 1, 1, 1, 1,
81           1, 1, 1, 1, 1, 0, 0, 0,           1, 1, 1, 1, 1, 0, 0, 0,
# Line 42  Line 83 
83           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
84           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
85           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
86           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
87           },           },
88    
89          {                                                       // inter, last = 0          /* inter, last = 0 */
90            {
91           12, 6, 4, 3, 3, 3, 3, 2,           12, 6, 4, 3, 3, 3, 3, 2,
92           2, 2, 2, 1, 1, 1, 1, 1,           2, 2, 2, 1, 1, 1, 1, 1,
93           1, 1, 1, 1, 1, 1, 1, 1,           1, 1, 1, 1, 1, 1, 1, 1,
# Line 53  Line 95 
95           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
96           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
97           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
98           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
99           },           },
100    
101          {                                                       // inter, last = 1          /* inter, last = 1 */
102            {
103           3, 2, 1, 1, 1, 1, 1, 1,           3, 2, 1, 1, 1, 1, 1, 1,
104           1, 1, 1, 1, 1, 1, 1, 1,           1, 1, 1, 1, 1, 1, 1, 1,
105           1, 1, 1, 1, 1, 1, 1, 1,           1, 1, 1, 1, 1, 1, 1, 1,
# Line 64  Line 107 
107           1, 1, 1, 1, 1, 1, 1, 1,           1, 1, 1, 1, 1, 1, 1, 1,
108           1, 0, 0, 0, 0, 0, 0, 0,           1, 0, 0, 0, 0, 0, 0, 0,
109           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
110           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
111           }           }
112  };  };
113    
114  static char max_run[4][256] = {  static char max_run[4][256] = {
115          {                                                       // intra, last = 0          /* intra, last = 0 */
116            {
117           0, 14, 9, 7, 3, 2, 1, 1,           0, 14, 9, 7, 3, 2, 1, 1,
118           1, 1, 1, 0, 0, 0, 0, 0,           1, 1, 1, 0, 0, 0, 0, 0,
119           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
# Line 101  Line 145 
145           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
146           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
147           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
148           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
149           },           },
150    
151          {                                                       // intra, last = 1          /* intra, last = 1 */
152            {
153           0, 20, 6, 1, 0, 0, 0, 0,           0, 20, 6, 1, 0, 0, 0, 0,
154           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
155           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
# Line 136  Line 181 
181           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
182           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
183           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
184           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
185           },           },
186    
187          {                                                       // inter, last = 0          /* inter, last = 0 */
188            {
189           0, 26, 10, 6, 2, 1, 1, 0,           0, 26, 10, 6, 2, 1, 1, 0,
190           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
191           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
# Line 171  Line 217 
217           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
218           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
219           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
220           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
221           },           },
222    
223          {                                                       // inter, last = 1          /* inter, last = 1 */
224            {
225           0, 40, 1, 0, 0, 0, 0, 0,           0, 40, 1, 0, 0, 0, 0, 0,
226           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
227           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
# Line 206  Line 253 
253           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
254           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
255           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0,
256           0, 0, 0, 0, 0, 0, 0, 0,           0, 0, 0, 0, 0, 0, 0, 0
257           }           }
258  };  };
259    
# Line 221  Line 268 
268  /* first part of coeffs for last = 0. Indexed by [run][level-1] */  /* first part of coeffs for last = 0. Indexed by [run][level-1] */
269    
270  static VLC coeff_tab0[2][12] = {  static VLC coeff_tab0[2][12] = {
271          /*          /* run = 0  */
            run = 0  
          */  
272          {          {
273           {0x02, 2}, {0x0f, 4}, {0x15, 6}, {0x17, 7},           {0x02, 2}, {0x0f, 4}, {0x15, 6}, {0x17, 7},
274           {0x1f, 8}, {0x25, 9}, {0x24, 9}, {0x21, 10},           {0x1f, 8}, {0x25, 9}, {0x24, 9}, {0x21, 10},
275           {0x20, 10}, {0x07, 11}, {0x06, 11}, {0x20, 11}           {0x20, 10}, {0x07, 11}, {0x06, 11}, {0x20, 11}
276           },           },
277          /*  
278             run = 1          /* run = 1 */
          */  
279          {          {
280           {0x06, 3}, {0x14, 6}, {0x1e, 8}, {0x0f, 10},           {0x06, 3}, {0x14, 6}, {0x1e, 8}, {0x0f, 10},
281           {0x21, 11}, {0x50, 12}, {0x00, 0}, {0x00, 0},           {0x21, 11}, {0x50, 12}, {0x00, 0}, {0x00, 0},
# Line 242  Line 286 
286  /* rest of coeffs for last = 0. indexing by [run-2][level-1] */  /* rest of coeffs for last = 0. indexing by [run-2][level-1] */
287    
288  static VLC coeff_tab1[25][4] = {  static VLC coeff_tab1[25][4] = {
289          /*          /* First row is run=2, then each row is run 2 + index */
290             run = 2          {{0x0e, 4}, {0x1d, 8}, {0x0e, 10}, {0x51, 12}},
291           */          {{0x0d, 5}, {0x23, 9},  {0x0d, 10}, {0x00, 0}},
292          {          {{0x0c, 5}, {0x22, 9},  {0x52, 12}, {0x00, 0}},
293           {0x0e, 4}, {0x1d, 8}, {0x0e, 10}, {0x51, 12}          {{0x0b, 5}, {0x0c, 10}, {0x53, 12}, {0x00, 0}},
294           },          {{0x13, 6}, {0x0b, 10}, {0x54, 12}, {0x00, 0}},
295          /*          {{0x12, 6}, {0x0a, 10}, {0x00, 0},  {0x00, 0}},
296             run = 3          {{0x11, 6}, {0x09, 10}, {0x00, 0},  {0x00, 0}},
297           */          {{0x10, 6}, {0x08, 10}, {0x00, 0},  {0x00, 0}},
298          {          {{0x16, 7}, {0x55, 12}, {0x00, 0},  {0x00, 0}},
299           {0x0d, 5}, {0x23, 9}, {0x0d, 10}, {0x00, 0}          {{0x15, 7}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
300           },          {{0x14, 7}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
301          /*          {{0x1c, 8}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
302             run = 4-26          {{0x1b, 8}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
303           */          {{0x21, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
304          {          {{0x20, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
305           {0x0c, 5}, {0x22, 9}, {0x52, 12}, {0x00, 0}          {{0x1f, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
306           },          {{0x1e, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
307          {          {{0x1d, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
308           {0x0b, 5}, {0x0c, 10}, {0x53, 12}, {0x00, 0}          {{0x1c, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
309           },          {{0x1b, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
310          {          {{0x1a, 9}, {0x00, 0},  {0x00, 0},  {0x00, 0}},
311           {0x13, 6}, {0x0b, 10}, {0x54, 12}, {0x00, 0}          {{0x22, 11}, {0x00, 0}, {0x00, 0},  {0x00, 0}},
312           },          {{0x23, 11}, {0x00, 0}, {0x00, 0},  {0x00, 0}},
313          {          {{0x56, 12}, {0x00, 0}, {0x00, 0},  {0x00, 0}},
314           {0x12, 6}, {0x0a, 10}, {0x00, 0}, {0x00, 0}          {{0x57, 12}, {0x00, 0}, {0x00, 0},  {0x00, 0}}
315           },  
         {  
          {0x11, 6}, {0x09, 10}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x10, 6}, {0x08, 10}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x16, 7}, {0x55, 12}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x15, 7}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x14, 7}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1c, 8}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1b, 8}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x21, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x20, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1f, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1e, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1d, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1c, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1b, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x1a, 9}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x22, 11}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x23, 11}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x56, 12}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          },  
         {  
          {0x57, 12}, {0x00, 0}, {0x00, 0}, {0x00, 0}  
          }  
316  };  };
317    
318  /* first coeffs of last = 1. indexing by [run][level-1] */  /* first coeffs of last = 1. indexing by [run][level-1] */
319    
320  static VLC coeff_tab2[2][3] = {  static VLC coeff_tab2[2][3] = {
321          /*          /*  run = 0 */
322             run = 0          {{0x07, 4}, {0x19, 9},  {0x05, 11}},
323           */          /* run = 1 */
324          {          {{0x0f, 6}, {0x04, 11}, {0x00, 0}}
          {0x07, 4}, {0x19, 9}, {0x05, 11}  
          },  
         /*  
            run = 1  
          */  
         {  
          {0x0f, 6}, {0x04, 11}, {0x00, 0}  
          }  
325  };  };
326    
327  /* rest of coeffs for last = 1. indexing by [run-2] */  /* rest of coeffs for last = 1. indexing by [run-2] */
328    
329  static VLC coeff_tab3[40][1] = {  static VLC coeff_tab3[40][1] = {
330          {{0x0e, 6}}, {{0x0d, 6}}, {{0x0c, 6}},          {{0x0e, 6}},  {{0x0d, 6}},  {{0x0c, 6}},  {{0x13, 7}},
331          {{0x13, 7}}, {{0x12, 7}}, {{0x11, 7}}, {{0x10, 7}},          {{0x12, 7}},  {{0x11, 7}},  {{0x10, 7}},  {{0x1a, 8}},
332          {{0x1a, 8}}, {{0x19, 8}}, {{0x18, 8}}, {{0x17, 8}},          {{0x19, 8}},  {{0x18, 8}},  {{0x17, 8}},  {{0x16, 8}},
333          {{0x16, 8}}, {{0x15, 8}}, {{0x14, 8}}, {{0x13, 8}},          {{0x15, 8}},  {{0x14, 8}},  {{0x13, 8}},  {{0x18, 9}},
334          {{0x18, 9}}, {{0x17, 9}}, {{0x16, 9}}, {{0x15, 9}},          {{0x17, 9}},  {{0x16, 9}},  {{0x15, 9}},  {{0x14, 9}},
335          {{0x14, 9}}, {{0x13, 9}}, {{0x12, 9}}, {{0x11, 9}},          {{0x13, 9}},  {{0x12, 9}},  {{0x11, 9}},  {{0x07, 10}},
336          {{0x07, 10}}, {{0x06, 10}}, {{0x05, 10}}, {{0x04, 10}},          {{0x06, 10}}, {{0x05, 10}}, {{0x04, 10}}, {{0x24, 11}},
337          {{0x24, 11}}, {{0x25, 11}}, {{0x26, 11}}, {{0x27, 11}},          {{0x25, 11}}, {{0x26, 11}}, {{0x27, 11}}, {{0x58, 12}},
338          {{0x58, 12}}, {{0x59, 12}}, {{0x5a, 12}}, {{0x5b, 12}},          {{0x59, 12}}, {{0x5a, 12}}, {{0x5b, 12}}, {{0x5c, 12}},
339          {{0x5c, 12}}, {{0x5d, 12}}, {{0x5e, 12}}, {{0x5f, 12}},          {{0x5d, 12}}, {{0x5e, 12}}, {{0x5f, 12}}, {{0x00, 0}}
         {{0x00, 0}}  
340  };  };
341    
342  /* New tables for Intra luminance coefficients. Same codewords,  /*
343     different meaning */   * New tables for Intra luminance coefficients. Same codewords,
344     * different meaning
345     */
346    
347  /* Coeffs for last = 0, run = 0. Indexed by [level-1] */  /* Coeffs for last = 0, run = 0. Indexed by [level-1] */
348    
349  static VLC coeff_tab4[27] = {  static VLC coeff_tab4[27] = {
350          /*          /* run = 0 */
351             run = 0          {0x02, 2},  {0x06, 3},  {0x0f, 4},
352           */          {0x0d, 5},  {0x0c, 5},  {0x15, 6},
353          {0x02, 2}, {0x06, 3}, {0x0f, 4}, {0x0d, 5},          {0x13, 6},  {0x12, 6},  {0x17, 7},
354          {0x0c, 5}, {0x15, 6}, {0x13, 6}, {0x12, 6},          {0x1f, 8},  {0x1e, 8},  {0x1d, 8},
355          {0x17, 7}, {0x1f, 8}, {0x1e, 8}, {0x1d, 8},          {0x25, 9},  {0x24, 9},  {0x23, 9},
356          {0x25, 9}, {0x24, 9}, {0x23, 9}, {0x21, 9},          {0x21, 9},      {0x21, 10}, {0x20, 10},
357          {0x21, 10}, {0x20, 10}, {0x0f, 10}, {0x0e, 10},          {0x0f, 10}, {0x0e, 10}, {0x07, 11},
358          {0x07, 11}, {0x06, 11}, {0x20, 11}, {0x21, 11},          {0x06, 11}, {0x20, 11}, {0x21, 11},
359          {0x50, 12}, {0x51, 12}, {0x52, 12}          {0x50, 12}, {0x51, 12}, {0x52, 12}
360  };  };
361    
362  /* Coeffs for last = 0, run = 1. Indexed by [level-1] */  /* Coeffs for last = 0, run = 1. Indexed by [level-1] */
363    
364  static VLC coeff_tab5[10] = {  static VLC coeff_tab5[10] = {
365          {0x0e, 4}, {0x14, 6}, {0x16, 7}, {0x1c, 8},          {0x0e, 4}, {0x14, 6},  {0x16, 7},  {0x1c, 8},  {0x20, 9},
366          {0x20, 9}, {0x1f, 9}, {0x0d, 10}, {0x22, 11},          {0x1f, 9}, {0x0d, 10}, {0x22, 11}, {0x53, 12}, {0x55, 12}
         {0x53, 12}, {0x55, 12}  
367  };  };
368    
369  /* Coeffs for last = 0, run = 2 -> 9. Indexed by [run-2][level-1] */  /* Coeffs for last = 0, run = 2 -> 9. Indexed by [run-2][level-1] */
370    
371  static VLC coeff_tab6[8][5] = {  static VLC coeff_tab6[8][5] = {
372          /*          /* run = 2 */
373             run = 2          {{0x0b, 5}, {0x15, 7}, {0x1e, 9}, {0x0c, 10}, {0x56, 12}},
374           */  
375          {          /* run = 3 */
376           {0x0b, 5}, {0x15, 7}, {0x1e, 9}, {0x0c, 10},          {{0x11, 6}, {0x1b, 8}, {0x1d, 9}, {0x0b, 10}, {0x00, 0}},
377           {0x56, 12}  
378           },          /* run = 4 */
379          /*          {{0x10, 6}, {0x22, 9}, {0x0a, 10}, {0x00, 0}, {0x00, 0}},
380             run = 3  
381           */          /* run = 5 */
382          {          {{0x0d, 6}, {0x1c, 9}, {0x08, 10}, {0x00, 0}, {0x00, 0}},
383           {0x11, 6}, {0x1b, 8}, {0x1d, 9}, {0x0b, 10},  
384           {0x00, 0}          /* run = 6 */
385           },          {{0x12, 7}, {0x1b, 9}, {0x54, 12}, {0x00, 0}, {0x00, 0}},
386          /*  
387             run = 4          /* run = 7 */
388           */          {{0x14, 7}, {0x1a, 9}, {0x57, 12}, {0x00, 0}, {0x00, 0}},
389          {  
390           {0x10, 6}, {0x22, 9}, {0x0a, 10}, {0x00, 0},          /* run = 8 */
391           {0x00, 0}          {{0x19, 8}, {0x09, 10}, {0x00, 0}, {0x00, 0}, {0x00, 0}},
392           },  
393          /*          /* run = 9 */
394             run = 5          {{0x18, 8}, {0x23, 11}, {0x00, 0}, {0x00, 0}, {0x00, 0}}
          */  
         {  
          {0x0d, 6}, {0x1c, 9}, {0x08, 10}, {0x00, 0},  
          {0x00, 0}  
          },  
         /*  
            run = 6  
          */  
         {  
          {0x12, 7}, {0x1b, 9}, {0x54, 12}, {0x00, 0},  
          {0x00, 0}  
          },  
         /*  
            run = 7  
          */  
         {  
          {0x14, 7}, {0x1a, 9}, {0x57, 12}, {0x00, 0},  
          {0x00, 0}  
          },  
         /*  
            run = 8  
          */  
         {  
          {0x19, 8}, {0x09, 10}, {0x00, 0}, {0x00, 0},  
          {0x00, 0}  
          },  
         /*  
            run = 9  
          */  
         {  
          {0x18, 8}, {0x23, 11}, {0x00, 0}, {0x00, 0},  
          {0x00, 0}  
          }  
395  };  };
396    
397  /* Coeffs for last = 0, run = 10 -> 14. Indexed by [run-10] */  /* Coeffs for last = 0, run = 10 -> 14. Indexed by [run-10] */
398    
399  static VLC coeff_tab7[5][1] = {  static VLC coeff_tab7[5][1] = {
400          {{0x17, 8}}, {{0x19, 9}}, {{0x18, 9}}, {{0x07, 10}},          {{0x17, 8}},
401            {{0x19, 9}},
402            {{0x18, 9}},
403            {{0x07, 10}},
404          {{0x58, 12}}          {{0x58, 12}}
405  };  };
406    
# Line 465  Line 414 
414  /* Coeffs for last = 1, run = 1 -> 6. Indexed by [run-1][level-1] */  /* Coeffs for last = 1, run = 1 -> 6. Indexed by [run-1][level-1] */
415    
416  static VLC coeff_tab9[6][3] = {  static VLC coeff_tab9[6][3] = {
417          /*          /* run = 1 */
418             run = 1          {{0x0f, 6}, {0x16, 9}, {0x05, 10}},
419           */  
420          {          /* run = 2 */
421           {0x0f, 6}, {0x16, 9}, {0x05, 10}          {{0x0e, 6}, {0x04, 10}, {0x00, 0}},
422           },  
423          /*          /* run = 3 */
424             run = 2          {{0x11, 7}, {0x24, 11}, {0x00, 0}},
425           */  
426          {          /* run = 4 */
427           {0x0e, 6}, {0x04, 10}, {0x00, 0}          {{0x10, 7}, {0x25, 11}, {0x00, 0}},
428           },  
429          /*          /* run = 5 */
430             run = 3          {{0x13, 7}, {0x5a, 12}, {0x00, 0}},
431           */  
432          {          /* run = 6 */
433           {0x11, 7}, {0x24, 11}, {0x00, 0}          {{0x15, 8}, {0x5b, 12}, {0x00, 0}}
          },  
         /*  
            run = 4  
          */  
         {  
          {0x10, 7}, {0x25, 11}, {0x00, 0}  
          },  
         /*  
            run = 5  
          */  
         {  
          {0x13, 7}, {0x5a, 12}, {0x00, 0}  
          },  
         /*  
            run = 6  
          */  
         {  
          {0x15, 8}, {0x5b, 12}, {0x00, 0}  
          }  
434  };  };
435    
436  /* Coeffs for last = 1, run = 7 -> 20. Indexed by [run-7] */  /* Coeffs for last = 1, run = 7 -> 20. Indexed by [run-7] */
437    
438  static VLC coeff_tab10[14][1] = {  static VLC coeff_tab10[14][1] = {
439          {{0x14, 8}}, {{0x13, 8}}, {{0x1a, 8}}, {{0x15, 9}},          {{0x14, 8}},
440          {{0x14, 9}}, {{0x13, 9}}, {{0x12, 9}}, {{0x11, 9}},          {{0x13, 8}},
441          {{0x26, 11}}, {{0x27, 11}}, {{0x5c, 12}}, {{0x5d, 12}},          {{0x1a, 8}},
442          {{0x5e, 12}}, {{0x5f, 12}}          {{0x15, 9}},
443            {{0x14, 9}},
444            {{0x13, 9}},
445            {{0x12, 9}},
446            {{0x11, 9}},
447            {{0x26, 11}},
448            {{0x27, 11}},
449            {{0x5c, 12}},
450            {{0x5d, 12}},
451            {{0x5e, 12}},
452            {{0x5f, 12}}
453  };  };
454    
455    
# Line 637  Line 577 
577          coeff_inter_last1,          coeff_inter_last1,
578  };  };
579    
580  /* MCBPC Indexing by cbpc in first two bits, mode in last two.  /*
581   CBPC as in table 4/H.263, MB type (mode): 3 = 01, 4 = 10.   * MCBPC Indexing by cbpc in first two bits, mode in last two.
582   Example: cbpc = 01 and mode = 4 gives index = 0110 = 6. */   * CBPC as in table 4/H.263, MB type (mode): 3 = 01, 4 = 10.
583     * Example: cbpc = 01 and mode = 4 gives index = 0110 = 6.
584     */
585    
586  static VLC mcbpc_intra_tab[15] = {  static VLC mcbpc_intra_tab[15] = {
587          {0x01, 9}, {0x01, 1}, {0x01, 4}, {0x00, 0},          {0x01, 9}, {0x01, 1}, {0x01, 4}, {0x00, 0},
# Line 952  Line 894 
894   ******************************************************************/   ******************************************************************/
895    
896  static const VLC mcbpc_intra_table[64] = {  static const VLC mcbpc_intra_table[64] = {
897          {-1, 0},          {-1, 0}, {20, 6}, {36, 6}, {52, 6}, {4, 4},  {4, 4},  {4, 4},  {4, 4},
898          {20, 6}, {36, 6}, {52, 6}, {4, 4}, {4, 4}, {4, 4},          {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3},
899          {4, 4}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3},          {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3},
900          {19, 3}, {19, 3}, {19, 3}, {35, 3}, {35, 3}, {35, 3},          {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3},
901          {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {51, 3},          {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},
902          {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3},          {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},      {3, 1},  {3, 1},  {3, 1},
903          {51, 3}, {3, 1},          {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},
904          {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1},          {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1}
         {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1},  
         {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1},  
         {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1},  
         {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1}, {3, 1},  
         {3, 1}  
905  };  };
906    
907    
908  static const VLC mcbpc_inter_table[257] = {  static const VLC mcbpc_inter_table[257] = {
909          {VLC_ERROR, 0},          {VLC_ERROR, 0}, {255, 9}, {52, 9}, {36, 9}, {20, 9}, {49, 9}, {35, 8}, {35, 8},
910          {255, 9}, {52, 9}, {36, 9}, {20, 9}, {49, 9}, {35, 8}, {35, 8}, {19, 8},          {19, 8}, {19, 8}, {50, 8}, {50, 8}, {51, 7}, {51, 7}, {51, 7}, {51, 7},
911                  {19, 8},          {34, 7}, {34, 7}, {34, 7}, {34, 7}, {18, 7}, {18, 7}, {18, 7}, {18, 7},
912          {50, 8}, {50, 8}, {51, 7}, {51, 7}, {51, 7}, {51, 7}, {34, 7}, {34, 7},          {33, 7}, {33, 7}, {33, 7}, {33, 7}, {17, 7}, {17, 7}, {17, 7}, {17, 7},
913                  {34, 7},          {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6},
914          {34, 7}, {18, 7}, {18, 7}, {18, 7}, {18, 7}, {33, 7}, {33, 7}, {33, 7},          {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6},
915                  {33, 7},          {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5},
916          {17, 7}, {17, 7}, {17, 7}, {17, 7}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6},          {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5},
         {4, 6}, {4, 6}, {4, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48,  
                                                                                                                                                   6},  
         {48, 6}, {48, 6}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5},  
         {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5},  
917          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
                 {32, 4},  
918          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
                 {32, 4},  
919          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
920                  {32, 4},          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
921          {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {16, 4}, {16, 4}, {16, 4},          {16, 4}, {16, 4}, {16, 4}, {16, 4},     {16, 4}, {16, 4}, {16, 4}, {16, 4},
                 {16, 4},  
922          {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},          {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
                 {16, 4},  
923          {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},          {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
                 {16, 4},  
924          {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},          {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
925                  {16, 4},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
926          {16, 4}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
927          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
928          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
929          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
930          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
931          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
932          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},          {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
933          {2, 3}, {2, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
934          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
935          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
936          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
937          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
938          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
939          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
940          {1, 3}, {1, 3}, {1, 3}, {0, 1}          {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
941            {0, 1}
942  };  };
943    
944  static const VLC cbpy_table[64] = {  static const VLC cbpy_table[64] = {
# Line 1019  Line 948 
948          {14, 4}, {14, 4}, {14, 4}, {14, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4},          {14, 4}, {14, 4}, {14, 4}, {14, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4},
949          {13, 4}, {13, 4}, {13, 4}, {13, 4}, {3, 4}, {3, 4}, {3, 4}, {3, 4},          {13, 4}, {13, 4}, {13, 4}, {13, 4}, {3, 4}, {3, 4}, {3, 4}, {3, 4},
950          {11, 4}, {11, 4}, {11, 4}, {11, 4}, {7, 4}, {7, 4}, {7, 4}, {7, 4},          {11, 4}, {11, 4}, {11, 4}, {11, 4}, {7, 4}, {7, 4}, {7, 4}, {7, 4},
951          {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2},          {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2},
952          {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2},          {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}
         {15, 2}, {15, 2}  
953  };  };
954    
955    
956  VLC TMNMVtab0[] = {  VLC TMNMVtab0[] = {
957          {3, 4}, {-3, 4}, {2, 3}, {2, 3}, {-2, 3}, {-2, 3}, {1, 2}, {1, 2}, {1, 2},          {3, 4}, {-3, 4}, {2, 3}, {2, 3}, {-2, 3}, {-2, 3}, {1, 2},
958                  {1, 2},          {1, 2}, {1, 2}, {1, 2}, {-1, 2}, {-1, 2}, {-1, 2}, {-1, 2}
         {-1, 2}, {-1, 2}, {-1, 2}, {-1, 2}  
959  };  };
960    
961  VLC TMNMVtab1[] = {  VLC TMNMVtab1[] = {
962          {12, 10}, {-12, 10}, {11, 10}, {-11, 10}, {10, 9}, {10, 9}, {-10, 9}, {-10,          {12, 10}, {-12, 10}, {11, 10}, {-11, 10},
963                                                                                                                                                     9},          {10, 9}, {10, 9}, {-10, 9}, {-10, 9},
964          {9, 9}, {9, 9}, {-9, 9}, {-9, 9}, {8, 9}, {8, 9}, {-8, 9}, {-8, 9}, {7, 7},          {9, 9}, {9, 9}, {-9, 9}, {-9, 9},
965                  {7, 7},          {8, 9}, {8, 9}, {-8, 9}, {-8, 9},
966          {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {-7, 7}, {-7, 7}, {-7, 7},          {7, 7}, {7, 7}, {7, 7}, {7, 7},
967                  {-7, 7},          {7, 7}, {7, 7}, {7, 7}, {7, 7},
968          {-7, 7}, {-7, 7}, {-7, 7}, {-7, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7},          {-7, 7}, {-7, 7}, {-7, 7}, {-7, 7},
969                  {6, 7},          {-7, 7}, {-7, 7}, {-7, 7}, {-7, 7},
970          {6, 7}, {6, 7}, {-6, 7}, {-6, 7}, {-6, 7}, {-6, 7}, {-6, 7}, {-6, 7}, {-6,          {6, 7}, {6, 7}, {6, 7}, {6, 7},
971                                                                                                                                                     7},          {6, 7}, {6, 7}, {6, 7}, {6, 7},
972          {-6, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7},          {-6, 7}, {-6, 7}, {-6, 7}, {-6, 7},
973                  {-5, 7},          {-6, 7}, {-6, 7}, {-6, 7}, {-6, 7},
974          {-5, 7}, {-5, 7}, {-5, 7}, {-5, 7}, {-5, 7}, {-5, 7}, {-5, 7}, {4, 6}, {4,          {5, 7}, {5, 7}, {5, 7}, {5, 7},
975                                                                                                                                                          6},          {5, 7}, {5, 7}, {5, 7}, {5, 7},
976                  {4, 6},          {-5, 7}, {-5, 7}, {-5, 7}, {-5, 7},
977          {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4,          {-5, 7}, {-5, 7}, {-5, 7}, {-5, 7},
978                                                                                                                                                           6},          {4, 6}, {4, 6}, {4, 6}, {4, 6},
979                  {4, 6},          {4, 6}, {4, 6}, {4, 6}, {4, 6},
980          {4, 6}, {4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4,          {4, 6}, {4, 6}, {4, 6}, {4, 6},
981                                                                                                                                                     6},          {4, 6}, {4, 6}, {4, 6}, {4, 6},
982          {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},          {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},
983                  {-4, 6}          {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},
984            {-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},
985            {-4, 6}, {-4, 6}, {-4, 6},{-4, 6}
986  };  };
987    
988  VLC TMNMVtab2[] = {  VLC TMNMVtab2[] = {
989          {32, 12}, {-32, 12}, {31, 12}, {-31, 12}, {30, 11}, {30, 11}, {-30, 11},          {32, 12}, {-32, 12}, {31, 12}, {-31, 12},
990                  {-30, 11},          {30, 11}, {30, 11}, {-30, 11}, {-30, 11},
991          {29, 11}, {29, 11}, {-29, 11}, {-29, 11}, {28, 11}, {28, 11}, {-28, 11},          {29, 11}, {29, 11}, {-29, 11}, {-29, 11},
992                  {-28, 11},          {28, 11}, {28, 11}, {-28, 11}, {-28, 11},
993          {27, 11}, {27, 11}, {-27, 11}, {-27, 11}, {26, 11}, {26, 11}, {-26, 11},          {27, 11}, {27, 11}, {-27, 11}, {-27, 11},
994                  {-26, 11},          {26, 11}, {26, 11}, {-26, 11}, {-26, 11},
995          {25, 11}, {25, 11}, {-25, 11}, {-25, 11}, {24, 10}, {24, 10}, {24, 10},          {25, 11}, {25, 11}, {-25, 11}, {-25, 11},
996                  {24, 10},          {24, 10}, {24, 10}, {24, 10}, {24, 10},
997          {-24, 10}, {-24, 10}, {-24, 10}, {-24, 10}, {23, 10}, {23, 10}, {23, 10},          {-24, 10}, {-24, 10}, {-24, 10}, {-24, 10},
998                  {23, 10},          {23, 10}, {23, 10}, {23, 10}, {23, 10},
999          {-23, 10}, {-23, 10}, {-23, 10}, {-23, 10}, {22, 10}, {22, 10}, {22, 10},          {-23, 10}, {-23, 10}, {-23, 10}, {-23, 10},
1000                  {22, 10},          {22, 10}, {22, 10}, {22, 10}, {22, 10},
1001          {-22, 10}, {-22, 10}, {-22, 10}, {-22, 10}, {21, 10}, {21, 10}, {21, 10},          {-22, 10}, {-22, 10}, {-22, 10}, {-22, 10},
1002                  {21, 10},          {21, 10}, {21, 10}, {21, 10}, {21, 10},
1003          {-21, 10}, {-21, 10}, {-21, 10}, {-21, 10}, {20, 10}, {20, 10}, {20, 10},          {-21, 10}, {-21, 10}, {-21, 10}, {-21, 10},
1004                  {20, 10},          {20, 10}, {20, 10}, {20, 10}, {20, 10},
1005          {-20, 10}, {-20, 10}, {-20, 10}, {-20, 10}, {19, 10}, {19, 10}, {19, 10},          {-20, 10}, {-20, 10}, {-20, 10}, {-20, 10},
1006                  {19, 10},          {19, 10}, {19, 10}, {19, 10}, {19, 10},
1007          {-19, 10}, {-19, 10}, {-19, 10}, {-19, 10}, {18, 10}, {18, 10}, {18, 10},          {-19, 10}, {-19, 10}, {-19, 10}, {-19, 10},
1008                  {18, 10},          {18, 10}, {18, 10}, {18, 10}, {18, 10},
1009          {-18, 10}, {-18, 10}, {-18, 10}, {-18, 10}, {17, 10}, {17, 10}, {17, 10},          {-18, 10}, {-18, 10}, {-18, 10}, {-18, 10},
1010                  {17, 10},          {17, 10}, {17, 10}, {17, 10}, {17, 10},
1011          {-17, 10}, {-17, 10}, {-17, 10}, {-17, 10}, {16, 10}, {16, 10}, {16, 10},          {-17, 10}, {-17, 10}, {-17, 10}, {-17, 10},
1012                  {16, 10},          {16, 10}, {16, 10}, {16, 10}, {16, 10},
1013          {-16, 10}, {-16, 10}, {-16, 10}, {-16, 10}, {15, 10}, {15, 10}, {15, 10},          {-16, 10}, {-16, 10}, {-16, 10}, {-16, 10},
1014                  {15, 10},          {15, 10}, {15, 10}, {15, 10}, {15, 10},
1015          {-15, 10}, {-15, 10}, {-15, 10}, {-15, 10}, {14, 10}, {14, 10}, {14, 10},          {-15, 10}, {-15, 10}, {-15, 10}, {-15, 10},
1016                  {14, 10},          {14, 10}, {14, 10}, {14, 10}, {14, 10},
1017          {-14, 10}, {-14, 10}, {-14, 10}, {-14, 10}, {13, 10}, {13, 10}, {13, 10},          {-14, 10}, {-14, 10}, {-14, 10}, {-14, 10},
1018                  {13, 10},          {13, 10}, {13, 10}, {13, 10}, {13, 10},
1019          {-13, 10}, {-13, 10}, {-13, 10}, {-13, 10}          {-13, 10}, {-13, 10}, {-13, 10}, {-13, 10}
1020  };  };
1021    
# Line 1261  Line 1190 
1190  };  };
1191    
1192  static const VLC dc_lum_tab[] = {  static const VLC dc_lum_tab[] = {
1193          {0, 0},          {0, 0}, {4, 3}, {3, 3}, {0, 3},
         {4, 3}, {3, 3}, {0, 3},  
1194          {2, 2}, {2, 2}, {1, 2}, {1, 2},          {2, 2}, {2, 2}, {1, 2}, {1, 2},
1195  };  };
1196    

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4