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