annotate adpcm.c @ 12418:e17840120b80 libavcodec

Move vp6_filter_diag4() x86 SIMD code from inline ASM to YASM. This should help in fixing the Win64 fate failures.
author rbultje
date Wed, 25 Aug 2010 13:44:16 +0000
parents 40d7fc8c7850
children 7defcfe74c72
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1 /*
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
2 * ADPCM codecs
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
3 * Copyright (c) 2001-2003 The ffmpeg Project
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3445
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3445
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3445
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
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: 3445
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3445
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
16 *
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
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: 3445
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: 2979
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
20 */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
21 #include "avcodec.h"
9428
0dce4fe6e6f3 Rename bitstream.h to get_bits.h.
stefano
parents: 9411
diff changeset
22 #include "get_bits.h"
9411
4cb7c65fc775 Split bitstream.h, put the bitstream writer stuff in the new file
stefano
parents: 9355
diff changeset
23 #include "put_bits.h"
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
24 #include "bytestream.h"
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
25
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1093
diff changeset
26 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 11560
diff changeset
27 * @file
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1093
diff changeset
28 * ADPCM codecs.
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
29 * First version by Francois Revol (revol@free.fr)
1491
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
30 * Fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
31 * by Mike Melanson (melanson@pcisys.net)
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
32 * CD-ROM XA ADPCM codec by BERO
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
33 * EA ADPCM decoder by Robin Kay (komadori@myrealbox.com)
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
34 * EA ADPCM R1/R2/R3 decoder by Peter Ross (pross@xvid.org)
5854
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
35 * EA IMA EACS decoder by Peter Ross (pross@xvid.org)
5853
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
36 * EA IMA SEAD decoder by Peter Ross (pross@xvid.org)
5870
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
37 * EA ADPCM XAS decoder by Peter Ross (pross@xvid.org)
6596
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
38 * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com)
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
39 * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
40 *
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
41 * Features and limitations:
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
42 *
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
43 * Reference documents:
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
44 * http://www.pcisys.net/~melanson/codecs/simpleaudio.html
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
45 * http://www.geocities.com/SiliconValley/8682/aud3.txt
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
46 * http://openquicktime.sourceforge.net/plugins.htm
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
47 * XAnim sources (xa_codec.c) http://www.rasnaimaging.com/people/lapus/download.html
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
48 * http://www.cs.ucla.edu/~leec/mediabench/applications.html
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
49 * SoX source code http://home.sprynet.com/~cbagwell/sox.html
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
50 *
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
51 * CD-ROM XA:
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
52 * http://ku-www.ss.titech.ac.jp/~yatsushi/xaadpcm.html
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
53 * vagpack & depack http://homepages.compuserve.de/bITmASTER32/psx-index.html
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
54 * readstr http://www.geocities.co.jp/Playtown/2004/
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
55 */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
56
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
57 #define BLKSIZE 1024
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
58
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
59 /* step_table[] and index_table[] are from the ADPCM reference source */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
60 /* This is the index table: */
1081
18157900b434 * fixed IMA WAV decoding (though still might not be fully correct)
kabi
parents: 1064
diff changeset
61 static const int index_table[16] = {
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
62 -1, -1, -1, -1, 2, 4, 6, 8,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
63 -1, -1, -1, -1, 2, 4, 6, 8,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
64 };
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
65
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
66 /**
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1093
diff changeset
67 * This is the step table. Note that many programs use slight deviations from
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
68 * this table, but such deviations are negligible:
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
69 */
1081
18157900b434 * fixed IMA WAV decoding (though still might not be fully correct)
kabi
parents: 1064
diff changeset
70 static const int step_table[89] = {
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
71 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
72 19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
73 50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
74 130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
75 337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
76 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
77 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
78 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
79 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
80 };
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
81
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
82 /* These are for MS-ADPCM */
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
83 /* AdaptationTable[], AdaptCoeff1[], and AdaptCoeff2[] are from libsndfile */
1081
18157900b434 * fixed IMA WAV decoding (though still might not be fully correct)
kabi
parents: 1064
diff changeset
84 static const int AdaptationTable[] = {
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
85 230, 230, 230, 230, 307, 409, 512, 614,
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
86 768, 614, 512, 409, 307, 230, 230, 230
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
87 };
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
88
10448
b73908dda9b4 Indicate that AdaptCoeff1 and 2 are functions of the actual coefficients.
daniel
parents: 10145
diff changeset
89 /** Divided by 4 to fit in 8-bit integers */
7247
35744b4e5082 100l, fix MS ADPCM decoding for e.g. http://samples.mplayerhq.hu/mov/qtaudio/surge-2-16-L-ms02.mov
reimar
parents: 7246
diff changeset
90 static const uint8_t AdaptCoeff1[] = {
7245
b79a3cd9ed94 Change MS ADPCM table so they fit into int8_t and change array type.
reimar
parents: 7197
diff changeset
91 64, 128, 0, 48, 60, 115, 98
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
92 };
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
93
10448
b73908dda9b4 Indicate that AdaptCoeff1 and 2 are functions of the actual coefficients.
daniel
parents: 10145
diff changeset
94 /** Divided by 4 to fit in 8-bit integers */
7245
b79a3cd9ed94 Change MS ADPCM table so they fit into int8_t and change array type.
reimar
parents: 7197
diff changeset
95 static const int8_t AdaptCoeff2[] = {
b79a3cd9ed94 Change MS ADPCM table so they fit into int8_t and change array type.
reimar
parents: 7197
diff changeset
96 0, -64, 0, 16, 0, -52, -58
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
97 };
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
98
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
99 /* These are for CD-ROM XA ADPCM */
1559
alex
parents: 1535
diff changeset
100 static const int xa_adpcm_table[5][2] = {
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
101 { 0, 0 },
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
102 { 60, 0 },
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
103 { 115, -52 },
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
104 { 98, -55 },
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
105 { 122, -60 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
106 };
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
107
2753
ba8ecddf5598 adding a few const
michael
parents: 2516
diff changeset
108 static const int ea_adpcm_table[] = {
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
109 0, 240, 460, 392, 0, 0, -208, -220, 0, 1,
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
110 3, 4, 7, 8, 10, 11, 0, -1, -3, -4
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
111 };
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
112
2516
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
113 // padded to zero where table size is less then 16
2753
ba8ecddf5598 adding a few const
michael
parents: 2516
diff changeset
114 static const int swf_index_tables[4][16] = {
2516
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
115 /*2*/ { -1, 2 },
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
116 /*3*/ { -1, -1, 2, 4 },
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
117 /*4*/ { -1, -1, -1, -1, 2, 4, 6, 8 },
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
118 /*5*/ { -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, 4, 6, 8, 10, 13, 16 }
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
119 };
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
120
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
121 static const int yamaha_indexscale[] = {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
122 230, 230, 230, 230, 307, 409, 512, 614,
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
123 230, 230, 230, 230, 307, 409, 512, 614
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
124 };
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
125
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
126 static const int yamaha_difflookup[] = {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
127 1, 3, 5, 7, 9, 11, 13, 15,
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
128 -1, -3, -5, -7, -9, -11, -13, -15
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
129 };
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
130
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
131 /* end of tables */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
132
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
133 typedef struct ADPCMChannelStatus {
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
134 int predictor;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
135 short int step_index;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
136 int step;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
137 /* for encoding */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
138 int prev_sample;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
139
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
140 /* MS version */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
141 short sample1;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
142 short sample2;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
143 int coeff1;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
144 int coeff2;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
145 int idelta;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
146 } ADPCMChannelStatus;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
147
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
148 typedef struct TrellisPath {
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
149 int nibble;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
150 int prev;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
151 } TrellisPath;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
152
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
153 typedef struct TrellisNode {
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
154 uint32_t ssd;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
155 int path;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
156 int sample1;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
157 int sample2;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
158 int step;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
159 } TrellisNode;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
160
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
161 typedef struct ADPCMContext {
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
162 ADPCMChannelStatus status[6];
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
163 TrellisPath *paths;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
164 TrellisNode *node_buf;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
165 TrellisNode **nodep_buf;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
166 } ADPCMContext;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
167
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
168 #define FREEZE_INTERVAL 128
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
169
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
170 /* XXX: implement encoding */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
171
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 7451
diff changeset
172 #if CONFIG_ENCODERS
9007
043574c5c153 Add missing av_cold in static init/close functions.
stefano
parents: 8734
diff changeset
173 static av_cold int adpcm_encode_init(AVCodecContext *avctx)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
174 {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
175 ADPCMContext *s = avctx->priv_data;
10449
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
176 uint8_t *extradata;
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
177 int i;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
178 if (avctx->channels > 2)
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
179 return -1; /* only stereo or mono =) */
6920
d02af7474bff Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays.
michael
parents: 6813
diff changeset
180
d02af7474bff Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays.
michael
parents: 6813
diff changeset
181 if(avctx->trellis && (unsigned)avctx->trellis > 16U){
d02af7474bff Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays.
michael
parents: 6813
diff changeset
182 av_log(avctx, AV_LOG_ERROR, "invalid trellis size\n");
d02af7474bff Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays.
michael
parents: 6813
diff changeset
183 return -1;
d02af7474bff Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays.
michael
parents: 6813
diff changeset
184 }
d02af7474bff Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays.
michael
parents: 6813
diff changeset
185
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
186 if (avctx->trellis) {
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
187 int frontier = 1 << avctx->trellis;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
188 int max_paths = frontier * FREEZE_INTERVAL;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
189 FF_ALLOC_OR_GOTO(avctx, s->paths, max_paths * sizeof(*s->paths), error);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
190 FF_ALLOC_OR_GOTO(avctx, s->node_buf, 2 * frontier * sizeof(*s->node_buf), error);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
191 FF_ALLOC_OR_GOTO(avctx, s->nodep_buf, 2 * frontier * sizeof(*s->nodep_buf), error);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
192 }
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
193
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
194 switch(avctx->codec->id) {
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
195 case CODEC_ID_ADPCM_IMA_WAV:
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
196 avctx->frame_size = (BLKSIZE - 4 * avctx->channels) * 8 / (4 * avctx->channels) + 1; /* each 16 bits sample gives one nibble */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
197 /* and we have 4 bytes per channel overhead */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
198 avctx->block_align = BLKSIZE;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
199 /* seems frame_size isn't taken into account... have to buffer the samples :-( */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
200 break;
6461
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
201 case CODEC_ID_ADPCM_IMA_QT:
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
202 avctx->frame_size = 64;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
203 avctx->block_align = 34 * avctx->channels;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
204 break;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
205 case CODEC_ID_ADPCM_MS:
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
206 avctx->frame_size = (BLKSIZE - 7 * avctx->channels) * 2 / avctx->channels + 2; /* each 16 bits sample gives one nibble */
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
207 /* and we have 7 bytes per channel overhead */
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
208 avctx->block_align = BLKSIZE;
10449
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
209 avctx->extradata_size = 32;
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
210 extradata = avctx->extradata = av_malloc(avctx->extradata_size);
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
211 if (!extradata)
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
212 return AVERROR(ENOMEM);
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
213 bytestream_put_le16(&extradata, avctx->frame_size);
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
214 bytestream_put_le16(&extradata, 7); /* wNumCoef */
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
215 for (i = 0; i < 7; i++) {
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
216 bytestream_put_le16(&extradata, AdaptCoeff1[i] * 4);
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
217 bytestream_put_le16(&extradata, AdaptCoeff2[i] * 4);
690fa44735ed Build extradata in adpcm_ms encoder.
daniel
parents: 10448
diff changeset
218 }
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
219 break;
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
220 case CODEC_ID_ADPCM_YAMAHA:
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
221 avctx->frame_size = BLKSIZE * avctx->channels;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
222 avctx->block_align = BLKSIZE;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
223 break;
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
224 case CODEC_ID_ADPCM_SWF:
5370
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
225 if (avctx->sample_rate != 11025 &&
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
226 avctx->sample_rate != 22050 &&
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
227 avctx->sample_rate != 44100) {
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
228 av_log(avctx, AV_LOG_ERROR, "Sample rate must be 11025, 22050 or 44100\n");
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
229 goto error;
5370
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
230 }
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
231 avctx->frame_size = 512 * (avctx->sample_rate / 11025);
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
232 break;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
233 default:
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
234 goto error;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
235 }
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 577
diff changeset
236
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 577
diff changeset
237 avctx->coded_frame= avcodec_alloc_frame();
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 577
diff changeset
238 avctx->coded_frame->key_frame= 1;
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 577
diff changeset
239
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
240 return 0;
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
241 error:
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
242 av_freep(&s->paths);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
243 av_freep(&s->node_buf);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
244 av_freep(&s->nodep_buf);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
245 return -1;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
246 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
247
9007
043574c5c153 Add missing av_cold in static init/close functions.
stefano
parents: 8734
diff changeset
248 static av_cold int adpcm_encode_close(AVCodecContext *avctx)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
249 {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
250 ADPCMContext *s = avctx->priv_data;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 577
diff changeset
251 av_freep(&avctx->coded_frame);
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
252 av_freep(&s->paths);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
253 av_freep(&s->node_buf);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
254 av_freep(&s->nodep_buf);
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 577
diff changeset
255
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
256 return 0;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
257 }
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
258
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
259
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
260 static inline unsigned char adpcm_ima_compress_sample(ADPCMChannelStatus *c, short sample)
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
261 {
3334
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
262 int delta = sample - c->prev_sample;
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
263 int nibble = FFMIN(7, abs(delta)*4/step_table[c->step_index]) + (delta<0)*8;
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
264 c->prev_sample += ((step_table[c->step_index] * yamaha_difflookup[nibble]) / 8);
5523
c2ab2ac31edb use av_clip_int16() where it makes sense
aurel
parents: 5501
diff changeset
265 c->prev_sample = av_clip_int16(c->prev_sample);
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
266 c->step_index = av_clip(c->step_index + index_table[nibble], 0, 88);
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
267 return nibble;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
268 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
269
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
270 static inline unsigned char adpcm_ms_compress_sample(ADPCMChannelStatus *c, short sample)
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
271 {
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
272 int predictor, nibble, bias;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
273
7245
b79a3cd9ed94 Change MS ADPCM table so they fit into int8_t and change array type.
reimar
parents: 7197
diff changeset
274 predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
275
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
276 nibble= sample - predictor;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
277 if(nibble>=0) bias= c->idelta/2;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
278 else bias=-c->idelta/2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
279
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
280 nibble= (nibble + bias) / c->idelta;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
281 nibble= av_clip(nibble, -8, 7)&0x0F;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
282
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
283 predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
284
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
285 c->sample2 = c->sample1;
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
286 c->sample1 = av_clip_int16(predictor);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
287
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
288 c->idelta = (AdaptationTable[(int)nibble] * c->idelta) >> 8;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
289 if (c->idelta < 16) c->idelta = 16;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
290
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
291 return nibble;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
292 }
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
293
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
294 static inline unsigned char adpcm_yamaha_compress_sample(ADPCMChannelStatus *c, short sample)
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
295 {
3334
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
296 int nibble, delta;
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
297
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
298 if(!c->step) {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
299 c->predictor = 0;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
300 c->step = 127;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
301 }
3334
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
302
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
303 delta = sample - c->predictor;
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
304
3334
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
305 nibble = FFMIN(7, abs(delta)*4/c->step) + (delta<0)*8;
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
306
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
307 c->predictor += ((c->step * yamaha_difflookup[nibble]) / 8);
5523
c2ab2ac31edb use av_clip_int16() where it makes sense
aurel
parents: 5501
diff changeset
308 c->predictor = av_clip_int16(c->predictor);
3334
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
309 c->step = (c->step * yamaha_indexscale[nibble]) >> 8;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
310 c->step = av_clip(c->step, 127, 24567);
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
311
3334
97d9937d4ce7 adpcm_ima & adpcm_yamaha: improved quantization
lorenm
parents: 3157
diff changeset
312 return nibble;
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
313 }
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
314
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
315 static void adpcm_compress_trellis(AVCodecContext *avctx, const short *samples,
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
316 uint8_t *dst, ADPCMChannelStatus *c, int n)
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
317 {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
318 //FIXME 6% faster if frontier is a compile-time constant
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
319 ADPCMContext *s = avctx->priv_data;
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
320 const int frontier = 1 << avctx->trellis;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
321 const int stride = avctx->channels;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
322 const int version = avctx->codec->id;
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
323 TrellisPath *paths = s->paths, *p;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
324 TrellisNode *node_buf = s->node_buf;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
325 TrellisNode **nodep_buf = s->nodep_buf;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
326 TrellisNode **nodes = nodep_buf; // nodes[] is always sorted by .ssd
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
327 TrellisNode **nodes_next = nodep_buf + frontier;
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
328 int pathn = 0, froze = -1, i, j, k;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
329
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
330 memset(nodep_buf, 0, 2 * frontier * sizeof(*nodep_buf));
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
331 nodes[0] = node_buf + frontier;
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
332 nodes[0]->ssd = 0;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
333 nodes[0]->path = 0;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
334 nodes[0]->step = c->step_index;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
335 nodes[0]->sample1 = c->sample1;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
336 nodes[0]->sample2 = c->sample2;
6461
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
337 if((version == CODEC_ID_ADPCM_IMA_WAV) || (version == CODEC_ID_ADPCM_IMA_QT) || (version == CODEC_ID_ADPCM_SWF))
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
338 nodes[0]->sample1 = c->prev_sample;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
339 if(version == CODEC_ID_ADPCM_MS)
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
340 nodes[0]->step = c->idelta;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
341 if(version == CODEC_ID_ADPCM_YAMAHA) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
342 if(c->step == 0) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
343 nodes[0]->step = 127;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
344 nodes[0]->sample1 = 0;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
345 } else {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
346 nodes[0]->step = c->step;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
347 nodes[0]->sample1 = c->predictor;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
348 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
349 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
350
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
351 for(i=0; i<n; i++) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
352 TrellisNode *t = node_buf + frontier*(i&1);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
353 TrellisNode **u;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
354 int sample = samples[i*stride];
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
355 memset(nodes_next, 0, frontier*sizeof(TrellisNode*));
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
356 for(j=0; j<frontier && nodes[j]; j++) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
357 // higher j have higher ssd already, so they're unlikely to use a suboptimal next sample too
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
358 const int range = (j < frontier/2) ? 1 : 0;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
359 const int step = nodes[j]->step;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
360 int nidx;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
361 if(version == CODEC_ID_ADPCM_MS) {
7245
b79a3cd9ed94 Change MS ADPCM table so they fit into int8_t and change array type.
reimar
parents: 7197
diff changeset
362 const int predictor = ((nodes[j]->sample1 * c->coeff1) + (nodes[j]->sample2 * c->coeff2)) / 64;
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
363 const int div = (sample - predictor) / step;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
364 const int nmin = av_clip(div-range, -8, 6);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
365 const int nmax = av_clip(div+range, -7, 7);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
366 for(nidx=nmin; nidx<=nmax; nidx++) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
367 const int nibble = nidx & 0xf;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
368 int dec_sample = predictor + nidx * step;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
369 #define STORE_NODE(NAME, STEP_INDEX)\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
370 int d;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
371 uint32_t ssd;\
5523
c2ab2ac31edb use av_clip_int16() where it makes sense
aurel
parents: 5501
diff changeset
372 dec_sample = av_clip_int16(dec_sample);\
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
373 d = sample - dec_sample;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
374 ssd = nodes[j]->ssd + d*d;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
375 if(nodes_next[frontier-1] && ssd >= nodes_next[frontier-1]->ssd)\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
376 continue;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
377 /* Collapse any two states with the same previous sample value. \
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
378 * One could also distinguish states by step and by 2nd to last
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
379 * sample, but the effects of that are negligible. */\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
380 for(k=0; k<frontier && nodes_next[k]; k++) {\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
381 if(dec_sample == nodes_next[k]->sample1) {\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
382 assert(ssd >= nodes_next[k]->ssd);\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
383 goto next_##NAME;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
384 }\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
385 }\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
386 for(k=0; k<frontier; k++) {\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
387 if(!nodes_next[k] || ssd < nodes_next[k]->ssd) {\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
388 TrellisNode *u = nodes_next[frontier-1];\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
389 if(!u) {\
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
390 assert(pathn < FREEZE_INTERVAL<<avctx->trellis);\
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
391 u = t++;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
392 u->path = pathn++;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
393 }\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
394 u->ssd = ssd;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
395 u->step = STEP_INDEX;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
396 u->sample2 = nodes[j]->sample1;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
397 u->sample1 = dec_sample;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
398 paths[u->path].nibble = nibble;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
399 paths[u->path].prev = nodes[j]->path;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
400 memmove(&nodes_next[k+1], &nodes_next[k], (frontier-k-1)*sizeof(TrellisNode*));\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
401 nodes_next[k] = u;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
402 break;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
403 }\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
404 }\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
405 next_##NAME:;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
406 STORE_NODE(ms, FFMAX(16, (AdaptationTable[nibble] * step) >> 8));
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
407 }
6461
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
408 } else if((version == CODEC_ID_ADPCM_IMA_WAV)|| (version == CODEC_ID_ADPCM_IMA_QT)|| (version == CODEC_ID_ADPCM_SWF)) {
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
409 #define LOOP_NODES(NAME, STEP_TABLE, STEP_INDEX)\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
410 const int predictor = nodes[j]->sample1;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
411 const int div = (sample - predictor) * 4 / STEP_TABLE;\
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
412 int nmin = av_clip(div-range, -7, 6);\
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
413 int nmax = av_clip(div+range, -6, 7);\
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
414 if(nmin<=0) nmin--; /* distinguish -0 from +0 */\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
415 if(nmax<0) nmax--;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
416 for(nidx=nmin; nidx<=nmax; nidx++) {\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
417 const int nibble = nidx<0 ? 7-nidx : nidx;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
418 int dec_sample = predictor + (STEP_TABLE * yamaha_difflookup[nibble]) / 8;\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
419 STORE_NODE(NAME, STEP_INDEX);\
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
420 }
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
421 LOOP_NODES(ima, step_table[step], av_clip(step + index_table[nibble], 0, 88));
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
422 } else { //CODEC_ID_ADPCM_YAMAHA
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
423 LOOP_NODES(yamaha, step, av_clip((step * yamaha_indexscale[nibble]) >> 8, 127, 24567));
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
424 #undef LOOP_NODES
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
425 #undef STORE_NODE
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
426 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
427 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
428
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
429 u = nodes;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
430 nodes = nodes_next;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
431 nodes_next = u;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
432
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
433 // prevent overflow
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
434 if(nodes[0]->ssd > (1<<28)) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
435 for(j=1; j<frontier && nodes[j]; j++)
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
436 nodes[j]->ssd -= nodes[0]->ssd;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
437 nodes[0]->ssd = 0;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
438 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
439
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
440 // merge old paths to save memory
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
441 if(i == froze + FREEZE_INTERVAL) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
442 p = &paths[nodes[0]->path];
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
443 for(k=i; k>froze; k--) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
444 dst[k] = p->nibble;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
445 p = &paths[p->prev];
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
446 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
447 froze = i;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
448 pathn = 0;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
449 // other nodes might use paths that don't coincide with the frozen one.
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
450 // checking which nodes do so is too slow, so just kill them all.
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
451 // this also slightly improves quality, but I don't know why.
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
452 memset(nodes+1, 0, (frontier-1)*sizeof(TrellisNode*));
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
453 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
454 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
455
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
456 p = &paths[nodes[0]->path];
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
457 for(i=n-1; i>froze; i--) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
458 dst[i] = p->nibble;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
459 p = &paths[p->prev];
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
460 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
461
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
462 c->predictor = nodes[0]->sample1;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
463 c->sample1 = nodes[0]->sample1;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
464 c->sample2 = nodes[0]->sample2;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
465 c->step_index = nodes[0]->step;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
466 c->step = nodes[0]->step;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
467 c->idelta = nodes[0]->step;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
468 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
469
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
470 static int adpcm_encode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
471 unsigned char *frame, int buf_size, void *data)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
472 {
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
473 int n, i, st;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
474 short *samples;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
475 unsigned char *dst;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
476 ADPCMContext *c = avctx->priv_data;
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
477 uint8_t *buf;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
478
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
479 dst = frame;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
480 samples = (short *)data;
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
481 st= avctx->channels == 2;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
482 /* n = (BLKSIZE - 4 * avctx->channels) / (2 * 8 * avctx->channels); */
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
483
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
484 switch(avctx->codec->id) {
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
485 case CODEC_ID_ADPCM_IMA_WAV:
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
486 n = avctx->frame_size / 8;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
487 c->status[0].prev_sample = (signed short)samples[0]; /* XXX */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
488 /* c->status[0].step_index = 0; *//* XXX: not sure how to init the state machine */
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4840
diff changeset
489 bytestream_put_le16(&dst, c->status[0].prev_sample);
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
490 *dst++ = (unsigned char)c->status[0].step_index;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
491 *dst++ = 0; /* unknown */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
492 samples++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
493 if (avctx->channels == 2) {
5877
aea495619138 fix predictor initialization for adpcm-ima encoder not to lose first sample
benoit
parents: 5870
diff changeset
494 c->status[1].prev_sample = (signed short)samples[0];
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
495 /* c->status[1].step_index = 0; */
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4840
diff changeset
496 bytestream_put_le16(&dst, c->status[1].prev_sample);
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
497 *dst++ = (unsigned char)c->status[1].step_index;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
498 *dst++ = 0;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
499 samples++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
500 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
501
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
502 /* stereo: 4 bytes (8 samples) for left, 4 bytes for right, 4 bytes left, ... */
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
503 if(avctx->trellis > 0) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
504 FF_ALLOC_OR_GOTO(avctx, buf, 2*n*8, error);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
505 adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n*8);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
506 if(avctx->channels == 2)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
507 adpcm_compress_trellis(avctx, samples+1, buf + n*8, &c->status[1], n*8);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
508 for(i=0; i<n; i++) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
509 *dst++ = buf[8*i+0] | (buf[8*i+1] << 4);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
510 *dst++ = buf[8*i+2] | (buf[8*i+3] << 4);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
511 *dst++ = buf[8*i+4] | (buf[8*i+5] << 4);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
512 *dst++ = buf[8*i+6] | (buf[8*i+7] << 4);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
513 if (avctx->channels == 2) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
514 uint8_t *buf1 = buf + n*8;
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
515 *dst++ = buf1[8*i+0] | (buf1[8*i+1] << 4);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
516 *dst++ = buf1[8*i+2] | (buf1[8*i+3] << 4);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
517 *dst++ = buf1[8*i+4] | (buf1[8*i+5] << 4);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
518 *dst++ = buf1[8*i+6] | (buf1[8*i+7] << 4);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
519 }
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
520 }
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
521 av_free(buf);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
522 } else
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
523 for (; n>0; n--) {
5834
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
524 *dst = adpcm_ima_compress_sample(&c->status[0], samples[0]);
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
525 *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels]) << 4;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
526 dst++;
5834
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
527 *dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 2]);
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
528 *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 3]) << 4;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
529 dst++;
5834
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
530 *dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 4]);
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
531 *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 5]) << 4;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
532 dst++;
5834
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
533 *dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 6]);
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
534 *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 7]) << 4;
577
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
535 dst++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
536 /* right channel */
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
537 if (avctx->channels == 2) {
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
538 *dst = adpcm_ima_compress_sample(&c->status[1], samples[1]);
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
539 *dst |= adpcm_ima_compress_sample(&c->status[1], samples[3]) << 4;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
540 dst++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
541 *dst = adpcm_ima_compress_sample(&c->status[1], samples[5]);
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
542 *dst |= adpcm_ima_compress_sample(&c->status[1], samples[7]) << 4;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
543 dst++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
544 *dst = adpcm_ima_compress_sample(&c->status[1], samples[9]);
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
545 *dst |= adpcm_ima_compress_sample(&c->status[1], samples[11]) << 4;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
546 dst++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
547 *dst = adpcm_ima_compress_sample(&c->status[1], samples[13]);
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
548 *dst |= adpcm_ima_compress_sample(&c->status[1], samples[15]) << 4;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
549 dst++;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
550 }
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
551 samples += 8 * avctx->channels;
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
552 }
babaca0899f1 adpcm encoding patch by Franois Revol <revol at free dot fr>
michaelni
parents: 573
diff changeset
553 break;
6461
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
554 case CODEC_ID_ADPCM_IMA_QT:
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
555 {
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
556 int ch, i;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
557 PutBitContext pb;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
558 init_put_bits(&pb, dst, buf_size*8);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
559
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
560 for(ch=0; ch<avctx->channels; ch++){
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
561 put_bits(&pb, 9, (c->status[ch].prev_sample + 0x10000) >> 7);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
562 put_bits(&pb, 7, c->status[ch].step_index);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
563 if(avctx->trellis > 0) {
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
564 uint8_t buf[64];
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
565 adpcm_compress_trellis(avctx, samples+ch, buf, &c->status[ch], 64);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
566 for(i=0; i<64; i++)
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
567 put_bits(&pb, 4, buf[i^1]);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
568 c->status[ch].prev_sample = c->status[ch].predictor & ~0x7F;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
569 } else {
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
570 for (i=0; i<64; i+=2){
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
571 int t1, t2;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
572 t1 = adpcm_ima_compress_sample(&c->status[ch], samples[avctx->channels*(i+0)+ch]);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
573 t2 = adpcm_ima_compress_sample(&c->status[ch], samples[avctx->channels*(i+1)+ch]);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
574 put_bits(&pb, 4, t2);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
575 put_bits(&pb, 4, t1);
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
576 }
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
577 c->status[ch].prev_sample &= ~0x7F;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
578 }
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
579 }
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
580
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
581 dst += put_bits_count(&pb)>>3;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
582 break;
73ed28ea2082 IMA ADPCM encoder - QT variant
kostya
parents: 6259
diff changeset
583 }
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
584 case CODEC_ID_ADPCM_SWF:
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
585 {
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
586 int i;
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
587 PutBitContext pb;
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
588 init_put_bits(&pb, dst, buf_size*8);
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
589
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
590 n = avctx->frame_size-1;
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
591
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
592 //Store AdpcmCodeSize
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
593 put_bits(&pb, 2, 2); //Set 4bits flash adpcm format
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
594
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
595 //Init the encoder state
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
596 for(i=0; i<avctx->channels; i++){
5371
74680ec68fd1 Set the step index correctly for flash adpcm. Patch by Baptiste
banan
parents: 5370
diff changeset
597 c->status[i].step_index = av_clip(c->status[i].step_index, 0, 63); // clip step so it fits 6 bits
7260
3ec34b551aae bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents: 7259
diff changeset
598 put_sbits(&pb, 16, samples[i]);
5371
74680ec68fd1 Set the step index correctly for flash adpcm. Patch by Baptiste
banan
parents: 5370
diff changeset
599 put_bits(&pb, 6, c->status[i].step_index);
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
600 c->status[i].prev_sample = (signed short)samples[i];
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
601 }
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
602
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
603 if(avctx->trellis > 0) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
604 FF_ALLOC_OR_GOTO(avctx, buf, 2*n, error);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
605 adpcm_compress_trellis(avctx, samples+2, buf, &c->status[0], n);
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
606 if (avctx->channels == 2)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
607 adpcm_compress_trellis(avctx, samples+3, buf+n, &c->status[1], n);
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
608 for(i=0; i<n; i++) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
609 put_bits(&pb, 4, buf[i]);
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
610 if (avctx->channels == 2)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
611 put_bits(&pb, 4, buf[n+i]);
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
612 }
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
613 av_free(buf);
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
614 } else {
5550
a0b2065d5df1 Cosmetics, indentation.
banan
parents: 5549
diff changeset
615 for (i=1; i<avctx->frame_size; i++) {
5834
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
616 put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels*i]));
5550
a0b2065d5df1 Cosmetics, indentation.
banan
parents: 5549
diff changeset
617 if (avctx->channels == 2)
5834
1edffbe7d57d Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().
diego
parents: 5775
diff changeset
618 put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[1], samples[2*i+1]));
5549
b97f9b97e454 Trellis quantization support for adpcm_swf.
banan
parents: 5527
diff changeset
619 }
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
620 }
5370
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
621 flush_put_bits(&pb);
bbb982818ce7 Calculate the correct blocksize for flash adpcm. Patch by Baptiste
banan
parents: 5129
diff changeset
622 dst += put_bits_count(&pb)>>3;
4840
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
623 break;
a743c46500d4 Per reference swf/flv adpcm encoder.
banan
parents: 4835
diff changeset
624 }
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
625 case CODEC_ID_ADPCM_MS:
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
626 for(i=0; i<avctx->channels; i++){
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
627 int predictor=0;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
628
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
629 *dst++ = predictor;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
630 c->status[i].coeff1 = AdaptCoeff1[predictor];
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
631 c->status[i].coeff2 = AdaptCoeff2[predictor];
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
632 }
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
633 for(i=0; i<avctx->channels; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
634 if (c->status[i].idelta < 16)
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
635 c->status[i].idelta = 16;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
636
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4840
diff changeset
637 bytestream_put_le16(&dst, c->status[i].idelta);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
638 }
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
639 for(i=0; i<avctx->channels; i++){
7257
9b836800690a Fix MS ADPCM de- and encoding: first and second sample are swapped.
reimar
parents: 7247
diff changeset
640 c->status[i].sample2= *samples++;
9b836800690a Fix MS ADPCM de- and encoding: first and second sample are swapped.
reimar
parents: 7247
diff changeset
641 }
9b836800690a Fix MS ADPCM de- and encoding: first and second sample are swapped.
reimar
parents: 7247
diff changeset
642 for(i=0; i<avctx->channels; i++){
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
643 c->status[i].sample1= *samples++;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
644
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4840
diff changeset
645 bytestream_put_le16(&dst, c->status[i].sample1);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
646 }
7257
9b836800690a Fix MS ADPCM de- and encoding: first and second sample are swapped.
reimar
parents: 7247
diff changeset
647 for(i=0; i<avctx->channels; i++)
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4840
diff changeset
648 bytestream_put_le16(&dst, c->status[i].sample2);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
649
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
650 if(avctx->trellis > 0) {
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
651 int n = avctx->block_align - 7*avctx->channels;
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
652 FF_ALLOC_OR_GOTO(avctx, buf, 2*n, error);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
653 if(avctx->channels == 1) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
654 adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
655 for(i=0; i<n; i+=2)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
656 *dst++ = (buf[i] << 4) | buf[i+1];
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
657 } else {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
658 adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
659 adpcm_compress_trellis(avctx, samples+1, buf+n, &c->status[1], n);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
660 for(i=0; i<n; i++)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
661 *dst++ = (buf[i] << 4) | buf[n+i];
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
662 }
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
663 av_free(buf);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
664 } else
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
665 for(i=7*avctx->channels; i<avctx->block_align; i++) {
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
666 int nibble;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
667 nibble = adpcm_ms_compress_sample(&c->status[ 0], *samples++)<<4;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
668 nibble|= adpcm_ms_compress_sample(&c->status[st], *samples++);
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
669 *dst++ = nibble;
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
670 }
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
671 break;
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
672 case CODEC_ID_ADPCM_YAMAHA:
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
673 n = avctx->frame_size / 2;
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
674 if(avctx->trellis > 0) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
675 FF_ALLOC_OR_GOTO(avctx, buf, 2*n*2, error);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
676 n *= 2;
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
677 if(avctx->channels == 1) {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
678 adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
679 for(i=0; i<n; i+=2)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
680 *dst++ = buf[i] | (buf[i+1] << 4);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
681 } else {
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
682 adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n);
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
683 adpcm_compress_trellis(avctx, samples+1, buf+n, &c->status[1], n);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
684 for(i=0; i<n; i++)
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
685 *dst++ = buf[i] | (buf[n+i] << 4);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
686 }
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
687 av_free(buf);
3336
4d807145f29a ADPCM: trellis quantization
lorenm
parents: 3334
diff changeset
688 } else
9874
ee966d1064a2 Fix indentation after last commit.
cehoyos
parents: 9873
diff changeset
689 for (n *= avctx->channels; n>0; n--) {
ee966d1064a2 Fix indentation after last commit.
cehoyos
parents: 9873
diff changeset
690 int nibble;
ee966d1064a2 Fix indentation after last commit.
cehoyos
parents: 9873
diff changeset
691 nibble = adpcm_yamaha_compress_sample(&c->status[ 0], *samples++);
ee966d1064a2 Fix indentation after last commit.
cehoyos
parents: 9873
diff changeset
692 nibble |= adpcm_yamaha_compress_sample(&c->status[st], *samples++) << 4;
ee966d1064a2 Fix indentation after last commit.
cehoyos
parents: 9873
diff changeset
693 *dst++ = nibble;
ee966d1064a2 Fix indentation after last commit.
cehoyos
parents: 9873
diff changeset
694 }
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
695 break;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
696 default:
11978
db5c3a602ddd adpcm: convert VLAs to malloc/free
mru
parents: 11644
diff changeset
697 error:
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
698 return -1;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
699 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
700 return dst - frame;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
701 }
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
702 #endif //CONFIG_ENCODERS
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
703
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6461
diff changeset
704 static av_cold int adpcm_decode_init(AVCodecContext * avctx)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
705 {
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
706 ADPCMContext *c = avctx->priv_data;
6678
92a91e7e7321 remove unused var
bcoudurier
parents: 6677
diff changeset
707 unsigned int max_channels = 2;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
708
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
709 switch(avctx->codec->id) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
710 case CODEC_ID_ADPCM_EA_R1:
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
711 case CODEC_ID_ADPCM_EA_R2:
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
712 case CODEC_ID_ADPCM_EA_R3:
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
713 max_channels = 6;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
714 break;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
715 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
716 if(avctx->channels > max_channels){
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
717 return -1;
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
718 }
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
719
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
720 switch(avctx->codec->id) {
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
721 case CODEC_ID_ADPCM_CT:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
722 c->status[0].step = c->status[1].step = 511;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
723 break;
12269
40d7fc8c7850 Only 4-bit ADPCM IMA WAV files are supported.
cehoyos
parents: 11978
diff changeset
724 case CODEC_ID_ADPCM_IMA_WAV:
40d7fc8c7850 Only 4-bit ADPCM IMA WAV files are supported.
cehoyos
parents: 11978
diff changeset
725 if (avctx->bits_per_coded_sample != 4) {
40d7fc8c7850 Only 4-bit ADPCM IMA WAV files are supported.
cehoyos
parents: 11978
diff changeset
726 av_log(avctx, AV_LOG_ERROR, "Only 4-bit ADPCM IMA WAV files are supported\n");
40d7fc8c7850 Only 4-bit ADPCM IMA WAV files are supported.
cehoyos
parents: 11978
diff changeset
727 return -1;
40d7fc8c7850 Only 4-bit ADPCM IMA WAV files are supported.
cehoyos
parents: 11978
diff changeset
728 }
40d7fc8c7850 Only 4-bit ADPCM IMA WAV files are supported.
cehoyos
parents: 11978
diff changeset
729 break;
4809
3a95bd17d355 CRYO APC demuxer
diego
parents: 4808
diff changeset
730 case CODEC_ID_ADPCM_IMA_WS:
3a95bd17d355 CRYO APC demuxer
diego
parents: 4808
diff changeset
731 if (avctx->extradata && avctx->extradata_size == 2 * 4) {
3a95bd17d355 CRYO APC demuxer
diego
parents: 4808
diff changeset
732 c->status[0].predictor = AV_RL32(avctx->extradata);
3a95bd17d355 CRYO APC demuxer
diego
parents: 4808
diff changeset
733 c->status[1].predictor = AV_RL32(avctx->extradata + 4);
3a95bd17d355 CRYO APC demuxer
diego
parents: 4808
diff changeset
734 }
3a95bd17d355 CRYO APC demuxer
diego
parents: 4808
diff changeset
735 break;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
736 default:
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
737 break;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
738 }
7451
85ab7655ad4d Modify all codecs to report their supported input and output sample format(s).
pross
parents: 7260
diff changeset
739 avctx->sample_fmt = SAMPLE_FMT_S16;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
740 return 0;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
741 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
742
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
743 static inline short adpcm_ima_expand_nibble(ADPCMChannelStatus *c, char nibble, int shift)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
744 {
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
745 int step_index;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
746 int predictor;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
747 int sign, delta, diff, step;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
748
1081
18157900b434 * fixed IMA WAV decoding (though still might not be fully correct)
kabi
parents: 1064
diff changeset
749 step = step_table[c->step_index];
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
750 step_index = c->step_index + index_table[(unsigned)nibble];
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
751 if (step_index < 0) step_index = 0;
1081
18157900b434 * fixed IMA WAV decoding (though still might not be fully correct)
kabi
parents: 1064
diff changeset
752 else if (step_index > 88) step_index = 88;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
753
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
754 sign = nibble & 8;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
755 delta = nibble & 7;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
756 /* perform direct multiplication instead of series of jumps proposed by
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
757 * the reference ADPCM implementation since modern CPUs can do the mults
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
758 * quickly enough */
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
759 diff = ((2 * delta + 1) * step) >> shift;
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
760 predictor = c->predictor;
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
761 if (sign) predictor -= diff;
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
762 else predictor += diff;
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
763
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
764 c->predictor = av_clip_int16(predictor);
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
765 c->step_index = step_index;
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
766
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
767 return (short)c->predictor;
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
768 }
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
769
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
770 static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble)
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
771 {
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
772 int predictor;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
773
7246
c9dc58950620 10l, forgot to replace a / 256 for r14173.
reimar
parents: 7245
diff changeset
774 predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 64;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
775 predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
776
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
777 c->sample2 = c->sample1;
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
778 c->sample1 = av_clip_int16(predictor);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
779 c->idelta = (AdaptationTable[(int)nibble] * c->idelta) >> 8;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
780 if (c->idelta < 16) c->idelta = 16;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
781
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
782 return c->sample1;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
783 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
784
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
785 static inline short adpcm_ct_expand_nibble(ADPCMChannelStatus *c, char nibble)
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
786 {
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
787 int sign, delta, diff;
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
788 int new_step;
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
789
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
790 sign = nibble & 8;
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
791 delta = nibble & 7;
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
792 /* perform direct multiplication instead of series of jumps proposed by
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
793 * the reference ADPCM implementation since modern CPUs can do the mults
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
794 * quickly enough */
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
795 diff = ((2 * delta + 1) * c->step) >> 3;
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
796 /* predictor update is not so trivial: predictor is multiplied on 254/256 before updating */
5526
9c37f7a3ff48 one more simplification
aurel
parents: 5525
diff changeset
797 c->predictor = ((c->predictor * 254) >> 8) + (sign ? -diff : diff);
9c37f7a3ff48 one more simplification
aurel
parents: 5525
diff changeset
798 c->predictor = av_clip_int16(c->predictor);
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
799 /* calculate new step and clamp it to range 511..32767 */
8696
20f235cc125e remove duplicate tables
stefang
parents: 8689
diff changeset
800 new_step = (AdaptationTable[nibble & 7] * c->step) >> 8;
5527
8b6ffd245ee2 more usage of av_clip()
aurel
parents: 5526
diff changeset
801 c->step = av_clip(new_step, 511, 32767);
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
802
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
803 return (short)c->predictor;
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
804 }
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
805
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
806 static inline short adpcm_sbpro_expand_nibble(ADPCMChannelStatus *c, char nibble, int size, int shift)
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
807 {
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
808 int sign, delta, diff;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
809
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
810 sign = nibble & (1<<(size-1));
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
811 delta = nibble & ((1<<(size-1))-1);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
812 diff = delta << (7 + c->step + shift);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
813
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
814 /* clamp result */
5527
8b6ffd245ee2 more usage of av_clip()
aurel
parents: 5526
diff changeset
815 c->predictor = av_clip(c->predictor + (sign ? -diff : diff), -16384,16256);
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
816
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
817 /* calculate new step */
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
818 if (delta >= (2*size - 3) && c->step < 3)
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
819 c->step++;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
820 else if (delta == 0 && c->step > 0)
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
821 c->step--;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
822
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
823 return (short) c->predictor;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
824 }
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
825
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
826 static inline short adpcm_yamaha_expand_nibble(ADPCMChannelStatus *c, unsigned char nibble)
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
827 {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
828 if(!c->step) {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
829 c->predictor = 0;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
830 c->step = 127;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
831 }
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
832
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
833 c->predictor += (c->step * yamaha_difflookup[nibble]) / 8;
5523
c2ab2ac31edb use av_clip_int16() where it makes sense
aurel
parents: 5501
diff changeset
834 c->predictor = av_clip_int16(c->predictor);
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
835 c->step = (c->step * yamaha_indexscale[nibble]) >> 8;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4463
diff changeset
836 c->step = av_clip(c->step, 127, 24567);
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
837 return c->predictor;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
838 }
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
839
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
840 static void xa_decode(short *out, const unsigned char *in,
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
841 ADPCMChannelStatus *left, ADPCMChannelStatus *right, int inc)
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
842 {
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
843 int i, j;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
844 int shift,filter,f0,f1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
845 int s_1,s_2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
846 int d,s,t;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
847
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
848 for(i=0;i<4;i++) {
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
849
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
850 shift = 12 - (in[4+i*2] & 15);
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
851 filter = in[4+i*2] >> 4;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
852 f0 = xa_adpcm_table[filter][0];
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
853 f1 = xa_adpcm_table[filter][1];
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
854
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
855 s_1 = left->sample1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
856 s_2 = left->sample2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
857
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
858 for(j=0;j<28;j++) {
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
859 d = in[16+i+j*4];
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
860
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
861 t = (signed char)(d<<4)>>4;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
862 s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6);
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
863 s_2 = s_1;
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
864 s_1 = av_clip_int16(s);
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
865 *out = s_1;
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
866 out += inc;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
867 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
868
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
869 if (inc==2) { /* stereo */
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
870 left->sample1 = s_1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
871 left->sample2 = s_2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
872 s_1 = right->sample1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
873 s_2 = right->sample2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
874 out = out + 1 - 28*2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
875 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
876
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
877 shift = 12 - (in[5+i*2] & 15);
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
878 filter = in[5+i*2] >> 4;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
879
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
880 f0 = xa_adpcm_table[filter][0];
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
881 f1 = xa_adpcm_table[filter][1];
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
882
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
883 for(j=0;j<28;j++) {
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
884 d = in[16+i+j*4];
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
885
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
886 t = (signed char)d >> 4;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
887 s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6);
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
888 s_2 = s_1;
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
889 s_1 = av_clip_int16(s);
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
890 *out = s_1;
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
891 out += inc;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
892 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
893
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
894 if (inc==2) { /* stereo */
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
895 right->sample1 = s_1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
896 right->sample2 = s_2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
897 out -= 1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
898 } else {
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
899 left->sample1 = s_1;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
900 left->sample2 = s_2;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
901 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
902 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
903 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
904
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
905
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
906 /* DK3 ADPCM support macro */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
907 #define DK3_GET_NEXT_NIBBLE() \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
908 if (decode_top_nibble_next) \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
909 { \
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
910 nibble = last_byte >> 4; \
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
911 decode_top_nibble_next = 0; \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
912 } \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
913 else \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
914 { \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
915 last_byte = *src++; \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
916 if (src >= buf + buf_size) break; \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
917 nibble = last_byte & 0x0F; \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
918 decode_top_nibble_next = 1; \
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
919 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
920
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
921 static int adpcm_decode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
922 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9087
diff changeset
923 AVPacket *avpkt)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
924 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9087
diff changeset
925 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9087
diff changeset
926 int buf_size = avpkt->size;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
927 ADPCMContext *c = avctx->priv_data;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
928 ADPCMChannelStatus *cs;
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
929 int n, m, channel, i;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
930 int block_predictor[2];
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
931 short *samples;
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
932 short *samples_end;
6259
michael
parents: 6076
diff changeset
933 const uint8_t *src;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
934 int st; /* stereo */
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
935
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
936 /* DK3 ADPCM accounting variables */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
937 unsigned char last_byte = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
938 unsigned char nibble;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
939 int decode_top_nibble_next = 0;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
940 int diff_channel;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
941
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
942 /* EA ADPCM state variables */
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
943 uint32_t samples_in_chunk;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
944 int32_t previous_left_sample, previous_right_sample;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
945 int32_t current_left_sample, current_right_sample;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
946 int32_t next_left_sample, next_right_sample;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
947 int32_t coeff1l, coeff2l, coeff1r, coeff2r;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
948 uint8_t shift_left, shift_right;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
949 int count1, count2;
6596
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
950 int coeff[2][2], shift[2];//used in EA MAXIS ADPCM
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
951
1768
45e99aa10395 handle 0-length buffers
melanson
parents: 1737
diff changeset
952 if (!buf_size)
45e99aa10395 handle 0-length buffers
melanson
parents: 1737
diff changeset
953 return 0;
45e99aa10395 handle 0-length buffers
melanson
parents: 1737
diff changeset
954
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
955 //should protect all 4bit ADPCM variants
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
956 //8 is needed for CODEC_ID_ADPCM_IMA_WAV with 2 channels
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
957 //
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
958 if(*data_size/4 < buf_size + 8)
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
959 return -1;
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
960
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
961 samples = data;
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
962 samples_end= samples + *data_size/2;
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
963 *data_size= 0;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
964 src = buf;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
965
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
966 st = avctx->channels == 2 ? 1 : 0;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
967
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
968 switch(avctx->codec->id) {
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
969 case CODEC_ID_ADPCM_IMA_QT:
6677
abb1f01ca0db remove ima qt decoding hack, decode whole frame at once
bcoudurier
parents: 6676
diff changeset
970 n = buf_size - 2*avctx->channels;
abb1f01ca0db remove ima qt decoding hack, decode whole frame at once
bcoudurier
parents: 6676
diff changeset
971 for (channel = 0; channel < avctx->channels; channel++) {
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
972 cs = &(c->status[channel]);
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
973 /* (pppppp) (piiiiiii) */
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
974
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
975 /* Bits 15-7 are the _top_ 9 bits of the 16-bit initial predictor value */
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
976 cs->predictor = (*src++) << 8;
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
977 cs->predictor |= (*src & 0x80);
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
978 cs->predictor &= 0xFF80;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
979
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
980 /* sign extension */
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
981 if(cs->predictor & 0x8000)
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
982 cs->predictor -= 0x10000;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
983
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
984 cs->predictor = av_clip_int16(cs->predictor);
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
985
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
986 cs->step_index = (*src++) & 0x7F;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
987
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
988 if (cs->step_index > 88){
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
989 av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i\n", cs->step_index);
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
990 cs->step_index = 88;
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
991 }
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
992
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
993 cs->step = step_table[cs->step_index];
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
994
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
995 samples = (short*)data + channel;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
996
6680
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
997 for(m=32; n>0 && m>0; n--, m--) { /* in QuickTime, IMA is encoded by chuncks of 34 bytes (=64 samples) */
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
998 *samples = adpcm_ima_expand_nibble(cs, src[0] & 0x0F, 3);
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
999 samples += avctx->channels;
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
1000 *samples = adpcm_ima_expand_nibble(cs, src[0] >> 4 , 3);
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
1001 samples += avctx->channels;
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
1002 src ++;
f96c7be83736 identation
bcoudurier
parents: 6679
diff changeset
1003 }
6677
abb1f01ca0db remove ima qt decoding hack, decode whole frame at once
bcoudurier
parents: 6676
diff changeset
1004 }
abb1f01ca0db remove ima qt decoding hack, decode whole frame at once
bcoudurier
parents: 6676
diff changeset
1005 if (st)
6676
36d091f338ca fix adpcm ima qt decoding, channel at init is 0, correct stereo out since samples += avctx->channels
bcoudurier
parents: 6637
diff changeset
1006 samples--;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1007 break;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1008 case CODEC_ID_ADPCM_IMA_WAV:
1576
bc4b13ca74de block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
michael
parents: 1559
diff changeset
1009 if (avctx->block_align != 0 && buf_size > avctx->block_align)
bc4b13ca74de block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
michael
parents: 1559
diff changeset
1010 buf_size = avctx->block_align;
bc4b13ca74de block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
michael
parents: 1559
diff changeset
1011
3157
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1012 // samples_per_block= (block_align-4*chanels)*8 / (bits_per_sample * chanels) + 1;
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1013
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1014 for(i=0; i<avctx->channels; i++){
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1015 cs = &(c->status[i]);
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1016 cs->predictor = *samples++ = (int16_t)bytestream_get_le16(&src);
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1017
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1018 cs->step_index = *src++;
3157
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1019 if (cs->step_index > 88){
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1020 av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i\n", cs->step_index);
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1021 cs->step_index = 88;
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1022 }
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1023 if (*src++) av_log(avctx, AV_LOG_ERROR, "unused byte should be null but is %d!!\n", src[-1]); /* unused */
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1024 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1025
3157
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1026 while(src < buf + buf_size){
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1027 for(m=0; m<4; m++){
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1028 for(i=0; i<=st; i++)
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1029 *samples++ = adpcm_ima_expand_nibble(&c->status[i], src[4*i] & 0x0F, 3);
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1030 for(i=0; i<=st; i++)
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1031 *samples++ = adpcm_ima_expand_nibble(&c->status[i], src[4*i] >> 4 , 3);
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1032 src++;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1033 }
3157
58dc6ca8c92d cleanup IMA-ADPCM WAV decoder
michael
parents: 3127
diff changeset
1034 src += 4*st;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1035 }
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1036 break;
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1037 case CODEC_ID_ADPCM_4XM:
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1038 cs = &(c->status[0]);
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1039 c->status[0].predictor= (int16_t)bytestream_get_le16(&src);
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1040 if(st){
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1041 c->status[1].predictor= (int16_t)bytestream_get_le16(&src);
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1042 }
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1043 c->status[0].step_index= (int16_t)bytestream_get_le16(&src);
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1044 if(st){
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1045 c->status[1].step_index= (int16_t)bytestream_get_le16(&src);
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1046 }
1695
2d11403fde4e initial predictors are not sent to the output in QT IMA; fix stereo QT
melanson
parents: 1611
diff changeset
1047 if (cs->step_index < 0) cs->step_index = 0;
2d11403fde4e initial predictors are not sent to the output in QT IMA; fix stereo QT
melanson
parents: 1611
diff changeset
1048 if (cs->step_index > 88) cs->step_index = 88;
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1049
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1050 m= (buf_size - (src - buf))>>st;
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1051 for(i=0; i<m; i++) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1052 *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[i] & 0x0F, 4);
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1053 if (st)
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1054 *samples++ = adpcm_ima_expand_nibble(&c->status[1], src[i+m] & 0x0F, 4);
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1055 *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[i] >> 4, 4);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1056 if (st)
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1057 *samples++ = adpcm_ima_expand_nibble(&c->status[1], src[i+m] >> 4, 4);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1058 }
1296
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1059
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1060 src += m<<st;
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1061
eff1dc4bed49 4xm adpcm
michaelni
parents: 1106
diff changeset
1062 break;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1063 case CODEC_ID_ADPCM_MS:
1576
bc4b13ca74de block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
michael
parents: 1559
diff changeset
1064 if (avctx->block_align != 0 && buf_size > avctx->block_align)
bc4b13ca74de block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
michael
parents: 1559
diff changeset
1065 buf_size = avctx->block_align;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1066 n = buf_size - 7 * avctx->channels;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1067 if (n < 0)
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1068 return -1;
7259
9de4bc7d4938 clip MS ADPCM predictor range to correct [0..6] range, not [0..7]
reimar
parents: 7258
diff changeset
1069 block_predictor[0] = av_clip(*src++, 0, 6);
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1070 block_predictor[1] = 0;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1071 if (st)
7259
9de4bc7d4938 clip MS ADPCM predictor range to correct [0..6] range, not [0..7]
reimar
parents: 7258
diff changeset
1072 block_predictor[1] = av_clip(*src++, 0, 6);
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1073 c->status[0].idelta = (int16_t)bytestream_get_le16(&src);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
1074 if (st){
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1075 c->status[1].idelta = (int16_t)bytestream_get_le16(&src);
1794
d133b4ad0620 M$ ADPCM encoding & some simplifications
michael
parents: 1779
diff changeset
1076 }
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1077 c->status[0].coeff1 = AdaptCoeff1[block_predictor[0]];
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1078 c->status[0].coeff2 = AdaptCoeff2[block_predictor[0]];
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1079 c->status[1].coeff1 = AdaptCoeff1[block_predictor[1]];
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1080 c->status[1].coeff2 = AdaptCoeff2[block_predictor[1]];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1081
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1082 c->status[0].sample1 = bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1083 if (st) c->status[1].sample1 = bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1084 c->status[0].sample2 = bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1085 if (st) c->status[1].sample2 = bytestream_get_le16(&src);
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1086
7257
9b836800690a Fix MS ADPCM de- and encoding: first and second sample are swapped.
reimar
parents: 7247
diff changeset
1087 *samples++ = c->status[0].sample2;
9b836800690a Fix MS ADPCM de- and encoding: first and second sample are swapped.
reimar
parents: 7247
diff changeset
1088 if (st) *samples++ = c->status[1].sample2;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1089 *samples++ = c->status[0].sample1;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1090 if (st) *samples++ = c->status[1].sample1;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1091 for(;n>0;n--) {
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1092 *samples++ = adpcm_ms_expand_nibble(&c->status[0 ], src[0] >> 4 );
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1093 *samples++ = adpcm_ms_expand_nibble(&c->status[st], src[0] & 0x0F);
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1094 src ++;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1095 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1096 break;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1097 case CODEC_ID_ADPCM_IMA_DK4:
1577
dbd0ede6623d fixing the remaning block-align checks
michael
parents: 1576
diff changeset
1098 if (avctx->block_align != 0 && buf_size > avctx->block_align)
dbd0ede6623d fixing the remaning block-align checks
michael
parents: 1576
diff changeset
1099 buf_size = avctx->block_align;
dbd0ede6623d fixing the remaning block-align checks
michael
parents: 1576
diff changeset
1100
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1101 c->status[0].predictor = (int16_t)bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1102 c->status[0].step_index = *src++;
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1103 src++;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1104 *samples++ = c->status[0].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1105 if (st) {
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1106 c->status[1].predictor = (int16_t)bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1107 c->status[1].step_index = *src++;
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1108 src++;
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1109 *samples++ = c->status[1].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1110 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1111 while (src < buf + buf_size) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1112
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1113 /* take care of the top nibble (always left or mono channel) */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1114 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1115 src[0] >> 4, 3);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1116
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1117 /* take care of the bottom nibble, which is right sample for
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1118 * stereo, or another mono sample */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1119 if (st)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1120 *samples++ = adpcm_ima_expand_nibble(&c->status[1],
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1121 src[0] & 0x0F, 3);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1122 else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1123 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1124 src[0] & 0x0F, 3);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1125
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1126 src++;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1127 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1128 break;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1129 case CODEC_ID_ADPCM_IMA_DK3:
1577
dbd0ede6623d fixing the remaning block-align checks
michael
parents: 1576
diff changeset
1130 if (avctx->block_align != 0 && buf_size > avctx->block_align)
dbd0ede6623d fixing the remaning block-align checks
michael
parents: 1576
diff changeset
1131 buf_size = avctx->block_align;
dbd0ede6623d fixing the remaning block-align checks
michael
parents: 1576
diff changeset
1132
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
1133 if(buf_size + 16 > (samples_end - samples)*3/8)
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
1134 return -1;
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
1135
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1136 c->status[0].predictor = (int16_t)AV_RL16(src + 10);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1137 c->status[1].predictor = (int16_t)AV_RL16(src + 12);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1138 c->status[0].step_index = src[14];
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1139 c->status[1].step_index = src[15];
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1140 /* sign extend the predictors */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1141 src += 16;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1142 diff_channel = c->status[1].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1143
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1144 /* the DK3_GET_NEXT_NIBBLE macro issues the break statement when
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1145 * the buffer is consumed */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1146 while (1) {
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1147
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1148 /* for this algorithm, c->status[0] is the sum channel and
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1149 * c->status[1] is the diff channel */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1150
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1151 /* process the first predictor of the sum channel */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1152 DK3_GET_NEXT_NIBBLE();
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1153 adpcm_ima_expand_nibble(&c->status[0], nibble, 3);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1154
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1155 /* process the diff channel predictor */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1156 DK3_GET_NEXT_NIBBLE();
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1157 adpcm_ima_expand_nibble(&c->status[1], nibble, 3);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1158
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1159 /* process the first pair of stereo PCM samples */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1160 diff_channel = (diff_channel + c->status[1].predictor) / 2;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1161 *samples++ = c->status[0].predictor + c->status[1].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1162 *samples++ = c->status[0].predictor - c->status[1].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1163
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1164 /* process the second predictor of the sum channel */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1165 DK3_GET_NEXT_NIBBLE();
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1166 adpcm_ima_expand_nibble(&c->status[0], nibble, 3);
1443
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1167
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1168 /* process the second pair of stereo PCM samples */
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1169 diff_channel = (diff_channel + c->status[1].predictor) / 2;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1170 *samples++ = c->status[0].predictor + c->status[1].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1171 *samples++ = c->status[0].predictor - c->status[1].predictor;
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1172 }
47f4c8a5a7fc New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM
tmmm
parents: 1296
diff changeset
1173 break;
8615
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1174 case CODEC_ID_ADPCM_IMA_ISS:
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1175 c->status[0].predictor = (int16_t)AV_RL16(src + 0);
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1176 c->status[0].step_index = src[2];
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1177 src += 4;
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1178 if(st) {
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1179 c->status[1].predictor = (int16_t)AV_RL16(src + 0);
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1180 c->status[1].step_index = src[2];
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1181 src += 4;
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1182 }
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1183
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1184 while (src < buf + buf_size) {
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1185
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1186 if (st) {
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1187 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1188 src[0] >> 4 , 3);
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1189 *samples++ = adpcm_ima_expand_nibble(&c->status[1],
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1190 src[0] & 0x0F, 3);
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1191 } else {
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1192 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1193 src[0] & 0x0F, 3);
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1194 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1195 src[0] >> 4 , 3);
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1196 }
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1197
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1198 src++;
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1199 }
2a2318411d9d added demuxer for FunCom ISS audio files,
stefang
parents: 8590
diff changeset
1200 break;
1491
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1201 case CODEC_ID_ADPCM_IMA_WS:
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1202 /* no per-block initialization; just start decoding the data */
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1203 while (src < buf + buf_size) {
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1204
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1205 if (st) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1206 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1207 src[0] >> 4 , 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1208 *samples++ = adpcm_ima_expand_nibble(&c->status[1],
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1209 src[0] & 0x0F, 3);
1491
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1210 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1211 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1212 src[0] >> 4 , 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1213 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
1737
d39bb6945761 cleanup
michael
parents: 1695
diff changeset
1214 src[0] & 0x0F, 3);
1491
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1215 }
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1216
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1217 src++;
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1218 }
222643544cf1 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 1443
diff changeset
1219 break;
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1220 case CODEC_ID_ADPCM_XA:
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1221 while (buf_size >= 128) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1222 xa_decode(samples, src, &c->status[0], &c->status[1],
1535
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1223 avctx->channels);
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1224 src += 128;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1225 samples += 28 * 8;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1226 buf_size -= 128;
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1227 }
bcb30ec7e86f activate the XA and ADX ADPCM codecs
melanson
parents: 1530
diff changeset
1228 break;
5854
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1229 case CODEC_ID_ADPCM_IMA_EA_EACS:
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1230 samples_in_chunk = bytestream_get_le32(&src) >> (1-st);
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1231
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1232 if (samples_in_chunk > buf_size-4-(8<<st)) {
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1233 src += buf_size - 4;
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1234 break;
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1235 }
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1236
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1237 for (i=0; i<=st; i++)
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1238 c->status[i].step_index = bytestream_get_le32(&src);
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1239 for (i=0; i<=st; i++)
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1240 c->status[i].predictor = bytestream_get_le32(&src);
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1241
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1242 for (; samples_in_chunk; samples_in_chunk--, src++) {
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1243 *samples++ = adpcm_ima_expand_nibble(&c->status[0], *src>>4, 3);
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1244 *samples++ = adpcm_ima_expand_nibble(&c->status[st], *src&0x0F, 3);
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1245 }
29b36106bc9c EA IMA EACS decoder
aurel
parents: 5853
diff changeset
1246 break;
5853
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
1247 case CODEC_ID_ADPCM_IMA_EA_SEAD:
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
1248 for (; src < buf+buf_size; src++) {
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
1249 *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] >> 4, 6);
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
1250 *samples++ = adpcm_ima_expand_nibble(&c->status[st],src[0]&0x0F, 6);
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
1251 }
286738ef0a4e EA IMA SEAD decoder
aurel
parents: 5851
diff changeset
1252 break;
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1253 case CODEC_ID_ADPCM_EA:
9577
0b4ee8aa4c11 Check if there is enough bytes before reading the buffer in the EA ADPCM
vitor
parents: 9576
diff changeset
1254 if (buf_size < 4 || AV_RL32(src) >= ((buf_size - 12) * 2)) {
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1255 src += buf_size;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1256 break;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1257 }
9577
0b4ee8aa4c11 Check if there is enough bytes before reading the buffer in the EA ADPCM
vitor
parents: 9576
diff changeset
1258 samples_in_chunk = AV_RL32(src);
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1259 src += 4;
7258
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1260 current_left_sample = (int16_t)bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1261 previous_left_sample = (int16_t)bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1262 current_right_sample = (int16_t)bytestream_get_le16(&src);
48c9043b1372 Use bytestream and AV_RL* functions in ADPCM code where possible
reimar
parents: 7257
diff changeset
1263 previous_right_sample = (int16_t)bytestream_get_le16(&src);
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1264
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1265 for (count1 = 0; count1 < samples_in_chunk/28;count1++) {
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1266 coeff1l = ea_adpcm_table[ *src >> 4 ];
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1267 coeff2l = ea_adpcm_table[(*src >> 4 ) + 4];
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1268 coeff1r = ea_adpcm_table[*src & 0x0F];
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1269 coeff2r = ea_adpcm_table[(*src & 0x0F) + 4];
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1270 src++;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1271
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1272 shift_left = (*src >> 4 ) + 8;
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1273 shift_right = (*src & 0x0F) + 8;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1274 src++;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1275
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1276 for (count2 = 0; count2 < 28; count2++) {
6592
1d4e5e8d8012 ILP64 fixes (untested)
michael
parents: 6586
diff changeset
1277 next_left_sample = (int32_t)((*src & 0xF0) << 24) >> shift_left;
1d4e5e8d8012 ILP64 fixes (untested)
michael
parents: 6586
diff changeset
1278 next_right_sample = (int32_t)((*src & 0x0F) << 28) >> shift_right;
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1279 src++;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1280
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1281 next_left_sample = (next_left_sample +
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1282 (current_left_sample * coeff1l) +
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1283 (previous_left_sample * coeff2l) + 0x80) >> 8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1284 next_right_sample = (next_right_sample +
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1285 (current_right_sample * coeff1r) +
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1286 (previous_right_sample * coeff2r) + 0x80) >> 8;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1287
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1288 previous_left_sample = current_left_sample;
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
1289 current_left_sample = av_clip_int16(next_left_sample);
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1290 previous_right_sample = current_right_sample;
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
1291 current_right_sample = av_clip_int16(next_right_sample);
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1292 *samples++ = (unsigned short)current_left_sample;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1293 *samples++ = (unsigned short)current_right_sample;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1294 }
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1295 }
9576
7a9f0be3ad64 Skip 0x0000 frame footer in EA ADPCM decoder.
vitor
parents: 9428
diff changeset
1296
7a9f0be3ad64 Skip 0x0000 frame footer in EA ADPCM decoder.
vitor
parents: 9428
diff changeset
1297 if (src - buf == buf_size - 2)
7a9f0be3ad64 Skip 0x0000 frame footer in EA ADPCM decoder.
vitor
parents: 9428
diff changeset
1298 src += 2; // Skip terminating 0x0000
7a9f0be3ad64 Skip 0x0000 frame footer in EA ADPCM decoder.
vitor
parents: 9428
diff changeset
1299
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1300 break;
6596
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1301 case CODEC_ID_ADPCM_EA_MAXIS_XA:
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1302 for(channel = 0; channel < avctx->channels; channel++) {
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1303 for (i=0; i<2; i++)
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1304 coeff[channel][i] = ea_adpcm_table[(*src >> 4) + 4*i];
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1305 shift[channel] = (*src & 0x0F) + 8;
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1306 src++;
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1307 }
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1308 for (count1 = 0; count1 < (buf_size - avctx->channels) / avctx->channels; count1++) {
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1309 for(i = 4; i >= 0; i-=4) { /* Pairwise samples LL RR (st) or LL LL (mono) */
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1310 for(channel = 0; channel < avctx->channels; channel++) {
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1311 int32_t sample = (int32_t)(((*(src+channel) >> i) & 0x0F) << 0x1C) >> shift[channel];
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1312 sample = (sample +
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1313 c->status[channel].sample1 * coeff[channel][0] +
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1314 c->status[channel].sample2 * coeff[channel][1] + 0x80) >> 8;
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1315 c->status[channel].sample2 = c->status[channel].sample1;
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1316 c->status[channel].sample1 = av_clip_int16(sample);
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1317 *samples++ = c->status[channel].sample1;
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1318 }
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1319 }
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1320 src+=avctx->channels;
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1321 }
372ad1fe174d Maxis XA demuxer and decoder.
benoit
parents: 6592
diff changeset
1322 break;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1323 case CODEC_ID_ADPCM_EA_R1:
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1324 case CODEC_ID_ADPCM_EA_R2:
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1325 case CODEC_ID_ADPCM_EA_R3: {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1326 /* channel numbering
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1327 2chan: 0=fl, 1=fr
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1328 4chan: 0=fl, 1=rl, 2=fr, 3=rr
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1329 6chan: 0=fl, 1=c, 2=fr, 3=rl, 4=rr, 5=sub */
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1330 const int big_endian = avctx->codec->id == CODEC_ID_ADPCM_EA_R3;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1331 int32_t previous_sample, current_sample, next_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1332 int32_t coeff1, coeff2;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1333 uint8_t shift;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1334 unsigned int channel;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1335 uint16_t *samplesC;
6259
michael
parents: 6076
diff changeset
1336 const uint8_t *srcC;
8734
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1337 const uint8_t *src_end = buf + buf_size;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1338
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1339 samples_in_chunk = (big_endian ? bytestream_get_be32(&src)
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1340 : bytestream_get_le32(&src)) / 28;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1341 if (samples_in_chunk > UINT32_MAX/(28*avctx->channels) ||
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1342 28*samples_in_chunk*avctx->channels > samples_end-samples) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1343 src += buf_size - 4;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1344 break;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1345 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1346
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1347 for (channel=0; channel<avctx->channels; channel++) {
8734
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1348 int32_t offset = (big_endian ? bytestream_get_be32(&src)
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1349 : bytestream_get_le32(&src))
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1350 + (avctx->channels-channel-1) * 4;
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1351
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1352 if ((offset < 0) || (offset >= src_end - src - 4)) break;
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1353 srcC = src + offset;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1354 samplesC = samples + channel;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1355
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1356 if (avctx->codec->id == CODEC_ID_ADPCM_EA_R1) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1357 current_sample = (int16_t)bytestream_get_le16(&srcC);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1358 previous_sample = (int16_t)bytestream_get_le16(&srcC);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1359 } else {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1360 current_sample = c->status[channel].predictor;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1361 previous_sample = c->status[channel].prev_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1362 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1363
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1364 for (count1=0; count1<samples_in_chunk; count1++) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1365 if (*srcC == 0xEE) { /* only seen in R2 and R3 */
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1366 srcC++;
8734
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1367 if (srcC > src_end - 30*2) break;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1368 current_sample = (int16_t)bytestream_get_be16(&srcC);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1369 previous_sample = (int16_t)bytestream_get_be16(&srcC);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1370
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1371 for (count2=0; count2<28; count2++) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1372 *samplesC = (int16_t)bytestream_get_be16(&srcC);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1373 samplesC += avctx->channels;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1374 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1375 } else {
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1376 coeff1 = ea_adpcm_table[ *srcC>>4 ];
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1377 coeff2 = ea_adpcm_table[(*srcC>>4) + 4];
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1378 shift = (*srcC++ & 0x0F) + 8;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1379
8734
bb969c77ad18 check validity of pointer srcC
stefang
parents: 8718
diff changeset
1380 if (srcC > src_end - 14) break;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1381 for (count2=0; count2<28; count2++) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1382 if (count2 & 1)
6592
1d4e5e8d8012 ILP64 fixes (untested)
michael
parents: 6586
diff changeset
1383 next_sample = (int32_t)((*srcC++ & 0x0F) << 28) >> shift;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1384 else
6592
1d4e5e8d8012 ILP64 fixes (untested)
michael
parents: 6586
diff changeset
1385 next_sample = (int32_t)((*srcC & 0xF0) << 24) >> shift;
5851
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1386
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1387 next_sample += (current_sample * coeff1) +
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1388 (previous_sample * coeff2);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1389 next_sample = av_clip_int16(next_sample >> 8);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1390
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1391 previous_sample = current_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1392 current_sample = next_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1393 *samplesC = current_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1394 samplesC += avctx->channels;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1395 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1396 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1397 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1398
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1399 if (avctx->codec->id != CODEC_ID_ADPCM_EA_R1) {
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1400 c->status[channel].predictor = current_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1401 c->status[channel].prev_sample = previous_sample;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1402 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1403 }
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1404
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1405 src = src + buf_size - (4 + 4*avctx->channels);
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1406 samples += 28 * samples_in_chunk * avctx->channels;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1407 break;
dea3ac1d4c67 EA ADPCM R1, R2 and R3 decoder
aurel
parents: 5846
diff changeset
1408 }
5870
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1409 case CODEC_ID_ADPCM_EA_XAS:
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1410 if (samples_end-samples < 32*4*avctx->channels
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1411 || buf_size < (4+15)*4*avctx->channels) {
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1412 src += buf_size;
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1413 break;
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1414 }
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1415 for (channel=0; channel<avctx->channels; channel++) {
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1416 int coeff[2][4], shift[4];
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1417 short *s2, *s = &samples[channel];
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1418 for (n=0; n<4; n++, s+=32*avctx->channels) {
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1419 for (i=0; i<2; i++)
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1420 coeff[i][n] = ea_adpcm_table[(src[0]&0x0F)+4*i];
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1421 shift[n] = (src[2]&0x0F) + 8;
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1422 for (s2=s, i=0; i<2; i++, src+=2, s2+=avctx->channels)
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1423 s2[0] = (src[0]&0xF0) + (src[1]<<8);
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1424 }
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1425
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1426 for (m=2; m<32; m+=2) {
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1427 s = &samples[m*avctx->channels + channel];
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1428 for (n=0; n<4; n++, src++, s+=32*avctx->channels) {
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1429 for (s2=s, i=0; i<8; i+=4, s2+=avctx->channels) {
6592
1d4e5e8d8012 ILP64 fixes (untested)
michael
parents: 6586
diff changeset
1430 int level = (int32_t)((*src & (0xF0>>i)) << (24+i)) >> shift[n];
5870
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1431 int pred = s2[-1*avctx->channels] * coeff[0][n]
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1432 + s2[-2*avctx->channels] * coeff[1][n];
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1433 s2[0] = av_clip_int16((level + pred + 0x80) >> 8);
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1434 }
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1435 }
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1436 }
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1437 }
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1438 samples += 32*4*avctx->channels;
b56df7a7204c add Electronic Arts XAS ADPCM decoder
aurel
parents: 5861
diff changeset
1439 break;
5726
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1440 case CODEC_ID_ADPCM_IMA_AMV:
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1441 case CODEC_ID_ADPCM_IMA_SMJPEG:
5775
38f220befc32 Replace "signed short" typecast with "int16_t" as suggested by
voroshil
parents: 5766
diff changeset
1442 c->status[0].predictor = (int16_t)bytestream_get_le16(&src);
5766
ad8345572a2e Fix audio clicks in ADPCM IMA AMV by casting predictor as "signed short"
voroshil
parents: 5726
diff changeset
1443 c->status[0].step_index = bytestream_get_le16(&src);
5726
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1444
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1445 if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV)
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1446 src+=4;
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1447
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1448 while (src < buf + buf_size) {
5726
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1449 char hi, lo;
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1450 lo = *src & 0x0F;
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1451 hi = *src >> 4;
5726
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1452
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1453 if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV)
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1454 FFSWAP(char, hi, lo);
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1455
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1456 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
5726
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1457 lo, 3);
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1458 *samples++ = adpcm_ima_expand_nibble(&c->status[0],
5726
6589b212f6b9 AMV audio decoder
vitor
parents: 5710
diff changeset
1459 hi, 3);
1779
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1460 src++;
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1461 }
9848ca4ad861 added support for EA ADPCM and SMJPEG IMA ADPCM
melanson
parents: 1768
diff changeset
1462 break;
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1463 case CODEC_ID_ADPCM_CT:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1464 while (src < buf + buf_size) {
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1465 if (st) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1466 *samples++ = adpcm_ct_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1467 src[0] >> 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1468 *samples++ = adpcm_ct_expand_nibble(&c->status[1],
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1469 src[0] & 0x0F);
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1470 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1471 *samples++ = adpcm_ct_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1472 src[0] >> 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1473 *samples++ = adpcm_ct_expand_nibble(&c->status[0],
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1474 src[0] & 0x0F);
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1475 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1476 src++;
2296
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1477 }
2b75dff01118 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 2028
diff changeset
1478 break;
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1479 case CODEC_ID_ADPCM_SBPRO_4:
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1480 case CODEC_ID_ADPCM_SBPRO_3:
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1481 case CODEC_ID_ADPCM_SBPRO_2:
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1482 if (!c->status[0].step_index) {
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1483 /* the first byte is a raw sample */
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1484 *samples++ = 128 * (*src++ - 0x80);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1485 if (st)
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1486 *samples++ = 128 * (*src++ - 0x80);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1487 c->status[0].step_index = 1;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1488 }
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1489 if (avctx->codec->id == CODEC_ID_ADPCM_SBPRO_4) {
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1490 while (src < buf + buf_size) {
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1491 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1492 src[0] >> 4, 4, 0);
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1493 *samples++ = adpcm_sbpro_expand_nibble(&c->status[st],
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1494 src[0] & 0x0F, 4, 0);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1495 src++;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1496 }
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1497 } else if (avctx->codec->id == CODEC_ID_ADPCM_SBPRO_3) {
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
1498 while (src < buf + buf_size && samples + 2 < samples_end) {
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1499 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1500 src[0] >> 5 , 3, 0);
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1501 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1502 (src[0] >> 2) & 0x07, 3, 0);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1503 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1504 src[0] & 0x03, 2, 0);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1505 src++;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1506 }
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1507 } else {
4461
c95e0df9841f some (probably exploitable) out of array write fixes
michael
parents: 4364
diff changeset
1508 while (src < buf + buf_size && samples + 3 < samples_end) {
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1509 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1510 src[0] >> 6 , 2, 2);
3127
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1511 *samples++ = adpcm_sbpro_expand_nibble(&c->status[st],
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1512 (src[0] >> 4) & 0x03, 2, 2);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1513 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1514 (src[0] >> 2) & 0x03, 2, 2);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1515 *samples++ = adpcm_sbpro_expand_nibble(&c->status[st],
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1516 src[0] & 0x03, 2, 2);
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1517 src++;
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1518 }
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1519 }
6bae70889b35 add Creative 8 bits ADPCM schemes support
aurel
parents: 3036
diff changeset
1520 break;
2516
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
1521 case CODEC_ID_ADPCM_SWF:
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
1522 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1523 GetBitContext gb;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1524 const int *table;
5494
c2512a13877e fix decoding of adpcm swf big frames, fix RamboMJPEGAVP6_1Mbps.swf
bcoudurier
parents: 5371
diff changeset
1525 int k0, signmask, nb_bits, count;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1526 int size = buf_size*8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1527
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1528 init_get_bits(&gb, buf, size);
2516
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
1529
5129
0244bba24b43 misc typo fixes
diego
parents: 5089
diff changeset
1530 //read bits & initial values
4614
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1531 nb_bits = get_bits(&gb, 2)+2;
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1532 //av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits);
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1533 table = swf_index_tables[nb_bits-2];
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1534 k0 = 1 << (nb_bits-2);
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1535 signmask = 1 << (nb_bits-1);
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1536
5494
c2512a13877e fix decoding of adpcm swf big frames, fix RamboMJPEGAVP6_1Mbps.swf
bcoudurier
parents: 5371
diff changeset
1537 while (get_bits_count(&gb) <= size - 22*avctx->channels) {
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1538 for (i = 0; i < avctx->channels; i++) {
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1539 *samples++ = c->status[i].predictor = get_sbits(&gb, 16);
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1540 c->status[i].step_index = get_bits(&gb, 6);
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1541 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1542
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1543 for (count = 0; get_bits_count(&gb) <= size - nb_bits*avctx->channels && count < 4095; count++) {
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1544 int i;
2516
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
1545
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1546 for (i = 0; i < avctx->channels; i++) {
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1547 // similar to IMA adpcm
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1548 int delta = get_bits(&gb, nb_bits);
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1549 int step = step_table[c->status[i].step_index];
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1550 long vpdiff = 0; // vpdiff = (delta+0.5)*step/4
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1551 int k = k0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1552
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1553 do {
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1554 if (delta & k)
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1555 vpdiff += step;
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1556 step >>= 1;
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1557 k >>= 1;
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1558 } while(k);
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1559 vpdiff += step;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1560
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1561 if (delta & signmask)
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1562 c->status[i].predictor -= vpdiff;
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1563 else
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1564 c->status[i].predictor += vpdiff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1565
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1566 c->status[i].step_index += table[delta & (~signmask)];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1567
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1568 c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88);
5523
c2ab2ac31edb use av_clip_int16() where it makes sense
aurel
parents: 5501
diff changeset
1569 c->status[i].predictor = av_clip_int16(c->status[i].predictor);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2795
diff changeset
1570
5500
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1571 *samples++ = c->status[i].predictor;
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1572 if (samples >= samples_end) {
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1573 av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n");
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1574 return -1;
8b0dc2ce135c cosmetic, indentation
bcoudurier
parents: 5494
diff changeset
1575 }
4614
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1576 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1577 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1578 }
4614
3c6c557aa977 fix adpcm swf decoding
bcoudurier
parents: 4594
diff changeset
1579 src += buf_size;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1580 break;
2516
9f17dd9b80c6 macromedia flavour adpcm decoding (used in flv and swf)
alex
parents: 2296
diff changeset
1581 }
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1582 case CODEC_ID_ADPCM_YAMAHA:
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1583 while (src < buf + buf_size) {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1584 if (st) {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1585 *samples++ = adpcm_yamaha_expand_nibble(&c->status[0],
2795
de03cac6f7c2 yamaha adpcm nibbles in the wrong order fix by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2794
diff changeset
1586 src[0] & 0x0F);
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1587 *samples++ = adpcm_yamaha_expand_nibble(&c->status[1],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1588 src[0] >> 4 );
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1589 } else {
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1590 *samples++ = adpcm_yamaha_expand_nibble(&c->status[0],
2795
de03cac6f7c2 yamaha adpcm nibbles in the wrong order fix by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2794
diff changeset
1591 src[0] & 0x0F);
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1592 *samples++ = adpcm_yamaha_expand_nibble(&c->status[0],
6586
01bea2407628 Remove redundant &.
michael
parents: 6517
diff changeset
1593 src[0] >> 4 );
2794
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1594 }
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1595 src++;
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1596 }
ed1ab1566353 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 2753
diff changeset
1597 break;
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1598 case CODEC_ID_ADPCM_THP:
4821
42eef6c711ac cosmetics: indentation fix
diego
parents: 4810
diff changeset
1599 {
4804
39975b6c49bb table[index][ch] -> table[ch][index] (might be faster ...)
michael
parents: 4800
diff changeset
1600 int table[2][16];
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1601 unsigned int samplecnt;
4807
30ac525752b9 prev1/2 -> prev[2]
michael
parents: 4806
diff changeset
1602 int prev[2][2];
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1603 int ch;
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1604
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1605 if (buf_size < 80) {
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1606 av_log(avctx, AV_LOG_ERROR, "frame too small\n");
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1607 return -1;
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1608 }
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1609
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1610 src+=4;
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1611 samplecnt = bytestream_get_be32(&src);
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1612
4806
52cb2800e26c simplify
michael
parents: 4805
diff changeset
1613 for (i = 0; i < 32; i++)
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1614 table[0][i] = (int16_t)bytestream_get_be16(&src);
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1615
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1616 /* Initialize the previous sample. */
4808
ec3c56e6185b simplify
michael
parents: 4807
diff changeset
1617 for (i = 0; i < 4; i++)
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1618 prev[0][i] = (int16_t)bytestream_get_be16(&src);
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1619
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1620 if (samplecnt >= (samples_end - samples) / (st + 1)) {
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1621 av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n");
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1622 return -1;
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1623 }
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1624
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1625 for (ch = 0; ch <= st; ch++) {
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1626 samples = (unsigned short *) data + ch;
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1627
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1628 /* Read in every sample for this channel. */
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1629 for (i = 0; i < samplecnt / 14; i++) {
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1630 int index = (*src >> 4) & 7;
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1631 unsigned int exp = 28 - (*src++ & 15);
4804
39975b6c49bb table[index][ch] -> table[ch][index] (might be faster ...)
michael
parents: 4800
diff changeset
1632 int factor1 = table[ch][index * 2];
39975b6c49bb table[index][ch] -> table[ch][index] (might be faster ...)
michael
parents: 4800
diff changeset
1633 int factor2 = table[ch][index * 2 + 1];
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1634
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1635 /* Decode 14 samples. */
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1636 for (n = 0; n < 14; n++) {
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1637 int32_t sampledat;
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1638 if(n&1) sampledat= *src++ <<28;
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1639 else sampledat= (*src&0xF0)<<24;
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1640
4835
ae2f8c9bc25d Fix an underflow/overflow that was causing some crackles when playing
diego
parents: 4821
diff changeset
1641 sampledat = ((prev[ch][0]*factor1
4810
0066256e99da use bytestream reader instead of bitstream for THP
michael
parents: 4809
diff changeset
1642 + prev[ch][1]*factor2) >> 11) + (sampledat>>exp);
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
1643 *samples = av_clip_int16(sampledat);
4807
30ac525752b9 prev1/2 -> prev[2]
michael
parents: 4806
diff changeset
1644 prev[ch][1] = prev[ch][0];
30ac525752b9 prev1/2 -> prev[2]
michael
parents: 4806
diff changeset
1645 prev[ch][0] = *samples++;
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1646
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1647 /* In case of stereo, skip one sample, this sample
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1648 is for the other channel. */
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1649 samples += st;
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1650 }
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1651 }
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1652 }
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1653
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1654 /* In the previous loop, in case stereo is used, samples is
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1655 increased exactly one time too often. */
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1656 samples -= st;
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1657 break;
4821
42eef6c711ac cosmetics: indentation fix
diego
parents: 4810
diff changeset
1658 }
4800
d6b2ddac2c5e THP PCM decoder, used on the Nintendo GameCube.
diego
parents: 4614
diff changeset
1659
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1660 default:
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1661 return -1;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1662 }
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 925
diff changeset
1663 *data_size = (uint8_t *)samples - (uint8_t *)data;
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1664 return src - buf;
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1665 }
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1666
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1667
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1668
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 7451
diff changeset
1669 #if CONFIG_ENCODERS
6801
047a6a80dca4 ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
diego
parents: 6680
diff changeset
1670 #define ADPCM_ENCODER(id,name,long_name_) \
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1671 AVCodec name ## _encoder = { \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1672 #name, \
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11027
diff changeset
1673 AVMEDIA_TYPE_AUDIO, \
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1674 id, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1675 sizeof(ADPCMContext), \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1676 adpcm_encode_init, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1677 adpcm_encode_frame, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1678 adpcm_encode_close, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1679 NULL, \
10145
7955db355703 Make sample_fmts and channel_layouts compound literals const to reduce size of
reimar
parents: 9900
diff changeset
1680 .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, \
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6920
diff changeset
1681 .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1682 };
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1683 #else
6801
047a6a80dca4 ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
diego
parents: 6680
diff changeset
1684 #define ADPCM_ENCODER(id,name,long_name_)
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1685 #endif
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1686
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 7451
diff changeset
1687 #if CONFIG_DECODERS
6801
047a6a80dca4 ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
diego
parents: 6680
diff changeset
1688 #define ADPCM_DECODER(id,name,long_name_) \
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1689 AVCodec name ## _decoder = { \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1690 #name, \
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11027
diff changeset
1691 AVMEDIA_TYPE_AUDIO, \
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1692 id, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1693 sizeof(ADPCMContext), \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1694 adpcm_decode_init, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1695 NULL, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1696 NULL, \
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1697 adpcm_decode_frame, \
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6920
diff changeset
1698 .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1699 };
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1700 #else
6801
047a6a80dca4 ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
diego
parents: 6680
diff changeset
1701 #define ADPCM_DECODER(id,name,long_name_)
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1702 #endif
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1491
diff changeset
1703
6801
047a6a80dca4 ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
diego
parents: 6680
diff changeset
1704 #define ADPCM_CODEC(id,name,long_name_) \
047a6a80dca4 ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
diego
parents: 6680
diff changeset
1705 ADPCM_ENCODER(id,name,long_name_) ADPCM_DECODER(id,name,long_name_)
573
b0f52172f4c5 beos/mov/adpcm patch by Franois Revol <revol at free dot fr>
michaelni
parents:
diff changeset
1706
7197
54f8d960f15b Add a note to remind people that new PCM/ADPCM formats need to be added to
diego
parents: 7040
diff changeset
1707 /* Note: Do not forget to add new entries to the Makefile as well. */
9087
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1708 ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1709 ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct, "ADPCM Creative Technology");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1710 ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea, "ADPCM Electronic Arts");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1711 ADPCM_DECODER(CODEC_ID_ADPCM_EA_MAXIS_XA, adpcm_ea_maxis_xa, "ADPCM Electronic Arts Maxis CDROM XA");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1712 ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1, "ADPCM Electronic Arts R1");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1713 ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2, "ADPCM Electronic Arts R2");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1714 ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3, "ADPCM Electronic Arts R3");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1715 ADPCM_DECODER(CODEC_ID_ADPCM_EA_XAS, adpcm_ea_xas, "ADPCM Electronic Arts XAS");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1716 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv, "ADPCM IMA AMV");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1717 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3, "ADPCM IMA Duck DK3");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1718 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4, "ADPCM IMA Duck DK4");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1719 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs, "ADPCM IMA Electronic Arts EACS");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1720 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead, "ADPCM IMA Electronic Arts SEAD");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1721 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_ISS, adpcm_ima_iss, "ADPCM IMA Funcom ISS");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1722 ADPCM_CODEC (CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, "ADPCM IMA QuickTime");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1723 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1724 ADPCM_CODEC (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "ADPCM IMA WAV");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1725 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "ADPCM IMA Westwood");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1726 ADPCM_CODEC (CODEC_ID_ADPCM_MS, adpcm_ms, "ADPCM Microsoft");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1727 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "ADPCM Sound Blaster Pro 2-bit");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1728 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3, "ADPCM Sound Blaster Pro 2.6-bit");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1729 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4, "ADPCM Sound Blaster Pro 4-bit");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1730 ADPCM_CODEC (CODEC_ID_ADPCM_SWF, adpcm_swf, "ADPCM Shockwave Flash");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1731 ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp, "ADPCM Nintendo Gamecube THP");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1732 ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa, "ADPCM CDROM XA");
95b679f9de63 cosmetics: Reformat long_names so that "ADPCM" comes first.
diego
parents: 9083
diff changeset
1733 ADPCM_CODEC (CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, "ADPCM Yamaha");