annotate interplayvideo.c @ 9486:350827602d26 libavcodec

Remove useless assignments, at least one found by CSA.
author michael
date Fri, 17 Apr 2009 18:28:59 +0000
parents 54bc8a2727b0
children f9828d48e19c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
26 * http://www.pcisys.net/~melanson/codecs/interplay-mve.txt
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
27 * This code is written in such a way that the identifiers match up
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
28 * with the encoding descriptions in the document.
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
29 *
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
30 * This decoder presently only supports a PAL8 output colorspace.
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
31 *
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
32 * An Interplay video frame consists of 2 parts: The decoding map and
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
33 * the video data. A demuxer must load these 2 parts together in a single
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4962
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
46 #define PALETTE_COUNT 256
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
47
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
48 /* debugging support */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
49 #define DEBUG_INTERPLAY 0
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
50 #if DEBUG_INTERPLAY
2515
alex
parents: 1926
diff changeset
51 #define debug_interplay(x,...) av_log(NULL, AV_LOG_DEBUG, x, __VA_ARGS__)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
52 #else
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
53 static inline void debug_interplay(const char *format, ...) { }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
54 #endif
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
michael
parents: 5215
diff changeset
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
michael
parents: 5215
diff changeset
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
michael
parents: 5215
diff changeset
69 const unsigned char *stream_ptr;
michael
parents: 5215
diff changeset
70 const unsigned char *stream_end;
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
71 unsigned char *pixel_ptr;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
72 int line_inc;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
73 int stride;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
74 int upper_motion_limit_offset;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
81 s->stream_ptr + n, s->stream_end); \
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
82 return -1; \
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
83 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
100
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
101 static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
104 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
105
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
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
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
111 static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
112 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
113 unsigned char B;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
114 int x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
115
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
116 /* copy block from 2 frames ago using a motion vector; need 1 more byte */
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
117 CHECK_STREAM_PTR(1);
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
118 B = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
119
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
120 if (B < 56) {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
121 x = 8 + (B % 7);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
122 y = B / 7;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
123 } else {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
124 x = -14 + ((B - 56) % 29);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
125 y = 8 + ((B - 56) / 29);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
126 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
127
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
130 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
131
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
132 static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
133 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
134 unsigned char B;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
135 int x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
136
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
137 /* copy 8x8 block from current frame from an up/left block */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
138
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
139 /* need 1 more byte for motion */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
140 CHECK_STREAM_PTR(1);
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
141 B = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
142
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
143 if (B < 56) {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
144 x = -(8 + (B % 7));
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
145 y = -(B / 7);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
146 } else {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
147 x = -(-14 + ((B - 56) % 29));
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
148 y = -( 8 + ((B - 56) / 29));
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
149 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
150
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
153 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
154
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
155 static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
156 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
157 int x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
158 unsigned char B, BL, BH;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
159
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
160 /* copy a block from the previous frame; need 1 more byte */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
161 CHECK_STREAM_PTR(1);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
162
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
163 B = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
164 BL = B & 0x0F;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
165 BH = (B >> 4) & 0x0F;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
166 x = -8 + BL;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
167 y = -8 + BH;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
168
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
171 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
172
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
173 static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
174 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
175 signed char x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
176
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
177 /* copy a block from the previous frame using an expanded range;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
178 * need 2 more bytes */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
179 CHECK_STREAM_PTR(2);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
180
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
181 x = *s->stream_ptr++;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
182 y = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
183
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
186 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
187
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
188 static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
189 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
192
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
193 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
194 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
195 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
196
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
197 static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
198 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
201 unsigned int flags;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
202
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
203 /* 2-color encoding */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
204 CHECK_STREAM_PTR(2);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
210
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
211 /* need 8 more bytes from the stream */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
212 CHECK_STREAM_PTR(8);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
213
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
44de9c136513 Cosmetics: remove some pointless {}
reimar
parents: 9318
diff changeset
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
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
218 s->pixel_ptr += s->line_inc;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
219 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
220
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
221 } else {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
222
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
223 /* need 2 more bytes from the stream */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
224 CHECK_STREAM_PTR(2);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
225
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4962
diff changeset
226 flags = bytestream_get_le16(&s->stream_ptr);
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
1c7fe87b1674 Fix indentation
reimar
parents: 9298
diff changeset
229 s->pixel_ptr[x ] =
1c7fe87b1674 Fix indentation
reimar
parents: 9298
diff changeset
230 s->pixel_ptr[x + 1 ] =
1c7fe87b1674 Fix indentation
reimar
parents: 9298
diff changeset
231 s->pixel_ptr[x + s->stride] =
1c7fe87b1674 Fix indentation
reimar
parents: 9298
diff changeset
232 s->pixel_ptr[x + 1 + s->stride] = P[flags & 1];
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
233 }
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
234 s->pixel_ptr += s->stride * 2;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
235 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
236 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
237
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
238 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
239 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
240 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
241
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
242 static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
243 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
246 unsigned int flags = 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
247
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
248 /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
249 * either top and bottom or left and right halves */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
250 CHECK_STREAM_PTR(2);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
251
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
252 P[0] = *s->stream_ptr++;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
253 P[1] = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
254
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
255 if (P[0] <= P[1]) {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
265 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
266
9319
44de9c136513 Cosmetics: remove some pointless {}
reimar
parents: 9318
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
272 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
273
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
274 } else {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
275
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
276 /* need 10 more bytes */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
277 CHECK_STREAM_PTR(10);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
278
9306
7a546836b61b 100l, fix FATE test broken by r18264
reimar
parents: 9305
diff changeset
279 if (s->stream_ptr[4] <= s->stream_ptr[5]) {
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
283 /* vertical split; left & right halves are 2-color encoded */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
44de9c136513 Cosmetics: remove some pointless {}
reimar
parents: 9318
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
294 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
295 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
296
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
297 } else {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
298
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
299 /* horizontal split; top & bottom halves are 2-color encoded */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
300
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
305 }
9307
851ca5db8327 Avoid the last two uses of bitmasks in interplayvideo
reimar
parents: 9306
diff changeset
306 flags = *s->stream_ptr++ | 0x100;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
307
9319
44de9c136513 Cosmetics: remove some pointless {}
reimar
parents: 9318
diff changeset
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
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
310 s->pixel_ptr += s->line_inc;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
311 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
312 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
313 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
314
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
315 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
316 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
317 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
318
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
319 static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
320 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
321 int x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
322 unsigned char P[4];
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
323
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
324 /* 4-color encoding */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
325 CHECK_STREAM_PTR(4);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
332
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
333 /* 1 of 4 colors for each pixel, need 16 more bytes */
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
334 CHECK_STREAM_PTR(16);
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
335
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
336 for (y = 0; y < 8; y++) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
337 /* get the next set of 8 2-bit flags */
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
338 int flags = bytestream_get_le16(&s->stream_ptr);
9319
44de9c136513 Cosmetics: remove some pointless {}
reimar
parents: 9318
diff changeset
339 for (x = 0; x < 8; x++, flags >>= 2)
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
340 *s->pixel_ptr++ = P[flags & 0x03];
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
341 s->pixel_ptr += s->line_inc;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
342 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
343
9303
2ae6ab3fa3ba Rearrange how the different cases are checked to reduce the number of
reimar
parents: 9302
diff changeset
344 } else {
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
345 uint32_t flags;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
346
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
347 /* 1 of 4 colors for each 2x2 block, need 4 more bytes */
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
348 CHECK_STREAM_PTR(4);
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
349
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
350 flags = bytestream_get_le32(&s->stream_ptr);
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
351
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
352 for (y = 0; y < 8; y += 2) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
353 for (x = 0; x < 8; x += 2, flags >>= 2) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
354 s->pixel_ptr[x ] =
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
355 s->pixel_ptr[x + 1 ] =
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
356 s->pixel_ptr[x + s->stride] =
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
357 s->pixel_ptr[x + 1 + s->stride] = P[flags & 0x03];
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
358 }
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
359 s->pixel_ptr += s->stride * 2;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
360 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
365
9304
94d7289c656e Deduplicate code by moving it outside the if/else
reimar
parents: 9303
diff changeset
366 /* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
367 CHECK_STREAM_PTR(8);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
94d7289c656e Deduplicate code by moving it outside the if/else
reimar
parents: 9303
diff changeset
370 if (P[2] <= P[3]) {
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
371 for (y = 0; y < 8; y++) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
372 for (x = 0; x < 8; x += 2, flags >>= 2) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
373 s->pixel_ptr[x ] =
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
374 s->pixel_ptr[x + 1] = P[flags & 0x03];
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
375 }
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
376 s->pixel_ptr += s->stride;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
377 }
9303
2ae6ab3fa3ba Rearrange how the different cases are checked to reduce the number of
reimar
parents: 9302
diff changeset
378 } else {
9305
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
379 for (y = 0; y < 8; y += 2) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
380 for (x = 0; x < 8; x++, flags >>= 2) {
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
381 s->pixel_ptr[x ] =
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
382 s->pixel_ptr[x + s->stride] = P[flags & 0x03];
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
383 }
be07610b4407 Reindent
reimar
parents: 9304
diff changeset
384 s->pixel_ptr += s->stride * 2;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
385 }
9303
2ae6ab3fa3ba Rearrange how the different cases are checked to reduce the number of
reimar
parents: 9302
diff changeset
386 }
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
387 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
388
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
389 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
390 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
391 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
392
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
393 static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
394 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
397 int flags = 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
398
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
399 /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
414 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
415
9319
44de9c136513 Cosmetics: remove some pointless {}
reimar
parents: 9318
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
422 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
423
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
428
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
438 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
448 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
449 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
450
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
451 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
452 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
453 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
454
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
455 static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
456 {
9273
42c63846b321 Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents: 9272
diff changeset
457 int y;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
458
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
459 /* 64-color encoding (each pixel in block is a different color) */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
460 CHECK_STREAM_PTR(64);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
461
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
466 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
467
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
468 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
469 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
470 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
471
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
472 static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
473 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
474 int x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
475
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
476 /* 16-color block encoding: each 2x2 block is a different color */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
477 CHECK_STREAM_PTR(16);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
478
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
479 for (y = 0; y < 8; y += 2) {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
480 for (x = 0; x < 8; x += 2) {
9297
493f6d65db83 Prettify some assignments
reimar
parents: 9296
diff changeset
481 s->pixel_ptr[x ] =
493f6d65db83 Prettify some assignments
reimar
parents: 9296
diff changeset
482 s->pixel_ptr[x + 1 ] =
493f6d65db83 Prettify some assignments
reimar
parents: 9296
diff changeset
483 s->pixel_ptr[x + s->stride] =
9301
37ef0d0eb1c2 Remove now pointless temporary pix variables.
reimar
parents: 9300
diff changeset
484 s->pixel_ptr[x + 1 + s->stride] = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
485 }
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
486 s->pixel_ptr += s->stride * 2;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
487 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
488
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
489 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
490 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
491 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
492
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
493 static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
494 {
9273
42c63846b321 Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents: 9272
diff changeset
495 int y;
9322
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
496 unsigned char P[2];
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
497
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
498 /* 4-color block encoding: each 4x4 block is a different color */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
499 CHECK_STREAM_PTR(4);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
500
9322
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
501 for (y = 0; y < 8; y++) {
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
502 if (!(y & 3)) {
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
503 P[0] = *s->stream_ptr++;
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
504 P[1] = *s->stream_ptr++;
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
505 }
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
506 memset(s->pixel_ptr, P[0], 4);
cea979496c7a Fix ipvideo_decode_block_opcode_0xD again.
reimar
parents: 9319
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
509 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
510
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
511 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
512 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
513 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
514
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
515 static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
516 {
9273
42c63846b321 Replace many tiny loops in the interplayvideo decoder by memset, memcpy
reimar
parents: 9272
diff changeset
517 int y;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
518 unsigned char pix;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
519
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
520 /* 1-color encoding: the whole block is 1 solid color */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
521 CHECK_STREAM_PTR(1);
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
522 pix = *s->stream_ptr++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
523
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
527 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
528
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
529 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
530 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
531 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
532
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
533 static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s)
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
534 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
537
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
538 /* dithered encoding */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
542
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
543 for (y = 0; y < 8; y++) {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
547 }
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
548 s->pixel_ptr += s->line_inc;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
549 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
550
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
551 /* report success */
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
552 return 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
553 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
565
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
566 static void ipvideo_decode_opcodes(IpvideoContext *s)
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
567 {
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
568 int x, y;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
569 int index = 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
570 unsigned char opcode;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
573 static int frame = 0;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
574
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
575 debug_interplay("------------------ frame %d\n", frame);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
576 frame++;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
577
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
580
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
581 s->stride = s->current_frame.linesize[0];
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
582 s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
583 s->stream_end = s->buf + s->size;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
584 s->line_inc = s->stride - 8;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
585 s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
586 + s->avctx->width - 8;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
587
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
588 for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) {
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
589 for (x = y; x < y + s->avctx->width; x += 8) {
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
590 /* bottom nibble first, then top nibble (which makes it
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
591 * hard to use a GetBitcontext) */
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
592 if (index & 1)
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
593 opcode = s->decoding_map[index >> 1] >> 4;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
594 else
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
595 opcode = s->decoding_map[index >> 1] & 0xF;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
596 index++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
597
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
598 debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
599 x - y, y / s->stride, opcode, s->stream_ptr);
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
600 code_counts[opcode]++;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
601
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
602 s->pixel_ptr = s->current_frame.data[0] + x;
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
603 ret = ipvideo_decode_block[opcode](s);
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
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
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
606 frame, x - y, y / s->stride);
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
607 return;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
608 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
609 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2515
diff changeset
612 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n",
1475
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
613 s->stream_end - s->stream_ptr);
26eb7678cb46 do away with all those naughty global variables
tmmm
parents: 1474
diff changeset
614 }
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
615 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
625 return -1;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
626 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
627
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
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,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9322
diff changeset
642 AVPacket *avpkt)
1439
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
643 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9322
diff changeset
644 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9322
diff changeset
645 int buf_size = avpkt->size;
1439
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
646 IpvideoContext *s = avctx->priv_data;
1585
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1545
diff changeset
647 AVPaletteControl *palette_control = avctx->palctrl;
1439
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
648
1770
cd36e37fb879 handle invalid buffer sizes
melanson
parents: 1598
diff changeset
649 /* compressed buffer needs to be large enough to at least hold an entire
cd36e37fb879 handle invalid buffer sizes
melanson
parents: 1598
diff changeset
650 * decoding map */
cd36e37fb879 handle invalid buffer sizes
melanson
parents: 1598
diff changeset
651 if (buf_size < s->decoding_map_size)
cd36e37fb879 handle invalid buffer sizes
melanson
parents: 1598
diff changeset
652 return buf_size;
cd36e37fb879 handle invalid buffer sizes
melanson
parents: 1598
diff changeset
653
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
654 s->decoding_map = buf;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
655 s->buf = buf + s->decoding_map_size;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
656 s->size = buf_size - s->decoding_map_size;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
657
1474
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
658 s->current_frame.reference = 3;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
659 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
660 av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n");
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
661 return -1;
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
662 }
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
663
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
664 ipvideo_decode_opcodes(s);
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
665
1585
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1545
diff changeset
666 if (palette_control->palette_changed) {
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1545
diff changeset
667 palette_control->palette_changed = 0;
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1545
diff changeset
668 s->current_frame.palette_has_changed = 1;
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1545
diff changeset
669 }
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1545
diff changeset
670
1474
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
671 *data_size = sizeof(AVFrame);
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
672 *(AVFrame*)data = s->current_frame;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
673
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
674 /* shuffle frames */
1474
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
675 if (s->second_last_frame.data[0])
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
676 avctx->release_buffer(avctx, &s->second_last_frame);
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
677 s->second_last_frame = s->last_frame;
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
678 s->last_frame = s->current_frame;
1474
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
679 s->current_frame.data[0] = NULL; /* catch any access attempts */
1468
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
680
92c1f24f7754 initial Interplay video decoder
tmmm
parents: 1439
diff changeset
681 /* report that the buffer was completely consumed */
1439
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
682 return buf_size;
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
683 }
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
684
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6483
diff changeset
685 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
686 {
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
687 IpvideoContext *s = avctx->priv_data;
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
688
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
689 /* release the last frame */
1474
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
690 if (s->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->last_frame);
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
692 if (s->second_last_frame.data[0])
94c7f7c23dd9 video looks beautiful now, many thanks to Alexander Belyakov
tmmm
parents: 1473
diff changeset
693 avctx->release_buffer(avctx, &s->second_last_frame);
1439
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 return 0;
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
696 }
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
697
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
698 AVCodec interplay_video_decoder = {
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
699 "interplayvideo",
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
700 CODEC_TYPE_VIDEO,
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
701 CODEC_ID_INTERPLAY_VIDEO,
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
702 sizeof(IpvideoContext),
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
703 ipvideo_decode_init,
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
704 NULL,
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
705 ipvideo_decode_end,
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
706 ipvideo_decode_frame,
a4d00b1f0271 initial commit for Id RoQ and Interplay MVE multimedia subsystems
tmmm
parents:
diff changeset
707 CODEC_CAP_DR1,
9083
bf274494b66e Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents: 8718
diff changeset
708 .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
709 };