annotate adpcm.c @ 6624:2dc587201e38 libavcodec

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