annotate xan.c @ 12530:63edd10ad4bc libavcodec tip

Try to fix crashes introduced by r25218 r25218 made assumptions about the existence of past reference frames that weren't necessarily true.
author darkshikari
date Tue, 28 Sep 2010 09:06:22 +0000
parents 7dd2a45249a9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
1 /*
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
2 * Wing Commander/Xan Video Decoder
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
3 * Copyright (C) 2003 the ffmpeg project
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
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
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
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.
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
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,
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
15 * Lesser General Public License for more details.
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
16 *
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
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: 2967
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
20 */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
21
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
22 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 11560
diff changeset
23 * @file
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
24 * Xan video decoder for Wing Commander III computer game
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
25 * by Mario Brito (mbrito@student.dei.uc.pt)
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
26 * and Mike Melanson (melanson@pcisys.net)
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
27 *
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
28 * The xan_wc3 decoder outputs PAL8 data.
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
29 */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
30
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
31 #include <stdio.h>
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
32 #include <stdlib.h>
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
33 #include <string.h>
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
34
8573
2acf0ae7b041 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents: 7040
diff changeset
35 #include "libavutil/intreadwrite.h"
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
36 #include "avcodec.h"
9489
f4fdab353f6f Some more simplifications of xan_unpack
reimar
parents: 9488
diff changeset
37 #include "bytestream.h"
9496
2c6a58787aeb Simplify xan_huffman_decode by using get_bits
reimar
parents: 9491
diff changeset
38 #define ALT_BITSTREAM_READER_LE
2c6a58787aeb Simplify xan_huffman_decode by using get_bits
reimar
parents: 9491
diff changeset
39 #include "get_bits.h"
9475
4faccfb98672 Replace bytecopy with the equivalent but faster av_memcpy_backptr.
reimar
parents: 9473
diff changeset
40 // for av_memcpy_backptr
4faccfb98672 Replace bytecopy with the equivalent but faster av_memcpy_backptr.
reimar
parents: 9473
diff changeset
41 #include "libavutil/lzo.h"
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
42
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
43 typedef struct XanContext {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
44
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
45 AVCodecContext *avctx;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
46 AVFrame last_frame;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
47 AVFrame current_frame;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
48
6302
michael
parents: 5215
diff changeset
49 const unsigned char *buf;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
50 int size;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
51
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
52 /* scratch space */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
53 unsigned char *buffer1;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
54 int buffer1_size;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
55 unsigned char *buffer2;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
56 int buffer2_size;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
57
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
58 int frame_size;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
59
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
60 } XanContext;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
61
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6452
diff changeset
62 static av_cold int xan_decode_init(AVCodecContext *avctx)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
63 {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
64 XanContext *s = avctx->priv_data;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
65
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
66 s->avctx = avctx;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
67 s->frame_size = 0;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
68
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2831
diff changeset
69 if ((avctx->codec->id == CODEC_ID_XAN_WC3) &&
1585
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1476
diff changeset
70 (s->avctx->palctrl == NULL)) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1585
diff changeset
71 av_log(avctx, AV_LOG_ERROR, " WC3 Xan video: palette expected.\n");
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
72 return -1;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
73 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
74
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
75 avctx->pix_fmt = PIX_FMT_PAL8;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
76
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
77 s->buffer1_size = avctx->width * avctx->height;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
78 s->buffer1 = av_malloc(s->buffer1_size);
10700
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
79 if (!s->buffer1)
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
80 return -1;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
81 s->buffer2_size = avctx->width * avctx->height;
9485
90d4d9708969 Increase buffer padding to avoid most space checks in xan_unpack
reimar
parents: 9479
diff changeset
82 s->buffer2 = av_malloc(s->buffer2_size + 130);
10700
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
83 if (!s->buffer2) {
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
84 av_freep(&s->buffer1);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
85 return -1;
10700
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
86 }
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
87
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
88 return 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
89 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
90
6302
michael
parents: 5215
diff changeset
91 static int xan_huffman_decode(unsigned char *dest, const unsigned char *src,
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
92 int dest_len)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
93 {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
94 unsigned char byte = *src++;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
95 unsigned char ival = byte + 0x16;
6302
michael
parents: 5215
diff changeset
96 const unsigned char * ptr = src + byte*2;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
97 unsigned char val = ival;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
98 unsigned char *dest_end = dest + dest_len;
9496
2c6a58787aeb Simplify xan_huffman_decode by using get_bits
reimar
parents: 9491
diff changeset
99 GetBitContext gb;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
100
9496
2c6a58787aeb Simplify xan_huffman_decode by using get_bits
reimar
parents: 9491
diff changeset
101 init_get_bits(&gb, ptr, 0); // FIXME: no src size available
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
102
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
103 while ( val != 0x16 ) {
9496
2c6a58787aeb Simplify xan_huffman_decode by using get_bits
reimar
parents: 9491
diff changeset
104 val = src[val - 0x17 + get_bits1(&gb) * byte];
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
105
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
106 if ( val < 0x16 ) {
9497
cb387dff812d Change buffer check to avoid an unlikely pointer arithmetic overflow.
reimar
parents: 9496
diff changeset
107 if (dest >= dest_end)
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
108 return 0;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
109 *dest++ = val;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
110 val = ival;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
111 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
112 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
113
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
114 return 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
115 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
116
9475
4faccfb98672 Replace bytecopy with the equivalent but faster av_memcpy_backptr.
reimar
parents: 9473
diff changeset
117 /**
4faccfb98672 Replace bytecopy with the equivalent but faster av_memcpy_backptr.
reimar
parents: 9473
diff changeset
118 * unpack simple compression
4faccfb98672 Replace bytecopy with the equivalent but faster av_memcpy_backptr.
reimar
parents: 9473
diff changeset
119 *
9485
90d4d9708969 Increase buffer padding to avoid most space checks in xan_unpack
reimar
parents: 9479
diff changeset
120 * @param dest destination buffer of dest_len, must be padded with at least 130 bytes
9475
4faccfb98672 Replace bytecopy with the equivalent but faster av_memcpy_backptr.
reimar
parents: 9473
diff changeset
121 */
6302
michael
parents: 5215
diff changeset
122 static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_len)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
123 {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
124 unsigned char opcode;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
125 int size;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
126 unsigned char *dest_end = dest + dest_len;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
127
9485
90d4d9708969 Increase buffer padding to avoid most space checks in xan_unpack
reimar
parents: 9479
diff changeset
128 while (dest < dest_end) {
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
129 opcode = *src++;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
130
9487
ab354d259380 Avoid some code duplication in xan_unpack
reimar
parents: 9485
diff changeset
131 if (opcode < 0xe0) {
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
132 int size2, back;
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
133 if ( (opcode & 0x80) == 0 ) {
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
134
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
135 size = opcode & 3;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
136
9491
28978a75c865 Cosmetics to improve xan_unpack readability
reimar
parents: 9490
diff changeset
137 back = ((opcode & 0x60) << 3) + *src++ + 1;
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
138 size2 = ((opcode & 0x1c) >> 2) + 3;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
139
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
140 } else if ( (opcode & 0x40) == 0 ) {
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
141
9489
f4fdab353f6f Some more simplifications of xan_unpack
reimar
parents: 9488
diff changeset
142 size = *src >> 6;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
143
9491
28978a75c865 Cosmetics to improve xan_unpack readability
reimar
parents: 9490
diff changeset
144 back = (bytestream_get_be16(&src) & 0x3fff) + 1;
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
145 size2 = (opcode & 0x3f) + 4;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
146
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
147 } else {
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
148
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
149 size = opcode & 3;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
150
9491
28978a75c865 Cosmetics to improve xan_unpack readability
reimar
parents: 9490
diff changeset
151 back = ((opcode & 0x10) << 12) + bytestream_get_be16(&src) + 1;
28978a75c865 Cosmetics to improve xan_unpack readability
reimar
parents: 9490
diff changeset
152 size2 = ((opcode & 0x0c) << 6) + *src++ + 5;
9490
9999ab77829b Fix buffer size check for xan_unpack which was broken by r18586
reimar
parents: 9489
diff changeset
153 if (size + size2 > dest_end - dest)
9488
bae097827a6d Reindent xan_unpack code
reimar
parents: 9487
diff changeset
154 return;
9487
ab354d259380 Avoid some code duplication in xan_unpack
reimar
parents: 9485
diff changeset
155 }
ab354d259380 Avoid some code duplication in xan_unpack
reimar
parents: 9485
diff changeset
156 memcpy(dest, src, size); dest += size; src += size;
ab354d259380 Avoid some code duplication in xan_unpack
reimar
parents: 9485
diff changeset
157 av_memcpy_backptr(dest, back, size2);
ab354d259380 Avoid some code duplication in xan_unpack
reimar
parents: 9485
diff changeset
158 dest += size2;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
159 } else {
10134
1d71688b4549 Slightly simplify detection of end of compressed data in xan_unpack
reimar
parents: 9981
diff changeset
160 int finish = opcode >= 0xfc;
1d71688b4549 Slightly simplify detection of end of compressed data in xan_unpack
reimar
parents: 9981
diff changeset
161 size = finish ? opcode & 3 : ((opcode & 0x1f) << 2) + 4;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
162
9473
e38284cd69dc Use memcpy instead of the very inefficient bytecopy where both are correct
reimar
parents: 9355
diff changeset
163 memcpy(dest, src, size); dest += size; src += size;
9501
880d9562d218 Avoid code duplication in xan_unpack for the final memcpy.
reimar
parents: 9500
diff changeset
164 if (finish)
880d9562d218 Avoid code duplication in xan_unpack for the final memcpy.
reimar
parents: 9500
diff changeset
165 return;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
166 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
167 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
168 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
169
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4801
diff changeset
170 static inline void xan_wc3_output_pixel_run(XanContext *s,
6303
aurel
parents: 6302
diff changeset
171 const unsigned char *pixel_buffer, int x, int y, int pixel_count)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
172 {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
173 int stride;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
174 int line_inc;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
175 int index;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
176 int current_x;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
177 int width = s->avctx->width;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
178 unsigned char *palette_plane;
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
179
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
180 palette_plane = s->current_frame.data[0];
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
181 stride = s->current_frame.linesize[0];
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
182 line_inc = stride - width;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
183 index = y * stride + x;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
184 current_x = x;
10135
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
185 while(pixel_count && (index < s->frame_size)) {
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
186 int count = FFMIN(pixel_count, width - current_x);
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
187 memcpy(palette_plane + index, pixel_buffer, count);
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
188 pixel_count -= count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
189 index += count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
190 pixel_buffer += count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
191 current_x += count;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
192
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
193 if (current_x >= width) {
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
194 index += line_inc;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
195 current_x = 0;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
196 }
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
197 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
198 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
199
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4801
diff changeset
200 static inline void xan_wc3_copy_pixel_run(XanContext *s,
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
201 int x, int y, int pixel_count, int motion_x, int motion_y)
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
202 {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
203 int stride;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
204 int line_inc;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
205 int curframe_index, prevframe_index;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
206 int curframe_x, prevframe_x;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
207 int width = s->avctx->width;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
208 unsigned char *palette_plane, *prev_palette_plane;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
209
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
210 palette_plane = s->current_frame.data[0];
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
211 prev_palette_plane = s->last_frame.data[0];
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
212 stride = s->current_frame.linesize[0];
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
213 line_inc = stride - width;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
214 curframe_index = y * stride + x;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
215 curframe_x = x;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
216 prevframe_index = (y + motion_y) * stride + x + motion_x;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
217 prevframe_x = x + motion_x;
10135
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
218 while(pixel_count && (curframe_index < s->frame_size)) {
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
219 int count = FFMIN3(pixel_count, width - curframe_x, width - prevframe_x);
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
220
10135
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
221 memcpy(palette_plane + curframe_index, prev_palette_plane + prevframe_index, count);
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
222 pixel_count -= count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
223 curframe_index += count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
224 prevframe_index += count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
225 curframe_x += count;
a3abf068e05e Use memcpy to copy till end of line in one go instead of copying pixel by pixel
reimar
parents: 10134
diff changeset
226 prevframe_x += count;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
227
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
228 if (curframe_x >= width) {
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
229 curframe_index += line_inc;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
230 curframe_x = 0;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
231 }
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
232
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
233 if (prevframe_x >= width) {
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
234 prevframe_index += line_inc;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
235 prevframe_x = 0;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
236 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
237 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
238 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
239
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
240 static void xan_wc3_decode_frame(XanContext *s) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
241
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
242 int width = s->avctx->width;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
243 int height = s->avctx->height;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
244 int total_pixels = width * height;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
245 unsigned char opcode;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
246 unsigned char flag = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
247 int size = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
248 int motion_x, motion_y;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
249 int x, y;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
250
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
251 unsigned char *opcode_buffer = s->buffer1;
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
252 int opcode_buffer_size = s->buffer1_size;
6303
aurel
parents: 6302
diff changeset
253 const unsigned char *imagedata_buffer = s->buffer2;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
254
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
255 /* pointers to segments inside the compressed chunk */
6302
michael
parents: 5215
diff changeset
256 const unsigned char *huffman_segment;
michael
parents: 5215
diff changeset
257 const unsigned char *size_segment;
michael
parents: 5215
diff changeset
258 const unsigned char *vector_segment;
michael
parents: 5215
diff changeset
259 const unsigned char *imagedata_segment;
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
260
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 3947
diff changeset
261 huffman_segment = s->buf + AV_RL16(&s->buf[0]);
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 3947
diff changeset
262 size_segment = s->buf + AV_RL16(&s->buf[2]);
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 3947
diff changeset
263 vector_segment = s->buf + AV_RL16(&s->buf[4]);
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 3947
diff changeset
264 imagedata_segment = s->buf + AV_RL16(&s->buf[6]);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
265
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
266 xan_huffman_decode(opcode_buffer, huffman_segment, opcode_buffer_size);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
267
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
268 if (imagedata_segment[0] == 2)
6303
aurel
parents: 6302
diff changeset
269 xan_unpack(s->buffer2, &imagedata_segment[1], s->buffer2_size);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
270 else
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
271 imagedata_buffer = &imagedata_segment[1];
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
272
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
273 /* use the decoded data segments to build the frame */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
274 x = y = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
275 while (total_pixels) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
276
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
277 opcode = *opcode_buffer++;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
278 size = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
279
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
280 switch (opcode) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
281
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
282 case 0:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
283 flag ^= 1;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
284 continue;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
285
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
286 case 1:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
287 case 2:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
288 case 3:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
289 case 4:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
290 case 5:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
291 case 6:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
292 case 7:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
293 case 8:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
294 size = opcode;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
295 break;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
296
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
297 case 12:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
298 case 13:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
299 case 14:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
300 case 15:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
301 case 16:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
302 case 17:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
303 case 18:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
304 size += (opcode - 10);
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
305 break;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
306
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
307 case 9:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
308 case 19:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
309 size = *size_segment++;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
310 break;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
311
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
312 case 10:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
313 case 20:
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 3947
diff changeset
314 size = AV_RB16(&size_segment[0]);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
315 size_segment += 2;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
316 break;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
317
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
318 case 11:
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
319 case 21:
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4962
diff changeset
320 size = AV_RB24(size_segment);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
321 size_segment += 3;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
322 break;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
323 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
324
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
325 if (opcode < 12) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
326 flag ^= 1;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
327 if (flag) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
328 /* run of (size) pixels is unchanged from last frame */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
329 xan_wc3_copy_pixel_run(s, x, y, size, 0, 0);
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
330 } else {
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
331 /* output a run of pixels from imagedata_buffer */
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
332 xan_wc3_output_pixel_run(s, imagedata_buffer, x, y, size);
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
333 imagedata_buffer += size;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
334 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
335 } else {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
336 /* run-based motion compensation from last frame */
9500
9157421b6239 Use sign_extend function instead of reimplementing it.
reimar
parents: 9499
diff changeset
337 motion_x = sign_extend(*vector_segment >> 4, 4);
9157421b6239 Use sign_extend function instead of reimplementing it.
reimar
parents: 9499
diff changeset
338 motion_y = sign_extend(*vector_segment & 0xF, 4);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
339 vector_segment++;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
340
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
341 /* copy a run of pixels from the previous frame */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
342 xan_wc3_copy_pixel_run(s, x, y, size, motion_x, motion_y);
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
343
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
344 flag = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
345 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
346
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
347 /* coordinate accounting */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
348 total_pixels -= size;
9498
6abd94fdd827 Use / and % operators instead of reimplementing them with a loop.
reimar
parents: 9497
diff changeset
349 y += (x + size) / width;
6abd94fdd827 Use / and % operators instead of reimplementing them with a loop.
reimar
parents: 9497
diff changeset
350 x = (x + size) % width;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
351 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
352 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
353
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
354 static void xan_wc4_decode_frame(XanContext *s) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
355 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
356
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
357 static int xan_decode_frame(AVCodecContext *avctx,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
358 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
359 AVPacket *avpkt)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
360 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
361 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
362 int buf_size = avpkt->size;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
363 XanContext *s = avctx->priv_data;
1585
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1476
diff changeset
364 AVPaletteControl *palette_control = avctx->palctrl;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
365
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
366 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
367 av_log(s->avctx, AV_LOG_ERROR, " Xan Video: get_buffer() failed\n");
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
368 return -1;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
369 }
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
370 s->current_frame.reference = 3;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
371
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
372 if (!s->frame_size)
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
373 s->frame_size = s->current_frame.linesize[0] * s->avctx->height;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
374
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
375 palette_control->palette_changed = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2831
diff changeset
376 memcpy(s->current_frame.data[1], palette_control->palette,
10699
633727ffa79a cosmetics: reindent a bit
kostya
parents: 10397
diff changeset
377 AVPALETTE_SIZE);
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
378 s->current_frame.palette_has_changed = 1;
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
379
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
380 s->buf = buf;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
381 s->size = buf_size;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
382
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
383 if (avctx->codec->id == CODEC_ID_XAN_WC3)
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
384 xan_wc3_decode_frame(s);
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
385 else if (avctx->codec->id == CODEC_ID_XAN_WC4)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
386 xan_wc4_decode_frame(s);
1459
201d4e25c207 xan_wc3 decoder now works correctly; added a bunch of output
tmmm
parents: 1443
diff changeset
387
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
388 /* release the last frame if it is allocated */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
389 if (s->last_frame.data[0])
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
390 avctx->release_buffer(avctx, &s->last_frame);
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
391
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
392 *data_size = sizeof(AVFrame);
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
393 *(AVFrame*)data = s->current_frame;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
394
6452
2a2f9cb7f1b0 fix the WC3 Xan decoder by correcting the frame accounting logic
melanson
parents: 6303
diff changeset
395 /* shuffle frames */
2a2f9cb7f1b0 fix the WC3 Xan decoder by correcting the frame accounting logic
melanson
parents: 6303
diff changeset
396 FFSWAP(AVFrame, s->current_frame, s->last_frame);
2a2f9cb7f1b0 fix the WC3 Xan decoder by correcting the frame accounting logic
melanson
parents: 6303
diff changeset
397
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
398 /* always report that the buffer was completely consumed */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
399 return buf_size;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
400 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
401
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6452
diff changeset
402 static av_cold int xan_decode_end(AVCodecContext *avctx)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
403 {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
404 XanContext *s = avctx->priv_data;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
405
6452
2a2f9cb7f1b0 fix the WC3 Xan decoder by correcting the frame accounting logic
melanson
parents: 6303
diff changeset
406 /* release the frames */
2831
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
407 if (s->last_frame.data[0])
ad9d121cc6e9 tinfoil patch: no array is written to in bulk before counts are
melanson
parents: 2422
diff changeset
408 avctx->release_buffer(avctx, &s->last_frame);
6452
2a2f9cb7f1b0 fix the WC3 Xan decoder by correcting the frame accounting logic
melanson
parents: 6303
diff changeset
409 if (s->current_frame.data[0])
2a2f9cb7f1b0 fix the WC3 Xan decoder by correcting the frame accounting logic
melanson
parents: 6303
diff changeset
410 avctx->release_buffer(avctx, &s->current_frame);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
411
10700
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
412 av_freep(&s->buffer1);
96a836b623ba Improve handling allocated buffers in Xan decoder
kostya
parents: 10699
diff changeset
413 av_freep(&s->buffer2);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
414
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
415 return 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
416 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
417
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
418 AVCodec xan_wc3_decoder = {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
419 "xan_wc3",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 10701
diff changeset
420 AVMEDIA_TYPE_VIDEO,
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
421 CODEC_ID_XAN_WC3,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
422 sizeof(XanContext),
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
423 xan_decode_init,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
424 NULL,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
425 xan_decode_end,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
426 xan_decode_frame,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
427 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
428 .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"),
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
429 };
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
430
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
431 /*
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
432 AVCodec xan_wc4_decoder = {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
433 "xan_wc4",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 10701
diff changeset
434 AVMEDIA_TYPE_VIDEO,
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
435 CODEC_ID_XAN_WC4,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
436 sizeof(XanContext),
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
437 xan_decode_init,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
438 NULL,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
439 xan_decode_end,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
440 xan_decode_frame,
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
441 CODEC_CAP_DR1,
10701
fb7d1f0e8bc6 Add long_name for Xxan codec.
diego
parents: 10700
diff changeset
442 .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"),
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
443 };
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents:
diff changeset
444 */