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