annotate intrax8.c @ 7733:50a75afca76f libavcodec

Fix typo in element type
author superdump
date Fri, 29 Aug 2008 20:19:23 +0000
parents 1d735690e172
children 800444234375
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
1 /*
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
2 * This file is part of FFmpeg.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
3 *
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
4 * FFmpeg is free software; you can redistribute it and/or
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
5 * modify it under the terms of the GNU Lesser General Public
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
6 * License as published by the Free Software Foundation; either
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
7 * version 2.1 of the License, or (at your option) any later version.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
8 *
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
9 * FFmpeg is distributed in the hope that it will be useful,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
12 * Lesser General Public License for more details.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
13 *
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
14 * You should have received a copy of the GNU Lesser General Public
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
15 * License along with FFmpeg; if not, write to the Free Software
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
17 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
18
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
19 /**
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
20 * @file intrax8.c
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
21 * @brief IntraX8 (J-Frame) subdecoder, used by WMV2 and VC-1
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
22 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
23
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
24 #include "avcodec.h"
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
25 #include "bitstream.h"
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
26 #include "mpegvideo.h"
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
27 #include "msmpeg4data.h"
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
28 #include "intrax8huf.h"
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
29 #include "intrax8.h"
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
30
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
31 #define MAX_TABLE_DEPTH(table_bits, max_bits) ((max_bits+table_bits-1)/table_bits)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
32
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
33 #define DC_VLC_BITS 9
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
34 #define AC_VLC_BITS 9
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
35 #define OR_VLC_BITS 7
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
36
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
37 #define DC_VLC_MTD MAX_TABLE_DEPTH(DC_VLC_BITS, MAX_DC_VLC_BITS)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
38 #define AC_VLC_MTD MAX_TABLE_DEPTH(AC_VLC_BITS, MAX_AC_VLC_BITS)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
39 #define OR_VLC_MTD MAX_TABLE_DEPTH(OR_VLC_BITS, MAX_OR_VLC_BITS)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
40
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
41 static VLC j_ac_vlc[2][2][8]; //[quant<13],[intra/inter],[select]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
42 static VLC j_dc_vlc[2][8]; //[quant], [select]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
43 static VLC j_orient_vlc[2][4]; //[quant], [select]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
44
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
45 static void x8_vlc_init(){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
46 int i;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
47
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
48 #define init_ac_vlc(dst,src) \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
49 init_vlc(&dst, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
50 AC_VLC_BITS,77, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
51 &src[1],4,2, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
52 &src[0],4,2, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
53 1)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
54 //set ac tables
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
55 for(i=0;i<8;i++){
5903
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
56 init_ac_vlc( j_ac_vlc[0][0][i], x8_ac0_highquant_table[i][0] );
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
57 init_ac_vlc( j_ac_vlc[0][1][i], x8_ac1_highquant_table[i][0] );
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
58 init_ac_vlc( j_ac_vlc[1][0][i], x8_ac0_lowquant_table [i][0] );
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
59 init_ac_vlc( j_ac_vlc[1][1][i], x8_ac1_lowquant_table [i][0] );
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
60 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
61 #undef init_ac_vlc
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
62
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
63 //set dc tables
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
64 #define init_dc_vlc(dst,src) \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
65 init_vlc(&dst, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
66 DC_VLC_BITS,34, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
67 &src[1],4,2, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
68 &src[0],4,2, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
69 1);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
70 for(i=0;i<8;i++){
5903
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
71 init_dc_vlc( j_dc_vlc[0][i], x8_dc_highquant_table[i][0]);
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
72 init_dc_vlc( j_dc_vlc[1][i], x8_dc_lowquant_table [i][0]);
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
73 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
74 #undef init_dc_vlc
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
75
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
76 //set orient tables
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
77 #define init_or_vlc(dst,src) \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
78 init_vlc(&dst, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
79 OR_VLC_BITS,12, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
80 &src[1],4,2, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
81 &src[0],4,2, \
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
82 1);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
83 for(i=0;i<2;i++){
5903
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
84 init_or_vlc( j_orient_vlc[0][i], x8_orient_highquant_table[i][0]);
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
85 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
86 for(i=0;i<4;i++){
5903
b838537e0ab3 make some tables static
aurel
parents: 5901
diff changeset
87 init_or_vlc( j_orient_vlc[1][i], x8_orient_lowquant_table [i][0])
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
88 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
89 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
90 #undef init_or_vlc
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
91
5898
9022754a5fa5 remove inline from non speed critical functions
michael
parents: 5897
diff changeset
92 static void x8_reset_vlc_tables(IntraX8Context * w){
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
93 memset(w->j_dc_vlc,0,sizeof(w->j_dc_vlc));
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
94 memset(w->j_ac_vlc,0,sizeof(w->j_ac_vlc));
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
95 w->j_orient_vlc=NULL;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
96 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
97
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
98 static inline void x8_select_ac_table(IntraX8Context * const w , int mode){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
99 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
100 int table_index;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
101
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
102 assert(mode<4);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
103
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
104 if( w->j_ac_vlc[mode] ) return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
105
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
106 table_index = get_bits(&s->gb, 3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
107 w->j_ac_vlc[mode] = &j_ac_vlc[w->quant<13][mode>>1][table_index];//2 modes use same tables
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
108 assert(w->j_ac_vlc[mode]);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
109 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
110
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
111 static inline int x8_get_orient_vlc(IntraX8Context * w){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
112 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
113 int table_index;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
114
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
115 if(!w->j_orient_vlc ){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
116 table_index = get_bits(&s->gb, 1+(w->quant<13) );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
117 w->j_orient_vlc = &j_orient_vlc[w->quant<13][table_index];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
118 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
119 assert(w->j_orient_vlc);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
120 assert(w->j_orient_vlc->table);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
121
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
122 return get_vlc2(&s->gb, w->j_orient_vlc->table, OR_VLC_BITS, OR_VLC_MTD);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
123 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
124
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
125 #define extra_bits(eb) (eb)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
126 #define extra_run (0xFF<<8)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
127 #define extra_level (0x00<<8)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
128 #define run_offset(r) ((r)<<16)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
129 #define level_offset(l) ((l)<<24)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
130 static const uint32_t ac_decode_table[]={
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
131 /*46*/ extra_bits(3) | extra_run | run_offset(16) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
132 /*47*/ extra_bits(3) | extra_run | run_offset(24) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
133 /*48*/ extra_bits(2) | extra_run | run_offset( 4) | level_offset( 1),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
134 /*49*/ extra_bits(3) | extra_run | run_offset( 8) | level_offset( 1),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
135
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
136 /*50*/ extra_bits(5) | extra_run | run_offset(32) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
137 /*51*/ extra_bits(4) | extra_run | run_offset(16) | level_offset( 1),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
138
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
139 /*52*/ extra_bits(2) | extra_level | run_offset( 0) | level_offset( 4),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
140 /*53*/ extra_bits(2) | extra_level | run_offset( 0) | level_offset( 8),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
141 /*54*/ extra_bits(2) | extra_level | run_offset( 0) | level_offset(12),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
142 /*55*/ extra_bits(3) | extra_level | run_offset( 0) | level_offset(16),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
143 /*56*/ extra_bits(3) | extra_level | run_offset( 0) | level_offset(24),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
144
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
145 /*57*/ extra_bits(2) | extra_level | run_offset( 1) | level_offset( 3),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
146 /*58*/ extra_bits(3) | extra_level | run_offset( 1) | level_offset( 7),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
147
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
148 /*59*/ extra_bits(2) | extra_run | run_offset(16) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
149 /*60*/ extra_bits(2) | extra_run | run_offset(20) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
150 /*61*/ extra_bits(2) | extra_run | run_offset(24) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
151 /*62*/ extra_bits(2) | extra_run | run_offset(28) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
152 /*63*/ extra_bits(4) | extra_run | run_offset(32) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
153 /*64*/ extra_bits(4) | extra_run | run_offset(48) | level_offset( 0),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
154
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
155 /*65*/ extra_bits(2) | extra_run | run_offset( 4) | level_offset( 1),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
156 /*66*/ extra_bits(3) | extra_run | run_offset( 8) | level_offset( 1),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
157 /*67*/ extra_bits(4) | extra_run | run_offset(16) | level_offset( 1),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
158
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
159 /*68*/ extra_bits(2) | extra_level | run_offset( 0) | level_offset( 4),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
160 /*69*/ extra_bits(3) | extra_level | run_offset( 0) | level_offset( 8),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
161 /*70*/ extra_bits(4) | extra_level | run_offset( 0) | level_offset(16),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
162
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
163 /*71*/ extra_bits(2) | extra_level | run_offset( 1) | level_offset( 3),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
164 /*72*/ extra_bits(3) | extra_level | run_offset( 1) | level_offset( 7),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
165 };
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
166 //extra_bits = 3bits; extra_run/level = 1 bit; run_offset = 6bits; level_offset = 5 bits;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
167 #undef extra_bits
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
168 #undef extra_run
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
169 #undef extra_level
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
170 #undef run_offset
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
171 #undef level_offset
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
172
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
173 static void x8_get_ac_rlf(IntraX8Context * const w, const int mode,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
174 int * const run, int * const level, int * const final){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
175 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
176 int i,e;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
177
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
178 // x8_select_ac_table(w,mode);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
179 i = get_vlc2(&s->gb, w->j_ac_vlc[mode]->table, AC_VLC_BITS, AC_VLC_MTD);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
180
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
181 if(i<46){ //[0-45]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
182 int t,l;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
183 if(i<0){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
184 (*level)=(*final)=//prevent 'may be used unilitialized'
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
185 (*run)=64;//this would cause error exit in the ac loop
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
186 return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
187 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
188
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
189 (*final) = t = (i>22);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
190 i-=23*t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
191 /*
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
192 i== 0-15 r=0-15 l=0 ;r=i& %01111
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
193 i==16-19 r=0-3 l=1 ;r=i& %00011
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
194 i==20-21 r=0-1 l=2 ;r=i& %00001
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
195 i==22 r=0 l=3 ;r=i& %00000
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
196 l=lut_l[i/2]={0,0,0,0,0,0,0,0,1,1,2,3}[i>>1];// 11 10'01 01'00 00'00 00'00 00'00 00 => 0xE50000
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
197 t=lut_mask[l]={0x0f,0x03,0x01,0x00}[l]; as i<256 the higher bits do not matter */
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
198 l=(0xE50000>>(i&(0x1E)))&3;/*0x1E or (~1) or ((i>>1)<<1)*/
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
199 t=(0x01030F>>(l<<3));
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
200
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
201 (*run) = i&t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
202 (*level) = l;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
203 }else if(i<73){//[46-72]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
204 uint32_t sm;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
205 uint32_t mask;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
206
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
207 i-=46;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
208 sm=ac_decode_table[i];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
209
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
210 e=get_bits(&s->gb,sm&0xF);sm>>=8;//3bits
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
211 mask=sm&0xff;sm>>=8; //1bit
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
212
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
213 (*run) =(sm&0xff) + (e&( mask));//6bits
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
214 (*level)=(sm>>8) + (e&(~mask));//5bits
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
215 (*final)=i>(58-46);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
216 }else if(i<75){//[73-74]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
217 static const uint8_t crazy_mix_runlevel[32]={
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
218 0x22,0x32,0x33,0x53,0x23,0x42,0x43,0x63,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
219 0x24,0x52,0x34,0x73,0x25,0x62,0x44,0x83,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
220 0x26,0x72,0x35,0x54,0x27,0x82,0x45,0x64,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
221 0x28,0x92,0x36,0x74,0x29,0xa2,0x46,0x84};
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
222
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
223 (*final)=!(i&1);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
224 e=get_bits(&s->gb,5);//get the extra bits
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
225 (*run) =crazy_mix_runlevel[e]>>4;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
226 (*level)=crazy_mix_runlevel[e]&0x0F;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
227 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
228 (*level)=get_bits( &s->gb, 7-3*(i&1));
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
229 (*run) =get_bits( &s->gb, 6);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
230 (*final)=get_bits1(&s->gb);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
231 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
232 return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
233 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
234
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
235 //static const uint8_t dc_extra_sbits[] ={0, 1,1, 1,1, 2,2, 3,3, 4,4, 5,5, 6,6, 7,7 };
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
236 static const uint8_t dc_index_offset[] ={ 0, 1,2, 3,4, 5,7, 9,13, 17,25, 33,49, 65,97, 129,193};
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
237
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
238 static int x8_get_dc_rlf(IntraX8Context * const w,int const mode, int * const level, int * const final){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
239 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
240 int i,e,c;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
241
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
242 assert(mode<3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
243 if( !w->j_dc_vlc[mode] ) {
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
244 int table_index;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
245 table_index = get_bits(&s->gb, 3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
246 //4 modes, same table
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
247 w->j_dc_vlc[mode]= &j_dc_vlc[w->quant<13][table_index];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
248 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
249 assert(w->j_dc_vlc);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
250 assert(w->j_dc_vlc[mode]->table);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
251
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
252 i=get_vlc2(&s->gb, w->j_dc_vlc[mode]->table, DC_VLC_BITS, DC_VLC_MTD);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
253
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
254 /*(i>=17) {i-=17;final=1;}*/
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
255 c= i>16;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
256 (*final)=c;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
257 i-=17*c;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
258
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
259 if(i<=0){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
260 (*level)=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
261 return -i;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
262 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
263 c=(i+1)>>1;//hackish way to calculate dc_extra_sbits[]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
264 c-=c>1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
265
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
266 e=get_bits(&s->gb,c);//get the extra bits
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
267 i=dc_index_offset[i]+(e>>1);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
268
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
269 e= -(e & 1);//0,0xffffff
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
270 (*level)= (i ^ e) - e;// (i^0)-0 , (i^0xff)-(-1)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
271 return 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
272 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
273 //end of huffman
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
274
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
275 static int x8_setup_spatial_predictor(IntraX8Context * const w, const int chroma){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
276 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
277 int range;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
278 int sum;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
279 int quant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
280
5907
fbd10e6dfbe1 cosmetics: Fix spacial --> spatial typo in function names.
diego
parents: 5906
diff changeset
281 s->dsp.x8_setup_spatial_compensation(s->dest[chroma], s->edge_emu_buffer,
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
282 s->current_picture.linesize[chroma>0],
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
283 &range, &sum, w->edges);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
284 if(chroma){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
285 w->orient=w->chroma_orient;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
286 quant=w->quant_dc_chroma;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
287 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
288 quant=w->quant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
289 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
290
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
291 w->flat_dc=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
292 if(range < quant || range < 3){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
293 w->orient=0;
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
294 if(range < 3){//yep you read right, a +-1 idct error may break decoding!
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
295 w->flat_dc=1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
296 sum+=9;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
297 w->predicted_dc = (sum*6899)>>17;//((1<<17)+9)/(8+8+1+2)=6899
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
298 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
299 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
300 if(chroma)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
301 return 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
302
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
303 assert(w->orient < 3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
304 if(range < 2*w->quant){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
305 if( (w->edges&3) == 0){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
306 if(w->orient==1) w->orient=11;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
307 if(w->orient==2) w->orient=10;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
308 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
309 w->orient=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
310 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
311 w->raw_orient=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
312 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
313 static const uint8_t prediction_table[3][12]={
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
314 {0,8,4, 10,11, 2,6,9,1,3,5,7},
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
315 {4,0,8, 11,10, 3,5,2,6,9,1,7},
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
316 {8,0,4, 10,11, 1,7,2,6,9,3,5}
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
317 };
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
318 w->raw_orient=x8_get_orient_vlc(w);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
319 if(w->raw_orient<0) return -1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
320 assert(w->raw_orient < 12 );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
321 assert(w->orient<3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
322 w->orient=prediction_table[w->orient][w->raw_orient];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
323 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
324 return 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
325 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
326
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
327 static void x8_update_predictions(IntraX8Context * const w, const int orient, const int est_run ){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
328 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
329
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
330 w->prediction_table[s->mb_x*2+(s->mb_y&1)] = (est_run<<2) + 1*(orient==4) + 2*(orient==8);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
331 /*
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
332 y=2n+0 ->//0 2 4
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
333 y=2n+1 ->//1 3 5
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
334 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
335 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
336 static void x8_get_prediction_chroma(IntraX8Context * const w){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
337 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
338
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
339 w->edges = 1*( !(s->mb_x>>1) );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
340 w->edges|= 2*( !(s->mb_y>>1) );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
341 w->edges|= 4*( s->mb_x >= (2*s->mb_width-1) );//mb_x for chroma would always be odd
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
342
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
343 w->raw_orient=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
344 if(w->edges&3){//lut_co[8]={inv,4,8,8, inv,4,8,8}<- =>{1,1,0,0;1,1,0,0} => 0xCC
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
345 w->chroma_orient=4<<((0xCC>>w->edges)&1);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
346 return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
347 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
348 w->chroma_orient = (w->prediction_table[2*s->mb_x-2] & 0x03)<<2;//block[x-1][y|1-1)]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
349 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
350
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
351 static void x8_get_prediction(IntraX8Context * const w){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
352 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
353 int a,b,c,i;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
354
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
355 w->edges = 1*( !s->mb_x );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
356 w->edges|= 2*( !s->mb_y );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
357 w->edges|= 4*( s->mb_x >= (2*s->mb_width-1) );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
358
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
359 switch(w->edges&3){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
360 case 0:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
361 break;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
362 case 1:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
363 //take the one from the above block[0][y-1]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
364 w->est_run = w->prediction_table[!(s->mb_y&1)]>>2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
365 w->orient = 1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
366 return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
367 case 2:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
368 //take the one from the previous block[x-1][0]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
369 w->est_run = w->prediction_table[2*s->mb_x-2]>>2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
370 w->orient = 2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
371 return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
372 case 3:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
373 w->est_run = 16;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
374 w->orient = 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
375 return;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
376 }
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
377 //no edge cases
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
378 b= w->prediction_table[2*s->mb_x + !(s->mb_y&1) ];//block[x ][y-1]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
379 a= w->prediction_table[2*s->mb_x-2 + (s->mb_y&1) ];//block[x-1][y ]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
380 c= w->prediction_table[2*s->mb_x-2 + !(s->mb_y&1) ];//block[x-1][y-1]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
381
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
382 w->est_run = FFMIN(b,a);
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
383 /* This condition has nothing to do with w->edges, even if it looks
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
384 similar it would trigger if e.g. x=3;y=2;
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
385 I guess somebody wrote something wrong and it became standard. */
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
386 if( (s->mb_x & s->mb_y) != 0 ) w->est_run=FFMIN(c,w->est_run);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
387 w->est_run>>=2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
388
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
389 a&=3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
390 b&=3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
391 c&=3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
392
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
393 i=( 0xFFEAF4C4>>(2*b+8*a) )&3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
394 if(i!=3) w->orient=i;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
395 else w->orient=( 0xFFEAD8>>(2*c+8*(w->quant>12)) )&3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
396 /*
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
397 lut1[b][a]={
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
398 ->{0, 1, 0, pad},
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
399 {0, 1, X, pad},
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
400 {2, 2, 2, pad}}
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
401 pad 2 2 2; pad X 1 0; pad 0 1 0 <-
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
402 -> 11 10 '10 10 '11 11'01 00 '11 00'01 00=>0xEAF4C4
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
403
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
404 lut2[q>12][c]={
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
405 ->{0,2,1,pad},
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
406 {2,2,2,pad}}
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
407 pad 2 2 2; pad 1 2 0 <-
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
408 -> 11 10'10 10 '11 01'10 00=>0xEAD8
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
409 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
410 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
411
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
412
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
413 static void x8_ac_compensation(IntraX8Context * const w, int const direction, int const dc_level){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
414 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
415 int t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
416 #define B(x,y) s->block[0][s->dsp.idct_permutation[(x)+(y)*8]]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
417 #define T(x) ((x) * dc_level + 0x8000) >> 16;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
418 switch(direction){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
419 case 0:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
420 t = T(3811);//h
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
421 B(1,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
422 B(0,1) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
423
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
424 t = T(487);//e
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
425 B(2,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
426 B(0,2) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
427
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
428 t = T(506);//f
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
429 B(3,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
430 B(0,3) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
431
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
432 t = T(135);//c
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
433 B(4,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
434 B(0,4) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
435 B(2,1) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
436 B(1,2) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
437 B(3,1) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
438 B(1,3) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
439
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
440 t = T(173);//d
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
441 B(5,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
442 B(0,5) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
443
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
444 t = T(61);//b
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
445 B(6,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
446 B(0,6) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
447 B(5,1) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
448 B(1,5) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
449
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
450 t = T(42); //a
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
451 B(7,0) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
452 B(0,7) -= t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
453 B(4,1) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
454 B(1,4) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
455 B(4,4) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
456
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
457 t = T(1084);//g
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
458 B(1,1) += t;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
459
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
460 s->block_last_index[0] = FFMAX(s->block_last_index[0], 7*8);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
461 break;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
462 case 1:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
463 B(0,1) -= T(6269);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
464 B(0,3) -= T( 708);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
465 B(0,5) -= T( 172);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
466 B(0,7) -= T( 73);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
467
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
468 s->block_last_index[0] = FFMAX(s->block_last_index[0], 7*8);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
469 break;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
470 case 2:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
471 B(1,0) -= T(6269);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
472 B(3,0) -= T( 708);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
473 B(5,0) -= T( 172);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
474 B(7,0) -= T( 73);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
475
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
476 s->block_last_index[0] = FFMAX(s->block_last_index[0], 7);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
477 break;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
478 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
479 #undef B
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
480 #undef T
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
481 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
482
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
483 static void dsp_x8_put_solidcolor(uint8_t const pix, uint8_t * dst, int const linesize){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
484 int k;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
485 for(k=0;k<8;k++){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
486 memset(dst,pix,8);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
487 dst+=linesize;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
488 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
489 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
490
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
491 static const int16_t quant_table[64] = {
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
492 256, 256, 256, 256, 256, 256, 259, 262,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
493 265, 269, 272, 275, 278, 282, 285, 288,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
494 292, 295, 299, 303, 306, 310, 314, 317,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
495 321, 325, 329, 333, 337, 341, 345, 349,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
496 353, 358, 362, 366, 371, 375, 379, 384,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
497 389, 393, 398, 403, 408, 413, 417, 422,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
498 428, 433, 438, 443, 448, 454, 459, 465,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
499 470, 476, 482, 488, 493, 499, 505, 511
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
500 };
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
501
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
502 static int x8_decode_intra_mb(IntraX8Context* const w, const int chroma){
5900
4a3dc304e623 indention
michael
parents: 5898
diff changeset
503 MpegEncContext * const s= w->s;
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
504
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
505 uint8_t * scantable;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
506 int final,run,level;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
507 int ac_mode,dc_mode,est_run,dc_level;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
508 int pos,n;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
509 int zeros_only;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
510 int use_quant_matrix;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
511 int sign;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
512
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
513 assert(w->orient<12);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
514 memset(s->block[0],0x00,64*sizeof(DCTELEM));
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
515
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
516 if(chroma){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
517 dc_mode=2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
518 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
519 dc_mode=!!w->est_run;//0,1
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
520 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
521
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
522 if(x8_get_dc_rlf(w, dc_mode, &dc_level, &final)) return -1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
523 n=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
524 zeros_only=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
525 if(!final){//decode ac
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
526 use_quant_matrix=w->use_quant_matrix;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
527 if(chroma){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
528 ac_mode = 1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
529 est_run = 64;//not used
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
530 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
531 if (w->raw_orient < 3){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
532 use_quant_matrix = 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
533 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
534 if(w->raw_orient > 4){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
535 ac_mode = 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
536 est_run = 64;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
537 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
538 if(w->est_run > 1){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
539 ac_mode = 2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
540 est_run=w->est_run;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
541 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
542 ac_mode = 3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
543 est_run = 64;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
544 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
545 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
546 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
547 x8_select_ac_table(w,ac_mode);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
548 /*scantable_selector[12]={0,2,0,1,1,1,0,2,2,0,1,2};<-
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
549 -> 10'01' 00'10' 10'00' 01'01' 01'00' 10'00 =>0x928548 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
550 scantable = w->scantable[ (0x928548>>(2*w->orient))&3 ].permutated;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
551 pos=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
552 do {
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
553 n++;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
554 if( n >= est_run ){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
555 ac_mode=3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
556 x8_select_ac_table(w,3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
557 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
558
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
559 x8_get_ac_rlf(w,ac_mode,&run,&level,&final);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
560
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
561 pos+=run+1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
562 if(pos>63){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
563 //this also handles vlc error in x8_get_ac_rlf
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
564 return -1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
565 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
566 level= (level+1) * w->dquant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
567 level+= w->qsum;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
568
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
569 sign = - get_bits1(&s->gb);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
570 level = (level ^ sign) - sign;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
571
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
572 if(use_quant_matrix){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
573 level = (level*quant_table[pos])>>8;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
574 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
575 s->block[0][ scantable[pos] ]=level;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
576 }while(!final);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
577
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
578 s->block_last_index[0]=pos;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
579 }else{//DC only
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
580 s->block_last_index[0]=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
581 if(w->flat_dc && ((unsigned)(dc_level+1)) < 3){//[-1;1]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
582 int32_t divide_quant= !chroma ? w->divide_quant_dc_luma:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
583 w->divide_quant_dc_chroma;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
584 int32_t dc_quant = !chroma ? w->quant:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
585 w->quant_dc_chroma;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
586
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
587 //original intent dc_level+=predicted_dc/quant; but it got lost somewhere in the rounding
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
588 dc_level+= (w->predicted_dc*divide_quant + (1<<12) )>>13;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
589
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
590 dsp_x8_put_solidcolor( av_clip_uint8((dc_level*dc_quant+4)>>3),
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
591 s->dest[chroma], s->current_picture.linesize[!!chroma]);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
592
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
593 goto block_placed;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
594 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
595 zeros_only = (dc_level == 0);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
596 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
597 if(!chroma){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
598 s->block[0][0] = dc_level*w->quant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
599 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
600 s->block[0][0] = dc_level*w->quant_dc_chroma;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
601 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
602
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
603 //there is !zero_only check in the original, but dc_level check is enough
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
604 if( (unsigned int)(dc_level+1) >= 3 && (w->edges&3) != 3 ){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
605 int direction;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
606 /*ac_comp_direction[orient] = { 0, 3, 3, 1, 1, 0, 0, 0, 2, 2, 2, 1 };<-
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
607 -> 01'10' 10'10' 00'00' 00'01' 01'11' 11'00 =>0x6A017C */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
608 direction= (0x6A017C>>(w->orient*2))&3;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
609 if (direction != 3){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
610 x8_ac_compensation(w, direction, s->block[0][0]);//modify block_last[]
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
611 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
612 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
613
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
614 if(w->flat_dc){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
615 dsp_x8_put_solidcolor(w->predicted_dc, s->dest[chroma], s->current_picture.linesize[!!chroma]);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
616 }else{
5907
fbd10e6dfbe1 cosmetics: Fix spacial --> spatial typo in function names.
diego
parents: 5906
diff changeset
617 s->dsp.x8_spatial_compensation[w->orient]( s->edge_emu_buffer,
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
618 s->dest[chroma],
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
619 s->current_picture.linesize[!!chroma] );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
620 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
621 if(!zeros_only)
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
622 s->dsp.idct_add ( s->dest[chroma],
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
623 s->current_picture.linesize[!!chroma],
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
624 s->block[0] );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
625
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
626 block_placed:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
627
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
628 if(!chroma){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
629 x8_update_predictions(w,w->orient,n);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
630 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
631
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
632 if(s->loop_filter){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
633 uint8_t* ptr = s->dest[chroma];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
634 int linesize = s->current_picture.linesize[!!chroma];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
635
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
636 if(!( (w->edges&2) || ( zeros_only && (w->orient|4)==4 ) )){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
637 s->dsp.x8_h_loop_filter(ptr, linesize, w->quant);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
638 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
639 if(!( (w->edges&1) || ( zeros_only && (w->orient|8)==8 ) )){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
640 s->dsp.x8_v_loop_filter(ptr, linesize, w->quant);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
641 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
642 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
643 return 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
644 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
645
5898
9022754a5fa5 remove inline from non speed critical functions
michael
parents: 5897
diff changeset
646 static void x8_init_block_index(MpegEncContext *s){ //FIXME maybe merge with ff_*
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
647 //not s->linesize as this would be wrong for field pics
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
648 //not that IntraX8 has interlacing support ;)
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
649 const int linesize = s->current_picture.linesize[0];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
650 const int uvlinesize= s->current_picture.linesize[1];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
651
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
652 s->dest[0] = s->current_picture.data[0];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
653 s->dest[1] = s->current_picture.data[1];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
654 s->dest[2] = s->current_picture.data[2];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
655
5897
6c7074038953 vertical align
michael
parents: 5896
diff changeset
656 s->dest[0] += s->mb_y * linesize << 3;
5896
43eabd0fd21b indention
michael
parents: 5895
diff changeset
657 s->dest[1] += ( s->mb_y&(~1) ) * uvlinesize << 2;//chroma blocks are on add rows
43eabd0fd21b indention
michael
parents: 5895
diff changeset
658 s->dest[2] += ( s->mb_y&(~1) ) * uvlinesize << 2;
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
659 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
660
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
661 /**
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
662 * Initialize IntraX8 frame decoder.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
663 * Requires valid MpegEncContext with valid s->mb_width before calling.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
664 * @param w pointer to IntraX8Context
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
665 * @param s pointer to MpegEncContext of the parent codec
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
666 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
667 void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
668
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
669 w->s=s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
670 x8_vlc_init();
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
671 assert(s->mb_width>0);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
672 w->prediction_table=av_mallocz(s->mb_width*2*2);//two rows, 2 blocks per cannon mb
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
673
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
674 ff_init_scantable(s->dsp.idct_permutation, &w->scantable[0], wmv1_scantable[0]);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
675 ff_init_scantable(s->dsp.idct_permutation, &w->scantable[1], wmv1_scantable[2]);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
676 ff_init_scantable(s->dsp.idct_permutation, &w->scantable[2], wmv1_scantable[3]);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
677 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
678
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
679 /**
6176
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
680 * Destroy IntraX8 frame structure.
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
681 * @param w pointer to IntraX8Context
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
682 */
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
683 void ff_intrax8_common_end(IntraX8Context * w)
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
684 {
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
685 av_freep(&w->prediction_table);
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
686 }
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
687
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 5907
diff changeset
688 /**
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
689 * Decode single IntraX8 frame.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
690 * The parent codec must fill s->loopfilter and s->gb (bitstream).
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
691 * The parent codec must call MPV_frame_start(), ff_er_frame_start() before calling this function.
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
692 * The parent codec must call ff_er_frame_end(), MPV_frame_end() after calling this function.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
693 * This function does not use MPV_decode_mb().
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
694 * lowres decoding is theoretically impossible.
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
695 * @param w pointer to IntraX8Context
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
696 * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
697 * @param quant_offset offset away from zero
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
698 */
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
699 //FIXME extern uint8_t wmv3_dc_scale_table[32];
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
700 int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_offset){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
701 MpegEncContext * const s= w->s;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
702 int mb_xy;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
703 assert(s);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
704 w->use_quant_matrix = get_bits1(&s->gb);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
705
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
706 w->dquant = dquant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
707 w->quant = dquant >> 1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
708 w->qsum = quant_offset;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
709
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
710 w->divide_quant_dc_luma = ((1<<16) + (w->quant>>1)) / w->quant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
711 if(w->quant < 5){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
712 w->quant_dc_chroma = w->quant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
713 w->divide_quant_dc_chroma = w->divide_quant_dc_luma;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
714 }else{
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
715 w->quant_dc_chroma = w->quant+((w->quant+3)>>3);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
716 w->divide_quant_dc_chroma = ((1<<16) + (w->quant_dc_chroma>>1)) / w->quant_dc_chroma;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
717 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
718 x8_reset_vlc_tables(w);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
719
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
720 s->resync_mb_x=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
721 s->resync_mb_y=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
722
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
723 for(s->mb_y=0; s->mb_y < s->mb_height*2; s->mb_y++){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
724 x8_init_block_index(s);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
725 mb_xy=(s->mb_y>>1)*s->mb_stride;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
726
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
727 for(s->mb_x=0; s->mb_x < s->mb_width*2; s->mb_x++){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
728 x8_get_prediction(w);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
729 if(x8_setup_spatial_predictor(w,0)) goto error;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
730 if(x8_decode_intra_mb(w,0)) goto error;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
731
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
732 if( s->mb_x & s->mb_y & 1 ){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
733 x8_get_prediction_chroma(w);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
734
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
735 /*when setting up chroma, no vlc is read,
5906
595a2f31430e misc spelling/grammar/wording fixes in comments
diego
parents: 5903
diff changeset
736 so no error condition can be reached*/
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
737 x8_setup_spatial_predictor(w,1);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
738 if(x8_decode_intra_mb(w,1)) goto error;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
739
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
740 x8_setup_spatial_predictor(w,2);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
741 if(x8_decode_intra_mb(w,2)) goto error;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
742
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
743 s->dest[1]+= 8;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
744 s->dest[2]+= 8;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
745
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
746 /*emulate MB info in the relevant tables*/
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
747 s->mbskip_table [mb_xy]=0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
748 s->mbintra_table[mb_xy]=1;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
749 s->current_picture.qscale_table[mb_xy]=w->quant;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
750 mb_xy++;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
751 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
752 s->dest[0]+= 8;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
753 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
754 if(s->mb_y&1){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
755 ff_draw_horiz_band(s, (s->mb_y-1)*8, 16);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
756 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
757 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
758
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
759 error:
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
760 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
761 (s->mb_x>>1)-1, (s->mb_y>>1)-1,
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
762 (AC_END|DC_END|MV_END) );
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
763 return 0;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents:
diff changeset
764 }