Mercurial > libavcodec.hg
annotate interplayvideo.c @ 9276:c80d14982fba libavcodec
Change CHECK_STREAM_PTR macro to correctly handle the (extremely unlikely)
overflow case.
| author | reimar |
|---|---|
| date | Sun, 29 Mar 2009 17:50:46 +0000 |
| parents | 67cf9d31724c |
| children | b8e5b7edb2d5 |
| 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 | |
| 1475 | 85 #define COPY_FROM_CURRENT() \ |
| 86 motion_offset = current_offset; \ | |
| 87 motion_offset += y * s->stride; \ | |
| 88 motion_offset += x; \ | |
| 89 if (motion_offset < 0) { \ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
90 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); \ |
| 1475 | 91 return -1; \ |
| 92 } else if (motion_offset > s->upper_motion_limit_offset) { \ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
93 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n", \ |
| 1475 | 94 motion_offset, s->upper_motion_limit_offset); \ |
| 95 return -1; \ | |
| 96 } \ | |
|
9127
5d2f8632d417
100l, interplayvideo uses 8x8 blocks, so call the 8x8 put_pixels_tab function
reimar
parents:
9083
diff
changeset
|
97 s->dsp.put_pixels_tab[1][0](s->pixel_ptr, \ |
| 1475 | 98 s->current_frame.data[0] + motion_offset, s->stride, 8); |
| 1468 | 99 |
| 1475 | 100 #define COPY_FROM_PREVIOUS() \ |
| 101 motion_offset = current_offset; \ | |
| 102 motion_offset += y * s->stride; \ | |
| 103 motion_offset += x; \ | |
| 104 if (motion_offset < 0) { \ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
105 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); \ |
| 1475 | 106 return -1; \ |
| 107 } else if (motion_offset > s->upper_motion_limit_offset) { \ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
108 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n", \ |
| 1475 | 109 motion_offset, s->upper_motion_limit_offset); \ |
| 110 return -1; \ | |
| 111 } \ | |
|
9127
5d2f8632d417
100l, interplayvideo uses 8x8 blocks, so call the 8x8 put_pixels_tab function
reimar
parents:
9083
diff
changeset
|
112 s->dsp.put_pixels_tab[1][0](s->pixel_ptr, \ |
| 1475 | 113 s->last_frame.data[0] + motion_offset, s->stride, 8); |
| 114 | |
| 115 #define COPY_FROM_SECOND_LAST() \ | |
| 116 motion_offset = current_offset; \ | |
| 117 motion_offset += y * s->stride; \ | |
| 118 motion_offset += x; \ | |
| 119 if (motion_offset < 0) { \ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
120 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); \ |
| 1475 | 121 return -1; \ |
| 122 } else if (motion_offset > s->upper_motion_limit_offset) { \ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
123 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n", \ |
| 1475 | 124 motion_offset, s->upper_motion_limit_offset); \ |
| 125 return -1; \ | |
| 126 } \ | |
|
9127
5d2f8632d417
100l, interplayvideo uses 8x8 blocks, so call the 8x8 put_pixels_tab function
reimar
parents:
9083
diff
changeset
|
127 s->dsp.put_pixels_tab[1][0](s->pixel_ptr, \ |
| 1475 | 128 s->second_last_frame.data[0] + motion_offset, s->stride, 8); |
| 129 | |
| 130 static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s) | |
| 1468 | 131 { |
| 132 int x, y; | |
| 1475 | 133 int motion_offset; |
| 134 int current_offset = s->pixel_ptr - s->current_frame.data[0]; | |
| 1468 | 135 |
| 1475 | 136 /* copy a block from the previous frame */ |
| 137 x = y = 0; | |
| 138 COPY_FROM_PREVIOUS(); | |
| 1468 | 139 |
| 140 /* report success */ | |
| 141 return 0; | |
| 142 } | |
| 143 | |
| 1475 | 144 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
|
145 { |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
146 int x, y; |
| 1475 | 147 int motion_offset; |
| 148 int current_offset = s->pixel_ptr - s->current_frame.data[0]; | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
149 |
| 1475 | 150 /* copy block from 2 frames ago */ |
| 151 x = y = 0; | |
| 152 COPY_FROM_SECOND_LAST(); | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
153 |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
154 /* report success */ |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
155 return 0; |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
156 } |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
157 |
| 1475 | 158 static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s) |
| 1468 | 159 { |
| 160 unsigned char B; | |
| 161 int x, y; | |
| 162 int motion_offset; | |
| 1475 | 163 int current_offset = s->pixel_ptr - s->current_frame.data[0]; |
| 1468 | 164 |
| 1475 | 165 /* copy block from 2 frames ago using a motion vector; need 1 more byte */ |
| 1468 | 166 CHECK_STREAM_PTR(1); |
| 1475 | 167 B = *s->stream_ptr++; |
| 1468 | 168 |
| 169 if (B < 56) { | |
| 170 x = 8 + (B % 7); | |
| 171 y = B / 7; | |
| 172 } else { | |
| 173 x = -14 + ((B - 56) % 29); | |
| 174 y = 8 + ((B - 56) / 29); | |
| 175 } | |
| 176 | |
| 177 debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
178 COPY_FROM_SECOND_LAST(); |
| 1468 | 179 |
| 180 /* report success */ | |
| 181 return 0; | |
| 182 } | |
| 183 | |
| 1475 | 184 static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s) |
| 1468 | 185 { |
| 186 unsigned char B; | |
| 187 int x, y; | |
| 188 int motion_offset; | |
| 1475 | 189 int current_offset = s->pixel_ptr - s->current_frame.data[0]; |
| 1468 | 190 |
| 191 /* copy 8x8 block from current frame from an up/left block */ | |
| 192 | |
| 193 /* need 1 more byte for motion */ | |
| 194 CHECK_STREAM_PTR(1); | |
| 1475 | 195 B = *s->stream_ptr++; |
| 1468 | 196 |
| 197 if (B < 56) { | |
| 198 x = -(8 + (B % 7)); | |
| 199 y = -(B / 7); | |
| 200 } else { | |
| 201 x = -(-14 + ((B - 56) % 29)); | |
| 202 y = -( 8 + ((B - 56) / 29)); | |
| 203 } | |
| 204 | |
| 205 debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | |
| 206 COPY_FROM_CURRENT(); | |
| 207 | |
| 208 /* report success */ | |
| 209 return 0; | |
| 210 } | |
| 211 | |
| 1475 | 212 static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s) |
| 1468 | 213 { |
| 214 int x, y; | |
| 215 unsigned char B, BL, BH; | |
| 216 int motion_offset; | |
| 1475 | 217 int current_offset = s->pixel_ptr - s->current_frame.data[0]; |
| 1468 | 218 |
| 219 /* copy a block from the previous frame; need 1 more byte */ | |
| 220 CHECK_STREAM_PTR(1); | |
| 221 | |
| 1475 | 222 B = *s->stream_ptr++; |
| 1468 | 223 BL = B & 0x0F; |
| 224 BH = (B >> 4) & 0x0F; | |
| 225 x = -8 + BL; | |
| 226 y = -8 + BH; | |
| 227 | |
| 228 debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | |
| 229 COPY_FROM_PREVIOUS(); | |
| 230 | |
| 231 /* report success */ | |
| 232 return 0; | |
| 233 } | |
| 234 | |
| 1475 | 235 static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s) |
| 1468 | 236 { |
| 237 signed char x, y; | |
| 238 int motion_offset; | |
| 1475 | 239 int current_offset = s->pixel_ptr - s->current_frame.data[0]; |
| 1468 | 240 |
| 241 /* copy a block from the previous frame using an expanded range; | |
| 242 * need 2 more bytes */ | |
| 243 CHECK_STREAM_PTR(2); | |
| 244 | |
| 1475 | 245 x = *s->stream_ptr++; |
| 246 y = *s->stream_ptr++; | |
| 1468 | 247 |
| 248 debug_interplay (" motion bytes = %d, %d\n", x, y); | |
| 249 COPY_FROM_PREVIOUS(); | |
| 250 | |
| 251 /* report success */ | |
| 252 return 0; | |
| 253 } | |
| 254 | |
| 1475 | 255 static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s) |
| 1468 | 256 { |
| 257 /* mystery opcode? skip multiple blocks? */ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
258 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: Help! Mystery opcode 0x6 seen\n"); |
| 1468 | 259 |
| 260 /* report success */ | |
| 261 return 0; | |
| 262 } | |
| 263 | |
| 1475 | 264 static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s) |
| 1468 | 265 { |
| 266 int x, y; | |
| 267 unsigned char P0, P1; | |
| 268 unsigned int flags; | |
| 269 int bitmask; | |
| 270 | |
| 271 /* 2-color encoding */ | |
| 272 CHECK_STREAM_PTR(2); | |
| 273 | |
| 1475 | 274 P0 = *s->stream_ptr++; |
| 275 P1 = *s->stream_ptr++; | |
| 1468 | 276 |
| 277 if (P0 <= P1) { | |
| 278 | |
| 279 /* need 8 more bytes from the stream */ | |
| 280 CHECK_STREAM_PTR(8); | |
| 281 | |
| 282 for (y = 0; y < 8; y++) { | |
|
9274
b0dcca654e18
Get rid of pointless "B" array in interplayvideo decoder.
reimar
parents:
9273
diff
changeset
|
283 flags = *s->stream_ptr++; |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
284 for (x = 0x01; x <= 0x80; x <<= 1) { |
| 1468 | 285 if (flags & x) |
| 1475 | 286 *s->pixel_ptr++ = P1; |
| 1468 | 287 else |
| 1475 | 288 *s->pixel_ptr++ = P0; |
| 1468 | 289 } |
| 1475 | 290 s->pixel_ptr += s->line_inc; |
| 1468 | 291 } |
| 292 | |
| 293 } else { | |
| 294 | |
| 295 /* need 2 more bytes from the stream */ | |
| 296 CHECK_STREAM_PTR(2); | |
| 297 | |
| 5089 | 298 flags = bytestream_get_le16(&s->stream_ptr); |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
299 bitmask = 0x0001; |
| 1468 | 300 for (y = 0; y < 8; y += 2) { |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
301 for (x = 0; x < 8; x += 2, bitmask <<= 1) { |
| 1468 | 302 if (flags & bitmask) { |
| 1475 | 303 *(s->pixel_ptr + x) = P1; |
| 304 *(s->pixel_ptr + x + 1) = P1; | |
| 305 *(s->pixel_ptr + s->stride + x) = P1; | |
| 306 *(s->pixel_ptr + s->stride + x + 1) = P1; | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
307 } else { |
| 1475 | 308 *(s->pixel_ptr + x) = P0; |
| 309 *(s->pixel_ptr + x + 1) = P0; | |
| 310 *(s->pixel_ptr + s->stride + x) = P0; | |
| 311 *(s->pixel_ptr + s->stride + x + 1) = P0; | |
| 1468 | 312 } |
| 313 } | |
| 1475 | 314 s->pixel_ptr += s->stride * 2; |
| 1468 | 315 } |
| 316 } | |
| 317 | |
| 318 /* report success */ | |
| 319 return 0; | |
| 320 } | |
| 321 | |
| 1475 | 322 static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s) |
| 1468 | 323 { |
| 324 int x, y; | |
| 325 unsigned char P[8]; | |
| 326 unsigned char B[8]; | |
| 327 unsigned int flags = 0; | |
| 328 unsigned int bitmask = 0; | |
| 329 unsigned char P0 = 0, P1 = 0; | |
| 330 int lower_half = 0; | |
| 331 | |
| 332 /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on | |
| 333 * either top and bottom or left and right halves */ | |
| 334 CHECK_STREAM_PTR(2); | |
| 335 | |
| 1475 | 336 P[0] = *s->stream_ptr++; |
| 337 P[1] = *s->stream_ptr++; | |
| 1468 | 338 |
| 339 if (P[0] <= P[1]) { | |
| 340 | |
| 341 /* need 12 more bytes */ | |
| 342 CHECK_STREAM_PTR(12); | |
| 1475 | 343 B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; |
| 344 P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; | |
| 345 B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; | |
| 346 P[4] = *s->stream_ptr++; P[5] = *s->stream_ptr++; | |
| 347 B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; | |
| 348 P[6] = *s->stream_ptr++; P[7] = *s->stream_ptr++; | |
| 349 B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; | |
| 1468 | 350 |
| 351 for (y = 0; y < 8; y++) { | |
| 352 | |
| 353 /* time to reload flags? */ | |
| 354 if (y == 0) { | |
| 355 flags = | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
356 ((B[0] & 0xF0) << 4) | ((B[4] & 0xF0) << 8) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
357 ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
358 ((B[1] & 0xF0) << 20) | ((B[5] & 0xF0) << 24) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
359 ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
360 bitmask = 0x00000001; |
| 1468 | 361 lower_half = 0; /* still on top half */ |
| 362 } else if (y == 4) { | |
| 363 flags = | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
364 ((B[2] & 0xF0) << 4) | ((B[6] & 0xF0) << 8) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
365 ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
366 ((B[3] & 0xF0) << 20) | ((B[7] & 0xF0) << 24) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
367 ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
368 bitmask = 0x00000001; |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
369 lower_half = 2; |
| 1468 | 370 } |
| 371 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
372 for (x = 0; x < 8; x++, bitmask <<= 1) { |
| 1468 | 373 /* get the pixel values ready for this quadrant */ |
| 374 if (x == 0) { | |
| 375 P0 = P[lower_half + 0]; | |
| 376 P1 = P[lower_half + 1]; | |
| 377 } else if (x == 4) { | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
378 P0 = P[lower_half + 4]; |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
379 P1 = P[lower_half + 5]; |
| 1468 | 380 } |
| 381 | |
| 382 if (flags & bitmask) | |
| 1475 | 383 *s->pixel_ptr++ = P1; |
| 1468 | 384 else |
| 1475 | 385 *s->pixel_ptr++ = P0; |
| 1468 | 386 } |
| 1475 | 387 s->pixel_ptr += s->line_inc; |
| 1468 | 388 } |
| 389 | |
| 390 } else { | |
| 391 | |
| 392 /* need 10 more bytes */ | |
| 393 CHECK_STREAM_PTR(10); | |
| 1475 | 394 B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; |
| 395 B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; | |
| 396 P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; | |
| 397 B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; | |
| 398 B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; | |
| 1468 | 399 |
| 400 if (P[2] <= P[3]) { | |
| 401 | |
| 402 /* vertical split; left & right halves are 2-color encoded */ | |
| 403 | |
| 404 for (y = 0; y < 8; y++) { | |
| 405 | |
| 406 /* time to reload flags? */ | |
| 407 if (y == 0) { | |
| 408 flags = | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
409 ((B[0] & 0xF0) << 4) | ((B[4] & 0xF0) << 8) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
410 ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
411 ((B[1] & 0xF0) << 20) | ((B[5] & 0xF0) << 24) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
412 ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
413 bitmask = 0x00000001; |
| 1468 | 414 } else if (y == 4) { |
| 415 flags = | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
416 ((B[2] & 0xF0) << 4) | ((B[6] & 0xF0) << 8) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
417 ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
418 ((B[3] & 0xF0) << 20) | ((B[7] & 0xF0) << 24) | |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
419 ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); |
|
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
420 bitmask = 0x00000001; |
| 1468 | 421 } |
| 422 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
423 for (x = 0; x < 8; x++, bitmask <<= 1) { |
| 1468 | 424 /* get the pixel values ready for this half */ |
| 425 if (x == 0) { | |
| 426 P0 = P[0]; | |
| 427 P1 = P[1]; | |
| 428 } else if (x == 4) { | |
| 429 P0 = P[2]; | |
| 430 P1 = P[3]; | |
| 431 } | |
| 432 | |
| 433 if (flags & bitmask) | |
| 1475 | 434 *s->pixel_ptr++ = P1; |
| 1468 | 435 else |
| 1475 | 436 *s->pixel_ptr++ = P0; |
| 1468 | 437 } |
| 1475 | 438 s->pixel_ptr += s->line_inc; |
| 1468 | 439 } |
| 440 | |
| 441 } else { | |
| 442 | |
| 443 /* horizontal split; top & bottom halves are 2-color encoded */ | |
| 444 | |
| 445 for (y = 0; y < 8; y++) { | |
| 446 | |
| 447 flags = B[y]; | |
| 448 if (y == 0) { | |
| 449 P0 = P[0]; | |
| 450 P1 = P[1]; | |
| 451 } else if (y == 4) { | |
| 452 P0 = P[2]; | |
| 453 P1 = P[3]; | |
| 454 } | |
| 455 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
456 for (bitmask = 0x01; bitmask <= 0x80; bitmask <<= 1) { |
| 1468 | 457 |
| 458 if (flags & bitmask) | |
| 1475 | 459 *s->pixel_ptr++ = P1; |
| 1468 | 460 else |
| 1475 | 461 *s->pixel_ptr++ = P0; |
| 1468 | 462 } |
| 1475 | 463 s->pixel_ptr += s->line_inc; |
| 1468 | 464 } |
| 465 } | |
| 466 } | |
| 467 | |
| 468 /* report success */ | |
| 469 return 0; | |
| 470 } | |
| 471 | |
| 1475 | 472 static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) |
| 1468 | 473 { |
| 474 int x, y; | |
| 475 unsigned char P[4]; | |
| 476 unsigned int flags = 0; | |
| 477 int shifter = 0; | |
| 478 unsigned char pix; | |
| 479 | |
| 480 /* 4-color encoding */ | |
| 481 CHECK_STREAM_PTR(4); | |
| 482 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
483 memcpy(P, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
484 s->stream_ptr += 4; |
| 1468 | 485 |
| 486 if ((P[0] <= P[1]) && (P[2] <= P[3])) { | |
| 487 | |
| 488 /* 1 of 4 colors for each pixel, need 16 more bytes */ | |
| 489 CHECK_STREAM_PTR(16); | |
| 490 | |
| 491 for (y = 0; y < 8; y++) { | |
| 492 /* get the next set of 8 2-bit flags */ | |
| 5089 | 493 flags = bytestream_get_le16(&s->stream_ptr); |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
494 for (x = 0, shifter = 0; x < 8; x++, shifter += 2) { |
| 1475 | 495 *s->pixel_ptr++ = P[(flags >> shifter) & 0x03]; |
| 1468 | 496 } |
| 1475 | 497 s->pixel_ptr += s->line_inc; |
| 1468 | 498 } |
| 499 | |
| 500 } else if ((P[0] <= P[1]) && (P[2] > P[3])) { | |
| 501 | |
| 502 /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ | |
| 503 CHECK_STREAM_PTR(4); | |
| 504 | |
| 5089 | 505 flags = bytestream_get_le32(&s->stream_ptr); |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
506 shifter = 0; |
| 1468 | 507 |
| 508 for (y = 0; y < 8; y += 2) { | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
509 for (x = 0; x < 8; x += 2, shifter += 2) { |
| 1468 | 510 pix = P[(flags >> shifter) & 0x03]; |
| 1475 | 511 *(s->pixel_ptr + x) = pix; |
| 512 *(s->pixel_ptr + x + 1) = pix; | |
| 513 *(s->pixel_ptr + s->stride + x) = pix; | |
| 514 *(s->pixel_ptr + s->stride + x + 1) = pix; | |
| 1468 | 515 } |
| 1475 | 516 s->pixel_ptr += s->stride * 2; |
| 1468 | 517 } |
| 518 | |
| 519 } else if ((P[0] > P[1]) && (P[2] <= P[3])) { | |
| 520 | |
| 521 /* 1 of 4 colors for each 2x1 block, need 8 more bytes */ | |
| 522 CHECK_STREAM_PTR(8); | |
| 523 | |
| 524 for (y = 0; y < 8; y++) { | |
| 525 /* time to reload flags? */ | |
| 526 if ((y == 0) || (y == 4)) { | |
| 5089 | 527 flags = bytestream_get_le32(&s->stream_ptr); |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
528 shifter = 0; |
| 1468 | 529 } |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
530 for (x = 0; x < 8; x += 2, shifter += 2) { |
| 1468 | 531 pix = P[(flags >> shifter) & 0x03]; |
| 1475 | 532 *(s->pixel_ptr + x) = pix; |
| 533 *(s->pixel_ptr + x + 1) = pix; | |
| 1468 | 534 } |
| 1475 | 535 s->pixel_ptr += s->stride; |
| 1468 | 536 } |
| 537 | |
| 538 } else { | |
| 539 | |
| 540 /* 1 of 4 colors for each 1x2 block, need 8 more bytes */ | |
| 541 CHECK_STREAM_PTR(8); | |
| 542 | |
| 543 for (y = 0; y < 8; y += 2) { | |
| 544 /* time to reload flags? */ | |
| 545 if ((y == 0) || (y == 4)) { | |
| 5089 | 546 flags = bytestream_get_le32(&s->stream_ptr); |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
547 shifter = 0; |
| 1468 | 548 } |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
549 for (x = 0; x < 8; x++, shifter += 2) { |
| 1468 | 550 pix = P[(flags >> shifter) & 0x03]; |
| 1475 | 551 *(s->pixel_ptr + x) = pix; |
| 552 *(s->pixel_ptr + s->stride + x) = pix; | |
| 1468 | 553 } |
| 1475 | 554 s->pixel_ptr += s->stride * 2; |
| 1468 | 555 } |
| 556 } | |
| 557 | |
| 558 /* report success */ | |
| 559 return 0; | |
| 560 } | |
| 561 | |
| 1475 | 562 static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s) |
| 1468 | 563 { |
| 564 int x, y; | |
| 565 unsigned char P[16]; | |
| 566 unsigned char B[16]; | |
| 567 int flags = 0; | |
| 568 int shifter = 0; | |
| 569 int index; | |
| 570 int split; | |
| 571 int lower_half; | |
| 572 | |
| 573 /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on | |
| 574 * either top and bottom or left and right halves */ | |
| 575 CHECK_STREAM_PTR(4); | |
| 576 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
577 memcpy(P, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
578 s->stream_ptr += 4; |
| 1468 | 579 |
| 580 if (P[0] <= P[1]) { | |
| 581 | |
| 582 /* 4-color encoding for each quadrant; need 28 more bytes */ | |
| 583 CHECK_STREAM_PTR(28); | |
| 584 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
585 memcpy(B, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
586 s->stream_ptr += 4; |
| 1468 | 587 for (y = 4; y < 16; y += 4) { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
588 memcpy(P + y, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
589 s->stream_ptr += 4; |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
590 memcpy(B + y, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
591 s->stream_ptr += 4; |
| 1468 | 592 } |
| 593 | |
| 594 for (y = 0; y < 8; y++) { | |
| 595 | |
| 596 lower_half = (y >= 4) ? 4 : 0; | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
597 flags = (B[y + 8] << 8) | B[y]; |
| 1468 | 598 |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
599 for (x = 0, shifter = 0; x < 8; x++, shifter += 2) { |
| 1468 | 600 split = (x >= 4) ? 8 : 0; |
| 601 index = split + lower_half + ((flags >> shifter) & 0x03); | |
| 1475 | 602 *s->pixel_ptr++ = P[index]; |
| 1468 | 603 } |
| 604 | |
| 1475 | 605 s->pixel_ptr += s->line_inc; |
| 1468 | 606 } |
| 607 | |
| 608 } else { | |
| 609 | |
| 610 /* 4-color encoding for either left and right or top and bottom | |
| 611 * halves; need 20 more bytes */ | |
| 612 CHECK_STREAM_PTR(20); | |
| 613 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
614 memcpy(B, s->stream_ptr, 8); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
615 s->stream_ptr += 8; |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
616 memcpy(P + 4, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
617 s->stream_ptr += 4; |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
618 memcpy(B + 8, s->stream_ptr, 8); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
619 s->stream_ptr += 8; |
| 1468 | 620 |
| 621 if (P[4] <= P[5]) { | |
| 622 | |
| 623 /* block is divided into left and right halves */ | |
| 624 for (y = 0; y < 8; y++) { | |
| 625 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
626 flags = (B[y + 8] << 8) | B[y]; |
| 1468 | 627 split = 0; |
| 628 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
629 for (x = 0, shifter = 0; x < 8; x++, shifter += 2) { |
| 1468 | 630 if (x == 4) |
| 631 split = 4; | |
| 1475 | 632 *s->pixel_ptr++ = P[split + ((flags >> shifter) & 0x03)]; |
| 1468 | 633 } |
| 634 | |
| 1475 | 635 s->pixel_ptr += s->line_inc; |
| 1468 | 636 } |
| 637 | |
| 638 } else { | |
| 639 | |
| 640 /* block is divided into top and bottom halves */ | |
| 641 split = 0; | |
| 642 for (y = 0; y < 8; y++) { | |
| 643 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
644 flags = (B[y * 2 + 1] << 8) | B[y * 2]; |
| 1468 | 645 if (y == 4) |
| 646 split = 4; | |
| 647 | |
|
1473
873100cd2108
wrong, wrong, wrong...coded bits are read in the opposite direction
tmmm
parents:
1468
diff
changeset
|
648 for (x = 0, shifter = 0; x < 8; x++, shifter += 2) |
| 1475 | 649 *s->pixel_ptr++ = P[split + ((flags >> shifter) & 0x03)]; |
| 1468 | 650 |
| 1475 | 651 s->pixel_ptr += s->line_inc; |
| 1468 | 652 } |
| 653 } | |
| 654 } | |
| 655 | |
| 656 /* report success */ | |
| 657 return 0; | |
| 658 } | |
| 659 | |
| 1475 | 660 static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s) |
| 1468 | 661 { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
662 int y; |
| 1468 | 663 |
| 664 /* 64-color encoding (each pixel in block is a different color) */ | |
| 665 CHECK_STREAM_PTR(64); | |
| 666 | |
| 667 for (y = 0; y < 8; y++) { | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
668 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
|
669 s->stream_ptr += 8; |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
670 s->pixel_ptr += s->stride; |
| 1468 | 671 } |
| 672 | |
| 673 /* report success */ | |
| 674 return 0; | |
| 675 } | |
| 676 | |
| 1475 | 677 static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s) |
| 1468 | 678 { |
| 679 int x, y; | |
| 680 unsigned char pix; | |
| 681 | |
| 682 /* 16-color block encoding: each 2x2 block is a different color */ | |
| 683 CHECK_STREAM_PTR(16); | |
| 684 | |
| 685 for (y = 0; y < 8; y += 2) { | |
| 686 for (x = 0; x < 8; x += 2) { | |
| 1475 | 687 pix = *s->stream_ptr++; |
| 688 *(s->pixel_ptr + x) = pix; | |
| 689 *(s->pixel_ptr + x + 1) = pix; | |
| 690 *(s->pixel_ptr + s->stride + x) = pix; | |
| 691 *(s->pixel_ptr + s->stride + x + 1) = pix; | |
| 1468 | 692 } |
| 1475 | 693 s->pixel_ptr += s->stride * 2; |
| 1468 | 694 } |
| 695 | |
| 696 /* report success */ | |
| 697 return 0; | |
| 698 } | |
| 699 | |
| 1475 | 700 static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s) |
| 1468 | 701 { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
702 int y; |
| 1468 | 703 unsigned char P[4]; |
| 704 unsigned char index = 0; | |
| 705 | |
| 706 /* 4-color block encoding: each 4x4 block is a different color */ | |
| 707 CHECK_STREAM_PTR(4); | |
| 708 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
709 memcpy(P, s->stream_ptr, 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
710 s->stream_ptr += 4; |
| 1468 | 711 |
| 712 for (y = 0; y < 8; y++) { | |
| 713 if (y < 4) | |
| 714 index = 0; | |
| 715 else | |
| 716 index = 2; | |
| 717 | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
718 memset(s->pixel_ptr , P[index ], 4); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
719 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
|
720 s->pixel_ptr += s->stride; |
| 1468 | 721 } |
| 722 | |
| 723 /* report success */ | |
| 724 return 0; | |
| 725 } | |
| 726 | |
| 1475 | 727 static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s) |
| 1468 | 728 { |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
729 int y; |
| 1468 | 730 unsigned char pix; |
| 731 | |
| 732 /* 1-color encoding: the whole block is 1 solid color */ | |
| 733 CHECK_STREAM_PTR(1); | |
| 1475 | 734 pix = *s->stream_ptr++; |
| 1468 | 735 |
| 736 for (y = 0; y < 8; y++) { | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
737 memset(s->pixel_ptr, pix, 8); |
|
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
738 s->pixel_ptr += s->stride; |
| 1468 | 739 } |
| 740 | |
| 741 /* report success */ | |
| 742 return 0; | |
| 743 } | |
| 744 | |
| 1475 | 745 static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s) |
| 1468 | 746 { |
| 747 int x, y; | |
| 748 unsigned char sample0, sample1; | |
| 749 | |
| 750 /* dithered encoding */ | |
| 751 CHECK_STREAM_PTR(2); | |
| 1475 | 752 sample0 = *s->stream_ptr++; |
| 753 sample1 = *s->stream_ptr++; | |
| 1468 | 754 |
| 755 for (y = 0; y < 8; y++) { | |
| 756 for (x = 0; x < 8; x += 2) { | |
| 757 if (y & 1) { | |
| 1475 | 758 *s->pixel_ptr++ = sample1; |
| 759 *s->pixel_ptr++ = sample0; | |
| 1468 | 760 } else { |
| 1475 | 761 *s->pixel_ptr++ = sample0; |
| 762 *s->pixel_ptr++ = sample1; | |
| 1468 | 763 } |
| 764 } | |
| 1475 | 765 s->pixel_ptr += s->line_inc; |
| 1468 | 766 } |
| 767 | |
| 768 /* report success */ | |
| 769 return 0; | |
| 770 } | |
| 771 | |
|
9272
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
772 static int (* const ipvideo_decode_block[])(IpvideoContext *s) = { |
|
bb2fa003a336
Make ipvideo_decode_block array constant, compile-time initialized instead
reimar
parents:
9127
diff
changeset
|
773 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
|
774 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
|
775 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
|
776 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
|
777 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
|
778 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
|
779 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
|
780 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
|
781 }; |
| 1468 | 782 |
| 783 static void ipvideo_decode_opcodes(IpvideoContext *s) | |
| 784 { | |
| 785 int x, y; | |
| 786 int index = 0; | |
| 787 unsigned char opcode; | |
| 788 int ret; | |
|
9273
42c63846b321
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents:
9272
diff
changeset
|
789 int code_counts[16] = {0}; |
| 1468 | 790 static int frame = 0; |
| 791 | |
| 792 debug_interplay("------------------ frame %d\n", frame); | |
| 793 frame++; | |
| 794 | |
| 795 /* 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
|
796 memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4); |
| 1468 | 797 |
| 1475 | 798 s->stride = s->current_frame.linesize[0]; |
| 799 s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */ | |
| 800 s->stream_end = s->buf + s->size; | |
| 801 s->line_inc = s->stride - 8; | |
| 802 s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride | |
| 803 + s->avctx->width - 8; | |
| 1468 | 804 |
| 1475 | 805 for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) { |
| 806 for (x = y; x < y + s->avctx->width; x += 8) { | |
| 807 /* bottom nibble first, then top nibble (which makes it | |
| 808 * hard to use a GetBitcontext) */ | |
| 809 if (index & 1) | |
| 810 opcode = s->decoding_map[index >> 1] >> 4; | |
| 811 else | |
| 812 opcode = s->decoding_map[index >> 1] & 0xF; | |
| 813 index++; | |
| 1468 | 814 |
| 1475 | 815 debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", |
| 816 x - y, y / s->stride, opcode, s->stream_ptr); | |
| 817 code_counts[opcode]++; | |
| 1468 | 818 |
| 1475 | 819 s->pixel_ptr = s->current_frame.data[0] + x; |
| 820 ret = ipvideo_decode_block[opcode](s); | |
| 821 if (ret != 0) { | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
822 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n", |
| 1475 | 823 frame, x - y, y / s->stride); |
| 824 return; | |
| 1468 | 825 } |
| 826 } | |
| 827 } | |
|
9275
67cf9d31724c
Simplify check for leftover bytes after decoding for interplayvideo.
reimar
parents:
9274
diff
changeset
|
828 if (s->stream_end - s->stream_ptr > 1) { |
| 2962 | 829 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n", |
| 1475 | 830 s->stream_end - s->stream_ptr); |
| 831 } | |
| 1468 | 832 } |
| 833 | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
834 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
|
835 { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
836 IpvideoContext *s = avctx->priv_data; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
837 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
838 s->avctx = avctx; |
| 1468 | 839 |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
840 if (s->avctx->palctrl == NULL) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1585
diff
changeset
|
841 av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n"); |
| 1468 | 842 return -1; |
| 843 } | |
| 844 | |
| 845 avctx->pix_fmt = PIX_FMT_PAL8; | |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
846 dsputil_init(&s->dsp, avctx); |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
847 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
848 /* 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
|
849 s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); |
| 1468 | 850 |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
851 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
|
852 s->second_last_frame.data[0] = NULL; |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
853 |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
854 return 0; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
855 } |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
856 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
857 static int ipvideo_decode_frame(AVCodecContext *avctx, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
858 void *data, int *data_size, |
| 6218 | 859 const uint8_t *buf, int buf_size) |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
860 { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
861 IpvideoContext *s = avctx->priv_data; |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
862 AVPaletteControl *palette_control = avctx->palctrl; |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
863 |
| 1770 | 864 /* compressed buffer needs to be large enough to at least hold an entire |
| 865 * decoding map */ | |
| 866 if (buf_size < s->decoding_map_size) | |
| 867 return buf_size; | |
| 868 | |
| 1468 | 869 s->decoding_map = buf; |
| 870 s->buf = buf + s->decoding_map_size; | |
| 871 s->size = buf_size - s->decoding_map_size; | |
| 872 | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
873 s->current_frame.reference = 3; |
| 1468 | 874 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
|
875 av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); |
| 1468 | 876 return -1; |
| 877 } | |
| 878 | |
| 879 ipvideo_decode_opcodes(s); | |
| 880 | |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
881 if (palette_control->palette_changed) { |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
882 palette_control->palette_changed = 0; |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
883 s->current_frame.palette_has_changed = 1; |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
884 } |
|
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1545
diff
changeset
|
885 |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
886 *data_size = sizeof(AVFrame); |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
887 *(AVFrame*)data = s->current_frame; |
| 1468 | 888 |
| 889 /* shuffle frames */ | |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
890 if (s->second_last_frame.data[0]) |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
891 avctx->release_buffer(avctx, &s->second_last_frame); |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
892 s->second_last_frame = s->last_frame; |
| 1468 | 893 s->last_frame = s->current_frame; |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
894 s->current_frame.data[0] = NULL; /* catch any access attempts */ |
| 1468 | 895 |
| 896 /* report that the buffer was completely consumed */ | |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
897 return buf_size; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
898 } |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
899 |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6483
diff
changeset
|
900 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
|
901 { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
902 IpvideoContext *s = avctx->priv_data; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
903 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
904 /* release the last frame */ |
|
1474
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
905 if (s->last_frame.data[0]) |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
906 avctx->release_buffer(avctx, &s->last_frame); |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
907 if (s->second_last_frame.data[0]) |
|
94c7f7c23dd9
video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents:
1473
diff
changeset
|
908 avctx->release_buffer(avctx, &s->second_last_frame); |
|
1439
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
909 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
910 return 0; |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
911 } |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
912 |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
913 AVCodec interplay_video_decoder = { |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
914 "interplayvideo", |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
915 CODEC_TYPE_VIDEO, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
916 CODEC_ID_INTERPLAY_VIDEO, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
917 sizeof(IpvideoContext), |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
918 ipvideo_decode_init, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
919 NULL, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
920 ipvideo_decode_end, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
921 ipvideo_decode_frame, |
|
a4d00b1f0271
initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff
changeset
|
922 CODEC_CAP_DR1, |
|
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
8718
diff
changeset
|
923 .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
|
924 }; |
