annotate svq3.c @ 8381:10aed1a9444b libavcodec

10l, svq3 didnt set h->cbp, this broke decoding a little.
author michael
date Thu, 18 Dec 2008 11:01:38 +0000
parents 4a01f7144da5
children 8263a5bf47e5
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
8067
8179f22a569e svq3 watermark code now needs zlib
bcoudurier
parents: 8066
diff changeset
43 #ifdef CONFIG_ZLIB
8179f22a569e svq3 watermark code now needs zlib
bcoudurier
parents: 8066
diff changeset
44 #include <zlib.h>
8179f22a569e svq3 watermark code now needs zlib
bcoudurier
parents: 8066
diff changeset
45 #endif
8179f22a569e svq3 watermark code now needs zlib
bcoudurier
parents: 8066
diff changeset
46
8080
847bcb16028a Add the function declaration of ff_svq1_packet_checksum to svq1.h and include
diego
parents: 8067
diff changeset
47 #include "svq1.h"
847bcb16028a Add the function declaration of ff_svq1_packet_checksum to svq1.h and include
diego
parents: 8067
diff changeset
48
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
49 /**
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
50 * @file svq3.c
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
51 * svq3 decoder.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
52 */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
53
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
54 #define FULLPEL_MODE 1
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
55 #define HALFPEL_MODE 2
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
56 #define THIRDPEL_MODE 3
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
57 #define PREDICT_MODE 4
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
58
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
59 /* dual scan (from some older h264 draft)
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
60 o-->o-->o o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
61 | /|
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
62 o o o / o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
63 | / | |/ |
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
64 o o o o
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
65 /
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
66 o-->o-->o-->o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
67 */
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
68 static const uint8_t svq3_scan[16] = {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
69 0+0*4, 1+0*4, 2+0*4, 2+1*4,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
70 2+2*4, 3+0*4, 3+1*4, 3+2*4,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
71 0+1*4, 0+2*4, 1+1*4, 1+2*4,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
72 0+3*4, 1+3*4, 2+3*4, 3+3*4,
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
73 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
74
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
75 static const uint8_t svq3_pred_0[25][2] = {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
76 { 0, 0 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
77 { 1, 0 }, { 0, 1 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
78 { 0, 2 }, { 1, 1 }, { 2, 0 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
79 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
80 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
81 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
82 { 2, 4 }, { 3, 3 }, { 4, 2 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
83 { 4, 3 }, { 3, 4 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
84 { 4, 4 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
85 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
86
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
87 static const int8_t svq3_pred_1[6][6][5] = {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
88 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
89 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
90 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
91 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
92 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
93 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
94 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
95 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
96 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
97 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
98 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
99 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } },
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
100 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
101
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
102 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
103 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
104 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
105 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 },
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
106 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
107 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
108
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
109 static const uint32_t svq3_dequant_coeff[32] = {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
110 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
111 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
112 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
113 61694, 68745, 77615, 89113,100253,109366,126635,141533
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
114 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
115
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
116
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
117 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
118 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
119 const int qmul = svq3_dequant_coeff[qp];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
120 #define stride 16
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
121 int i;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
122 int temp[16];
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
123 static const int x_offset[4] = {0, 1*stride, 4* stride, 5*stride};
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
124 static const int y_offset[4] = {0, 2*stride, 8* stride, 10*stride};
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
125
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
126 for (i = 0; i < 4; i++){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
127 const int offset = y_offset[i];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
128 const int z0 = 13*(block[offset+stride*0] + block[offset+stride*4]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
129 const int z1 = 13*(block[offset+stride*0] - block[offset+stride*4]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
130 const int z2 = 7* block[offset+stride*1] - 17*block[offset+stride*5];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
131 const int z3 = 17* block[offset+stride*1] + 7*block[offset+stride*5];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
132
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
133 temp[4*i+0] = z0+z3;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
134 temp[4*i+1] = z1+z2;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
135 temp[4*i+2] = z1-z2;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
136 temp[4*i+3] = z0-z3;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
137 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
138
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
139 for (i = 0; i < 4; i++){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
140 const int offset = x_offset[i];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
141 const int z0 = 13*(temp[4*0+i] + temp[4*2+i]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
142 const int z1 = 13*(temp[4*0+i] - temp[4*2+i]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
143 const int z2 = 7* temp[4*1+i] - 17*temp[4*3+i];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
144 const int z3 = 17* temp[4*1+i] + 7*temp[4*3+i];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
145
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
146 block[stride*0 +offset] = ((z0 + z3)*qmul + 0x80000) >> 20;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
147 block[stride*2 +offset] = ((z1 + z2)*qmul + 0x80000) >> 20;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
148 block[stride*8 +offset] = ((z1 - z2)*qmul + 0x80000) >> 20;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
149 block[stride*10+offset] = ((z0 - z3)*qmul + 0x80000) >> 20;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
150 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
151 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
152 #undef stride
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
153
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
154 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
155 int dc)
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
156 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
157 const int qmul = svq3_dequant_coeff[qp];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
158 int i;
4176
23da44e8fd05 rename cropTbl -> ff_cropTbl
mru
parents: 3947
diff changeset
159 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
160
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
161 if (dc) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
162 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
163 block[0] = 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
164 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
165
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
166 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
167 const int z0 = 13*(block[0 + 4*i] + block[2 + 4*i]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
168 const int z1 = 13*(block[0 + 4*i] - block[2 + 4*i]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
169 const int z2 = 7* block[1 + 4*i] - 17*block[3 + 4*i];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
170 const int z3 = 17* block[1 + 4*i] + 7*block[3 + 4*i];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
171
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
172 block[0 + 4*i] = z0 + z3;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
173 block[1 + 4*i] = z1 + z2;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
174 block[2 + 4*i] = z1 - z2;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
175 block[3 + 4*i] = z0 - z3;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
176 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
177
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
178 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
179 const int z0 = 13*(block[i + 4*0] + block[i + 4*2]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
180 const int z1 = 13*(block[i + 4*0] - block[i + 4*2]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
181 const int z2 = 7* block[i + 4*1] - 17*block[i + 4*3];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
182 const int z3 = 17* block[i + 4*1] + 7*block[i + 4*3];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
183 const int rr = (dc + 0x80000);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
184
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
185 dst[i + stride*0] = cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
186 dst[i + stride*1] = cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
187 dst[i + stride*2] = cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
188 dst[i + stride*3] = cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
189 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
190 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
191
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
192 static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
193 int index, const int type)
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
194 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
195 static const uint8_t *const scan_patterns[4] =
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
196 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan };
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
197
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
198 int run, level, sign, vlc, limit;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
199 const int intra = (3 * type) >> 2;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
200 const uint8_t *const scan = scan_patterns[type];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
201
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
202 for (limit = (16 >> intra); index < 16; index = limit, limit += 8) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
203 for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
204
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
205 if (vlc == INVALID_VLC)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
206 return -1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
207
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
208 sign = (vlc & 0x1) - 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
209 vlc = (vlc + 1) >> 1;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
210
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
211 if (type == 3) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
212 if (vlc < 3) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
213 run = 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
214 level = vlc;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
215 } else if (vlc < 4) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
216 run = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
217 level = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
218 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
219 run = (vlc & 0x3);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
220 level = ((vlc + 9) >> 2) - run;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
221 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
222 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
223 if (vlc < 16) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
224 run = svq3_dct_tables[intra][vlc].run;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
225 level = svq3_dct_tables[intra][vlc].level;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
226 } else if (intra) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
227 run = (vlc & 0x7);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
228 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1)));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
229 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
230 run = (vlc & 0xF);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
231 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0)));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
232 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
233 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
234
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
235 if ((index += run) >= limit)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
236 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
237
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
238 block[scan[index]] = (level ^ sign) - sign;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
239 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
240
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
241 if (type != 2) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
242 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
243 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
244 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
245
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
246 return 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
247 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
248
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
249 static inline void svq3_mc_dir_part(MpegEncContext *s,
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
250 int x, int y, int width, int height,
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
251 int mx, int my, int dxy,
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
252 int thirdpel, int dir, int avg)
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
253 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
254 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
255 uint8_t *src, *dest;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
256 int i, emu = 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
257 int blocksize = 2 - (width>>3); //16->0, 8->1, 4->2
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
258
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
259 mx += x;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
260 my += y;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
261
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
262 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) ||
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
263 my < 0 || my >= (s->v_edge_pos - height - 1)) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
264
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
265 if ((s->flags & CODEC_FLAG_EMU_EDGE)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
266 emu = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
267 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
268
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
269 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
270 my = av_clip (my, -16, (s->v_edge_pos - height + 15));
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
271 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
272
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
273 /* form component predictions */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
274 dest = s->current_picture.data[0] + x + y*s->linesize;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
275 src = pic->data[0] + mx + my*s->linesize;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
276
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
277 if (emu) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
278 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1),
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
279 mx, my, s->h_edge_pos, s->v_edge_pos);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
280 src = s->edge_emu_buffer;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
281 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
282 if (thirdpel)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
283 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
284 else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
285 (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
286
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
287 if (!(s->flags & CODEC_FLAG_GRAY)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
288 mx = (mx + (mx < (int) x)) >> 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
289 my = (my + (my < (int) y)) >> 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
290 width = (width >> 1);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
291 height = (height >> 1);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
292 blocksize++;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
293
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
294 for (i = 1; i < 3; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
295 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
296 src = pic->data[i] + mx + my*s->uvlinesize;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
297
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
298 if (emu) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
299 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1),
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
300 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
301 src = s->edge_emu_buffer;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
302 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
303 if (thirdpel)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
304 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
305 else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
306 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
307 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
308 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
309 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
310
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
311 static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
312 int avg)
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
313 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
314 int i, j, k, mx, my, dx, dy, x, y;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
315 MpegEncContext *const s = (MpegEncContext *) h;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
316 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
317 const int part_height = 16 >> ((unsigned) (size + 1) / 3);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
318 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
319 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
320 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
321
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
322 for (i = 0; i < 16; i += part_height) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
323 for (j = 0; j < 16; j += part_width) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
324 const int b_xy = (4*s->mb_x + (j >> 2)) + (4*s->mb_y + (i >> 2))*h->b_stride;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
325 int dxy;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
326 x = 16*s->mb_x + j;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
327 y = 16*s->mb_y + i;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
328 k = ((j >> 2) & 1) + ((i >> 1) & 2) + ((j >> 1) & 4) + (i & 8);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
329
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
330 if (mode != PREDICT_MODE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
331 pred_motion(h, k, (part_width >> 2), dir, 1, &mx, &my);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
332 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
333 mx = s->next_picture.motion_val[0][b_xy][0]<<1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
334 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
335
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
336 if (dir == 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
337 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
338 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
339 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
340 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
341 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
342 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
343 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
344
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
345 /* clip motion vector prediction to frame border */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
346 mx = av_clip(mx, extra_width - 6*x, h_edge_pos - 6*x);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
347 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
348
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
349 /* get (optional) motion vector differential */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
350 if (mode == PREDICT_MODE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
351 dx = dy = 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
352 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
353 dy = svq3_get_se_golomb(&s->gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
354 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
355
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
356 if (dx == INVALID_VLC || dy == INVALID_VLC) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
357 av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
358 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
359 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
360 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
361
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
362 /* compute motion vector */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
363 if (mode == THIRDPEL_MODE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
364 int fx, fy;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
365 mx = ((mx + 1)>>1) + dx;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
366 my = ((my + 1)>>1) + dy;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
367 fx = ((unsigned)(mx + 0x3000))/3 - 0x1000;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
368 fy = ((unsigned)(my + 0x3000))/3 - 0x1000;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
369 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
370
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
371 svq3_mc_dir_part(s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
372 mx += mx;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
373 my += my;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
374 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
375 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
376 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
377 dxy = (mx&1) + 2*(my&1);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
378
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
379 svq3_mc_dir_part(s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
380 mx *= 3;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
381 my *= 3;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
382 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
383 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
384 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
385
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
386 svq3_mc_dir_part(s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
387 mx *= 6;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
388 my *= 6;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
389 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
390
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
391 /* update mv_cache */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
392 if (mode != PREDICT_MODE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
393 int32_t mv = pack16to32(mx,my);
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
394
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
395 if (part_height == 8 && i < 8) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
396 *(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
397
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
398 if (part_width == 8 && j < 8) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
399 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
400 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
401 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
402 if (part_width == 8 && j < 8) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
403 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
404 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
405 if (part_width == 4 || part_height == 4) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
406 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
407 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
408 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
409
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
410 /* write back motion vectors */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
411 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
412 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
413 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
414
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
415 return 0;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
416 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
417
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
418 static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
419 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
420 int i, j, k, m, dir, mode;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
421 int cbp = 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
422 uint32_t vlc;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
423 int8_t *top, *left;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
424 MpegEncContext *const s = (MpegEncContext *) h;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
425 const int mb_xy = h->mb_xy;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
426 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
427
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
428 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
429 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
430 h->topright_samples_available = 0xFFFF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
431
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
432 if (mb_type == 0) { /* SKIP */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
433 if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
434 svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
435
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
436 if (s->pict_type == FF_B_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
437 svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
438 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
439
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
440 mb_type = MB_TYPE_SKIP;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
441 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
442 mb_type = FFMIN(s->next_picture.mb_type[mb_xy], 6);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
443 if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 0, 0) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
444 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
445 if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 1, 1) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
446 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
447
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
448 mb_type = MB_TYPE_16x16;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
449 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
450 } else if (mb_type < 8) { /* INTER */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
451 if (h->thirdpel_flag && h->halfpel_flag == !get_bits1 (&s->gb)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
452 mode = THIRDPEL_MODE;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
453 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits1 (&s->gb)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
454 mode = HALFPEL_MODE;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
455 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
456 mode = FULLPEL_MODE;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
457 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
458
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
459 /* fill caches */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
460 /* note ref_cache should contain here:
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
461 ????????
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
462 ???11111
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
463 N??11111
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
464 N??11111
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
465 N??11111
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
466 */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
467
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
468 for (m = 0; m < 2; m++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
469 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
470 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
471 *(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];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
472 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
473 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
474 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
475 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
476 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
477 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
478 if (s->mb_y > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
479 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));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
480 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
481
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
482 if (s->mb_x < (s->mb_width - 1)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
483 *(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];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
484 h->ref_cache[m][scan8[0] + 4 - 1*8] =
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
485 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 ||
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
486 h->intra4x4_pred_mode[mb_xy - s->mb_stride ][4] == -1) ? PART_NOT_AVAILABLE : 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
487 }else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
488 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
489 if (s->mb_x > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
490 *(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];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
491 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;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
492 }else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
493 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
494 }else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
495 memset(&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
496
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
497 if (s->pict_type != FF_B_TYPE)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
498 break;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
499 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
500
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
501 /* decode motion vector(s) and form prediction(s) */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
502 if (s->pict_type == FF_P_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
503 if (svq3_mc_dir(h, (mb_type - 1), mode, 0, 0) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
504 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
505 } else { /* FF_B_TYPE */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
506 if (mb_type != 2) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
507 if (svq3_mc_dir(h, 0, mode, 0, 0) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
508 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
509 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
510 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
511 memset(s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
512 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
513 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
514 if (mb_type != 1) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
515 if (svq3_mc_dir(h, 0, mode, 1, (mb_type == 3)) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
516 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
517 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
518 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
519 memset(s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
520 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
521 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
522 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
523
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
524 mb_type = MB_TYPE_16x16;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
525 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
526 memset(h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
527
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
528 if (mb_type == 8) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
529 if (s->mb_x > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
530 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
531 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
532 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
533 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
534 h->left_samples_available = 0x5F5F;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
535 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
536 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
537 if (s->mb_y > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
538 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
539 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
540 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
541 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
542
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
543 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
544 h->top_samples_available = 0x33FF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
545 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
546 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
547
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
548 /* decode prediction codes for luma blocks */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
549 for (i = 0; i < 16; i+=2) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
550 vlc = svq3_get_ue_golomb(&s->gb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
551
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
552 if (vlc >= 25){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
553 av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
554 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
555 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
556
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
557 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
558 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
559
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
560 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]];
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
561 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
562
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
563 if (left[1] == -1 || left[2] == -1){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
564 av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
565 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
566 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
567 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
568 } else { /* mb_type == 33, DC_128_PRED block type */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
569 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
570 memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
571 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
572 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
573
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
574 write_back_intra_pred_mode(h);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
575
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
576 if (mb_type == 8) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
577 check_intra4x4_pred_mode(h);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
578
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
579 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
580 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
581 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
582 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
583 memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
584 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
585
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
586 h->top_samples_available = 0x33FF;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
587 h->left_samples_available = 0x5F5F;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
588 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
589
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
590 mb_type = MB_TYPE_INTRA4x4;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
591 } else { /* INTRA16x16 */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
592 dir = i_mb_type_info[mb_type - 8].pred_mode;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
593 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
594
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
595 if ((h->intra16x16_pred_mode = check_intra_pred_mode(h, dir)) == -1){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
596 av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
597 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
598 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
599
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
600 cbp = i_mb_type_info[mb_type - 8].cbp;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
601 mb_type = MB_TYPE_INTRA16x16;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
602 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
603
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
604 if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
605 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
606 memset(s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
607 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
608 if (s->pict_type == FF_B_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
609 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
610 memset(s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
611 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
612 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
613 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
614 if (!IS_INTRA4x4(mb_type)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
615 memset(h->intra4x4_pred_mode[mb_xy], DC_PRED, 8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
616 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
617 if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
618 memset(h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
619 s->dsp.clear_blocks(h->mb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
620 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
621
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
622 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
623 if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
624 av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
625 return -1;
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
626 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
627
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
628 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
629 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
630 if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
631 s->qscale += svq3_get_se_golomb(&s->gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
632
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
633 if (s->qscale > 31){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
634 av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
635 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
636 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
637 }
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
638 if (IS_INTRA16x16(mb_type)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
639 if (svq3_decode_block(&s->gb, h->mb, 0, 0)){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
640 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
641 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
642 }
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
643 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
644
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
645 if (cbp) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
646 const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
647 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
648
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
649 for (i = 0; i < 4; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
650 if ((cbp & (1 << i))) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
651 for (j = 0; j < 4; j++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
652 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
653 h->non_zero_count_cache[ scan8[k] ] = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
654
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
655 if (svq3_decode_block(&s->gb, &h->mb[16*k], index, type)){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
656 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
657 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
658 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
659 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
660 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
661 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
662
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
663 if ((cbp & 0x30)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
664 for (i = 0; i < 2; ++i) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
665 if (svq3_decode_block(&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
666 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
667 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
668 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
669 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
670
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
671 if ((cbp & 0x20)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
672 for (i = 0; i < 8; i++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
673 h->non_zero_count_cache[ scan8[16+i] ] = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
674
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
675 if (svq3_decode_block(&s->gb, &h->mb[16*(16 + i)], 1, 1)){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
676 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
677 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
678 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
679 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
680 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
681 }
2452
73a66a4a6ab4 more detailed error messages
michael
parents: 2088
diff changeset
682 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
683
8381
10aed1a9444b 10l, svq3 didnt set h->cbp, this broke decoding a little.
michael
parents: 8364
diff changeset
684 h->cbp= cbp;
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
685 s->current_picture.mb_type[mb_xy] = mb_type;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
686
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
687 if (IS_INTRA(mb_type)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
688 h->chroma_pred_mode = check_intra_pred_mode(h, DC_PRED8x8);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
689 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
690
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
691 return 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
692 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
693
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
694 static int svq3_decode_slice_header(H264Context *h)
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
695 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
696 MpegEncContext *const s = (MpegEncContext *) h;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
697 const int mb_xy = h->mb_xy;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
698 int i, header;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
699
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
700 header = get_bits(&s->gb, 8);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
701
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
702 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
703 /* TODO: what? */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
704 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
705 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
706 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
707 int length = (header >> 5) & 3;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
708
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
709 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
710
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
711 if (h->next_slice_index > s->gb.size_in_bits) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
712 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
713 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
714 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
715
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
716 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
717 skip_bits(&s->gb, 8);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
718
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
719 if (h->svq3_watermark_key) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
720 uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
721 AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1], header ^ h->svq3_watermark_key);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
722 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
723 if (length > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
724 memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3],
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
725 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
726 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
727 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
728
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
729 if ((i = svq3_get_ue_golomb(&s->gb)) == INVALID_VLC || i >= 3){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
730 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
731 return -1;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
732 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
733
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
734 h->slice_type = golomb_to_pict_type[i];
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
735
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
736 if ((header & 0x9F) == 2) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
737 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
738 s->mb_skip_run = get_bits(&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
739 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
740 skip_bits1(&s->gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
741 s->mb_skip_run = 0;
8066
94fa05bc0390 svq3 watermark decoding support, based on reverse engineering work by chrono
bcoudurier
parents: 8059
diff changeset
742 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
743
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
744 h->slice_num = get_bits(&s->gb, 8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
745 s->qscale = get_bits(&s->gb, 5);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
746 s->adaptive_quant = get_bits1(&s->gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
747
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
748 /* unknown fields */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
749 skip_bits1(&s->gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
750
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
751 if (h->unknown_svq3_flag) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
752 skip_bits1(&s->gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
753 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
754
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
755 skip_bits1(&s->gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
756 skip_bits(&s->gb, 2);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
757
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
758 while (get_bits1(&s->gb)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
759 skip_bits(&s->gb, 8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
760 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
761
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
762 /* reset intra predictors and invalidate motion vector references */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
763 if (s->mb_x > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
764 memset(h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
765 memset(h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
766 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
767 if (s->mb_y > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
768 memset(h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x));
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
769
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
770 if (s->mb_x > 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
771 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
772 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
773 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
774
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
775 return 0;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
776 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
777
8209
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
778 static int svq3_decode_init(AVCodecContext *avctx)
8195
cfe339a90018 cosmetics: consistent function declarations
diego
parents: 8194
diff changeset
779 {
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
780 MpegEncContext *const s = avctx->priv_data;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
781 H264Context *const h = avctx->priv_data;
8209
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
782 int m;
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
783 unsigned char *extradata;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
784 unsigned int size;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
785
8209
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
786 if (decode_init(avctx) < 0)
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
787 return -1;
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
788
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
789 s->flags = avctx->flags;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
790 s->flags2 = avctx->flags2;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
791 s->unrestricted_mv = 1;
8364
4a01f7144da5 Fix svq3 decoding, is_complex was not initialized.
michael
parents: 8209
diff changeset
792 h->is_complex=1;
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
793
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
794 if (!s->context_initialized) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
795 s->width = avctx->width;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
796 s->height = avctx->height;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
797 h->halfpel_flag = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
798 h->thirdpel_flag = 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
799 h->unknown_svq3_flag = 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
800 h->chroma_qp[0] = h->chroma_qp[1] = 4;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
801
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
802 if (MPV_common_init(s) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
803 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
804
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
805 h->b_stride = 4*s->mb_width;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
806
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
807 alloc_tables(h);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
808
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
809 /* prowl for the "SEQH" marker in the extradata */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
810 extradata = (unsigned char *)avctx->extradata;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
811 for (m = 0; m < avctx->extradata_size; m++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
812 if (!memcmp(extradata, "SEQH", 4))
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
813 break;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
814 extradata++;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
815 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
816
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
817 /* if a match was found, parse the extra data */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
818 if (extradata && !memcmp(extradata, "SEQH", 4)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
819
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
820 GetBitContext gb;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
821
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
822 size = AV_RB32(&extradata[4]);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
823 init_get_bits(&gb, extradata + 8, size*8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
824
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
825 /* 'frame size code' and optional 'width, height' */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
826 if (get_bits(&gb, 3) == 7) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
827 skip_bits(&gb, 12);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
828 skip_bits(&gb, 12);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
829 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
830
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
831 h->halfpel_flag = get_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
832 h->thirdpel_flag = get_bits1(&gb);
1699
92643b9794a9 SVQ3 uses unrestricted motion vectors
melanson
parents: 1598
diff changeset
833
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
834 /* unknown fields */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
835 skip_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
836 skip_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
837 skip_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
838 skip_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
839
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
840 s->low_delay = get_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
841
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
842 /* unknown field */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
843 skip_bits1(&gb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
844
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
845 while (get_bits1(&gb)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
846 skip_bits(&gb, 8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
847 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
848
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
849 h->unknown_svq3_flag = get_bits1(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
850 avctx->has_b_frames = !s->low_delay;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
851 if (h->unknown_svq3_flag) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
852 #ifdef CONFIG_ZLIB
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
853 unsigned watermark_width = svq3_get_ue_golomb(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
854 unsigned watermark_height = svq3_get_ue_golomb(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
855 int u1 = svq3_get_ue_golomb(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
856 int u2 = get_bits(&gb, 8);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
857 int u3 = get_bits(&gb, 2);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
858 int u4 = svq3_get_ue_golomb(&gb);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
859 unsigned buf_len = watermark_width*watermark_height*4;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
860 int offset = (get_bits_count(&gb)+7)>>3;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
861 uint8_t *buf;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
862
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
863 if ((uint64_t)watermark_width*4 > UINT_MAX/watermark_height)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
864 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
865
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
866 buf = av_malloc(buf_len);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
867 av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", watermark_width, watermark_height);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
868 av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", u1, u2, u3, u4, offset);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
869 if (uncompress(buf, (uLong*)&buf_len, extradata + 8 + offset, size - offset) != Z_OK) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
870 av_log(avctx, AV_LOG_ERROR, "could not uncompress watermark logo\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
871 av_free(buf);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
872 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
873 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
874 h->svq3_watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
875 h->svq3_watermark_key = h->svq3_watermark_key << 16 | h->svq3_watermark_key;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
876 av_log(avctx, AV_LOG_DEBUG, "watermark key %#x\n", h->svq3_watermark_key);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
877 av_free(buf);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
878 #else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
879 av_log(avctx, AV_LOG_ERROR, "this svq3 file contains watermark which need zlib support compiled in\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
880 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
881 #endif
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
882 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
883 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
884 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
885
8209
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
886 return 0;
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
887 }
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
888
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
889 static int svq3_decode_frame(AVCodecContext *avctx,
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
890 void *data, int *data_size,
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
891 const uint8_t *buf, int buf_size)
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
892 {
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
893 MpegEncContext *const s = avctx->priv_data;
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
894 H264Context *const h = avctx->priv_data;
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
895 int m, mb_type;
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
896
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
897 /* special case for last picture */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
898 if (buf_size == 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
899 if (s->next_picture_ptr && !s->low_delay) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
900 *(AVFrame *) data = *(AVFrame *) &s->next_picture;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
901 s->next_picture_ptr = NULL;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
902 *data_size = sizeof(AVFrame);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
903 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
904 return 0;
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
905 }
1878
838c18d1e7fc be smarter about the variable size of the extra SVQ3 data
melanson
parents: 1877
diff changeset
906
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
907 init_get_bits (&s->gb, buf, 8*buf_size);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
908
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
909 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
910
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
911 if (svq3_decode_slice_header(h))
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
912 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
913
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
914 s->pict_type = h->slice_type;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
915 s->picture_number = h->slice_num;
8066
94fa05bc0390 svq3 watermark decoding support, based on reverse engineering work by chrono
bcoudurier
parents: 8059
diff changeset
916
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
917 if (avctx->debug&FF_DEBUG_PICT_INFO){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
918 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
919 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag,
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
920 s->adaptive_quant, s->qscale, h->slice_num);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
921 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
922
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
923 /* for hurry_up == 5 */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
924 s->current_picture.pict_type = s->pict_type;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
925 s->current_picture.key_frame = (s->pict_type == FF_I_TYPE);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
926
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
927 /* Skip B-frames if we do not have reference frames. */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
928 if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
929 return 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
930 /* Skip B-frames if we are in a hurry. */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
931 if (avctx->hurry_up && s->pict_type == FF_B_TYPE)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
932 return 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
933 /* Skip everything if we are in a hurry >= 5. */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
934 if (avctx->hurry_up >= 5)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
935 return 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
936 if ( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == FF_B_TYPE)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
937 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != FF_I_TYPE)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
938 || avctx->skip_frame >= AVDISCARD_ALL)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
939 return 0;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
940
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
941 if (s->next_p_frame_damaged) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
942 if (s->pict_type == FF_B_TYPE)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
943 return 0;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
944 else
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
945 s->next_p_frame_damaged = 0;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
946 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
947
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
948 if (frame_start(h) < 0)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
949 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
950
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
951 if (s->pict_type == FF_B_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
952 h->frame_num_offset = (h->slice_num - h->prev_frame_num);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
953
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
954 if (h->frame_num_offset < 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
955 h->frame_num_offset += 256;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
956 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
957 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
958 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
959 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
960 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
961 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
962 h->prev_frame_num = h->frame_num;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
963 h->frame_num = h->slice_num;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
964 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
965
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
966 if (h->prev_frame_num_offset < 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
967 h->prev_frame_num_offset += 256;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
968 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
969 }
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
970
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
971 for (m = 0; m < 2; m++){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
972 int i;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
973 for (i = 0; i < 4; i++){
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
974 int j;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
975 for (j = -1; j < 4; j++)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
976 h->ref_cache[m][scan8[0] + 8*i + j]= 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
977 if (i < 3)
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
978 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
979 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
980 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
981
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
982 for (s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
983 for (s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
984 h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
985
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
986 if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
987 ((get_bits_count(&s->gb) & 7) == 0 || show_bits(&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
988
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
989 skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb));
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
990 s->gb.size_in_bits = 8*buf_size;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
991
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
992 if (svq3_decode_slice_header(h))
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
993 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
994
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
995 /* TODO: support s->mb_skip_run */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
996 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
997
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
998 mb_type = svq3_get_ue_golomb(&s->gb);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
999
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1000 if (s->pict_type == FF_I_TYPE) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1001 mb_type += 8;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1002 } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1003 mb_type += 4;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1004 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1005 if (mb_type > 33 || svq3_decode_mb(h, mb_type)) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1006 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1007 return -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1008 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1009
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1010 if (mb_type != 0) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1011 hl_decode_mb (h);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1012 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1013
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1014 if (s->pict_type != FF_B_TYPE && !s->low_delay) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1015 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] =
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1016 (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1017 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1018 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1019
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1020 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1021 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1022
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1023 MPV_frame_end(s);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
1024
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1025 if (s->pict_type == FF_B_TYPE || s->low_delay) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1026 *(AVFrame *) data = *(AVFrame *) &s->current_picture;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1027 } else {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1028 *(AVFrame *) data = *(AVFrame *) &s->last_picture;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1029 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
1030
8196
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1031 avctx->frame_number = s->picture_number - 1;
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1032
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1033 /* Do not output the last pic after seeking. */
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1034 if (s->last_picture_ptr || s->low_delay) {
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1035 *data_size = sizeof(AVFrame);
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1036 }
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1037
2717c68de07f cosmetics: indentation, prettyprinting
diego
parents: 8195
diff changeset
1038 return buf_size;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1039 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1040
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1041
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1042 AVCodec svq3_decoder = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1043 "svq3",
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1044 CODEC_TYPE_VIDEO,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1045 CODEC_ID_SVQ3,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1046 sizeof(H264Context),
8209
65e05fda5280 move decoder initialization in separate function, earlier failure detection
bcoudurier
parents: 8196
diff changeset
1047 svq3_decode_init,
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1048 NULL,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1049 decode_end,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1050 svq3_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2452
diff changeset
1051 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
1052 .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3"),
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1053 };