Mercurial > libavcodec.hg
annotate interplayvideo.c @ 9299:1c7fe87b1674 libavcodec
Fix indentation
author | reimar |
---|---|
date | Tue, 31 Mar 2009 13:21:41 +0000 |
parents | 9698f0d03ed9 |
children | 6a1aacfa3043 |
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++) { | |
9274
b0dcca654e18
Get rid of pointless "B" array in interplayvideo decoder.
reimar
parents:
9273
diff
changeset
|
215 flags = *s->stream_ptr++; |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
216 for (x = 0x01; x <= 0x80; x <<= 1) { |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
217 *s->pixel_ptr++ = P[!!(flags & x)]; |
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 | |
261 /* need 12 more bytes */ | |
262 CHECK_STREAM_PTR(12); | |
1475 | 263 B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; |
264 P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; | |
265 B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; | |
266 P[4] = *s->stream_ptr++; P[5] = *s->stream_ptr++; | |
267 B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; | |
268 P[6] = *s->stream_ptr++; P[7] = *s->stream_ptr++; | |
269 B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; | |
1468 | 270 |
271 for (y = 0; y < 8; y++) { | |
272 | |
273 /* time to reload flags? */ | |
274 if (y == 0) { | |
275 flags = | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
276 ((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
|
277 ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
278 ((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
|
279 ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); |
1468 | 280 lower_half = 0; /* still on top half */ |
281 } else if (y == 4) { | |
282 flags = | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
283 ((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
|
284 ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | |
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
285 ((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
|
286 ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
287 lower_half = 2; |
1468 | 288 } |
289 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
290 for (x = 0; x < 8; x++, flags >>= 1) { |
1468 | 291 /* get the pixel values ready for this quadrant */ |
292 if (x == 0) { | |
293 P0 = P[lower_half + 0]; | |
294 P1 = P[lower_half + 1]; | |
295 } else if (x == 4) { | |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
296 P0 = P[lower_half + 4]; |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
297 P1 = P[lower_half + 5]; |
1468 | 298 } |
299 | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
300 *s->pixel_ptr++ = flags & 1 ? P1 : P0; |
1468 | 301 } |
1475 | 302 s->pixel_ptr += s->line_inc; |
1468 | 303 } |
304 | |
305 } else { | |
306 | |
307 /* need 10 more bytes */ | |
308 CHECK_STREAM_PTR(10); | |
1475 | 309 B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; |
310 B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; | |
311 P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; | |
312 B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; | |
313 B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; | |
1468 | 314 |
315 if (P[2] <= P[3]) { | |
316 | |
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++) { | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
356 int bitmask; |
1468 | 357 |
358 flags = B[y]; | |
359 if (y == 0) { | |
360 P0 = P[0]; | |
361 P1 = P[1]; | |
362 } else if (y == 4) { | |
363 P0 = P[2]; | |
364 P1 = P[3]; | |
365 } | |
366 | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
367 for (bitmask = 0x01; bitmask <= 0x80; bitmask <<= 1) { |
1468 | 368 |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
369 *s->pixel_ptr++ = flags & bitmask ? P1 : P0; |
1468 | 370 } |
1475 | 371 s->pixel_ptr += s->line_inc; |
1468 | 372 } |
373 } | |
374 } | |
375 | |
376 /* report success */ | |
377 return 0; | |
378 } | |
379 | |
1475 | 380 static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) |
1468 | 381 { |
382 int x, y; | |
383 unsigned char P[4]; | |
384 unsigned int flags = 0; | |
385 unsigned char pix; | |
386 | |
387 /* 4-color encoding */ | |
388 CHECK_STREAM_PTR(4); | |
389 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
390 memcpy(P, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
391 s->stream_ptr += 4; |
1468 | 392 |
393 if ((P[0] <= P[1]) && (P[2] <= P[3])) { | |
394 | |
395 /* 1 of 4 colors for each pixel, need 16 more bytes */ | |
396 CHECK_STREAM_PTR(16); | |
397 | |
398 for (y = 0; y < 8; y++) { | |
399 /* get the next set of 8 2-bit flags */ | |
5089 | 400 flags = bytestream_get_le16(&s->stream_ptr); |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
401 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
|
402 *s->pixel_ptr++ = P[flags & 0x03]; |
1468 | 403 } |
1475 | 404 s->pixel_ptr += s->line_inc; |
1468 | 405 } |
406 | |
407 } else if ((P[0] <= P[1]) && (P[2] > P[3])) { | |
408 | |
409 /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ | |
410 CHECK_STREAM_PTR(4); | |
411 | |
5089 | 412 flags = bytestream_get_le32(&s->stream_ptr); |
1468 | 413 |
414 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
|
415 for (x = 0; x < 8; x += 2, flags >>= 2) { |
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
416 pix = P[flags & 0x03]; |
9297 | 417 s->pixel_ptr[x ] = |
418 s->pixel_ptr[x + 1 ] = | |
419 s->pixel_ptr[x + s->stride] = | |
420 s->pixel_ptr[x + 1 + s->stride] = pix; | |
1468 | 421 } |
1475 | 422 s->pixel_ptr += s->stride * 2; |
1468 | 423 } |
424 | |
425 } else if ((P[0] > P[1]) && (P[2] <= P[3])) { | |
426 | |
427 /* 1 of 4 colors for each 2x1 block, need 8 more bytes */ | |
428 CHECK_STREAM_PTR(8); | |
429 | |
430 for (y = 0; y < 8; y++) { | |
431 /* time to reload flags? */ | |
432 if ((y == 0) || (y == 4)) { | |
5089 | 433 flags = bytestream_get_le32(&s->stream_ptr); |
1468 | 434 } |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
435 for (x = 0; x < 8; x += 2, flags >>= 2) { |
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
436 pix = P[flags & 0x03]; |
9297 | 437 s->pixel_ptr[x ] = |
438 s->pixel_ptr[x + 1] = pix; | |
1468 | 439 } |
1475 | 440 s->pixel_ptr += s->stride; |
1468 | 441 } |
442 | |
443 } else { | |
444 | |
445 /* 1 of 4 colors for each 1x2 block, need 8 more bytes */ | |
446 CHECK_STREAM_PTR(8); | |
447 | |
448 for (y = 0; y < 8; y += 2) { | |
449 /* time to reload flags? */ | |
450 if ((y == 0) || (y == 4)) { | |
5089 | 451 flags = bytestream_get_le32(&s->stream_ptr); |
1468 | 452 } |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
453 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
|
454 pix = P[flags & 0x03]; |
9297 | 455 s->pixel_ptr[x ] = |
456 s->pixel_ptr[x + s->stride] = pix; | |
1468 | 457 } |
1475 | 458 s->pixel_ptr += s->stride * 2; |
1468 | 459 } |
460 } | |
461 | |
462 /* report success */ | |
463 return 0; | |
464 } | |
465 | |
1475 | 466 static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s) |
1468 | 467 { |
468 int x, y; | |
469 unsigned char P[16]; | |
470 unsigned char B[16]; | |
471 int flags = 0; | |
472 int index; | |
473 int split; | |
474 int lower_half; | |
475 | |
476 /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on | |
477 * either top and bottom or left and right halves */ | |
478 CHECK_STREAM_PTR(4); | |
479 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
480 memcpy(P, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
481 s->stream_ptr += 4; |
1468 | 482 |
483 if (P[0] <= P[1]) { | |
484 | |
485 /* 4-color encoding for each quadrant; need 28 more bytes */ | |
486 CHECK_STREAM_PTR(28); | |
487 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
488 memcpy(B, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
489 s->stream_ptr += 4; |
1468 | 490 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
|
491 memcpy(P + y, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
492 s->stream_ptr += 4; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
493 memcpy(B + y, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
494 s->stream_ptr += 4; |
1468 | 495 } |
496 | |
497 for (y = 0; y < 8; y++) { | |
498 | |
499 lower_half = (y >= 4) ? 4 : 0; | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
500 flags = (B[y + 8] << 8) | B[y]; |
1468 | 501 |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
502 for (x = 0; x < 8; x++, flags >>= 2) { |
1468 | 503 split = (x >= 4) ? 8 : 0; |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
504 index = split + lower_half + (flags & 0x03); |
1475 | 505 *s->pixel_ptr++ = P[index]; |
1468 | 506 } |
507 | |
1475 | 508 s->pixel_ptr += s->line_inc; |
1468 | 509 } |
510 | |
511 } else { | |
512 | |
513 /* 4-color encoding for either left and right or top and bottom | |
514 * halves; need 20 more bytes */ | |
515 CHECK_STREAM_PTR(20); | |
516 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
517 memcpy(B, s->stream_ptr, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
518 s->stream_ptr += 8; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
519 memcpy(P + 4, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
520 s->stream_ptr += 4; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
521 memcpy(B + 8, s->stream_ptr, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
522 s->stream_ptr += 8; |
1468 | 523 |
524 if (P[4] <= P[5]) { | |
525 | |
526 /* block is divided into left and right halves */ | |
527 for (y = 0; y < 8; y++) { | |
528 | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
529 flags = (B[y + 8] << 8) | B[y]; |
1468 | 530 split = 0; |
531 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
532 for (x = 0; x < 8; x++, flags >>= 2) { |
1468 | 533 if (x == 4) |
534 split = 4; | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
535 *s->pixel_ptr++ = P[split + (flags & 0x03)]; |
1468 | 536 } |
537 | |
1475 | 538 s->pixel_ptr += s->line_inc; |
1468 | 539 } |
540 | |
541 } else { | |
542 | |
543 /* block is divided into top and bottom halves */ | |
544 split = 0; | |
545 for (y = 0; y < 8; y++) { | |
546 | |
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
547 flags = (B[y * 2 + 1] << 8) | B[y * 2]; |
1468 | 548 if (y == 4) |
549 split = 4; | |
550 | |
9296
2129ee5b7e0d
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
reimar
parents:
9277
diff
changeset
|
551 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
|
552 *s->pixel_ptr++ = P[split + (flags & 0x03)]; |
1468 | 553 |
1475 | 554 s->pixel_ptr += s->line_inc; |
1468 | 555 } |
556 } | |
557 } | |
558 | |
559 /* report success */ | |
560 return 0; | |
561 } | |
562 | |
1475 | 563 static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s) |
1468 | 564 { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
565 int y; |
1468 | 566 |
567 /* 64-color encoding (each pixel in block is a different color) */ | |
568 CHECK_STREAM_PTR(64); | |
569 | |
570 for (y = 0; y < 8; y++) { | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
571 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
|
572 s->stream_ptr += 8; |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
573 s->pixel_ptr += s->stride; |
1468 | 574 } |
575 | |
576 /* report success */ | |
577 return 0; | |
578 } | |
579 | |
1475 | 580 static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s) |
1468 | 581 { |
582 int x, y; | |
583 unsigned char pix; | |
584 | |
585 /* 16-color block encoding: each 2x2 block is a different color */ | |
586 CHECK_STREAM_PTR(16); | |
587 | |
588 for (y = 0; y < 8; y += 2) { | |
589 for (x = 0; x < 8; x += 2) { | |
1475 | 590 pix = *s->stream_ptr++; |
9297 | 591 s->pixel_ptr[x ] = |
592 s->pixel_ptr[x + 1 ] = | |
593 s->pixel_ptr[x + s->stride] = | |
594 s->pixel_ptr[x + 1 + s->stride] = pix; | |
1468 | 595 } |
1475 | 596 s->pixel_ptr += s->stride * 2; |
1468 | 597 } |
598 | |
599 /* report success */ | |
600 return 0; | |
601 } | |
602 | |
1475 | 603 static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s) |
1468 | 604 { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
605 int y; |
1468 | 606 unsigned char P[4]; |
607 unsigned char index = 0; | |
608 | |
609 /* 4-color block encoding: each 4x4 block is a different color */ | |
610 CHECK_STREAM_PTR(4); | |
611 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
612 memcpy(P, s->stream_ptr, 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
613 s->stream_ptr += 4; |
1468 | 614 |
615 for (y = 0; y < 8; y++) { | |
616 if (y < 4) | |
617 index = 0; | |
618 else | |
619 index = 2; | |
620 | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
621 memset(s->pixel_ptr , P[index ], 4); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
622 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
|
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_0xE(IpvideoContext *s) |
1468 | 631 { |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
632 int y; |
1468 | 633 unsigned char pix; |
634 | |
635 /* 1-color encoding: the whole block is 1 solid color */ | |
636 CHECK_STREAM_PTR(1); | |
1475 | 637 pix = *s->stream_ptr++; |
1468 | 638 |
639 for (y = 0; y < 8; y++) { | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
640 memset(s->pixel_ptr, pix, 8); |
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
641 s->pixel_ptr += s->stride; |
1468 | 642 } |
643 | |
644 /* report success */ | |
645 return 0; | |
646 } | |
647 | |
1475 | 648 static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s) |
1468 | 649 { |
650 int x, y; | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
651 unsigned char sample[2]; |
1468 | 652 |
653 /* dithered encoding */ | |
654 CHECK_STREAM_PTR(2); | |
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
655 sample[0] = *s->stream_ptr++; |
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
656 sample[1] = *s->stream_ptr++; |
1468 | 657 |
658 for (y = 0; y < 8; y++) { | |
659 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
|
660 *s->pixel_ptr++ = sample[ y & 1 ]; |
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
661 *s->pixel_ptr++ = sample[!(y & 1)]; |
1468 | 662 } |
1475 | 663 s->pixel_ptr += s->line_inc; |
1468 | 664 } |
665 | |
666 /* report success */ | |
667 return 0; | |
668 } | |
669 | |
9272
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
670 static int (* const ipvideo_decode_block[])(IpvideoContext *s) = { |
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
671 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
|
672 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
|
673 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
|
674 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
|
675 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
|
676 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
|
677 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
|
678 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
|
679 }; |
1468 | 680 |
681 static void ipvideo_decode_opcodes(IpvideoContext *s) | |
682 { | |
683 int x, y; | |
684 int index = 0; | |
685 unsigned char opcode; | |
686 int ret; | |
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
687 int code_counts[16] = {0}; |
1468 | 688 static int frame = 0; |
689 | |
690 debug_interplay("------------------ frame %d\n", frame); | |
691 frame++; | |
692 | |
693 /* 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
|
694 memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4); |
1468 | 695 |
1475 | 696 s->stride = s->current_frame.linesize[0]; |
697 s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */ | |
698 s->stream_end = s->buf + s->size; | |
699 s->line_inc = s->stride - 8; | |
700 s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride | |
701 + s->avctx->width - 8; | |
1468 | 702 |
1475 | 703 for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) { |
704 for (x = y; x < y + s->avctx->width; x += 8) { | |
705 /* bottom nibble first, then top nibble (which makes it | |
706 * hard to use a GetBitcontext) */ | |
707 if (index & 1) | |
708 opcode = s->decoding_map[index >> 1] >> 4; | |
709 else | |
710 opcode = s->decoding_map[index >> 1] & 0xF; | |
711 index++; | |
1468 | 712 |
1475 | 713 debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", |
714 x - y, y / s->stride, opcode, s->stream_ptr); | |
715 code_counts[opcode]++; | |
1468 | 716 |
1475 | 717 s->pixel_ptr = s->current_frame.data[0] + x; |
718 ret = ipvideo_decode_block[opcode](s); | |
719 if (ret != 0) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
720 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n", |
1475 | 721 frame, x - y, y / s->stride); |
722 return; | |
1468 | 723 } |
724 } | |
725 } | |
9275
67cf9d31724c
Simplify check for leftover bytes after decoding for interplayvideo.
reimar
parents:
9274
diff
changeset
|
726 if (s->stream_end - s->stream_ptr > 1) { |
2962 | 727 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n", |
1475 | 728 s->stream_end - s->stream_ptr); |
729 } | |
1468 | 730 } |
731 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
732 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
|
733 { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
734 IpvideoContext *s = avctx->priv_data; |
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 s->avctx = avctx; |
1468 | 737 |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
738 if (s->avctx->palctrl == NULL) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
739 av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n"); |
1468 | 740 return -1; |
741 } | |
742 | |
743 avctx->pix_fmt = PIX_FMT_PAL8; | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
744 dsputil_init(&s->dsp, avctx); |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
745 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
746 /* 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
|
747 s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); |
1468 | 748 |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
749 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
|
750 s->second_last_frame.data[0] = NULL; |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
751 |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
752 return 0; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
753 } |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
754 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
755 static int ipvideo_decode_frame(AVCodecContext *avctx, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
756 void *data, int *data_size, |
6218 | 757 const uint8_t *buf, int buf_size) |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
758 { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
759 IpvideoContext *s = avctx->priv_data; |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
760 AVPaletteControl *palette_control = avctx->palctrl; |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
761 |
1770 | 762 /* compressed buffer needs to be large enough to at least hold an entire |
763 * decoding map */ | |
764 if (buf_size < s->decoding_map_size) | |
765 return buf_size; | |
766 | |
1468 | 767 s->decoding_map = buf; |
768 s->buf = buf + s->decoding_map_size; | |
769 s->size = buf_size - s->decoding_map_size; | |
770 | |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
771 s->current_frame.reference = 3; |
1468 | 772 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
|
773 av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); |
1468 | 774 return -1; |
775 } | |
776 | |
777 ipvideo_decode_opcodes(s); | |
778 | |
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
779 if (palette_control->palette_changed) { |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
780 palette_control->palette_changed = 0; |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
781 s->current_frame.palette_has_changed = 1; |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
782 } |
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
783 |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
784 *data_size = sizeof(AVFrame); |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
785 *(AVFrame*)data = s->current_frame; |
1468 | 786 |
787 /* shuffle frames */ | |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
788 if (s->second_last_frame.data[0]) |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
789 avctx->release_buffer(avctx, &s->second_last_frame); |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
790 s->second_last_frame = s->last_frame; |
1468 | 791 s->last_frame = s->current_frame; |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
792 s->current_frame.data[0] = NULL; /* catch any access attempts */ |
1468 | 793 |
794 /* report that the buffer was completely consumed */ | |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
795 return buf_size; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
796 } |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
797 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
798 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
|
799 { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
800 IpvideoContext *s = avctx->priv_data; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
801 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
802 /* release the last frame */ |
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
803 if (s->last_frame.data[0]) |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
804 avctx->release_buffer(avctx, &s->last_frame); |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
805 if (s->second_last_frame.data[0]) |
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
806 avctx->release_buffer(avctx, &s->second_last_frame); |
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
807 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
808 return 0; |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
809 } |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
810 |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
811 AVCodec interplay_video_decoder = { |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
812 "interplayvideo", |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
813 CODEC_TYPE_VIDEO, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
814 CODEC_ID_INTERPLAY_VIDEO, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
815 sizeof(IpvideoContext), |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
816 ipvideo_decode_init, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
817 NULL, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
818 ipvideo_decode_end, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
819 ipvideo_decode_frame, |
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
820 CODEC_CAP_DR1, |
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
8718
diff
changeset
|
821 .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
|
822 }; |