Mercurial > libavcodec.hg
annotate interplayvideo.c @ 9311:5d20b2610662 libavcodec
Fix a too small CHECK_STREAM_PTR value in interplayvideo.c
author | reimar |
---|---|
date | Tue, 31 Mar 2009 18:23:52 +0000 |
parents | 851ca5db8327 |
children | 601e91e470e7 |
rev | line source |
---|---|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
1 /* |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
2 * Interplay MVE Video Decoder |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
3 * Copyright (C) 2003 the ffmpeg project |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
4 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
9 * 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
|
10 * version 2.1 of the License, or (at your option) any later version. |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
16 * |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
17 * 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
|
18 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2962
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
20 */ |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
21 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
22 /** |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
7040
diff
changeset
|
23 * @file libavcodec/interplayvideo.c |
1468 | 24 * Interplay MVE Video Decoder by Mike Melanson (melanson@pcisys.net) |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
25 * For more information about the Interplay MVE format, visit: |
1468 | 26 * http://www.pcisys.net/~melanson/codecs/interplay-mve.txt |
27 * This code is written in such a way that the identifiers match up | |
28 * with the encoding descriptions in the document. | |
29 * | |
30 * This decoder presently only supports a PAL8 output colorspace. | |
31 * | |
32 * An Interplay video frame consists of 2 parts: The decoding map and | |
33 * the video data. A demuxer must load these 2 parts together in a single | |
34 * buffer before sending it through the stream to this decoder. | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
35 */ |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
36 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
37 #include <stdio.h> |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
38 #include <stdlib.h> |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
39 #include <string.h> |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
40 #include <unistd.h> |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
41 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
42 #include "avcodec.h" |
5089 | 43 #include "bytestream.h" |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
44 #include "dsputil.h" |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
45 |
1468 | 46 #define PALETTE_COUNT 256 |
47 | |
48 /* debugging support */ | |
49 #define DEBUG_INTERPLAY 0 | |
50 #if DEBUG_INTERPLAY | |
2515 | 51 #define debug_interplay(x,...) av_log(NULL, AV_LOG_DEBUG, x, __VA_ARGS__) |
1468 | 52 #else |
53 static inline void debug_interplay(const char *format, ...) { } | |
54 #endif | |
55 | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
56 typedef struct IpvideoContext { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
57 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
58 AVCodecContext *avctx; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
59 DSPContext dsp; |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
60 AVFrame second_last_frame; |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
61 AVFrame last_frame; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
62 AVFrame current_frame; |
6218 | 63 const unsigned char *decoding_map; |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
64 int decoding_map_size; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
65 |
6218 | 66 const unsigned char *buf; |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
67 int size; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
68 |
6218 | 69 const unsigned char *stream_ptr; |
70 const unsigned char *stream_end; | |
1475 | 71 unsigned char *pixel_ptr; |
72 int line_inc; | |
73 int stride; | |
74 int upper_motion_limit_offset; | |
75 | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
76 } IpvideoContext; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
77 |
1468 | 78 #define CHECK_STREAM_PTR(n) \ |
9276
c80d14982fba
Change CHECK_STREAM_PTR macro to correctly handle the (extremely unlikely)
reimar
parents:
9275
diff
changeset
|
79 if (s->stream_end - s->stream_ptr < n) { \ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
80 av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \ |
1475 | 81 s->stream_ptr + n, s->stream_end); \ |
1468 | 82 return -1; \ |
83 } | |
84 | |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
85 static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y) |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
86 { |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
87 int current_offset = s->pixel_ptr - s->current_frame.data[0]; |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
88 int motion_offset = current_offset + delta_y * s->stride + delta_x; |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
89 if (motion_offset < 0) { |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
90 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
91 return -1; |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
92 } else if (motion_offset > s->upper_motion_limit_offset) { |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
93 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n", |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
94 motion_offset, s->upper_motion_limit_offset); |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
95 return -1; |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
96 } |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
97 s->dsp.put_pixels_tab[1][0](s->pixel_ptr, src->data[0] + motion_offset, s->stride, 8); |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
98 return 0; |
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
99 } |
1475 | 100 |
101 static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s) | |
1468 | 102 { |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
103 return copy_from(s, &s->last_frame, 0, 0); |
1468 | 104 } |
105 | |
1475 | 106 static int ipvideo_decode_block_opcode_0x1(IpvideoContext *s) |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
107 { |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
108 return copy_from(s, &s->second_last_frame, 0, 0); |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
109 } |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
110 |
1475 | 111 static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s) |
1468 | 112 { |
113 unsigned char B; | |
114 int x, y; | |
115 | |
1475 | 116 /* copy block from 2 frames ago using a motion vector; need 1 more byte */ |
1468 | 117 CHECK_STREAM_PTR(1); |
1475 | 118 B = *s->stream_ptr++; |
1468 | 119 |
120 if (B < 56) { | |
121 x = 8 + (B % 7); | |
122 y = B / 7; | |
123 } else { | |
124 x = -14 + ((B - 56) % 29); | |
125 y = 8 + ((B - 56) / 29); | |
126 } | |
127 | |
128 debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
129 return copy_from(s, &s->second_last_frame, x, y); |
1468 | 130 } |
131 | |
1475 | 132 static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s) |
1468 | 133 { |
134 unsigned char B; | |
135 int x, y; | |
136 | |
137 /* copy 8x8 block from current frame from an up/left block */ | |
138 | |
139 /* need 1 more byte for motion */ | |
140 CHECK_STREAM_PTR(1); | |
1475 | 141 B = *s->stream_ptr++; |
1468 | 142 |
143 if (B < 56) { | |
144 x = -(8 + (B % 7)); | |
145 y = -(B / 7); | |
146 } else { | |
147 x = -(-14 + ((B - 56) % 29)); | |
148 y = -( 8 + ((B - 56) / 29)); | |
149 } | |
150 | |
151 debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
152 return copy_from(s, &s->current_frame, x, y); |
1468 | 153 } |
154 | |
1475 | 155 static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s) |
1468 | 156 { |
157 int x, y; | |
158 unsigned char B, BL, BH; | |
159 | |
160 /* copy a block from the previous frame; need 1 more byte */ | |
161 CHECK_STREAM_PTR(1); | |
162 | |
1475 | 163 B = *s->stream_ptr++; |
1468 | 164 BL = B & 0x0F; |
165 BH = (B >> 4) & 0x0F; | |
166 x = -8 + BL; | |
167 y = -8 + BH; | |
168 | |
169 debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
170 return copy_from(s, &s->last_frame, x, y); |
1468 | 171 } |
172 | |
1475 | 173 static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s) |
1468 | 174 { |
175 signed char x, y; | |
176 | |
177 /* copy a block from the previous frame using an expanded range; | |
178 * need 2 more bytes */ | |
179 CHECK_STREAM_PTR(2); | |
180 | |
1475 | 181 x = *s->stream_ptr++; |
182 y = *s->stream_ptr++; | |
1468 | 183 |
184 debug_interplay (" motion bytes = %d, %d\n", x, y); | |
9277
b8e5b7edb2d5
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
reimar
parents:
9276
diff
changeset
|
185 return copy_from(s, &s->last_frame, x, y); |
1468 | 186 } |
187 | |
1475 | 188 static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s) |
1468 | 189 { |
190 /* mystery opcode? skip multiple blocks? */ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
191 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: Help! Mystery opcode 0x6 seen\n"); |
1468 | 192 |
193 /* report success */ | |
194 return 0; | |
195 } | |
196 | |
1475 | 197 static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s) |
1468 | 198 { |
199 int x, y; | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
200 unsigned char P[2]; |
1468 | 201 unsigned int flags; |
202 | |
203 /* 2-color encoding */ | |
204 CHECK_STREAM_PTR(2); | |
205 | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
206 P[0] = *s->stream_ptr++; |
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
207 P[1] = *s->stream_ptr++; |
1468 | 208 |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
209 if (P[0] <= P[1]) { |
1468 | 210 |
211 /* need 8 more bytes from the stream */ | |
212 CHECK_STREAM_PTR(8); | |
213 | |
214 for (y = 0; y < 8; y++) { | |
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
215 flags = *s->stream_ptr++ | 0x100; |
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
216 for (; flags != 1; flags >>= 1) { |
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
217 *s->pixel_ptr++ = P[flags & 1]; |
1468 | 218 } |
1475 | 219 s->pixel_ptr += s->line_inc; |
1468 | 220 } |
221 | |
222 } else { | |
223 | |
224 /* need 2 more bytes from the stream */ | |
225 CHECK_STREAM_PTR(2); | |
226 | |
5089 | 227 flags = bytestream_get_le16(&s->stream_ptr); |
1468 | 228 for (y = 0; y < 8; y += 2) { |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
229 for (x = 0; x < 8; x += 2, flags >>= 1) { |
9299 | 230 s->pixel_ptr[x ] = |
231 s->pixel_ptr[x + 1 ] = | |
232 s->pixel_ptr[x + s->stride] = | |
233 s->pixel_ptr[x + 1 + s->stride] = P[flags & 1]; | |
1468 | 234 } |
1475 | 235 s->pixel_ptr += s->stride * 2; |
1468 | 236 } |
237 } | |
238 | |
239 /* report success */ | |
240 return 0; | |
241 } | |
242 | |
1475 | 243 static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s) |
1468 | 244 { |
245 int x, y; | |
246 unsigned char P[8]; | |
247 unsigned char B[8]; | |
248 unsigned int flags = 0; | |
249 unsigned char P0 = 0, P1 = 0; | |
250 int lower_half = 0; | |
251 | |
252 /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on | |
253 * either top and bottom or left and right halves */ | |
254 CHECK_STREAM_PTR(2); | |
255 | |
1475 | 256 P[0] = *s->stream_ptr++; |
257 P[1] = *s->stream_ptr++; | |
1468 | 258 |
259 if (P[0] <= P[1]) { | |
260 | |
9311
5d20b2610662
Fix a too small CHECK_STREAM_PTR value in interplayvideo.c
reimar
parents:
9307
diff
changeset
|
261 CHECK_STREAM_PTR(14); |
1475 | 262 B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; |
263 P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; | |
264 B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; | |
265 P[4] = *s->stream_ptr++; P[5] = *s->stream_ptr++; | |
266 B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; | |
267 P[6] = *s->stream_ptr++; P[7] = *s->stream_ptr++; | |
268 B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; | |
1468 | 269 |
270 for (y = 0; y < 8; y++) { | |
271 | |
272 /* time to reload flags? */ | |
273 if (y == 0) { | |
274 flags = | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
275 ((B[0] & 0xF0) << 4) | ((B[4] & 0xF0) << 8) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
276 ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
277 ((B[1] & 0xF0) << 20) | ((B[5] & 0xF0) << 24) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
278 ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); |
1468 | 279 lower_half = 0; /* still on top half */ |
280 } else if (y == 4) { | |
281 flags = | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
282 ((B[2] & 0xF0) << 4) | ((B[6] & 0xF0) << 8) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
283 ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
284 ((B[3] & 0xF0) << 20) | ((B[7] & 0xF0) << 24) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
285 ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
286 lower_half = 2; |
1468 | 287 } |
288 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
289 for (x = 0; x < 8; x++, flags >>= 1) { |
1468 | 290 /* get the pixel values ready for this quadrant */ |
291 if (x == 0) { | |
292 P0 = P[lower_half + 0]; | |
293 P1 = P[lower_half + 1]; | |
294 } else if (x == 4) { | |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
295 P0 = P[lower_half + 4]; |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
296 P1 = P[lower_half + 5]; |
1468 | 297 } |
298 | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
299 *s->pixel_ptr++ = flags & 1 ? P1 : P0; |
1468 | 300 } |
1475 | 301 s->pixel_ptr += s->line_inc; |
1468 | 302 } |
303 | |
304 } else { | |
305 | |
306 /* need 10 more bytes */ | |
307 CHECK_STREAM_PTR(10); | |
308 | |
9306 | 309 if (s->stream_ptr[4] <= s->stream_ptr[5]) { |
1468 | 310 |
9300
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
311 B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
312 B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
313 P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
314 B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
315 B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
316 |
1468 | 317 /* vertical split; left & right halves are 2-color encoded */ |
318 | |
319 for (y = 0; y < 8; y++) { | |
320 | |
321 /* time to reload flags? */ | |
322 if (y == 0) { | |
323 flags = | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
324 ((B[0] & 0xF0) << 4) | ((B[4] & 0xF0) << 8) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
325 ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
326 ((B[1] & 0xF0) << 20) | ((B[5] & 0xF0) << 24) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
327 ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); |
1468 | 328 } else if (y == 4) { |
329 flags = | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
330 ((B[2] & 0xF0) << 4) | ((B[6] & 0xF0) << 8) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
331 ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
332 ((B[3] & 0xF0) << 20) | ((B[7] & 0xF0) << 24) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
333 ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); |
1468 | 334 } |
335 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
336 for (x = 0; x < 8; x++, flags >>= 1) { |
1468 | 337 /* get the pixel values ready for this half */ |
338 if (x == 0) { | |
339 P0 = P[0]; | |
340 P1 = P[1]; | |
341 } else if (x == 4) { | |
342 P0 = P[2]; | |
343 P1 = P[3]; | |
344 } | |
345 | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
346 *s->pixel_ptr++ = flags & 1 ? P1 : P0; |
1468 | 347 } |
1475 | 348 s->pixel_ptr += s->line_inc; |
1468 | 349 } |
350 | |
351 } else { | |
352 | |
353 /* horizontal split; top & bottom halves are 2-color encoded */ | |
354 | |
355 for (y = 0; y < 8; y++) { | |
9300
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
356 if (y == 4) { |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
357 P[0] = *s->stream_ptr++; |
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
358 P[1] = *s->stream_ptr++; |
1468 | 359 } |
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
360 flags = *s->stream_ptr++ | 0x100; |
1468 | 361 |
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
362 for (; flags != 1; flags >>= 1) { |
1468 | 363 |
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
364 *s->pixel_ptr++ = P[flags & 1]; |
1468 | 365 } |
1475 | 366 s->pixel_ptr += s->line_inc; |
1468 | 367 } |
368 } | |
369 } | |
370 | |
371 /* report success */ | |
372 return 0; | |
373 } | |
374 | |
1475 | 375 static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) |
1468 | 376 { |
377 int x, y; | |
378 unsigned char P[4]; | |
379 | |
380 /* 4-color encoding */ | |
381 CHECK_STREAM_PTR(4); | |
382 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
383 memcpy(P, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
384 s->stream_ptr += 4; |
1468 | 385 |
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
386 if (P[0] <= P[1]) { |
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
387 if (P[2] <= P[3]) { |
1468 | 388 |
9305 | 389 /* 1 of 4 colors for each pixel, need 16 more bytes */ |
390 CHECK_STREAM_PTR(16); | |
1468 | 391 |
9305 | 392 for (y = 0; y < 8; y++) { |
393 /* get the next set of 8 2-bit flags */ | |
394 int flags = bytestream_get_le16(&s->stream_ptr); | |
395 for (x = 0; x < 8; x++, flags >>= 2) { | |
396 *s->pixel_ptr++ = P[flags & 0x03]; | |
397 } | |
398 s->pixel_ptr += s->line_inc; | |
1468 | 399 } |
400 | |
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
401 } else { |
9305 | 402 uint32_t flags; |
1468 | 403 |
9305 | 404 /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ |
405 CHECK_STREAM_PTR(4); | |
1468 | 406 |
9305 | 407 flags = bytestream_get_le32(&s->stream_ptr); |
1468 | 408 |
9305 | 409 for (y = 0; y < 8; y += 2) { |
410 for (x = 0; x < 8; x += 2, flags >>= 2) { | |
411 s->pixel_ptr[x ] = | |
412 s->pixel_ptr[x + 1 ] = | |
413 s->pixel_ptr[x + s->stride] = | |
414 s->pixel_ptr[x + 1 + s->stride] = P[flags & 0x03]; | |
415 } | |
416 s->pixel_ptr += s->stride * 2; | |
1468 | 417 } |
418 | |
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
419 } |
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
420 } else { |
9302
0469949a5224
Avoid "reloading" code by using a 64 bit type for the flags and loading all at once.
reimar
parents:
9301
diff
changeset
|
421 uint64_t flags; |
1468 | 422 |
9304 | 423 /* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */ |
1468 | 424 CHECK_STREAM_PTR(8); |
425 | |
9302
0469949a5224
Avoid "reloading" code by using a 64 bit type for the flags and loading all at once.
reimar
parents:
9301
diff
changeset
|
426 flags = bytestream_get_le64(&s->stream_ptr); |
9304 | 427 if (P[2] <= P[3]) { |
9305 | 428 for (y = 0; y < 8; y++) { |
429 for (x = 0; x < 8; x += 2, flags >>= 2) { | |
430 s->pixel_ptr[x ] = | |
431 s->pixel_ptr[x + 1] = P[flags & 0x03]; | |
432 } | |
433 s->pixel_ptr += s->stride; | |
1468 | 434 } |
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
435 } else { |
9305 | 436 for (y = 0; y < 8; y += 2) { |
437 for (x = 0; x < 8; x++, flags >>= 2) { | |
438 s->pixel_ptr[x ] = | |
439 s->pixel_ptr[x + s->stride] = P[flags & 0x03]; | |
440 } | |
441 s->pixel_ptr += s->stride * 2; | |
1468 | 442 } |
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
443 } |
1468 | 444 } |
445 | |
446 /* report success */ | |
447 return 0; | |
448 } | |
449 | |
1475 | 450 static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s) |
1468 | 451 { |
452 int x, y; | |
453 unsigned char P[16]; | |
454 unsigned char B[16]; | |
455 int flags = 0; | |
456 int index; | |
457 int split; | |
458 int lower_half; | |
459 | |
460 /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on | |
461 * either top and bottom or left and right halves */ | |
462 CHECK_STREAM_PTR(4); | |
463 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
464 memcpy(P, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
465 s->stream_ptr += 4; |
1468 | 466 |
467 if (P[0] <= P[1]) { | |
468 | |
469 /* 4-color encoding for each quadrant; need 28 more bytes */ | |
470 CHECK_STREAM_PTR(28); | |
471 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
472 memcpy(B, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
473 s->stream_ptr += 4; |
1468 | 474 for (y = 4; y < 16; y += 4) { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
475 memcpy(P + y, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
476 s->stream_ptr += 4; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
477 memcpy(B + y, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
478 s->stream_ptr += 4; |
1468 | 479 } |
480 | |
481 for (y = 0; y < 8; y++) { | |
482 | |
483 lower_half = (y >= 4) ? 4 : 0; | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
484 flags = (B[y + 8] << 8) | B[y]; |
1468 | 485 |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
486 for (x = 0; x < 8; x++, flags >>= 2) { |
1468 | 487 split = (x >= 4) ? 8 : 0; |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
488 index = split + lower_half + (flags & 0x03); |
1475 | 489 *s->pixel_ptr++ = P[index]; |
1468 | 490 } |
491 | |
1475 | 492 s->pixel_ptr += s->line_inc; |
1468 | 493 } |
494 | |
495 } else { | |
496 | |
497 /* 4-color encoding for either left and right or top and bottom | |
498 * halves; need 20 more bytes */ | |
499 CHECK_STREAM_PTR(20); | |
500 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
501 memcpy(B, s->stream_ptr, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
502 s->stream_ptr += 8; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
503 memcpy(P + 4, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
504 s->stream_ptr += 4; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
505 memcpy(B + 8, s->stream_ptr, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
506 s->stream_ptr += 8; |
1468 | 507 |
508 if (P[4] <= P[5]) { | |
509 | |
510 /* block is divided into left and right halves */ | |
511 for (y = 0; y < 8; y++) { | |
512 | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
513 flags = (B[y + 8] << 8) | B[y]; |
1468 | 514 split = 0; |
515 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
516 for (x = 0; x < 8; x++, flags >>= 2) { |
1468 | 517 if (x == 4) |
518 split = 4; | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
519 *s->pixel_ptr++ = P[split + (flags & 0x03)]; |
1468 | 520 } |
521 | |
1475 | 522 s->pixel_ptr += s->line_inc; |
1468 | 523 } |
524 | |
525 } else { | |
526 | |
527 /* block is divided into top and bottom halves */ | |
528 split = 0; | |
529 for (y = 0; y < 8; y++) { | |
530 | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
531 flags = (B[y * 2 + 1] << 8) | B[y * 2]; |
1468 | 532 if (y == 4) |
533 split = 4; | |
534 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
535 for (x = 0; x < 8; x++, flags >>= 2) |
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
536 *s->pixel_ptr++ = P[split + (flags & 0x03)]; |
1468 | 537 |
1475 | 538 s->pixel_ptr += s->line_inc; |
1468 | 539 } |
540 } | |
541 } | |
542 | |
543 /* report success */ | |
544 return 0; | |
545 } | |
546 | |
1475 | 547 static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s) |
1468 | 548 { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
549 int y; |
1468 | 550 |
551 /* 64-color encoding (each pixel in block is a different color) */ | |
552 CHECK_STREAM_PTR(64); | |
553 | |
554 for (y = 0; y < 8; y++) { | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
555 memcpy(s->pixel_ptr, s->stream_ptr, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
556 s->stream_ptr += 8; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
557 s->pixel_ptr += s->stride; |
1468 | 558 } |
559 | |
560 /* report success */ | |
561 return 0; | |
562 } | |
563 | |
1475 | 564 static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s) |
1468 | 565 { |
566 int x, y; | |
567 | |
568 /* 16-color block encoding: each 2x2 block is a different color */ | |
569 CHECK_STREAM_PTR(16); | |
570 | |
571 for (y = 0; y < 8; y += 2) { | |
572 for (x = 0; x < 8; x += 2) { | |
9297 | 573 s->pixel_ptr[x ] = |
574 s->pixel_ptr[x + 1 ] = | |
575 s->pixel_ptr[x + s->stride] = | |
9301 | 576 s->pixel_ptr[x + 1 + s->stride] = *s->stream_ptr++; |
1468 | 577 } |
1475 | 578 s->pixel_ptr += s->stride * 2; |
1468 | 579 } |
580 | |
581 /* report success */ | |
582 return 0; | |
583 } | |
584 | |
1475 | 585 static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s) |
1468 | 586 { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
587 int y; |
1468 | 588 unsigned char P[4]; |
589 unsigned char index = 0; | |
590 | |
591 /* 4-color block encoding: each 4x4 block is a different color */ | |
592 CHECK_STREAM_PTR(4); | |
593 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
594 memcpy(P, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
595 s->stream_ptr += 4; |
1468 | 596 |
597 for (y = 0; y < 8; y++) { | |
598 if (y < 4) | |
599 index = 0; | |
600 else | |
601 index = 2; | |
602 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
603 memset(s->pixel_ptr , P[index ], 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
604 memset(s->pixel_ptr + 4, P[index + 1], 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
605 s->pixel_ptr += s->stride; |
1468 | 606 } |
607 | |
608 /* report success */ | |
609 return 0; | |
610 } | |
611 | |
1475 | 612 static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s) |
1468 | 613 { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
614 int y; |
1468 | 615 unsigned char pix; |
616 | |
617 /* 1-color encoding: the whole block is 1 solid color */ | |
618 CHECK_STREAM_PTR(1); | |
1475 | 619 pix = *s->stream_ptr++; |
1468 | 620 |
621 for (y = 0; y < 8; y++) { | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
622 memset(s->pixel_ptr, pix, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
623 s->pixel_ptr += s->stride; |
1468 | 624 } |
625 | |
626 /* report success */ | |
627 return 0; | |
628 } | |
629 | |
1475 | 630 static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s) |
1468 | 631 { |
632 int x, y; | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
633 unsigned char sample[2]; |
1468 | 634 |
635 /* dithered encoding */ | |
636 CHECK_STREAM_PTR(2); | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
637 sample[0] = *s->stream_ptr++; |
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
638 sample[1] = *s->stream_ptr++; |
1468 | 639 |
640 for (y = 0; y < 8; y++) { | |
641 for (x = 0; x < 8; x += 2) { | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
642 *s->pixel_ptr++ = sample[ y & 1 ]; |
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
643 *s->pixel_ptr++ = sample[!(y & 1)]; |
1468 | 644 } |
1475 | 645 s->pixel_ptr += s->line_inc; |
1468 | 646 } |
647 | |
648 /* report success */ | |
649 return 0; | |
650 } | |
651 | |
9272
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
652 static int (* const ipvideo_decode_block[])(IpvideoContext *s) = { |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
653 ipvideo_decode_block_opcode_0x0, ipvideo_decode_block_opcode_0x1, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
654 ipvideo_decode_block_opcode_0x2, ipvideo_decode_block_opcode_0x3, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
655 ipvideo_decode_block_opcode_0x4, ipvideo_decode_block_opcode_0x5, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
656 ipvideo_decode_block_opcode_0x6, ipvideo_decode_block_opcode_0x7, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
657 ipvideo_decode_block_opcode_0x8, ipvideo_decode_block_opcode_0x9, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
658 ipvideo_decode_block_opcode_0xA, ipvideo_decode_block_opcode_0xB, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
659 ipvideo_decode_block_opcode_0xC, ipvideo_decode_block_opcode_0xD, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
660 ipvideo_decode_block_opcode_0xE, ipvideo_decode_block_opcode_0xF, |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
661 }; |
1468 | 662 |
663 static void ipvideo_decode_opcodes(IpvideoContext *s) | |
664 { | |
665 int x, y; | |
666 int index = 0; | |
667 unsigned char opcode; | |
668 int ret; | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
669 int code_counts[16] = {0}; |
1468 | 670 static int frame = 0; |
671 | |
672 debug_interplay("------------------ frame %d\n", frame); | |
673 frame++; | |
674 | |
675 /* this is PAL8, so make the palette available */ | |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
676 memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4); |
1468 | 677 |
1475 | 678 s->stride = s->current_frame.linesize[0]; |
679 s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */ | |
680 s->stream_end = s->buf + s->size; | |
681 s->line_inc = s->stride - 8; | |
682 s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride | |
683 + s->avctx->width - 8; | |
1468 | 684 |
1475 | 685 for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) { |
686 for (x = y; x < y + s->avctx->width; x += 8) { | |
687 /* bottom nibble first, then top nibble (which makes it | |
688 * hard to use a GetBitcontext) */ | |
689 if (index & 1) | |
690 opcode = s->decoding_map[index >> 1] >> 4; | |
691 else | |
692 opcode = s->decoding_map[index >> 1] & 0xF; | |
693 index++; | |
1468 | 694 |
1475 | 695 debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", |
696 x - y, y / s->stride, opcode, s->stream_ptr); | |
697 code_counts[opcode]++; | |
1468 | 698 |
1475 | 699 s->pixel_ptr = s->current_frame.data[0] + x; |
700 ret = ipvideo_decode_block[opcode](s); | |
701 if (ret != 0) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
702 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n", |
1475 | 703 frame, x - y, y / s->stride); |
704 return; | |
1468 | 705 } |
706 } | |
707 } | |
9275
67cf9d31724c
Simplify check for leftover bytes after decoding for interplayvideo.
reimar
parents:
9274
diff
changeset
|
708 if (s->stream_end - s->stream_ptr > 1) { |
2962 | 709 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n", |
1475 | 710 s->stream_end - s->stream_ptr); |
711 } | |
1468 | 712 } |
713 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
714 static av_cold int ipvideo_decode_init(AVCodecContext *avctx) |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
715 { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
716 IpvideoContext *s = avctx->priv_data; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
717 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
718 s->avctx = avctx; |
1468 | 719 |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
720 if (s->avctx->palctrl == NULL) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
721 av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n"); |
1468 | 722 return -1; |
723 } | |
724 | |
725 avctx->pix_fmt = PIX_FMT_PAL8; | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
726 dsputil_init(&s->dsp, avctx); |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
727 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
728 /* decoding map contains 4 bits of information per 8x8 block */ |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
729 s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); |
1468 | 730 |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
731 s->current_frame.data[0] = s->last_frame.data[0] = |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
732 s->second_last_frame.data[0] = NULL; |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
733 |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
734 return 0; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
735 } |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
736 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
737 static int ipvideo_decode_frame(AVCodecContext *avctx, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
738 void *data, int *data_size, |
6218 | 739 const uint8_t *buf, int buf_size) |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
740 { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
741 IpvideoContext *s = avctx->priv_data; |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
742 AVPaletteControl *palette_control = avctx->palctrl; |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
743 |
1770 | 744 /* compressed buffer needs to be large enough to at least hold an entire |
745 * decoding map */ | |
746 if (buf_size < s->decoding_map_size) | |
747 return buf_size; | |
748 | |
1468 | 749 s->decoding_map = buf; |
750 s->buf = buf + s->decoding_map_size; | |
751 s->size = buf_size - s->decoding_map_size; | |
752 | |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
753 s->current_frame.reference = 3; |
1468 | 754 if (avctx->get_buffer(avctx, &s->current_frame)) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
755 av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); |
1468 | 756 return -1; |
757 } | |
758 | |
759 ipvideo_decode_opcodes(s); | |
760 | |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
761 if (palette_control->palette_changed) { |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
762 palette_control->palette_changed = 0; |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
763 s->current_frame.palette_has_changed = 1; |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
764 } |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
765 |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
766 *data_size = sizeof(AVFrame); |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
767 *(AVFrame*)data = s->current_frame; |
1468 | 768 |
769 /* shuffle frames */ | |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
770 if (s->second_last_frame.data[0]) |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
771 avctx->release_buffer(avctx, &s->second_last_frame); |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
772 s->second_last_frame = s->last_frame; |
1468 | 773 s->last_frame = s->current_frame; |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
774 s->current_frame.data[0] = NULL; /* catch any access attempts */ |
1468 | 775 |
776 /* report that the buffer was completely consumed */ | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
777 return buf_size; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
778 } |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
779 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
780 static av_cold int ipvideo_decode_end(AVCodecContext *avctx) |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
781 { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
782 IpvideoContext *s = avctx->priv_data; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
783 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
784 /* release the last frame */ |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
785 if (s->last_frame.data[0]) |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
786 avctx->release_buffer(avctx, &s->last_frame); |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
787 if (s->second_last_frame.data[0]) |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
788 avctx->release_buffer(avctx, &s->second_last_frame); |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
789 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
790 return 0; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
791 } |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
792 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
793 AVCodec interplay_video_decoder = { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
794 "interplayvideo", |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
795 CODEC_TYPE_VIDEO, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
796 CODEC_ID_INTERPLAY_VIDEO, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
797 sizeof(IpvideoContext), |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
798 ipvideo_decode_init, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
799 NULL, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
800 ipvideo_decode_end, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
801 ipvideo_decode_frame, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
802 CODEC_CAP_DR1, |
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
8718
diff
changeset
|
803 .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
804 }; |