annotate svq3.c @ 10852:86d7ab878805 libavcodec

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