annotate wavpack.c @ 9605:93029f1a4c14 libavcodec

ac3dec: move channel remapping to outside of block loop
author jbr
date Tue, 05 May 2009 23:38:12 +0000
parents b60289b3e29a
children 71c0f08bd41d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
1 /*
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
2 * WavPack lossless audio decoder
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
3 * Copyright (c) 2006 Konstantin Shishkov
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3782
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3782
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3782
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
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: 3782
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3782
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
15 * Lesser General Public License for more details.
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
16 *
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
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: 3782
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
20 */
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
21 #define ALT_BITSTREAM_READER_LE
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
22 #include "avcodec.h"
9428
0dce4fe6e6f3 Rename bitstream.h to get_bits.h.
stefano
parents: 9355
diff changeset
23 #include "get_bits.h"
5605
d92fa6e5fc8c move get_unary() to its own file
aurel
parents: 5539
diff changeset
24 #include "unary.h"
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
25
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
26 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8607
diff changeset
27 * @file libavcodec/wavpack.c
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
28 * WavPack lossless audio decoder
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
29 */
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
30
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
31 #define WV_MONO 0x00000004
5538
33a32de3c1bc Rename flag for consistency with the next commit
kostya
parents: 5510
diff changeset
32 #define WV_JOINT_STEREO 0x00000010
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
33 #define WV_FALSE_STEREO 0x40000000
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
34
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
35 #define WV_HYBRID_MODE 0x00000008
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
36 #define WV_HYBRID_SHAPE 0x00000008
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
37 #define WV_HYBRID_BITRATE 0x00000200
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
38 #define WV_HYBRID_BALANCE 0x00000400
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
39
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
40 enum WP_ID_Flags{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
41 WP_IDF_MASK = 0x1F,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
42 WP_IDF_IGNORE = 0x20,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
43 WP_IDF_ODD = 0x40,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
44 WP_IDF_LONG = 0x80
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
45 };
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
46
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
47 enum WP_ID{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
48 WP_ID_DUMMY = 0,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
49 WP_ID_ENCINFO,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
50 WP_ID_DECTERMS,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
51 WP_ID_DECWEIGHTS,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
52 WP_ID_DECSAMPLES,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
53 WP_ID_ENTROPY,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
54 WP_ID_HYBRID,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
55 WP_ID_SHAPING,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
56 WP_ID_FLOATINFO,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
57 WP_ID_INT32INFO,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
58 WP_ID_DATA,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
59 WP_ID_CORR,
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
60 WP_ID_EXTRABITS,
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
61 WP_ID_CHANINFO
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
62 };
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
63
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
64 #define MAX_TERMS 16
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
65
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
66 typedef struct Decorr {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
67 int delta;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
68 int value;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
69 int weightA;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
70 int weightB;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
71 int samplesA[8];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
72 int samplesB[8];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
73 } Decorr;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
74
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
75 typedef struct WvChannel {
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
76 int median[3];
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
77 int slow_level, error_limit;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
78 int bitrate_acc, bitrate_delta;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
79 } WvChannel;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
80
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
81 typedef struct WavpackContext {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
82 AVCodecContext *avctx;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
83 int frame_flags;
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
84 int stereo, stereo_in;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
85 int joint;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
86 uint32_t CRC;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
87 GetBitContext gb;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
88 int got_extra_bits;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
89 uint32_t crc_extra_bits;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
90 GetBitContext gb_extra_bits;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
91 int data_size; // in bits
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
92 int samples;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
93 int terms;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
94 Decorr decorr[MAX_TERMS];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
95 int zero, one, zeroes;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
96 int extra_bits;
5482
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
97 int and, or, shift;
9542
c110790496ff Shift 9-15 bit samples to use full 16-bit range.
kostya
parents: 9428
diff changeset
98 int post_shift;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
99 int hybrid, hybrid_bitrate;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
100 WvChannel ch[2];
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
101 } WavpackContext;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
102
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
103 // exponent table copied from WavPack source
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
104 static const uint8_t wp_exp2_table [256] = {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
105 0x00, 0x01, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a, 0x0b,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
106 0x0b, 0x0c, 0x0d, 0x0e, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x14, 0x15, 0x16, 0x16,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
107 0x17, 0x18, 0x19, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1f, 0x20, 0x20, 0x21, 0x22, 0x23,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
108 0x24, 0x24, 0x25, 0x26, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
109 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3a, 0x3b, 0x3c, 0x3d,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
110 0x3e, 0x3f, 0x40, 0x41, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x48, 0x49, 0x4a, 0x4b,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
111 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
112 0x5b, 0x5c, 0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
113 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
114 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x87, 0x88, 0x89, 0x8a,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
115 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
116 0x9c, 0x9d, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
117 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
118 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc8, 0xc9, 0xca, 0xcb, 0xcd, 0xce, 0xcf, 0xd0, 0xd2, 0xd3, 0xd4,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
119 0xd6, 0xd7, 0xd8, 0xd9, 0xdb, 0xdc, 0xdd, 0xde, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe8, 0xe9,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
120 0xea, 0xec, 0xed, 0xee, 0xf0, 0xf1, 0xf2, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfc, 0xfd, 0xff
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
121 };
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
122
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
123 static const uint8_t wp_log2_table [] = {
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
124 0x00, 0x01, 0x03, 0x04, 0x06, 0x07, 0x09, 0x0a, 0x0b, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x15,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
125 0x16, 0x18, 0x19, 0x1a, 0x1c, 0x1d, 0x1e, 0x20, 0x21, 0x22, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
126 0x2c, 0x2d, 0x2e, 0x2f, 0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x39, 0x3b, 0x3c, 0x3d, 0x3e,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
127 0x3f, 0x41, 0x42, 0x43, 0x44, 0x45, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4d, 0x4e, 0x4f, 0x50, 0x51,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
128 0x52, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
129 0x64, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x74, 0x75,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
130 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
131 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
132 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
133 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb2,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
134 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc0,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
135 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xce,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
136 0xcf, 0xd0, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd8, 0xd9, 0xda, 0xdb,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
137 0xdc, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe4, 0xe5, 0xe6, 0xe7, 0xe7,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
138 0xe8, 0xe9, 0xea, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xee, 0xef, 0xf0, 0xf1, 0xf1, 0xf2, 0xf3, 0xf4,
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
139 0xf4, 0xf5, 0xf6, 0xf7, 0xf7, 0xf8, 0xf9, 0xf9, 0xfa, 0xfb, 0xfc, 0xfc, 0xfd, 0xfe, 0xff, 0xff
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
140 };
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
141
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4021
diff changeset
142 static av_always_inline int wp_exp2(int16_t val)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
143 {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
144 int res, neg = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
145
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
146 if(val < 0){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
147 val = -val;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
148 neg = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
149 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
150
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
151 res = wp_exp2_table[val & 0xFF] | 0x100;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
152 val >>= 8;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
153 res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val));
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
154 return neg ? -res : res;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
155 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
156
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
157 static av_always_inline int wp_log2(int32_t val)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
158 {
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
159 int bits;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
160
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
161 if(!val)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
162 return 0;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
163 if(val == 1)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
164 return 256;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
165 val += val >> 9;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
166 bits = av_log2(val) + 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
167 if(bits < 9)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
168 return (bits << 8) + wp_log2_table[(val << (9 - bits)) & 0xFF];
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
169 else
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
170 return (bits << 8) + wp_log2_table[(val >> (bits - 9)) & 0xFF];
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
171 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
172
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
173 #define LEVEL_DECAY(a) ((a + 0x80) >> 8)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
174
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
175 // macros for manipulating median values
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
176 #define GET_MED(n) ((c->median[n] >> 4) + 1)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
177 #define DEC_MED(n) c->median[n] -= ((c->median[n] + (128>>n) - 2) / (128>>n)) * 2
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
178 #define INC_MED(n) c->median[n] += ((c->median[n] + (128>>n)) / (128>>n)) * 5
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
179
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
180 // macros for applying weight
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
181 #define UPDATE_WEIGHT_CLIP(weight, delta, samples, in) \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
182 if(samples && in){ \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
183 if((samples ^ in) < 0){ \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
184 weight -= delta; \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
185 if(weight < -1024) weight = -1024; \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
186 }else{ \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
187 weight += delta; \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
188 if(weight > 1024) weight = 1024; \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
189 } \
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
190 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
191
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
192
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4021
diff changeset
193 static av_always_inline int get_tail(GetBitContext *gb, int k)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
194 {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
195 int p, e, res;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
196
4421
41ee67dd4bef Coded residual in WavPack may be > 0xFFFF
kostya
parents: 4364
diff changeset
197 if(k<1)return 0;
41ee67dd4bef Coded residual in WavPack may be > 0xFFFF
kostya
parents: 4364
diff changeset
198 p = av_log2(k);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
199 e = (1 << (p + 1)) - k - 1;
3782
a8b80c80494b Handle case of get_bits(0)
kostya
parents: 3764
diff changeset
200 res = p ? get_bits(gb, p) : 0;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
201 if(res >= e){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
202 res = (res<<1) - e + get_bits1(gb);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
203 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
204 return res;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
205 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
206
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
207 static void update_error_limit(WavpackContext *ctx)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
208 {
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
209 int i, br[2], sl[2];
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
210
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
211 for(i = 0; i <= ctx->stereo_in; i++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
212 ctx->ch[i].bitrate_acc += ctx->ch[i].bitrate_delta;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
213 br[i] = ctx->ch[i].bitrate_acc >> 16;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
214 sl[i] = LEVEL_DECAY(ctx->ch[i].slow_level);
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
215 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
216 if(ctx->stereo_in && ctx->hybrid_bitrate){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
217 int balance = (sl[1] - sl[0] + br[1] + 1) >> 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
218 if(balance > br[0]){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
219 br[1] = br[0] << 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
220 br[0] = 0;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
221 }else if(-balance > br[0]){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
222 br[0] <<= 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
223 br[1] = 0;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
224 }else{
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
225 br[1] = br[0] + balance;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
226 br[0] = br[0] - balance;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
227 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
228 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
229 for(i = 0; i <= ctx->stereo_in; i++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
230 if(ctx->hybrid_bitrate){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
231 if(sl[i] - br[i] > -0x100)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
232 ctx->ch[i].error_limit = wp_exp2(sl[i] - br[i] + 0x100);
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
233 else
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
234 ctx->ch[i].error_limit = 0;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
235 }else{
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
236 ctx->ch[i].error_limit = wp_exp2(br[i]);
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
237 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
238 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
239 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
240
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
241 static int wv_get_value(WavpackContext *ctx, GetBitContext *gb, int channel, int *last)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
242 {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
243 int t, t2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
244 int sign, base, add, ret;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
245 WvChannel *c = &ctx->ch[channel];
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
246
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
247 *last = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
248
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
249 if((ctx->ch[0].median[0] < 2U) && (ctx->ch[1].median[0] < 2U) && !ctx->zero && !ctx->one){
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
250 if(ctx->zeroes){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
251 ctx->zeroes--;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
252 if(ctx->zeroes){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
253 c->slow_level -= LEVEL_DECAY(c->slow_level);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
254 return 0;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
255 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
256 }else{
5607
5b80d560cdca add get_unary_0_33() to help gcc with inlining
aurel
parents: 5605
diff changeset
257 t = get_unary_0_33(gb);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
258 if(t >= 2) t = get_bits(gb, t - 1) | (1 << (t-1));
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
259 ctx->zeroes = t;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
260 if(ctx->zeroes){
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
261 memset(ctx->ch[0].median, 0, sizeof(ctx->ch[0].median));
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
262 memset(ctx->ch[1].median, 0, sizeof(ctx->ch[1].median));
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
263 c->slow_level -= LEVEL_DECAY(c->slow_level);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
264 return 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
265 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
266 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
267 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
268
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
269 if(get_bits_count(gb) >= ctx->data_size){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
270 *last = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
271 return 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
272 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
273
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
274 if(ctx->zero){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
275 t = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
276 ctx->zero = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
277 }else{
5607
5b80d560cdca add get_unary_0_33() to help gcc with inlining
aurel
parents: 5605
diff changeset
278 t = get_unary_0_33(gb);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
279 if(get_bits_count(gb) >= ctx->data_size){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
280 *last = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
281 return 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
282 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
283 if(t == 16) {
5607
5b80d560cdca add get_unary_0_33() to help gcc with inlining
aurel
parents: 5605
diff changeset
284 t2 = get_unary_0_33(gb);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
285 if(t2 < 2) t += t2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
286 else t += get_bits(gb, t2 - 1) | (1 << (t2 - 1));
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
287 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
288
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
289 if(ctx->one){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
290 ctx->one = t&1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
291 t = (t>>1) + 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
292 }else{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
293 ctx->one = t&1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
294 t >>= 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
295 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
296 ctx->zero = !ctx->one;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
297 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
298
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
299 if(ctx->hybrid && !channel)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
300 update_error_limit(ctx);
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
301
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
302 if(!t){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
303 base = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
304 add = GET_MED(0) - 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
305 DEC_MED(0);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
306 }else if(t == 1){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
307 base = GET_MED(0);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
308 add = GET_MED(1) - 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
309 INC_MED(0);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
310 DEC_MED(1);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
311 }else if(t == 2){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
312 base = GET_MED(0) + GET_MED(1);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
313 add = GET_MED(2) - 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
314 INC_MED(0);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
315 INC_MED(1);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
316 DEC_MED(2);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
317 }else{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
318 base = GET_MED(0) + GET_MED(1) + GET_MED(2) * (t - 2);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
319 add = GET_MED(2) - 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
320 INC_MED(0);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
321 INC_MED(1);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
322 INC_MED(2);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
323 }
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
324 if(!c->error_limit){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
325 ret = base + get_tail(gb, add);
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
326 }else{
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
327 int mid = (base*2 + add + 1) >> 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
328 while(add > c->error_limit){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
329 if(get_bits1(gb)){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
330 add -= (mid - base);
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
331 base = mid;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
332 }else
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
333 add = mid - base - 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
334 mid = (base*2 + add + 1) >> 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
335 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
336 ret = mid;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
337 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
338 sign = get_bits1(gb);
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
339 if(ctx->hybrid_bitrate)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
340 c->slow_level += wp_log2(ret) - LEVEL_DECAY(c->slow_level);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
341 return sign ? ~ret : ret;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
342 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
343
9597
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
344 static inline int wv_get_value_integer(WavpackContext *s, uint32_t *crc, int S)
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
345 {
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
346 int bit;
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
347
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
348 if(s->extra_bits){
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
349 S <<= s->extra_bits;
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
350
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
351 if(s->got_extra_bits){
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
352 S |= get_bits(&s->gb_extra_bits, s->extra_bits);
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
353 *crc = *crc * 9 + (S&0xffff) * 3 + ((unsigned)S>>16);
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
354 }
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
355 }
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
356 bit = (S & s->and) | s->or;
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
357 return (((S + bit) << s->shift) - bit) << s->post_shift;
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
358 }
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
359
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
360 static inline int wv_unpack_stereo(WavpackContext *s, GetBitContext *gb, void *dst, const int hires)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
361 {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
362 int i, j, count = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
363 int last, t;
9597
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
364 int A, B, L, L2, R, R2;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
365 int pos = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
366 uint32_t crc = 0xFFFFFFFF;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
367 uint32_t crc_extra_bits = 0xFFFFFFFF;
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
368 int16_t *dst16 = dst;
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
369 int32_t *dst32 = dst;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
370
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
371 s->one = s->zero = s->zeroes = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
372 do{
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
373 L = wv_get_value(s, gb, 0, &last);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
374 if(last) break;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
375 R = wv_get_value(s, gb, 1, &last);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
376 if(last) break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
377 for(i = 0; i < s->terms; i++){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
378 t = s->decorr[i].value;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
379 if(t > 0){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
380 if(t > 8){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
381 if(t & 1){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
382 A = 2 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
383 B = 2 * s->decorr[i].samplesB[0] - s->decorr[i].samplesB[1];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
384 }else{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
385 A = (3 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]) >> 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
386 B = (3 * s->decorr[i].samplesB[0] - s->decorr[i].samplesB[1]) >> 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
387 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
388 s->decorr[i].samplesA[1] = s->decorr[i].samplesA[0];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
389 s->decorr[i].samplesB[1] = s->decorr[i].samplesB[0];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
390 j = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
391 }else{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
392 A = s->decorr[i].samplesA[pos];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
393 B = s->decorr[i].samplesB[pos];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
394 j = (pos + t) & 7;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
395 }
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
396 if(hires){
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
397 L2 = L + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
398 R2 = R + ((s->decorr[i].weightB * (int64_t)B + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
399 }else{
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
400 L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
401 R2 = R + ((s->decorr[i].weightB * B + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
402 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
403 if(A && L) s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
404 if(B && R) s->decorr[i].weightB -= ((((R ^ B) >> 30) & 2) - 1) * s->decorr[i].delta;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
405 s->decorr[i].samplesA[j] = L = L2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
406 s->decorr[i].samplesB[j] = R = R2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
407 }else if(t == -1){
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
408 if(hires)
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
409 L2 = L + ((s->decorr[i].weightA * (int64_t)s->decorr[i].samplesA[0] + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
410 else
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
411 L2 = L + ((s->decorr[i].weightA * s->decorr[i].samplesA[0] + 512) >> 10);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
412 UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, s->decorr[i].samplesA[0], L);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
413 L = L2;
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
414 if(hires)
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
415 R2 = R + ((s->decorr[i].weightB * (int64_t)L2 + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
416 else
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
417 R2 = R + ((s->decorr[i].weightB * L2 + 512) >> 10);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
418 UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, L2, R);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
419 R = R2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
420 s->decorr[i].samplesA[0] = R;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
421 }else{
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
422 if(hires)
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
423 R2 = R + ((s->decorr[i].weightB * (int64_t)s->decorr[i].samplesB[0] + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
424 else
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
425 R2 = R + ((s->decorr[i].weightB * s->decorr[i].samplesB[0] + 512) >> 10);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
426 UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, s->decorr[i].samplesB[0], R);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
427 R = R2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
428
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
429 if(t == -3){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
430 R2 = s->decorr[i].samplesA[0];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
431 s->decorr[i].samplesA[0] = R;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
432 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
433
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
434 if(hires)
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
435 L2 = L + ((s->decorr[i].weightA * (int64_t)R2 + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
436 else
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
437 L2 = L + ((s->decorr[i].weightA * R2 + 512) >> 10);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
438 UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, R2, L);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
439 L = L2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
440 s->decorr[i].samplesB[0] = L;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
441 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
442 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
443 pos = (pos + 1) & 7;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
444 if(s->joint)
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
445 L += (R -= (L >> 1));
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
446 crc = (crc * 3 + L) * 3 + R;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
447
9597
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
448 if(hires){
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
449 *dst32++ = wv_get_value_integer(s, &crc_extra_bits, L);
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
450 *dst32++ = wv_get_value_integer(s, &crc_extra_bits, R);
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
451 } else {
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
452 *dst16++ = wv_get_value_integer(s, &crc_extra_bits, L);
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
453 *dst16++ = wv_get_value_integer(s, &crc_extra_bits, R);
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
454 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
455 count++;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
456 }while(!last && count < s->samples);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
457
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
458 if(crc != s->CRC){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
459 av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
460 return -1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
461 }
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
462 if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
463 av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
464 return -1;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
465 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
466 return count * 2;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
467 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
468
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
469 static inline int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, void *dst, const int hires)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
470 {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
471 int i, j, count = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
472 int last, t;
9597
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
473 int A, S, T;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
474 int pos = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
475 uint32_t crc = 0xFFFFFFFF;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
476 uint32_t crc_extra_bits = 0xFFFFFFFF;
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
477 int16_t *dst16 = dst;
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
478 int32_t *dst32 = dst;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
479
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
480 s->one = s->zero = s->zeroes = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
481 do{
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
482 T = wv_get_value(s, gb, 0, &last);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
483 S = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
484 if(last) break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
485 for(i = 0; i < s->terms; i++){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
486 t = s->decorr[i].value;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
487 if(t > 8){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
488 if(t & 1)
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
489 A = 2 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
490 else
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
491 A = (3 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]) >> 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
492 s->decorr[i].samplesA[1] = s->decorr[i].samplesA[0];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
493 j = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
494 }else{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
495 A = s->decorr[i].samplesA[pos];
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
496 j = (pos + t) & 7;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
497 }
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
498 if(hires)
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
499 S = T + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
500 else
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
501 S = T + ((s->decorr[i].weightA * A + 512) >> 10);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
502 if(A && T) s->decorr[i].weightA -= ((((T ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
503 s->decorr[i].samplesA[j] = T = S;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
504 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
505 pos = (pos + 1) & 7;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
506 crc = crc * 3 + S;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
507
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
508 if(hires)
9597
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
509 *dst32++ = wv_get_value_integer(s, &crc_extra_bits, S);
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
510 else
9597
b60289b3e29a Factorize out integer sample value decoding for WavPack.
kostya
parents: 9592
diff changeset
511 *dst16++ = wv_get_value_integer(s, &crc_extra_bits, S);
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
512 count++;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
513 }while(!last && count < s->samples);
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
514
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
515 if(crc != s->CRC){
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
516 av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
517 return -1;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
518 }
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
519 if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
520 av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
521 return -1;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
522 }
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
523 return count;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
524 }
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
525
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6294
diff changeset
526 static av_cold int wavpack_decode_init(AVCodecContext *avctx)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
527 {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
528 WavpackContext *s = avctx->priv_data;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
529
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
530 s->avctx = avctx;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
531 s->stereo = (avctx->channels == 2);
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
532 if(avctx->bits_per_coded_sample <= 16)
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
533 avctx->sample_fmt = SAMPLE_FMT_S16;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
534 else
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
535 avctx->sample_fmt = SAMPLE_FMT_S32;
8174
f11197441364 Add channel layout to several audio decoders I maintain
kostya
parents: 7451
diff changeset
536 avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
537
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
538 return 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
539 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
540
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
541 static int wavpack_decode_frame(AVCodecContext *avctx,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
542 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
543 AVPacket *avpkt)
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
544 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
545 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
546 int buf_size = avpkt->size;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
547 WavpackContext *s = avctx->priv_data;
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
548 void *samples = data;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
549 int samplecount;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
550 int got_terms = 0, got_weights = 0, got_samples = 0, got_entropy = 0, got_bs = 0;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
551 int got_hybrid = 0;
6294
michael
parents: 5941
diff changeset
552 const uint8_t* buf_end = buf + buf_size;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
553 int i, j, id, size, ssize, weights, t;
9566
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
554 int bpp;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
555
4690
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
556 if (buf_size == 0){
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
557 *data_size = 0;
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
558 return 0;
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
559 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
560
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
561 memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
562 memset(s->ch, 0, sizeof(s->ch));
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
563 s->extra_bits = 0;
5482
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
564 s->and = s->or = s->shift = 0;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
565 s->got_extra_bits = 0;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
566
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
567 s->samples = AV_RL32(buf); buf += 4;
4690
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
568 if(!s->samples){
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
569 *data_size = 0;
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
570 return buf_size;
1bfdcac74275 Correctly handle data_size on decoding
kostya
parents: 4421
diff changeset
571 }
9566
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
572 s->frame_flags = AV_RL32(buf); buf += 4;
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
573 if((s->frame_flags&0x03) <= 1){
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
574 bpp = 2;
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
575 avctx->sample_fmt = SAMPLE_FMT_S16;
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
576 } else {
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
577 bpp = 4;
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
578 avctx->sample_fmt = SAMPLE_FMT_S32;
4017
b1a1fb651bf5 Move block size check to decoder
kostya
parents: 3947
diff changeset
579 }
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
580 s->stereo_in = (s->frame_flags & WV_FALSE_STEREO) ? 0 : s->stereo;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
581 s->joint = s->frame_flags & WV_JOINT_STEREO;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
582 s->hybrid = s->frame_flags & WV_HYBRID_MODE;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
583 s->hybrid_bitrate = s->frame_flags & WV_HYBRID_BITRATE;
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
584 s->post_shift = 8 * (bpp-1-(s->frame_flags&0x03)) + ((s->frame_flags >> 13) & 0x1f);
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
585 s->CRC = AV_RL32(buf); buf += 4;
9566
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
586
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
587 /* should not happen but who knows */
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
588 if(s->samples * bpp * avctx->channels > *data_size){
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
589 av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
590 return -1;
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
591 }
9a3fddd31092 Correctly update output sample format in wavpack decoder.
kostya
parents: 9549
diff changeset
592
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
593 // parse metadata blocks
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
594 while(buf < buf_end){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
595 id = *buf++;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
596 size = *buf++;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
597 if(id & WP_IDF_LONG) {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
598 size |= (*buf++) << 8;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
599 size |= (*buf++) << 16;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
600 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
601 size <<= 1; // size is specified in words
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
602 ssize = size;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
603 if(id & WP_IDF_ODD) size--;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
604 if(size < 0){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
605 av_log(avctx, AV_LOG_ERROR, "Got incorrect block %02X with size %i\n", id, size);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
606 break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
607 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
608 if(buf + ssize > buf_end){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
609 av_log(avctx, AV_LOG_ERROR, "Block size %i is out of bounds\n", size);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
610 break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
611 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
612 if(id & WP_IDF_IGNORE){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
613 buf += ssize;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
614 continue;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
615 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
616 switch(id & WP_IDF_MASK){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
617 case WP_ID_DECTERMS:
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
618 s->terms = size;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
619 if(s->terms > MAX_TERMS){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
620 av_log(avctx, AV_LOG_ERROR, "Too many decorrelation terms\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
621 buf += ssize;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
622 continue;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
623 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
624 for(i = 0; i < s->terms; i++) {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
625 s->decorr[s->terms - i - 1].value = (*buf & 0x1F) - 5;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
626 s->decorr[s->terms - i - 1].delta = *buf >> 5;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
627 buf++;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
628 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
629 got_terms = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
630 break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
631 case WP_ID_DECWEIGHTS:
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
632 if(!got_terms){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
633 av_log(avctx, AV_LOG_ERROR, "No decorrelation terms met\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
634 continue;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
635 }
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
636 weights = size >> s->stereo_in;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
637 if(weights > MAX_TERMS || weights > s->terms){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
638 av_log(avctx, AV_LOG_ERROR, "Too many decorrelation weights\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
639 buf += ssize;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
640 continue;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
641 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
642 for(i = 0; i < weights; i++) {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
643 t = (int8_t)(*buf++);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
644 s->decorr[s->terms - i - 1].weightA = t << 3;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
645 if(s->decorr[s->terms - i - 1].weightA > 0)
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
646 s->decorr[s->terms - i - 1].weightA += (s->decorr[s->terms - i - 1].weightA + 64) >> 7;
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
647 if(s->stereo_in){
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
648 t = (int8_t)(*buf++);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
649 s->decorr[s->terms - i - 1].weightB = t << 3;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
650 if(s->decorr[s->terms - i - 1].weightB > 0)
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
651 s->decorr[s->terms - i - 1].weightB += (s->decorr[s->terms - i - 1].weightB + 64) >> 7;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
652 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
653 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
654 got_weights = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
655 break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
656 case WP_ID_DECSAMPLES:
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
657 if(!got_terms){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
658 av_log(avctx, AV_LOG_ERROR, "No decorrelation terms met\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
659 continue;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
660 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
661 t = 0;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
662 for(i = s->terms - 1; (i >= 0) && (t < size); i--) {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
663 if(s->decorr[i].value > 8){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
664 s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
665 s->decorr[i].samplesA[1] = wp_exp2(AV_RL16(buf)); buf += 2;
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
666 if(s->stereo_in){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
667 s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
668 s->decorr[i].samplesB[1] = wp_exp2(AV_RL16(buf)); buf += 2;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
669 t += 4;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
670 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
671 t += 4;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
672 }else if(s->decorr[i].value < 0){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
673 s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
674 s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
675 t += 4;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
676 }else{
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
677 for(j = 0; j < s->decorr[i].value; j++){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
678 s->decorr[i].samplesA[j] = wp_exp2(AV_RL16(buf)); buf += 2;
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
679 if(s->stereo_in){
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4283
diff changeset
680 s->decorr[i].samplesB[j] = wp_exp2(AV_RL16(buf)); buf += 2;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
681 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
682 }
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
683 t += s->decorr[i].value * 2 * (s->stereo_in + 1);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
684 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
685 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
686 got_samples = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
687 break;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
688 case WP_ID_ENTROPY:
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
689 if(size != 6 * (s->stereo_in + 1)){
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
690 av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, got %i", 6 * (s->stereo_in + 1), size);
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
691 buf += ssize;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
692 continue;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
693 }
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
694 for(j = 0; j <= s->stereo_in; j++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
695 for(i = 0; i < 3; i++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
696 s->ch[j].median[i] = wp_exp2(AV_RL16(buf));
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
697 buf += 2;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
698 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
699 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
700 got_entropy = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
701 break;
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
702 case WP_ID_HYBRID:
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
703 if(s->hybrid_bitrate){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
704 for(i = 0; i <= s->stereo_in; i++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
705 s->ch[i].slow_level = wp_exp2(AV_RL16(buf));
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
706 buf += 2;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
707 size -= 2;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
708 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
709 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
710 for(i = 0; i < (s->stereo_in + 1); i++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
711 s->ch[i].bitrate_acc = AV_RL16(buf) << 16;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
712 buf += 2;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
713 size -= 2;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
714 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
715 if(size > 0){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
716 for(i = 0; i < (s->stereo_in + 1); i++){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
717 s->ch[i].bitrate_delta = wp_exp2((int16_t)AV_RL16(buf));
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
718 buf += 2;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
719 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
720 }else{
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
721 for(i = 0; i < (s->stereo_in + 1); i++)
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
722 s->ch[i].bitrate_delta = 0;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
723 }
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
724 got_hybrid = 1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
725 break;
5482
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
726 case WP_ID_INT32INFO:
9544
e5afd314bd14 Handle WavPack INT32INFO chunks with nonzero post shift
kostya
parents: 9543
diff changeset
727 if(size != 4){
5482
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
728 av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
729 buf += ssize;
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
730 continue;
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
731 }
9544
e5afd314bd14 Handle WavPack INT32INFO chunks with nonzero post shift
kostya
parents: 9543
diff changeset
732 if(buf[0])
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
733 s->extra_bits = buf[0];
9544
e5afd314bd14 Handle WavPack INT32INFO chunks with nonzero post shift
kostya
parents: 9543
diff changeset
734 else if(buf[1])
5482
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
735 s->shift = buf[1];
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
736 else if(buf[2]){
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
737 s->and = s->or = 1;
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
738 s->shift = buf[2];
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
739 }else if(buf[3]){
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
740 s->and = 1;
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
741 s->shift = buf[3];
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
742 }
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
743 buf += 4;
bba203d5c5e7 Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents: 4690
diff changeset
744 break;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
745 case WP_ID_DATA:
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
746 init_get_bits(&s->gb, buf, size * 8);
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
747 s->data_size = size * 8;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
748 buf += size;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
749 got_bs = 1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
750 break;
9589
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
751 case WP_ID_EXTRABITS:
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
752 if(size <= 4){
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
753 av_log(avctx, AV_LOG_ERROR, "Invalid EXTRABITS, size = %i\n", size);
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
754 buf += size;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
755 continue;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
756 }
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
757 init_get_bits(&s->gb_extra_bits, buf, size * 8);
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
758 s->crc_extra_bits = get_bits_long(&s->gb_extra_bits, 32);
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
759 buf += size;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
760 s->got_extra_bits = 1;
3f7496cd7cab Decode extended bitstream for high-precision WavPack files.
kostya
parents: 9566
diff changeset
761 break;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
762 default:
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
763 buf += size;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
764 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
765 if(id & WP_IDF_ODD) buf++;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
766 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
767 if(!got_terms){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
768 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation terms\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
769 return -1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
770 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
771 if(!got_weights){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
772 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation weights\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
773 return -1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
774 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
775 if(!got_samples){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
776 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation samples\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
777 return -1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
778 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
779 if(!got_entropy){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
780 av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
781 return -1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
782 }
8607
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
783 if(s->hybrid && !got_hybrid){
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
784 av_log(avctx, AV_LOG_ERROR, "Hybrid config not found\n");
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
785 return -1;
79b1cf27cfea WavPack hybrid mode support
kostya
parents: 8174
diff changeset
786 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
787 if(!got_bs){
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
788 av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
789 return -1;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
790 }
9592
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
791 if(s->got_extra_bits){
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
792 const int size = s->gb_extra_bits.size_in_bits - get_bits_count(&s->gb_extra_bits);
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
793 const int wanted = s->samples * s->extra_bits << s->stereo_in;
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
794 if(size < wanted){
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
795 av_log(avctx, AV_LOG_ERROR, "Too small EXTRABITS\n");
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
796 s->got_extra_bits = 0;
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
797 }
05661d19f6d2 Check whether extra bits block has enough data.
kostya
parents: 9590
diff changeset
798 }
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
799
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
800 if(s->stereo_in){
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
801 if(bpp == 2)
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
802 samplecount = wv_unpack_stereo(s, &s->gb, samples, 0);
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
803 else
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
804 samplecount = wv_unpack_stereo(s, &s->gb, samples, 1);
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
805 }else{
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
806 if(bpp == 2)
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
807 samplecount = wv_unpack_mono(s, &s->gb, samples, 0);
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
808 else
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
809 samplecount = wv_unpack_mono(s, &s->gb, samples, 1);
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
810 if(s->stereo && bpp == 2){
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
811 int16_t *dst = (int16_t*)samples + samplecount * 2;
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
812 int16_t *src = (int16_t*)samples + samplecount;
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
813 int cnt = samplecount;
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
814 while(cnt--){
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
815 *--dst = *--src;
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
816 *--dst = *src;
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
817 }
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
818 samplecount *= 2;
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
819 }else if(s->stereo){ //32-bit output
9549
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
820 int32_t *dst = (int32_t*)samples + samplecount * 2;
7a51c0815b28 Merge decoding functions for all bitdepths in WavPack decoder
kostya
parents: 9544
diff changeset
821 int32_t *src = (int32_t*)samples + samplecount;
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
822 int cnt = samplecount;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
823 while(cnt--){
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
824 *--dst = *--src;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
825 *--dst = *src;
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
826 }
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
827 samplecount *= 2;
5539
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
828 }
1c67999f81c8 Support for WavPack version 0x410 (false stereo chunks)
kostya
parents: 5538
diff changeset
829 }
9543
a00e7601b584 Add functions for decoding >16 bits WavPack files.
kostya
parents: 9542
diff changeset
830 *data_size = samplecount * bpp;
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
831
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
832 return buf_size;
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
833 }
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
834
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
835 AVCodec wavpack_decoder = {
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
836 "wavpack",
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
837 CODEC_TYPE_AUDIO,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
838 CODEC_ID_WAVPACK,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
839 sizeof(WavpackContext),
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
840 wavpack_decode_init,
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
841 NULL,
5941
d030978bcd93 remove some empty close/init functions in avcodec
aurel
parents: 5607
diff changeset
842 NULL,
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
843 wavpack_decode_frame,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6710
diff changeset
844 .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
3764
6e7dc8fa5f70 WavPack lossless audio decoder
kostya
parents:
diff changeset
845 };