Mercurial > libavcodec.hg
comparison h263data.h @ 1482:b372ecde32a8 libavcodec
h263 stuffing decode fix
author | michaelni |
---|---|
date | Fri, 26 Sep 2003 22:18:25 +0000 |
parents | 1e39f273ecd6 |
children | e389d57db630 |
comparison
equal
deleted
inserted
replaced
1481:0cfed95c7707 | 1482:b372ecde32a8 |
---|---|
3 * H.263 tables. | 3 * H.263 tables. |
4 */ | 4 */ |
5 | 5 |
6 | 6 |
7 /* intra MCBPC, mb_type = (intra), then (intraq) */ | 7 /* intra MCBPC, mb_type = (intra), then (intraq) */ |
8 const uint8_t intra_MCBPC_code[8] = { 1, 1, 2, 3, 1, 1, 2, 3 }; | 8 const uint8_t intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 }; |
9 const uint8_t intra_MCBPC_bits[8] = { 1, 3, 3, 3, 4, 6, 6, 6 }; | 9 const uint8_t intra_MCBPC_bits[9] = { 1, 3, 3, 3, 4, 6, 6, 6, 9 }; |
10 | 10 |
11 /* inter MCBPC, mb_type = (inter), (intra), (interq), (intraq), (inter4v) */ | 11 /* inter MCBPC, mb_type = (inter), (intra), (interq), (intraq), (inter4v) */ |
12 /* Changed the tables for interq and inter4v+q, following the standard ** Juanjo ** */ | 12 /* Changed the tables for interq and inter4v+q, following the standard ** Juanjo ** */ |
13 const uint8_t inter_MCBPC_code[25] = { | 13 const uint8_t inter_MCBPC_code[28] = { |
14 1, 3, 2, 5, | 14 1, 3, 2, 5, |
15 3, 4, 3, 3, | 15 3, 4, 3, 3, |
16 3, 7, 6, 5, | 16 3, 7, 6, 5, |
17 4, 4, 3, 2, | 17 4, 4, 3, 2, |
18 2, 5, 4, 5, | 18 2, 5, 4, 5, |
19 1, /* Stuffing */ | 19 1, 0, 0, 0, /* Stuffing */ |
20 2, 12, 14, 15, | 20 2, 12, 14, 15, |
21 }; | 21 }; |
22 const uint8_t inter_MCBPC_bits[25] = { | 22 const uint8_t inter_MCBPC_bits[28] = { |
23 1, 4, 4, 6, | 23 1, 4, 4, 6, /* inter */ |
24 5, 8, 8, 7, | 24 5, 8, 8, 7, /* intra */ |
25 3, 7, 7, 9, | 25 3, 7, 7, 9, /* interQ */ |
26 6, 9, 9, 9, | 26 6, 9, 9, 9, /* intraQ */ |
27 3, 7, 7, 8, | 27 3, 7, 7, 8, /* inter4 */ |
28 9, /* Stuffing */ | 28 9, 0, 0, 0, /* Stuffing */ |
29 11, 13, 13, 13, | 29 11, 13, 13, 13,/* inter4Q*/ |
30 }; | 30 }; |
31 | |
32 /* This is the old table | |
33 static const uint8_t inter_MCBPC_code[20] = { | |
34 1, 3, 2, 5, | |
35 3, 4, 3, 3, | |
36 0, 1, 2, 3, | |
37 4, 4, 3, 2, | |
38 2, 5, 4, 5, | |
39 }; | |
40 static const uint8_t inter_MCBPC_bits[20] = { | |
41 1, 4, 4, 6, | |
42 5, 8, 8, 7, | |
43 12, 12, 12, 12, | |
44 6, 9, 9, 9, | |
45 3, 7, 7, 8, | |
46 };*/ | |
47 | 31 |
48 const uint8_t cbpy_tab[16][2] = | 32 const uint8_t cbpy_tab[16][2] = |
49 { | 33 { |
50 {3,4}, {5,5}, {4,5}, {9,4}, {3,5}, {7,4}, {2,6}, {11,4}, | 34 {3,4}, {5,5}, {4,5}, {9,4}, {3,5}, {7,4}, {2,6}, {11,4}, |
51 {2,5}, {3,6}, {5,4}, {10,4}, {4,4}, {8,4}, {6,4}, {3,2} | 35 {2,5}, {3,6}, {5,4}, {10,4}, {4,4}, {8,4}, {6,4}, {3,2} |