annotate svq3.c @ 7257:9b836800690a libavcodec

Fix MS ADPCM de- and encoding: first and second sample are swapped. Noticeable better decoding of e.g. http://samples.mplayerhq.hu/A-codecs/msadpcm-stereo/dance-b5th.asf
author reimar
date Sun, 13 Jul 2008 14:08:28 +0000
parents e943e1409077
children 6163e7de8604
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1 /*
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
2 * Copyright (c) 2003 The FFmpeg Project.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
3 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
14 * Lesser General Public License for more details.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
15 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
5215
2b72f9bc4f06 license header consistency cosmetics
diego
parents: 5127
diff changeset
19 */
2b72f9bc4f06 license header consistency cosmetics
diego
parents: 5127
diff changeset
20
2b72f9bc4f06 license header consistency cosmetics
diego
parents: 5127
diff changeset
21 /*
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
22 * How to use this decoder:
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
23 * SVQ3 data is transported within Apple Quicktime files. Quicktime files
1235
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
24 * have stsd atoms to describe media trak properties. A stsd atom for a
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
25 * video trak contains 1 or more ImageDescription atoms. These atoms begin
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
26 * with the 4-byte length of the atom followed by the codec fourcc. Some
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
27 * decoders need information in this atom to operate correctly. Such
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
28 * is the case with SVQ3. In order to get the best use out of this decoder,
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
29 * the calling app must make the SVQ3 ImageDescription atom available
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
30 * via the AVCodecContext's extradata[_size] field:
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
31 *
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
32 * AVCodecContext.extradata = pointer to ImageDescription, first characters
1235
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
33 * are expected to be 'S', 'V', 'Q', and '3', NOT the 4-byte atom length
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
34 * AVCodecContext.extradata_size = size of ImageDescription atom memory
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
35 * buffer (which will be the same as the ImageDescription atom size field
1235
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
36 * from the QT file, minus 4 bytes since the length is missing)
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
37 *
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
38 * You will know you have these parameters passed correctly when the decoder
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
39 * correctly decodes this file:
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
40 * ftp://ftp.mplayerhq.hu/MPlayer/samples/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
41 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
42
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
43 /**
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
44 * @file svq3.c
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
45 * svq3 decoder.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
46 */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
47
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
48 #define FULLPEL_MODE 1
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
49 #define HALFPEL_MODE 2
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
50 #define THIRDPEL_MODE 3
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
51 #define PREDICT_MODE 4
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
52
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
53 /* dual scan (from some older h264 draft)
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
54 o-->o-->o o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
55 | /|
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
56 o o o / o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
57 | / | |/ |
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
58 o o o o
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
59 /
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
60 o-->o-->o-->o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
61 */
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
62 static const uint8_t svq3_scan[16]={
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
63 0+0*4, 1+0*4, 2+0*4, 2+1*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
64 2+2*4, 3+0*4, 3+1*4, 3+2*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
65 0+1*4, 0+2*4, 1+1*4, 1+2*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
66 0+3*4, 1+3*4, 2+3*4, 3+3*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
67 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
68
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
69 static const uint8_t svq3_pred_0[25][2] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
70 { 0, 0 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
71 { 1, 0 }, { 0, 1 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
72 { 0, 2 }, { 1, 1 }, { 2, 0 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
73 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
74 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
75 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
76 { 2, 4 }, { 3, 3 }, { 4, 2 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
77 { 4, 3 }, { 3, 4 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
78 { 4, 4 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
79 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
80
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
81 static const int8_t svq3_pred_1[6][6][5] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
82 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
83 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
84 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
85 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
86 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
87 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
88 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
89 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
90 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
91 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
92 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
93 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
94 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
95
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
96 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
97 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
98 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
99 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
100 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
101 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
102
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
103 static const uint32_t svq3_dequant_coeff[32] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
104 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
105 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
106 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
107 61694, 68745, 77615, 89113,100253,109366,126635,141533
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
108 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
109
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
110
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
111 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
112 const int qmul= svq3_dequant_coeff[qp];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
113 #define stride 16
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
114 int i;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
115 int temp[16];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
116 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
117 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
118
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
119 for(i=0; i<4; i++){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
120 const int offset= y_offset[i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
121 const int z0= 13*(block[offset+stride*0] + block[offset+stride*4]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
122 const int z1= 13*(block[offset+stride*0] - block[offset+stride*4]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
123 const int z2= 7* block[offset+stride*1] - 17*block[offset+stride*5];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
124 const int z3= 17* block[offset+stride*1] + 7*block[offset+stride*5];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
125
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
126 temp[4*i+0]= z0+z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
127 temp[4*i+1]= z1+z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
128 temp[4*i+2]= z1-z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
129 temp[4*i+3]= z0-z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
130 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
131
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
132 for(i=0; i<4; i++){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
133 const int offset= x_offset[i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
134 const int z0= 13*(temp[4*0+i] + temp[4*2+i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
135 const int z1= 13*(temp[4*0+i] - temp[4*2+i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
136 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
137 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
138
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
139 block[stride*0 +offset]= ((z0 + z3)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
140 block[stride*2 +offset]= ((z1 + z2)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
141 block[stride*8 +offset]= ((z1 - z2)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
142 block[stride*10+offset]= ((z0 - z3)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
143 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
144 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
145 #undef stride
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
146
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
147 static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, int dc){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
148 const int qmul= svq3_dequant_coeff[qp];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
149 int i;
4176
23da44e8fd05 rename cropTbl -> ff_cropTbl
mru
parents: 3947
diff changeset
150 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
151
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
152 if (dc) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
153 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
154 block[0] = 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
155 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
156
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
157 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
158 const int z0= 13*(block[0 + 4*i] + block[2 + 4*i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
159 const int z1= 13*(block[0 + 4*i] - block[2 + 4*i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
160 const int z2= 7* block[1 + 4*i] - 17*block[3 + 4*i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
161 const int z3= 17* block[1 + 4*i] + 7*block[3 + 4*i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
162
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
163 block[0 + 4*i]= z0 + z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
164 block[1 + 4*i]= z1 + z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
165 block[2 + 4*i]= z1 - z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
166 block[3 + 4*i]= z0 - z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
167 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
168
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
169 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
170 const int z0= 13*(block[i + 4*0] + block[i + 4*2]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
171 const int z1= 13*(block[i + 4*0] - block[i + 4*2]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
172 const int z2= 7* block[i + 4*1] - 17*block[i + 4*3];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
173 const int z3= 17* block[i + 4*1] + 7*block[i + 4*3];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
174 const int rr= (dc + 0x80000);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
175
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
176 dst[i + stride*0]= cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
177 dst[i + stride*1]= cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
178 dst[i + stride*2]= cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
179 dst[i + stride*3]= cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
180 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
181 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
182
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
183 static inline int svq3_decode_block (GetBitContext *gb, DCTELEM *block,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
184 int index, const int type) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
185
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
186 static const uint8_t *const scan_patterns[4] =
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
187 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
188
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
189 int run, level, sign, vlc, limit;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
190 const int intra = (3 * type) >> 2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
191 const uint8_t *const scan = scan_patterns[type];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
192
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
193 for (limit=(16 >> intra); index < 16; index=limit, limit+=8) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
194 for (; (vlc = svq3_get_ue_golomb (gb)) != 0; index++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
195
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
196 if (vlc == INVALID_VLC)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
197 return -1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
198
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
199 sign = (vlc & 0x1) - 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
200 vlc = (vlc + 1) >> 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
201
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
202 if (type == 3) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
203 if (vlc < 3) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
204 run = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
205 level = vlc;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
206 } else if (vlc < 4) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
207 run = 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
208 level = 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
209 } else {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
210 run = (vlc & 0x3);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
211 level = ((vlc + 9) >> 2) - run;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
212 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
213 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
214 if (vlc < 16) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
215 run = svq3_dct_tables[intra][vlc].run;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
216 level = svq3_dct_tables[intra][vlc].level;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
217 } else if (intra) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
218 run = (vlc & 0x7);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
219 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1)));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
220 } else {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
221 run = (vlc & 0xF);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
222 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0)));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
223 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
224 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
225
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
226 if ((index += run) >= limit)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
227 return -1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
228
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
229 block[scan[index]] = (level ^ sign) - sign;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
230 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
231
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
232 if (type != 2) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
233 break;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
234 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
235 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
236
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
237 return 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
238 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
239
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
240 static inline void svq3_mc_dir_part (MpegEncContext *s,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
241 int x, int y, int width, int height,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
242 int mx, int my, int dxy,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
243 int thirdpel, int dir, int avg) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
244
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
245 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
246 uint8_t *src, *dest;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
247 int i, emu = 0;
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
248 int blocksize= 2 - (width>>3); //16->0, 8->1, 4->2
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
249
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
250 mx += x;
09165461996f optimize
michaelni
parents: 1264
diff changeset
251 my += y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
252
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
253 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) ||
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
254 my < 0 || my >= (s->v_edge_pos - height - 1)) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
255
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
256 if ((s->flags & CODEC_FLAG_EMU_EDGE)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
257 emu = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
258 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
259
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4395
diff changeset
260 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15));
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4395
diff changeset
261 my = av_clip (my, -16, (s->v_edge_pos - height + 15));
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
262 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
263
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
264 /* form component predictions */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
265 dest = s->current_picture.data[0] + x + y*s->linesize;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
266 src = pic->data[0] + mx + my*s->linesize;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
267
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
268 if (emu) {
1321
2365b4dfc450 don't step on the context
tmmm
parents: 1319
diff changeset
269 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1),
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
270 mx, my, s->h_edge_pos, s->v_edge_pos);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
271 src = s->edge_emu_buffer;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
272 }
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
273 if(thirdpel)
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
274 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height);
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
275 else
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
276 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
277
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
278 if (!(s->flags & CODEC_FLAG_GRAY)) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
279 mx = (mx + (mx < (int) x)) >> 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
280 my = (my + (my < (int) y)) >> 1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
281 width = (width >> 1);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
282 height = (height >> 1);
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
283 blocksize++;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
284
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
285 for (i=1; i < 3; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
286 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
287 src = pic->data[i] + mx + my*s->uvlinesize;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
288
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
289 if (emu) {
1321
2365b4dfc450 don't step on the context
tmmm
parents: 1319
diff changeset
290 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1),
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
291 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1));
1321
2365b4dfc450 don't step on the context
tmmm
parents: 1319
diff changeset
292 src = s->edge_emu_buffer;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
293 }
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
294 if(thirdpel)
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
295 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height);
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
296 else
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
297 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
298 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
299 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
300 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
301
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
302 static inline int svq3_mc_dir (H264Context *h, int size, int mode, int dir, int avg) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
303
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
304 int i, j, k, mx, my, dx, dy, x, y;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
305 MpegEncContext *const s = (MpegEncContext *) h;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
306 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
307 const int part_height = 16 >> ((unsigned) (size + 1) / 3);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
308 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
309 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
310 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
311
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
312 for (i=0; i < 16; i+=part_height) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
313 for (j=0; j < 16; j+=part_width) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
314 const int b_xy = (4*s->mb_x+(j>>2)) + (4*s->mb_y+(i>>2))*h->b_stride;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
315 int dxy;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
316 x = 16*s->mb_x + j;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
317 y = 16*s->mb_y + i;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
318 k = ((j>>2)&1) + ((i>>1)&2) + ((j>>1)&4) + (i&8);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
319
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
320 if (mode != PREDICT_MODE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
321 pred_motion (h, k, (part_width >> 2), dir, 1, &mx, &my);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
322 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
323 mx = s->next_picture.motion_val[0][b_xy][0]<<1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
324 my = s->next_picture.motion_val[0][b_xy][1]<<1;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
325
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
326 if (dir == 0) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
327 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
328 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
329 } else {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
330 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
331 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
332 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
333 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
334
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
335 /* clip motion vector prediction to frame border */
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4395
diff changeset
336 mx = av_clip (mx, extra_width - 6*x, h_edge_pos - 6*x);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4395
diff changeset
337 my = av_clip (my, extra_width - 6*y, v_edge_pos - 6*y);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
338
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
339 /* get (optional) motion vector differential */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
340 if (mode == PREDICT_MODE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
341 dx = dy = 0;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
342 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
343 dy = svq3_get_se_golomb (&s->gb);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
344 dx = svq3_get_se_golomb (&s->gb);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
345
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
346 if (dx == INVALID_VLC || dy == INVALID_VLC) {
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
347 av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
348 return -1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
349 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
350 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
351
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
352 /* compute motion vector */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
353 if (mode == THIRDPEL_MODE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
354 int fx, fy;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
355 mx = ((mx + 1)>>1) + dx;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
356 my = ((my + 1)>>1) + dy;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
357 fx= ((unsigned)(mx + 0x3000))/3 - 0x1000;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
358 fy= ((unsigned)(my + 0x3000))/3 - 0x1000;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
359 dxy= (mx - 3*fx) + 4*(my - 3*fy);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
360
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
361 svq3_mc_dir_part (s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
362 mx += mx;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
363 my += my;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
364 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
365 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
366 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
367 dxy= (mx&1) + 2*(my&1);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
368
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
369 svq3_mc_dir_part (s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
370 mx *= 3;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
371 my *= 3;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
372 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
373 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
374 my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
375
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
376 svq3_mc_dir_part (s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
377 mx *= 6;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
378 my *= 6;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
379 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
380
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
381 /* update mv_cache */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
382 if (mode != PREDICT_MODE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
383 int32_t mv = pack16to32(mx,my);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
384
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
385 if (part_height == 8 && i < 8) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
386 *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
387
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
388 if (part_width == 8 && j < 8) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
389 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
390 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
391 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
392 if (part_width == 8 && j < 8) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
393 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
394 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
395 if (part_width == 4 || part_height == 4) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
396 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
397 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
398 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
399
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
400 /* write back motion vectors */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
401 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
402 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
403 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
404
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
405 return 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
406 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
407
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
408 static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
409 int i, j, k, m, dir, mode;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
410 int cbp = 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
411 uint32_t vlc;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
412 int8_t *top, *left;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
413 MpegEncContext *const s = (MpegEncContext *) h;
6787
d24da66bec76 Set and use h->mb_xy in SVQ3 too.
astrange
parents: 6712
diff changeset
414 const int mb_xy = h->mb_xy;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
415 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
416
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
417 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
418 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
419 h->topright_samples_available = 0xFFFF;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
420
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
421 if (mb_type == 0) { /* SKIP */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
422 if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
423 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
424
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
425 if (s->pict_type == FF_B_TYPE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
426 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
427 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
428
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
429 mb_type = MB_TYPE_SKIP;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
430 } else {
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
431 mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6);
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
432 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
433 return -1;
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
434 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
435 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
436
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
437 mb_type = MB_TYPE_16x16;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
438 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
439 } else if (mb_type < 8) { /* INTER */
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5231
diff changeset
440 if (h->thirdpel_flag && h->halfpel_flag == !get_bits1 (&s->gb)) {
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
441 mode = THIRDPEL_MODE;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5231
diff changeset
442 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits1 (&s->gb)) {
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
443 mode = HALFPEL_MODE;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
444 } else {
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
445 mode = FULLPEL_MODE;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
446 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
447
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
448 /* fill caches */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
449 /* note ref_cache should contain here:
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
450 ????????
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
451 ???11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
452 N??11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
453 N??11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
454 N??11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
455 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
456
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
457 for (m=0; m < 2; m++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
458 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
459 for (i=0; i < 4; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
460 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
461 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
462 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
463 for (i=0; i < 4; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
464 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
465 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
466 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
467 if (s->mb_y > 0) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
468 memcpy (h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
469 memset (&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
470
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
471 if (s->mb_x < (s->mb_width - 1)) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
472 *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
473 h->ref_cache[m][scan8[0] + 4 - 1*8] =
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
474 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 ||
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
475 h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
476 }else
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
477 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
478 if (s->mb_x > 0) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
479 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride - 1];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
480 h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] == -1) ? PART_NOT_AVAILABLE : 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
481 }else
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
482 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE;
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
483 }else
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
484 memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
485
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
486 if (s->pict_type != FF_B_TYPE)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
487 break;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
488 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
489
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
490 /* decode motion vector(s) and form prediction(s) */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
491 if (s->pict_type == FF_P_TYPE) {
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
492 if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
493 return -1;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
494 } else { /* FF_B_TYPE */
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
495 if (mb_type != 2) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
496 if(svq3_mc_dir (h, 0, mode, 0, 0) < 0)
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
497 return -1;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
498 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
499 for (i=0; i < 4; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
500 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
501 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
502 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
503 if (mb_type != 1) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
504 if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0)
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
505 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
506 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
507 for (i=0; i < 4; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
508 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
509 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
510 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
511 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
512
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
513 mb_type = MB_TYPE_16x16;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
514 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
515 memset (h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
516
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
517 if (mb_type == 8) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
518 if (s->mb_x > 0) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
519 for (i=0; i < 4; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
520 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
521 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
522 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
523 h->left_samples_available = 0x5F5F;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
524 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
525 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
526 if (s->mb_y > 0) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
527 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
528 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
529 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
530 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3];
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
531
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
532 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
533 h->top_samples_available = 0x33FF;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
534 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
535 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
536
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
537 /* decode prediction codes for luma blocks */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
538 for (i=0; i < 16; i+=2) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
539 vlc = svq3_get_ue_golomb (&s->gb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
540
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
541 if (vlc >= 25){
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
542 av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
543 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
544 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
545
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
546 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
547 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
548
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
549 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
550 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
551
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
552 if (left[1] == -1 || left[2] == -1){
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
553 av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
554 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
555 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
556 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
557 } else { /* mb_type == 33, DC_128_PRED block type */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
558 for (i=0; i < 4; i++) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
559 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
560 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
561 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
562
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
563 write_back_intra_pred_mode (h);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
564
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
565 if (mb_type == 8) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
566 check_intra4x4_pred_mode (h);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
567
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
568 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
569 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
570 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
571 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
572 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
573 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
574
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
575 h->top_samples_available = 0x33FF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
576 h->left_samples_available = 0x5F5F;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
577 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
578
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
579 mb_type = MB_TYPE_INTRA4x4;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
580 } else { /* INTRA16x16 */
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
581 dir = i_mb_type_info[mb_type - 8].pred_mode;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
582 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
583
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
584 if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1){
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
585 av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
586 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
587 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
588
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
589 cbp = i_mb_type_info[mb_type - 8].cbp;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
590 mb_type = MB_TYPE_INTRA16x16;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
591 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
592
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
593 if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
594 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
595 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
596 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
597 if (s->pict_type == FF_B_TYPE) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
598 for (i=0; i < 4; i++) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
599 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
600 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
601 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
602 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
603 if (!IS_INTRA4x4(mb_type)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
604 memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
605 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
606 if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) {
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
607 memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t));
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
608 s->dsp.clear_blocks(h->mb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
609 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
610
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
611 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) {
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
612 if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
613 av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
614 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
615 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
616
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
617 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc];
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
618 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
619 if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
620 s->qscale += svq3_get_se_golomb (&s->gb);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
621
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
622 if (s->qscale > 31){
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
623 av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
624 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
625 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
626 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
627 if (IS_INTRA16x16(mb_type)) {
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
628 if (svq3_decode_block (&s->gb, h->mb, 0, 0)){
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
629 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n");
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
630 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
631 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
632 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
633
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
634 if (cbp) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
635 const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
636 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
637
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
638 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
639 if ((cbp & (1 << i))) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
640 for (j=0; j < 4; j++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
641 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
642 h->non_zero_count_cache[ scan8[k] ] = 1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
643
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
644 if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type)){
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
645 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
646 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
647 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
648 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
649 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
650 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
651
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
652 if ((cbp & 0x30)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
653 for (i=0; i < 2; ++i) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
654 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
655 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
656 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
657 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
658 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
659
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
660 if ((cbp & 0x20)) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
661 for (i=0; i < 8; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
662 h->non_zero_count_cache[ scan8[16+i] ] = 1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
663
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
664 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1)){
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
665 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
666 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
667 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
668 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
669 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
670 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
671 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
672
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
673 s->current_picture.mb_type[mb_xy] = mb_type;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
674
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
675 if (IS_INTRA(mb_type)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
676 h->chroma_pred_mode = check_intra_pred_mode (h, DC_PRED8x8);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
677 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
678
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
679 return 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
680 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
681
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
682 static int svq3_decode_slice_header (H264Context *h) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
683 MpegEncContext *const s = (MpegEncContext *) h;
6789
8107e891b226 Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents: 6787
diff changeset
684 const int mb_xy = h->mb_xy;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
685 int i, header;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
686
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
687 header = get_bits (&s->gb, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
688
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
689 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
690 /* TODO: what? */
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1330
diff changeset
691 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
692 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
693 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
694 int length = (header >> 5) & 3;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
695
2614
5e24800ab329 various fixes related to the non alt_bitstream_reader
michael
parents: 2453
diff changeset
696 h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits (&s->gb, 8*length) + 8*length;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
697
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
698 if (h->next_slice_index > s->gb.size_in_bits){
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
699 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n");
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
700 return -1;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
701 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
702
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
703 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1);
2614
5e24800ab329 various fixes related to the non alt_bitstream_reader
michael
parents: 2453
diff changeset
704 skip_bits(&s->gb, 8);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
705
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
706 if (length > 0) {
2614
5e24800ab329 various fixes related to the non alt_bitstream_reader
michael
parents: 2453
diff changeset
707 memcpy ((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3],
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
708 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
709 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
710 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
711
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
712 if ((i = svq3_get_ue_golomb (&s->gb)) == INVALID_VLC || i >= 3){
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
713 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
714 return -1;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
715 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
716
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
717 h->slice_type = golomb_to_pict_type[i];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
718
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
719 if ((header & 0x9F) == 2) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
720 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
721 s->mb_skip_run = get_bits (&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
722 } else {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
723 skip_bits1 (&s->gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
724 s->mb_skip_run = 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
725 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
726
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
727 h->slice_num = get_bits (&s->gb, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
728 s->qscale = get_bits (&s->gb, 5);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
729 s->adaptive_quant = get_bits1 (&s->gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
730
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
731 /* unknown fields */
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
732 skip_bits1 (&s->gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
733
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
734 if (h->unknown_svq3_flag) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
735 skip_bits1 (&s->gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
736 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
737
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
738 skip_bits1 (&s->gb);
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
739 skip_bits (&s->gb, 2);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
740
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
741 while (get_bits1 (&s->gb)) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
742 skip_bits (&s->gb, 8);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
743 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
744
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
745 /* reset intra predictors and invalidate motion vector references */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
746 if (s->mb_x > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
747 memset (h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
748 memset (h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
749 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
750 if (s->mb_y > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
751 memset (h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
752
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
753 if (s->mb_x > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
754 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
755 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
756 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
757
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
758 return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
759 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
760
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
761 static int svq3_decode_frame (AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
762 void *data, int *data_size,
6216
michael
parents: 5638
diff changeset
763 const uint8_t *buf, int buf_size) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
764 MpegEncContext *const s = avctx->priv_data;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
765 H264Context *const h = avctx->priv_data;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
766 int m, mb_type;
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
767 unsigned char *extradata;
1878
838c18d1e7fc be smarter about the variable size of the extra SVQ3 data
melanson
parents: 1877
diff changeset
768 unsigned int size;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
769
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
770 s->flags = avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
771 s->flags2 = avctx->flags2;
1699
92643b9794a9 SVQ3 uses unrestricted motion vectors
melanson
parents: 1598
diff changeset
772 s->unrestricted_mv = 1;
92643b9794a9 SVQ3 uses unrestricted motion vectors
melanson
parents: 1598
diff changeset
773
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
774 if (!s->context_initialized) {
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
775 s->width = avctx->width;
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
776 s->height = avctx->height;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
777 h->halfpel_flag = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
778 h->thirdpel_flag = 1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
779 h->unknown_svq3_flag = 0;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5215
diff changeset
780 h->chroma_qp[0] = h->chroma_qp[1] = 4;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
781
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
782 if (MPV_common_init (s) < 0)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
783 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
784
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
785 h->b_stride = 4*s->mb_width;
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
786
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
787 alloc_tables (h);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
788
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
789 /* prowl for the "SEQH" marker in the extradata */
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
790 extradata = (unsigned char *)avctx->extradata;
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
791 for (m = 0; m < avctx->extradata_size; m++) {
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
792 if (!memcmp (extradata, "SEQH", 4))
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
793 break;
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
794 extradata++;
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
795 }
1878
838c18d1e7fc be smarter about the variable size of the extra SVQ3 data
melanson
parents: 1877
diff changeset
796
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
797 /* if a match was found, parse the extra data */
4392
e0c94f1b8f55 maybe fix segfault with missing extradata (unchecked)
michael
parents: 4364
diff changeset
798 if (extradata && !memcmp (extradata, "SEQH", 4)) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
799
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
800 GetBitContext gb;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
801
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4176
diff changeset
802 size = AV_RB32(&extradata[4]);
2966
564788471dd4 bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents: 2792
diff changeset
803 init_get_bits (&gb, extradata + 8, size*8);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
804
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
805 /* 'frame size code' and optional 'width, height' */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
806 if (get_bits (&gb, 3) == 7) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
807 skip_bits (&gb, 12);
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
808 skip_bits (&gb, 12);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
809 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
810
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
811 h->halfpel_flag = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
812 h->thirdpel_flag = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
813
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
814 /* unknown fields */
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
815 skip_bits1 (&gb);
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
816 skip_bits1 (&gb);
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
817 skip_bits1 (&gb);
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
818 skip_bits1 (&gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
819
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
820 s->low_delay = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
821
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
822 /* unknown field */
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
823 skip_bits1 (&gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
824
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
825 while (get_bits1 (&gb)) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
826 skip_bits (&gb, 8);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
827 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
828
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
829 h->unknown_svq3_flag = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
830 avctx->has_b_frames = !s->low_delay;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
831 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
832 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
833
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
834 /* special case for last picture */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
835 if (buf_size == 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
836 if (s->next_picture_ptr && !s->low_delay) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
837 *(AVFrame *) data = *(AVFrame *) &s->next_picture;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
838 *data_size = sizeof(AVFrame);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
839 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
840 return 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
841 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
842
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
843 init_get_bits (&s->gb, buf, 8*buf_size);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
844
6789
8107e891b226 Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents: 6787
diff changeset
845 s->mb_x = s->mb_y = h->mb_xy = 0;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
846
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
847 if (svq3_decode_slice_header (h))
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
848 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
849
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
850 s->pict_type = h->slice_type;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
851 s->picture_number = h->slice_num;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
852
1250
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
853 if(avctx->debug&FF_DEBUG_PICT_INFO){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
854 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d\n",
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
855 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag,
1250
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
856 s->adaptive_quant, s->qscale
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
857 );
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
858 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
859
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
860 /* for hurry_up==5 */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
861 s->current_picture.pict_type = s->pict_type;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
862 s->current_picture.key_frame = (s->pict_type == FF_I_TYPE);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
863
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5083
diff changeset
864 /* Skip B-frames if we do not have reference frames. */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
865 if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) return 0;
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5083
diff changeset
866 /* Skip B-frames if we are in a hurry. */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
867 if (avctx->hurry_up && s->pict_type == FF_B_TYPE) return 0;
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5083
diff changeset
868 /* Skip everything if we are in a hurry >= 5. */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
869 if (avctx->hurry_up >= 5) return 0;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
870 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE)
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
871 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE)
2792
0a8c847ad5e7 skip_idct
michael
parents: 2614
diff changeset
872 || avctx->skip_frame >= AVDISCARD_ALL)
0a8c847ad5e7 skip_idct
michael
parents: 2614
diff changeset
873 return 0;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
874
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
875 if (s->next_p_frame_damaged) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
876 if (s->pict_type == FF_B_TYPE)
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
877 return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
878 else
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
879 s->next_p_frame_damaged = 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
880 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
881
4395
b0bfea78ca13 crash fix by Carl Eugen Hoyos cehoyos ag.or at
michael
parents: 4392
diff changeset
882 if (frame_start (h) < 0)
b0bfea78ca13 crash fix by Carl Eugen Hoyos cehoyos ag.or at
michael
parents: 4392
diff changeset
883 return -1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
884
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
885 if (s->pict_type == FF_B_TYPE) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
886 h->frame_num_offset = (h->slice_num - h->prev_frame_num);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
887
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
888 if (h->frame_num_offset < 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
889 h->frame_num_offset += 256;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
890 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
891 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1330
diff changeset
892 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
893 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
894 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
895 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
896 h->prev_frame_num = h->frame_num;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
897 h->frame_num = h->slice_num;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
898 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
899
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
900 if (h->prev_frame_num_offset < 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
901 h->prev_frame_num_offset += 256;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
902 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
903 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
904
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
905 for(m=0; m<2; m++){
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
906 int i;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
907 for(i=0; i<4; i++){
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
908 int j;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
909 for(j=-1; j<4; j++)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
910 h->ref_cache[m][scan8[0] + 8*i + j]= 1;
5008
71da0c30248b dont write over the end of ref_cache
michael
parents: 5006
diff changeset
911 if(i<3)
71da0c30248b dont write over the end of ref_cache
michael
parents: 5006
diff changeset
912 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
913 }
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
914 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
915
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
916 for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
917 for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
6789
8107e891b226 Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents: 6787
diff changeset
918 h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
919
2614
5e24800ab329 various fixes related to the non alt_bitstream_reader
michael
parents: 2453
diff changeset
920 if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
921 ((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
922
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
923 skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
924 s->gb.size_in_bits = 8*buf_size;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
925
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
926 if (svq3_decode_slice_header (h))
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
927 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
928
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
929 /* TODO: support s->mb_skip_run */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
930 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
931
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
932 mb_type = svq3_get_ue_golomb (&s->gb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
933
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
934 if (s->pict_type == FF_I_TYPE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
935 mb_type += 8;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
936 } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
937 mb_type += 4;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
938 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
939 if (mb_type > 33 || svq3_decode_mb (h, mb_type)) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
940 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
941 return -1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
942 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
943
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
944 if (mb_type != 0) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
945 hl_decode_mb (h);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
946 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
947
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
948 if (s->pict_type != FF_B_TYPE && !s->low_delay) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
949 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] =
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
950 (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
951 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
952 }
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
953
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
954 ff_draw_horiz_band(s, 16*s->mb_y, 16);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
955 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
956
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
957 MPV_frame_end(s);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
958
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6216
diff changeset
959 if (s->pict_type == FF_B_TYPE || s->low_delay) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
960 *(AVFrame *) data = *(AVFrame *) &s->current_picture;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
961 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
962 *(AVFrame *) data = *(AVFrame *) &s->last_picture;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
963 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
964
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
965 avctx->frame_number = s->picture_number - 1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
966
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5083
diff changeset
967 /* Do not output the last pic after seeking. */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
968 if (s->last_picture_ptr || s->low_delay) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
969 *data_size = sizeof(AVFrame);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
970 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
971
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
972 return buf_size;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
973 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
974
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
975
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
976 AVCodec svq3_decoder = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
977 "svq3",
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
978 CODEC_TYPE_VIDEO,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
979 CODEC_ID_SVQ3,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
980 sizeof(H264Context),
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
981 decode_init,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
982 NULL,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
983 decode_end,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
984 svq3_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2452
diff changeset
985 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6789
diff changeset
986 .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3"),
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
987 };