Mercurial > libavcodec.hg
annotate interplayvideo.c @ 9322:cea979496c7a libavcodec
Fix ipvideo_decode_block_opcode_0xD again.
| author | reimar |
|---|---|
| date | Tue, 31 Mar 2009 22:28:36 +0000 |
| parents | 44de9c136513 |
| children | 54bc8a2727b0 |
| 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; |
| 9319 | 216 for (; flags != 1; flags >>= 1) |
|
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
217 *s->pixel_ptr++ = P[flags & 1]; |
| 1475 | 218 s->pixel_ptr += s->line_inc; |
| 1468 | 219 } |
| 220 | |
| 221 } else { | |
| 222 | |
| 223 /* need 2 more bytes from the stream */ | |
| 224 CHECK_STREAM_PTR(2); | |
| 225 | |
| 5089 | 226 flags = bytestream_get_le16(&s->stream_ptr); |
| 1468 | 227 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
|
228 for (x = 0; x < 8; x += 2, flags >>= 1) { |
| 9299 | 229 s->pixel_ptr[x ] = |
| 230 s->pixel_ptr[x + 1 ] = | |
| 231 s->pixel_ptr[x + s->stride] = | |
| 232 s->pixel_ptr[x + 1 + s->stride] = P[flags & 1]; | |
| 1468 | 233 } |
| 1475 | 234 s->pixel_ptr += s->stride * 2; |
| 1468 | 235 } |
| 236 } | |
| 237 | |
| 238 /* report success */ | |
| 239 return 0; | |
| 240 } | |
| 241 | |
| 1475 | 242 static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s) |
| 1468 | 243 { |
| 244 int x, y; | |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
245 unsigned char P[2]; |
| 1468 | 246 unsigned int flags = 0; |
| 247 | |
| 248 /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on | |
| 249 * either top and bottom or left and right halves */ | |
| 250 CHECK_STREAM_PTR(2); | |
| 251 | |
| 1475 | 252 P[0] = *s->stream_ptr++; |
| 253 P[1] = *s->stream_ptr++; | |
| 1468 | 254 |
| 255 if (P[0] <= P[1]) { | |
| 256 | |
|
9311
5d20b2610662
Fix a too small CHECK_STREAM_PTR value in interplayvideo.c
reimar
parents:
9307
diff
changeset
|
257 CHECK_STREAM_PTR(14); |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
258 s->stream_ptr -= 2; |
| 1468 | 259 |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
260 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
|
261 // 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
|
262 if (!(y & 3)) { |
|
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
263 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
|
264 flags = bytestream_get_le16(&s->stream_ptr); |
| 1468 | 265 } |
| 266 | |
| 9319 | 267 for (x = 0; x < 4; x++, flags >>= 1) |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
268 *s->pixel_ptr++ = P[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 += s->stride - 4; |
|
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
270 // switch to right half |
|
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
271 if (y == 7) s->pixel_ptr -= 8 * s->stride - 4; |
| 1468 | 272 } |
| 273 | |
| 274 } else { | |
| 275 | |
| 276 /* need 10 more bytes */ | |
| 277 CHECK_STREAM_PTR(10); | |
| 278 | |
| 9306 | 279 if (s->stream_ptr[4] <= s->stream_ptr[5]) { |
| 1468 | 280 |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
281 flags = bytestream_get_le32(&s->stream_ptr); |
|
9300
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
282 |
| 1468 | 283 /* vertical split; left & right halves are 2-color encoded */ |
| 284 | |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
285 for (y = 0; y < 16; y++) { |
| 9319 | 286 for (x = 0; x < 4; x++, flags >>= 1) |
|
9312
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
287 *s->pixel_ptr++ = P[flags & 1]; |
|
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
288 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
|
289 // switch to right half |
|
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
290 if (y == 7) { |
|
601e91e470e7
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
reimar
parents:
9311
diff
changeset
|
291 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
|
292 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
|
293 flags = bytestream_get_le32(&s->stream_ptr); |
| 1468 | 294 } |
| 295 } | |
| 296 | |
| 297 } else { | |
| 298 | |
| 299 /* horizontal split; top & bottom halves are 2-color encoded */ | |
| 300 | |
| 301 for (y = 0; y < 8; y++) { | |
|
9300
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
302 if (y == 4) { |
|
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
303 P[0] = *s->stream_ptr++; |
|
6a1aacfa3043
Slightly simplify part of ipvideo_decode_block_opcode_0x8
reimar
parents:
9299
diff
changeset
|
304 P[1] = *s->stream_ptr++; |
| 1468 | 305 } |
|
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
306 flags = *s->stream_ptr++ | 0x100; |
| 1468 | 307 |
| 9319 | 308 for (; flags != 1; flags >>= 1) |
|
9307
851ca5db8327
Avoid the last two uses of bitmasks in interplayvideo
reimar
parents:
9306
diff
changeset
|
309 *s->pixel_ptr++ = P[flags & 1]; |
| 1475 | 310 s->pixel_ptr += s->line_inc; |
| 1468 | 311 } |
| 312 } | |
| 313 } | |
| 314 | |
| 315 /* report success */ | |
| 316 return 0; | |
| 317 } | |
| 318 | |
| 1475 | 319 static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) |
| 1468 | 320 { |
| 321 int x, y; | |
| 322 unsigned char P[4]; | |
| 323 | |
| 324 /* 4-color encoding */ | |
| 325 CHECK_STREAM_PTR(4); | |
| 326 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
327 memcpy(P, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
328 s->stream_ptr += 4; |
| 1468 | 329 |
|
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
330 if (P[0] <= P[1]) { |
|
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
331 if (P[2] <= P[3]) { |
| 1468 | 332 |
| 9305 | 333 /* 1 of 4 colors for each pixel, need 16 more bytes */ |
| 334 CHECK_STREAM_PTR(16); | |
| 1468 | 335 |
| 9305 | 336 for (y = 0; y < 8; y++) { |
| 337 /* get the next set of 8 2-bit flags */ | |
| 338 int flags = bytestream_get_le16(&s->stream_ptr); | |
| 9319 | 339 for (x = 0; x < 8; x++, flags >>= 2) |
| 9305 | 340 *s->pixel_ptr++ = P[flags & 0x03]; |
| 341 s->pixel_ptr += s->line_inc; | |
| 1468 | 342 } |
| 343 | |
|
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
344 } else { |
| 9305 | 345 uint32_t flags; |
| 1468 | 346 |
| 9305 | 347 /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ |
| 348 CHECK_STREAM_PTR(4); | |
| 1468 | 349 |
| 9305 | 350 flags = bytestream_get_le32(&s->stream_ptr); |
| 1468 | 351 |
| 9305 | 352 for (y = 0; y < 8; y += 2) { |
| 353 for (x = 0; x < 8; x += 2, flags >>= 2) { | |
| 354 s->pixel_ptr[x ] = | |
| 355 s->pixel_ptr[x + 1 ] = | |
| 356 s->pixel_ptr[x + s->stride] = | |
| 357 s->pixel_ptr[x + 1 + s->stride] = P[flags & 0x03]; | |
| 358 } | |
| 359 s->pixel_ptr += s->stride * 2; | |
| 1468 | 360 } |
| 361 | |
|
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
362 } |
|
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
363 } 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
|
364 uint64_t flags; |
| 1468 | 365 |
| 9304 | 366 /* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */ |
| 1468 | 367 CHECK_STREAM_PTR(8); |
| 368 | |
|
9302
0469949a5224
Avoid "reloading" code by using a 64 bit type for the flags and loading all at once.
reimar
parents:
9301
diff
changeset
|
369 flags = bytestream_get_le64(&s->stream_ptr); |
| 9304 | 370 if (P[2] <= P[3]) { |
| 9305 | 371 for (y = 0; y < 8; y++) { |
| 372 for (x = 0; x < 8; x += 2, flags >>= 2) { | |
| 373 s->pixel_ptr[x ] = | |
| 374 s->pixel_ptr[x + 1] = P[flags & 0x03]; | |
| 375 } | |
| 376 s->pixel_ptr += s->stride; | |
| 1468 | 377 } |
|
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
378 } else { |
| 9305 | 379 for (y = 0; y < 8; y += 2) { |
| 380 for (x = 0; x < 8; x++, flags >>= 2) { | |
| 381 s->pixel_ptr[x ] = | |
| 382 s->pixel_ptr[x + s->stride] = P[flags & 0x03]; | |
| 383 } | |
| 384 s->pixel_ptr += s->stride * 2; | |
| 1468 | 385 } |
|
9303
2ae6ab3fa3ba
Rearrange how the different cases are checked to reduce the number of
reimar
parents:
9302
diff
changeset
|
386 } |
| 1468 | 387 } |
| 388 | |
| 389 /* report success */ | |
| 390 return 0; | |
| 391 } | |
| 392 | |
| 1475 | 393 static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s) |
| 1468 | 394 { |
| 395 int x, y; | |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
396 unsigned char P[4]; |
| 1468 | 397 int flags = 0; |
| 398 | |
| 399 /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on | |
| 400 * 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
|
401 CHECK_STREAM_PTR(24); |
| 1468 | 402 |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
403 if (s->stream_ptr[0] <= s->stream_ptr[1]) { |
| 1468 | 404 |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
405 /* 4-color encoding for each quadrant; need 32 bytes */ |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
406 CHECK_STREAM_PTR(32); |
| 1468 | 407 |
|
9315
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
408 for (y = 0; y < 16; y++) { |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
409 // new values for each 4x4 block |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
410 if (!(y & 3)) { |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
411 memcpy(P, s->stream_ptr, 4); |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
412 s->stream_ptr += 4; |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
413 flags = bytestream_get_le32(&s->stream_ptr); |
| 1468 | 414 } |
| 415 | |
| 9319 | 416 for (x = 0; x < 4; x++, flags >>= 2) |
|
9315
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
417 *s->pixel_ptr++ = P[flags & 0x03]; |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
418 |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
419 s->pixel_ptr += s->stride - 4; |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
420 // switch to right half |
|
a476e5590725
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
reimar
parents:
9312
diff
changeset
|
421 if (y == 7) s->pixel_ptr -= 8 * s->stride - 4; |
| 1468 | 422 } |
| 423 | |
| 424 } else { | |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
425 // vertical split? |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
426 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
|
427 uint64_t flags = 0; |
| 1468 | 428 |
| 429 /* 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
|
430 * halves */ |
| 1468 | 431 |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
432 for (y = 0; y < 16; y++) { |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
433 // load values for each half |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
434 if (!(y & 7)) { |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
435 memcpy(P, s->stream_ptr, 4); |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
436 s->stream_ptr += 4; |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
437 flags = bytestream_get_le64(&s->stream_ptr); |
| 1468 | 438 } |
| 439 | |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
440 for (x = 0; x < 4; x++, flags >>= 2) |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
441 *s->pixel_ptr++ = P[flags & 0x03]; |
| 1468 | 442 |
|
9317
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
443 if (vert) { |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
444 s->pixel_ptr += s->stride - 4; |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
445 // switch to right half |
|
2c06c31c8664
One more simplification for ipvideo_decode_block_opcode_0xA
reimar
parents:
9315
diff
changeset
|
446 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
|
447 } else if (y & 1) s->pixel_ptr += s->line_inc; |
| 1468 | 448 } |
| 449 } | |
| 450 | |
| 451 /* report success */ | |
| 452 return 0; | |
| 453 } | |
| 454 | |
| 1475 | 455 static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s) |
| 1468 | 456 { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
457 int y; |
| 1468 | 458 |
| 459 /* 64-color encoding (each pixel in block is a different color) */ | |
| 460 CHECK_STREAM_PTR(64); | |
| 461 | |
| 462 for (y = 0; y < 8; y++) { | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
463 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
|
464 s->stream_ptr += 8; |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
465 s->pixel_ptr += s->stride; |
| 1468 | 466 } |
| 467 | |
| 468 /* report success */ | |
| 469 return 0; | |
| 470 } | |
| 471 | |
| 1475 | 472 static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s) |
| 1468 | 473 { |
| 474 int x, y; | |
| 475 | |
| 476 /* 16-color block encoding: each 2x2 block is a different color */ | |
| 477 CHECK_STREAM_PTR(16); | |
| 478 | |
| 479 for (y = 0; y < 8; y += 2) { | |
| 480 for (x = 0; x < 8; x += 2) { | |
| 9297 | 481 s->pixel_ptr[x ] = |
| 482 s->pixel_ptr[x + 1 ] = | |
| 483 s->pixel_ptr[x + s->stride] = | |
| 9301 | 484 s->pixel_ptr[x + 1 + s->stride] = *s->stream_ptr++; |
| 1468 | 485 } |
| 1475 | 486 s->pixel_ptr += s->stride * 2; |
| 1468 | 487 } |
| 488 | |
| 489 /* report success */ | |
| 490 return 0; | |
| 491 } | |
| 492 | |
| 1475 | 493 static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s) |
| 1468 | 494 { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
495 int y; |
| 9322 | 496 unsigned char P[2]; |
| 1468 | 497 |
| 498 /* 4-color block encoding: each 4x4 block is a different color */ | |
| 499 CHECK_STREAM_PTR(4); | |
| 500 | |
| 9322 | 501 for (y = 0; y < 8; y++) { |
| 502 if (!(y & 3)) { | |
| 503 P[0] = *s->stream_ptr++; | |
| 504 P[1] = *s->stream_ptr++; | |
| 505 } | |
| 506 memset(s->pixel_ptr, P[0], 4); | |
| 507 memset(s->pixel_ptr + 4, P[1], 4); | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
508 s->pixel_ptr += s->stride; |
| 1468 | 509 } |
| 510 | |
| 511 /* report success */ | |
| 512 return 0; | |
| 513 } | |
| 514 | |
| 1475 | 515 static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s) |
| 1468 | 516 { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
517 int y; |
| 1468 | 518 unsigned char pix; |
| 519 | |
| 520 /* 1-color encoding: the whole block is 1 solid color */ | |
| 521 CHECK_STREAM_PTR(1); | |
| 1475 | 522 pix = *s->stream_ptr++; |
| 1468 | 523 |
| 524 for (y = 0; y < 8; y++) { | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
525 memset(s->pixel_ptr, pix, 8); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
526 s->pixel_ptr += s->stride; |
| 1468 | 527 } |
| 528 | |
| 529 /* report success */ | |
| 530 return 0; | |
| 531 } | |
| 532 | |
| 1475 | 533 static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s) |
| 1468 | 534 { |
| 535 int x, y; | |
|
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
536 unsigned char sample[2]; |
| 1468 | 537 |
| 538 /* dithered encoding */ | |
| 539 CHECK_STREAM_PTR(2); | |
|
9298
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
540 sample[0] = *s->stream_ptr++; |
|
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
541 sample[1] = *s->stream_ptr++; |
| 1468 | 542 |
| 543 for (y = 0; y < 8; y++) { | |
| 544 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
|
545 *s->pixel_ptr++ = sample[ y & 1 ]; |
|
9698f0d03ed9
Avoid code duplication by using ?: and array indexing instead of if..else
reimar
parents:
9297
diff
changeset
|
546 *s->pixel_ptr++ = sample[!(y & 1)]; |
| 1468 | 547 } |
| 1475 | 548 s->pixel_ptr += s->line_inc; |
| 1468 | 549 } |
| 550 | |
| 551 /* report success */ | |
| 552 return 0; | |
| 553 } | |
| 554 | |
|
9272
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
555 static int (* const ipvideo_decode_block[])(IpvideoContext *s) = { |
|
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
556 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
|
557 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
|
558 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
|
559 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
|
560 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
|
561 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
|
562 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
|
563 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
|
564 }; |
| 1468 | 565 |
| 566 static void ipvideo_decode_opcodes(IpvideoContext *s) | |
| 567 { | |
| 568 int x, y; | |
| 569 int index = 0; | |
| 570 unsigned char opcode; | |
| 571 int ret; | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
572 int code_counts[16] = {0}; |
| 1468 | 573 static int frame = 0; |
| 574 | |
| 575 debug_interplay("------------------ frame %d\n", frame); | |
| 576 frame++; | |
| 577 | |
| 578 /* 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
|
579 memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4); |
| 1468 | 580 |
| 1475 | 581 s->stride = s->current_frame.linesize[0]; |
| 582 s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */ | |
| 583 s->stream_end = s->buf + s->size; | |
| 584 s->line_inc = s->stride - 8; | |
| 585 s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride | |
| 586 + s->avctx->width - 8; | |
| 1468 | 587 |
| 1475 | 588 for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) { |
| 589 for (x = y; x < y + s->avctx->width; x += 8) { | |
| 590 /* bottom nibble first, then top nibble (which makes it | |
| 591 * hard to use a GetBitcontext) */ | |
| 592 if (index & 1) | |
| 593 opcode = s->decoding_map[index >> 1] >> 4; | |
| 594 else | |
| 595 opcode = s->decoding_map[index >> 1] & 0xF; | |
| 596 index++; | |
| 1468 | 597 |
| 1475 | 598 debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", |
| 599 x - y, y / s->stride, opcode, s->stream_ptr); | |
| 600 code_counts[opcode]++; | |
| 1468 | 601 |
| 1475 | 602 s->pixel_ptr = s->current_frame.data[0] + x; |
| 603 ret = ipvideo_decode_block[opcode](s); | |
| 604 if (ret != 0) { | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
605 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n", |
| 1475 | 606 frame, x - y, y / s->stride); |
| 607 return; | |
| 1468 | 608 } |
| 609 } | |
| 610 } | |
|
9275
67cf9d31724c
Simplify check for leftover bytes after decoding for interplayvideo.
reimar
parents:
9274
diff
changeset
|
611 if (s->stream_end - s->stream_ptr > 1) { |
| 2962 | 612 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n", |
| 1475 | 613 s->stream_end - s->stream_ptr); |
| 614 } | |
| 1468 | 615 } |
| 616 | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
617 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
|
618 { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
619 IpvideoContext *s = avctx->priv_data; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
620 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
621 s->avctx = avctx; |
| 1468 | 622 |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
623 if (s->avctx->palctrl == NULL) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
624 av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n"); |
| 1468 | 625 return -1; |
| 626 } | |
| 627 | |
| 628 avctx->pix_fmt = PIX_FMT_PAL8; | |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
629 dsputil_init(&s->dsp, avctx); |
|
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 /* 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
|
632 s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); |
| 1468 | 633 |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
634 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
|
635 s->second_last_frame.data[0] = NULL; |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
636 |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
637 return 0; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
638 } |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
639 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
640 static int ipvideo_decode_frame(AVCodecContext *avctx, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
641 void *data, int *data_size, |
| 6218 | 642 const uint8_t *buf, int buf_size) |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
643 { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
644 IpvideoContext *s = avctx->priv_data; |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
645 AVPaletteControl *palette_control = avctx->palctrl; |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
646 |
| 1770 | 647 /* compressed buffer needs to be large enough to at least hold an entire |
| 648 * decoding map */ | |
| 649 if (buf_size < s->decoding_map_size) | |
| 650 return buf_size; | |
| 651 | |
| 1468 | 652 s->decoding_map = buf; |
| 653 s->buf = buf + s->decoding_map_size; | |
| 654 s->size = buf_size - s->decoding_map_size; | |
| 655 | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
656 s->current_frame.reference = 3; |
| 1468 | 657 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
|
658 av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); |
| 1468 | 659 return -1; |
| 660 } | |
| 661 | |
| 662 ipvideo_decode_opcodes(s); | |
| 663 | |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
664 if (palette_control->palette_changed) { |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
665 palette_control->palette_changed = 0; |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
666 s->current_frame.palette_has_changed = 1; |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
667 } |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
668 |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
669 *data_size = sizeof(AVFrame); |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
670 *(AVFrame*)data = s->current_frame; |
| 1468 | 671 |
| 672 /* shuffle frames */ | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
673 if (s->second_last_frame.data[0]) |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
674 avctx->release_buffer(avctx, &s->second_last_frame); |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
675 s->second_last_frame = s->last_frame; |
| 1468 | 676 s->last_frame = s->current_frame; |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
677 s->current_frame.data[0] = NULL; /* catch any access attempts */ |
| 1468 | 678 |
| 679 /* report that the buffer was completely consumed */ | |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
680 return buf_size; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
681 } |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
682 |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
683 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
|
684 { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
685 IpvideoContext *s = avctx->priv_data; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
686 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
687 /* release the last frame */ |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
688 if (s->last_frame.data[0]) |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
689 avctx->release_buffer(avctx, &s->last_frame); |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
690 if (s->second_last_frame.data[0]) |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
691 avctx->release_buffer(avctx, &s->second_last_frame); |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
692 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
693 return 0; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
694 } |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
695 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
696 AVCodec interplay_video_decoder = { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
697 "interplayvideo", |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
698 CODEC_TYPE_VIDEO, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
699 CODEC_ID_INTERPLAY_VIDEO, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
700 sizeof(IpvideoContext), |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
701 ipvideo_decode_init, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
702 NULL, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
703 ipvideo_decode_end, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
704 ipvideo_decode_frame, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
705 CODEC_CAP_DR1, |
|
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
8718
diff
changeset
|
706 .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
|
707 }; |
