Mercurial > libavcodec.hg
annotate flacenc.c @ 7597:7060f0338be3 libavcodec
G.729 decoder main code
(just skeleton, contains only parts, explicitly ok'ed by Michael)
author | voroshil |
---|---|
date | Sun, 17 Aug 2008 08:43:37 +0000 |
parents | cd6217c9ce92 |
children | 3c07ce8ac9f7 |
rev | line source |
---|---|
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1 /** |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
2 * FLAC audio encoder |
7594
cd6217c9ce92
update my email address to one which does not depend on my service provider
jbr
parents:
7592
diff
changeset
|
3 * Copyright (c) 2006 Justin Ruggles <justin.ruggles@gmail.com> |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
4 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3481
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3481
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3481
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
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:
3481
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3481
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
16 * |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
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:
3481
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
20 */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
21 |
6763 | 22 #include "libavutil/crc.h" |
23 #include "libavutil/lls.h" | |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
24 #include "avcodec.h" |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
25 #include "bitstream.h" |
5737 | 26 #include "dsputil.h" |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
27 #include "golomb.h" |
7589
8b695a99e8df
flacenc, lpc: Move LPC code from flacenc.c to new lpc.[ch] files.
ramiro
parents:
7588
diff
changeset
|
28 #include "lpc.h" |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
29 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
30 #define FLAC_MAX_CH 8 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
31 #define FLAC_MIN_BLOCKSIZE 16 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
32 #define FLAC_MAX_BLOCKSIZE 65535 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
33 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
34 #define FLAC_SUBFRAME_CONSTANT 0 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
35 #define FLAC_SUBFRAME_VERBATIM 1 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
36 #define FLAC_SUBFRAME_FIXED 8 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
37 #define FLAC_SUBFRAME_LPC 32 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
38 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
39 #define FLAC_CHMODE_NOT_STEREO 0 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
40 #define FLAC_CHMODE_LEFT_RIGHT 1 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
41 #define FLAC_CHMODE_LEFT_SIDE 8 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
42 #define FLAC_CHMODE_RIGHT_SIDE 9 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
43 #define FLAC_CHMODE_MID_SIDE 10 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
44 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
45 #define FLAC_STREAMINFO_SIZE 34 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
46 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
47 #define MAX_FIXED_ORDER 4 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
48 #define MAX_PARTITION_ORDER 8 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
49 #define MAX_PARTITIONS (1 << MAX_PARTITION_ORDER) |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
50 #define MAX_LPC_PRECISION 15 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
51 #define MAX_LPC_SHIFT 15 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
52 #define MAX_RICE_PARAM 14 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
53 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
54 typedef struct CompressionOptions { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
55 int compression_level; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
56 int block_time_ms; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
57 int use_lpc; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
58 int lpc_coeff_precision; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
59 int min_prediction_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
60 int max_prediction_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
61 int prediction_order_method; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
62 int min_partition_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
63 int max_partition_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
64 } CompressionOptions; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
65 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
66 typedef struct RiceContext { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
67 int porder; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
68 int params[MAX_PARTITIONS]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
69 } RiceContext; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
70 |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
71 typedef struct FlacSubframe { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
72 int type; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
73 int type_code; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
74 int obits; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
75 int order; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
76 int32_t coefs[MAX_LPC_ORDER]; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
77 int shift; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
78 RiceContext rc; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
79 int32_t samples[FLAC_MAX_BLOCKSIZE]; |
5722 | 80 int32_t residual[FLAC_MAX_BLOCKSIZE+1]; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
81 } FlacSubframe; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
82 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
83 typedef struct FlacFrame { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
84 FlacSubframe subframes[FLAC_MAX_CH]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
85 int blocksize; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
86 int bs_code[2]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
87 uint8_t crc8; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
88 int ch_mode; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
89 } FlacFrame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
90 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
91 typedef struct FlacEncodeContext { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
92 PutBitContext pb; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
93 int channels; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
94 int ch_code; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
95 int samplerate; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
96 int sr_code[2]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
97 int max_framesize; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
98 uint32_t frame_count; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
99 FlacFrame frame; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
100 CompressionOptions options; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
101 AVCodecContext *avctx; |
5737 | 102 DSPContext dsp; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
103 } FlacEncodeContext; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
104 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
105 static const int flac_samplerates[16] = { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
106 0, 0, 0, 0, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
107 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
108 0, 0, 0, 0 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
109 }; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
110 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
111 static const int flac_blocksizes[16] = { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
112 0, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
113 192, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
114 576, 1152, 2304, 4608, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
115 0, 0, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
116 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
117 }; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
118 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
119 /** |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
120 * Writes streaminfo metadata block to byte array |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
121 */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
122 static void write_streaminfo(FlacEncodeContext *s, uint8_t *header) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
123 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
124 PutBitContext pb; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
125 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
126 memset(header, 0, FLAC_STREAMINFO_SIZE); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
127 init_put_bits(&pb, header, FLAC_STREAMINFO_SIZE); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
128 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
129 /* streaminfo metadata block */ |
6548 | 130 put_bits(&pb, 16, s->avctx->frame_size); |
131 put_bits(&pb, 16, s->avctx->frame_size); | |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
132 put_bits(&pb, 24, 0); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
133 put_bits(&pb, 24, s->max_framesize); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
134 put_bits(&pb, 20, s->samplerate); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
135 put_bits(&pb, 3, s->channels-1); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
136 put_bits(&pb, 5, 15); /* bits per sample - 1 */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
137 flush_put_bits(&pb); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
138 /* total samples = 0 */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
139 /* MD5 signature = 0 */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
140 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
141 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
142 /** |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
143 * Sets blocksize based on samplerate |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
144 * Chooses the closest predefined blocksize >= BLOCK_TIME_MS milliseconds |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
145 */ |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
146 static int select_blocksize(int samplerate, int block_time_ms) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
147 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
148 int i; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
149 int target; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
150 int blocksize; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
151 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
152 assert(samplerate > 0); |
3354 | 153 blocksize = flac_blocksizes[1]; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
154 target = (samplerate * block_time_ms) / 1000; |
3354 | 155 for(i=0; i<16; i++) { |
156 if(target >= flac_blocksizes[i] && flac_blocksizes[i] > blocksize) { | |
157 blocksize = flac_blocksizes[i]; | |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
158 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
159 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
160 return blocksize; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
161 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
162 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6341
diff
changeset
|
163 static av_cold int flac_encode_init(AVCodecContext *avctx) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
164 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
165 int freq = avctx->sample_rate; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
166 int channels = avctx->channels; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
167 FlacEncodeContext *s = avctx->priv_data; |
3386 | 168 int i, level; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
169 uint8_t *streaminfo; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
170 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
171 s->avctx = avctx; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
172 |
5737 | 173 dsputil_init(&s->dsp, avctx); |
174 | |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
175 if(avctx->sample_fmt != SAMPLE_FMT_S16) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
176 return -1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
177 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
178 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
179 if(channels < 1 || channels > FLAC_MAX_CH) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
180 return -1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
181 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
182 s->channels = channels; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
183 s->ch_code = s->channels-1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
184 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
185 /* find samplerate in table */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
186 if(freq < 1) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
187 return -1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
188 for(i=4; i<12; i++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
189 if(freq == flac_samplerates[i]) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
190 s->samplerate = flac_samplerates[i]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
191 s->sr_code[0] = i; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
192 s->sr_code[1] = 0; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
193 break; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
194 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
195 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
196 /* if not in table, samplerate is non-standard */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
197 if(i == 12) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
198 if(freq % 1000 == 0 && freq < 255000) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
199 s->sr_code[0] = 12; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
200 s->sr_code[1] = freq / 1000; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
201 } else if(freq % 10 == 0 && freq < 655350) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
202 s->sr_code[0] = 14; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
203 s->sr_code[1] = freq / 10; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
204 } else if(freq < 65535) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
205 s->sr_code[0] = 13; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
206 s->sr_code[1] = freq; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
207 } else { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
208 return -1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
209 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
210 s->samplerate = freq; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
211 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
212 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
213 /* set compression option defaults based on avctx->compression_level */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
214 if(avctx->compression_level < 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
215 s->options.compression_level = 5; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
216 } else { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
217 s->options.compression_level = avctx->compression_level; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
218 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
219 av_log(avctx, AV_LOG_DEBUG, " compression: %d\n", s->options.compression_level); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
220 |
3386 | 221 level= s->options.compression_level; |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
222 if(level > 12) { |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
223 av_log(avctx, AV_LOG_ERROR, "invalid compression level: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
224 s->options.compression_level); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
225 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
226 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
227 |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
228 s->options.block_time_ms = ((int[]){ 27, 27, 27,105,105,105,105,105,105,105,105,105,105})[level]; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
229 s->options.use_lpc = ((int[]){ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})[level]; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
230 s->options.min_prediction_order= ((int[]){ 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})[level]; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
231 s->options.max_prediction_order= ((int[]){ 3, 4, 4, 6, 8, 8, 8, 8, 12, 12, 12, 32, 32})[level]; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
232 s->options.prediction_order_method = ((int[]){ ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST, |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
233 ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST, |
3480
9eb59c4a22d2
Modify preset compression levels to utilize log search.
jbr
parents:
3478
diff
changeset
|
234 ORDER_METHOD_4LEVEL, ORDER_METHOD_LOG, ORDER_METHOD_4LEVEL, |
9eb59c4a22d2
Modify preset compression levels to utilize log search.
jbr
parents:
3478
diff
changeset
|
235 ORDER_METHOD_LOG, ORDER_METHOD_SEARCH, ORDER_METHOD_LOG, |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
236 ORDER_METHOD_SEARCH})[level]; |
3481 | 237 s->options.min_partition_order = ((int[]){ 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})[level]; |
238 s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level]; | |
3386 | 239 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
240 /* set compression option overrides from AVCodecContext */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
241 if(avctx->use_lpc >= 0) { |
4594 | 242 s->options.use_lpc = av_clip(avctx->use_lpc, 0, 11); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
243 } |
3467
33af013504d5
optionally (use_lpc=2) support Cholesky factorization for finding the lpc coeficients
michael
parents:
3464
diff
changeset
|
244 if(s->options.use_lpc == 1) |
33af013504d5
optionally (use_lpc=2) support Cholesky factorization for finding the lpc coeficients
michael
parents:
3464
diff
changeset
|
245 av_log(avctx, AV_LOG_DEBUG, " use lpc: Levinson-Durbin recursion with Welch window\n"); |
33af013504d5
optionally (use_lpc=2) support Cholesky factorization for finding the lpc coeficients
michael
parents:
3464
diff
changeset
|
246 else if(s->options.use_lpc > 1) |
33af013504d5
optionally (use_lpc=2) support Cholesky factorization for finding the lpc coeficients
michael
parents:
3464
diff
changeset
|
247 av_log(avctx, AV_LOG_DEBUG, " use lpc: Cholesky factorization\n"); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
248 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
249 if(avctx->min_prediction_order >= 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
250 if(s->options.use_lpc) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
251 if(avctx->min_prediction_order < MIN_LPC_ORDER || |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
252 avctx->min_prediction_order > MAX_LPC_ORDER) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
253 av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
254 avctx->min_prediction_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
255 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
256 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
257 } else { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
258 if(avctx->min_prediction_order > MAX_FIXED_ORDER) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
259 av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
260 avctx->min_prediction_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
261 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
262 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
263 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
264 s->options.min_prediction_order = avctx->min_prediction_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
265 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
266 if(avctx->max_prediction_order >= 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
267 if(s->options.use_lpc) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
268 if(avctx->max_prediction_order < MIN_LPC_ORDER || |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
269 avctx->max_prediction_order > MAX_LPC_ORDER) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
270 av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
271 avctx->max_prediction_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
272 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
273 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
274 } else { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
275 if(avctx->max_prediction_order > MAX_FIXED_ORDER) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
276 av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
277 avctx->max_prediction_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
278 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
279 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
280 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
281 s->options.max_prediction_order = avctx->max_prediction_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
282 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
283 if(s->options.max_prediction_order < s->options.min_prediction_order) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
284 av_log(avctx, AV_LOG_ERROR, "invalid prediction orders: min=%d max=%d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
285 s->options.min_prediction_order, s->options.max_prediction_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
286 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
287 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
288 av_log(avctx, AV_LOG_DEBUG, " prediction order: %d, %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
289 s->options.min_prediction_order, s->options.max_prediction_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
290 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
291 if(avctx->prediction_order_method >= 0) { |
3478 | 292 if(avctx->prediction_order_method > ORDER_METHOD_LOG) { |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
293 av_log(avctx, AV_LOG_ERROR, "invalid prediction order method: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
294 avctx->prediction_order_method); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
295 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
296 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
297 s->options.prediction_order_method = avctx->prediction_order_method; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
298 } |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
299 switch(s->options.prediction_order_method) { |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
300 case ORDER_METHOD_EST: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
301 "estimate"); break; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
302 case ORDER_METHOD_2LEVEL: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
303 "2-level"); break; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
304 case ORDER_METHOD_4LEVEL: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
305 "4-level"); break; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
306 case ORDER_METHOD_8LEVEL: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
307 "8-level"); break; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
308 case ORDER_METHOD_SEARCH: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
309 "full search"); break; |
3478 | 310 case ORDER_METHOD_LOG: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", |
311 "log search"); break; | |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
312 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
313 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
314 if(avctx->min_partition_order >= 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
315 if(avctx->min_partition_order > MAX_PARTITION_ORDER) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
316 av_log(avctx, AV_LOG_ERROR, "invalid min partition order: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
317 avctx->min_partition_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
318 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
319 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
320 s->options.min_partition_order = avctx->min_partition_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
321 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
322 if(avctx->max_partition_order >= 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
323 if(avctx->max_partition_order > MAX_PARTITION_ORDER) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
324 av_log(avctx, AV_LOG_ERROR, "invalid max partition order: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
325 avctx->max_partition_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
326 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
327 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
328 s->options.max_partition_order = avctx->max_partition_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
329 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
330 if(s->options.max_partition_order < s->options.min_partition_order) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
331 av_log(avctx, AV_LOG_ERROR, "invalid partition orders: min=%d max=%d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
332 s->options.min_partition_order, s->options.max_partition_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
333 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
334 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
335 av_log(avctx, AV_LOG_DEBUG, " partition order: %d, %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
336 s->options.min_partition_order, s->options.max_partition_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
337 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
338 if(avctx->frame_size > 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
339 if(avctx->frame_size < FLAC_MIN_BLOCKSIZE || |
3442
5d133e59ecf2
allows user-settable block size and fixes related typo
jbr
parents:
3397
diff
changeset
|
340 avctx->frame_size > FLAC_MAX_BLOCKSIZE) { |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
341 av_log(avctx, AV_LOG_ERROR, "invalid block size: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
342 avctx->frame_size); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
343 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
344 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
345 } else { |
6548 | 346 s->avctx->frame_size = select_blocksize(s->samplerate, s->options.block_time_ms); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
347 } |
6548 | 348 av_log(avctx, AV_LOG_DEBUG, " block size: %d\n", s->avctx->frame_size); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
349 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
350 /* set LPC precision */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
351 if(avctx->lpc_coeff_precision > 0) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
352 if(avctx->lpc_coeff_precision > MAX_LPC_PRECISION) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
353 av_log(avctx, AV_LOG_ERROR, "invalid lpc coeff precision: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
354 avctx->lpc_coeff_precision); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
355 return -1; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
356 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
357 s->options.lpc_coeff_precision = avctx->lpc_coeff_precision; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
358 } else { |
6545
85acd5166cf8
Use 15-bit LPC precision by default. This generally gives better compression
jbr
parents:
6517
diff
changeset
|
359 /* default LPC precision */ |
85acd5166cf8
Use 15-bit LPC precision by default. This generally gives better compression
jbr
parents:
6517
diff
changeset
|
360 s->options.lpc_coeff_precision = 15; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
361 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
362 av_log(avctx, AV_LOG_DEBUG, " lpc precision: %d\n", |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
363 s->options.lpc_coeff_precision); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
364 |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
365 /* set maximum encoded frame size in verbatim mode */ |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
366 if(s->channels == 2) { |
6548 | 367 s->max_framesize = 14 + ((s->avctx->frame_size * 33 + 7) >> 3); |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
368 } else { |
6548 | 369 s->max_framesize = 14 + (s->avctx->frame_size * s->channels * 2); |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
370 } |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
371 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
372 streaminfo = av_malloc(FLAC_STREAMINFO_SIZE); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
373 write_streaminfo(s, streaminfo); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
374 avctx->extradata = streaminfo; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
375 avctx->extradata_size = FLAC_STREAMINFO_SIZE; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
376 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
377 s->frame_count = 0; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
378 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
379 avctx->coded_frame = avcodec_alloc_frame(); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
380 avctx->coded_frame->key_frame = 1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
381 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
382 return 0; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
383 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
384 |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
385 static void init_frame(FlacEncodeContext *s) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
386 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
387 int i, ch; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
388 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
389 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
390 frame = &s->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
391 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
392 for(i=0; i<16; i++) { |
6548 | 393 if(s->avctx->frame_size == flac_blocksizes[i]) { |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
394 frame->blocksize = flac_blocksizes[i]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
395 frame->bs_code[0] = i; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
396 frame->bs_code[1] = 0; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
397 break; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
398 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
399 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
400 if(i == 16) { |
6548 | 401 frame->blocksize = s->avctx->frame_size; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
402 if(frame->blocksize <= 256) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
403 frame->bs_code[0] = 6; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
404 frame->bs_code[1] = frame->blocksize-1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
405 } else { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
406 frame->bs_code[0] = 7; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
407 frame->bs_code[1] = frame->blocksize-1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
408 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
409 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
410 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
411 for(ch=0; ch<s->channels; ch++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
412 frame->subframes[ch].obits = 16; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
413 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
414 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
415 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
416 /** |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
417 * Copy channel-interleaved input samples into separate subframes |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
418 */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
419 static void copy_samples(FlacEncodeContext *s, int16_t *samples) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
420 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
421 int i, j, ch; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
422 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
423 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
424 frame = &s->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
425 for(i=0,j=0; i<frame->blocksize; i++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
426 for(ch=0; ch<s->channels; ch++,j++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
427 frame->subframes[ch].samples[i] = samples[j]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
428 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
429 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
430 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
431 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
432 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
433 #define rice_encode_count(sum, n, k) (((n)*((k)+1))+((sum-(n>>1))>>(k))) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
434 |
5732
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
435 /** |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
436 * Solve for d/dk(rice_encode_count) = n-((sum-(n>>1))>>(k+1)) = 0 |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
437 */ |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
438 static int find_optimal_param(uint32_t sum, int n) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
439 { |
5732
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
440 int k; |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
441 uint32_t sum2; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
442 |
5732
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
443 if(sum <= n>>1) |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
444 return 0; |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
445 sum2 = sum-(n>>1); |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
446 k = av_log2(n<256 ? FASTDIV(sum2,n) : sum2/n); |
d6fc148d1a48
replace brute force find_optimal_param() with a closed-form solution.
lorenm
parents:
5731
diff
changeset
|
447 return FFMIN(k, MAX_RICE_PARAM); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
448 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
449 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
450 static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder, |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
451 uint32_t *sums, int n, int pred_order) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
452 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
453 int i; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
454 int k, cnt, part; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
455 uint32_t all_bits; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
456 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
457 part = (1 << porder); |
5852 | 458 all_bits = 4 * part; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
459 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
460 cnt = (n >> porder) - pred_order; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
461 for(i=0; i<part; i++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
462 k = find_optimal_param(sums[i], cnt); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
463 rc->params[i] = k; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
464 all_bits += rice_encode_count(sums[i], cnt, k); |
5852 | 465 cnt = n >> porder; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
466 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
467 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
468 rc->porder = porder; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
469 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
470 return all_bits; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
471 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
472 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
473 static void calc_sums(int pmin, int pmax, uint32_t *data, int n, int pred_order, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
474 uint32_t sums[][MAX_PARTITIONS]) |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
475 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
476 int i, j; |
3384 | 477 int parts; |
478 uint32_t *res, *res_end; | |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
479 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
480 /* sums for highest level */ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
481 parts = (1 << pmax); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
482 res = &data[pred_order]; |
3384 | 483 res_end = &data[n >> pmax]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
484 for(i=0; i<parts; i++) { |
5731
976b4c5e68bb
gcc isn't smart enough to factor out duplicate stores
lorenm
parents:
5729
diff
changeset
|
485 uint32_t sum = 0; |
3384 | 486 while(res < res_end){ |
5731
976b4c5e68bb
gcc isn't smart enough to factor out duplicate stores
lorenm
parents:
5729
diff
changeset
|
487 sum += *(res++); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
488 } |
5731
976b4c5e68bb
gcc isn't smart enough to factor out duplicate stores
lorenm
parents:
5729
diff
changeset
|
489 sums[pmax][i] = sum; |
3384 | 490 res_end+= n >> pmax; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
491 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
492 /* sums for lower levels */ |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
493 for(i=pmax-1; i>=pmin; i--) { |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
494 parts = (1 << i); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
495 for(j=0; j<parts; j++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
496 sums[i][j] = sums[i+1][2*j] + sums[i+1][2*j+1]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
497 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
498 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
499 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
500 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
501 static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
502 int32_t *data, int n, int pred_order) |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
503 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
504 int i; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
505 uint32_t bits[MAX_PARTITION_ORDER+1]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
506 int opt_porder; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
507 RiceContext tmp_rc; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
508 uint32_t *udata; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
509 uint32_t sums[MAX_PARTITION_ORDER+1][MAX_PARTITIONS]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
510 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
511 assert(pmin >= 0 && pmin <= MAX_PARTITION_ORDER); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
512 assert(pmax >= 0 && pmax <= MAX_PARTITION_ORDER); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
513 assert(pmin <= pmax); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
514 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
515 udata = av_malloc(n * sizeof(uint32_t)); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
516 for(i=0; i<n; i++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
517 udata[i] = (2*data[i]) ^ (data[i]>>31); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
518 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
519 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
520 calc_sums(pmin, pmax, udata, n, pred_order, sums); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
521 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
522 opt_porder = pmin; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
523 bits[pmin] = UINT32_MAX; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
524 for(i=pmin; i<=pmax; i++) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
525 bits[i] = calc_optimal_rice_params(&tmp_rc, i, sums[i], n, pred_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
526 if(bits[i] <= bits[opt_porder]) { |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
527 opt_porder = i; |
3387 | 528 *rc= tmp_rc; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
529 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
530 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
531 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
532 av_freep(&udata); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
533 return bits[opt_porder]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
534 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
535 |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
536 static int get_max_p_order(int max_porder, int n, int order) |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
537 { |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
538 int porder = FFMIN(max_porder, av_log2(n^(n-1))); |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
539 if(order > 0) |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
540 porder = FFMIN(porder, av_log2(n/order)); |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
541 return porder; |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
542 } |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
543 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
544 static uint32_t calc_rice_params_fixed(RiceContext *rc, int pmin, int pmax, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
545 int32_t *data, int n, int pred_order, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
546 int bps) |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
547 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
548 uint32_t bits; |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
549 pmin = get_max_p_order(pmin, n, pred_order); |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
550 pmax = get_max_p_order(pmax, n, pred_order); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
551 bits = pred_order*bps + 6; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
552 bits += calc_rice_params(rc, pmin, pmax, data, n, pred_order); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
553 return bits; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
554 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
555 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
556 static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
557 int32_t *data, int n, int pred_order, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
558 int bps, int precision) |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
559 { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
560 uint32_t bits; |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
561 pmin = get_max_p_order(pmin, n, pred_order); |
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
562 pmax = get_max_p_order(pmax, n, pred_order); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
563 bits = pred_order*bps + 4 + 5 + pred_order*precision + 6; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
564 bits += calc_rice_params(rc, pmin, pmax, data, n, pred_order); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
565 return bits; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
566 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
567 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
568 /** |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
569 * Apply Welch window function to audio block |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
570 */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
571 static void apply_welch_window(const int32_t *data, int len, double *w_data) |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
572 { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
573 int i, n2; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
574 double w; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
575 double c; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
576 |
6341 | 577 assert(!(len&1)); //the optimization in r11881 does not support odd len |
578 //if someone wants odd len extend the change in r11881 | |
579 | |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
580 n2 = (len >> 1); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
581 c = 2.0 / (len - 1.0); |
6338 | 582 |
583 w_data+=n2; | |
584 data+=n2; | |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
585 for(i=0; i<n2; i++) { |
6338 | 586 w = c - n2 + i; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
587 w = 1.0 - (w * w); |
6338 | 588 w_data[-i-1] = data[-i-1] * w; |
589 w_data[+i ] = data[+i ] * w; | |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
590 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
591 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
592 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
593 /** |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
594 * Calculates autocorrelation data from audio samples |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
595 * A Welch window function is applied before calculation. |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
596 */ |
5737 | 597 void ff_flac_compute_autocorr(const int32_t *data, int len, int lag, |
598 double *autoc) | |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
599 { |
5729 | 600 int i, j; |
5733
c2f88af57c16
was computing one more autocorrelation coefficient that was actually used
lorenm
parents:
5732
diff
changeset
|
601 double tmp[len + lag + 1]; |
3388 | 602 double *data1= tmp + lag; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
603 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
604 apply_welch_window(data, len, data1); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
605 |
5729 | 606 for(j=0; j<lag; j++) |
607 data1[j-lag]= 0.0; | |
5733
c2f88af57c16
was computing one more autocorrelation coefficient that was actually used
lorenm
parents:
5732
diff
changeset
|
608 data1[len] = 0.0; |
5729 | 609 |
610 for(j=0; j<lag; j+=2){ | |
611 double sum0 = 1.0, sum1 = 1.0; | |
612 for(i=0; i<len; i++){ | |
613 sum0 += data1[i] * data1[i-j]; | |
614 sum1 += data1[i] * data1[i-j-1]; | |
615 } | |
616 autoc[j ] = sum0; | |
617 autoc[j+1] = sum1; | |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
618 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
619 |
5729 | 620 if(j==lag){ |
621 double sum = 1.0; | |
5733
c2f88af57c16
was computing one more autocorrelation coefficient that was actually used
lorenm
parents:
5732
diff
changeset
|
622 for(i=0; i<len; i+=2){ |
c2f88af57c16
was computing one more autocorrelation coefficient that was actually used
lorenm
parents:
5732
diff
changeset
|
623 sum += data1[i ] * data1[i-j ] |
c2f88af57c16
was computing one more autocorrelation coefficient that was actually used
lorenm
parents:
5732
diff
changeset
|
624 + data1[i+1] * data1[i-j+1]; |
c2f88af57c16
was computing one more autocorrelation coefficient that was actually used
lorenm
parents:
5732
diff
changeset
|
625 } |
5729 | 626 autoc[j] = sum; |
3388 | 627 } |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
628 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
629 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
630 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
631 static void encode_residual_verbatim(int32_t *res, int32_t *smp, int n) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
632 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
633 assert(n > 0); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
634 memcpy(res, smp, n * sizeof(int32_t)); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
635 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
636 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
637 static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
638 int order) |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
639 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
640 int i; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
641 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
642 for(i=0; i<order; i++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
643 res[i] = smp[i]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
644 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
645 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
646 if(order==0){ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
647 for(i=order; i<n; i++) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
648 res[i]= smp[i]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
649 }else if(order==1){ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
650 for(i=order; i<n; i++) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
651 res[i]= smp[i] - smp[i-1]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
652 }else if(order==2){ |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
653 int a = smp[order-1] - smp[order-2]; |
5739
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
654 for(i=order; i<n; i+=2) { |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
655 int b = smp[i] - smp[i-1]; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
656 res[i]= b - a; |
5739
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
657 a = smp[i+1] - smp[i]; |
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
658 res[i+1]= a - b; |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
659 } |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
660 }else if(order==3){ |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
661 int a = smp[order-1] - smp[order-2]; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
662 int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; |
5739
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
663 for(i=order; i<n; i+=2) { |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
664 int b = smp[i] - smp[i-1]; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
665 int d = b - a; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
666 res[i]= d - c; |
5739
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
667 a = smp[i+1] - smp[i]; |
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
668 c = a - b; |
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
669 res[i+1]= c - d; |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
670 } |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
671 }else{ |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
672 int a = smp[order-1] - smp[order-2]; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
673 int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
674 int e = smp[order-1] - 3*smp[order-2] + 3*smp[order-3] - smp[order-4]; |
5739
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
675 for(i=order; i<n; i+=2) { |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
676 int b = smp[i] - smp[i-1]; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
677 int d = b - a; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
678 int f = d - c; |
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
679 res[i]= f - e; |
5739
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
680 a = smp[i+1] - smp[i]; |
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
681 c = a - b; |
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
682 e = c - d; |
832a3152d38e
unroll finite differences to avoid swapping registers.
lorenm
parents:
5738
diff
changeset
|
683 res[i+1]= e - f; |
5738
c1a4aae5adb4
encode_residual_fixed(): replace FIR with finite differences.
lorenm
parents:
5737
diff
changeset
|
684 } |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
685 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
686 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
687 |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
688 #define LPC1(x) {\ |
5742 | 689 int c = coefs[(x)-1];\ |
690 p0 += c*s;\ | |
691 s = smp[i-(x)+1];\ | |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
692 p1 += c*s;\ |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
693 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
694 |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
695 static av_always_inline void encode_residual_lpc_unrolled( |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
696 int32_t *res, const int32_t *smp, int n, |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
697 int order, const int32_t *coefs, int shift, int big) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
698 { |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
699 int i; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
700 for(i=order; i<n; i+=2) { |
5742 | 701 int s = smp[i-order]; |
702 int p0 = 0, p1 = 0; | |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
703 if(big) { |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
704 switch(order) { |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
705 case 32: LPC1(32) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
706 case 31: LPC1(31) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
707 case 30: LPC1(30) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
708 case 29: LPC1(29) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
709 case 28: LPC1(28) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
710 case 27: LPC1(27) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
711 case 26: LPC1(26) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
712 case 25: LPC1(25) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
713 case 24: LPC1(24) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
714 case 23: LPC1(23) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
715 case 22: LPC1(22) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
716 case 21: LPC1(21) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
717 case 20: LPC1(20) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
718 case 19: LPC1(19) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
719 case 18: LPC1(18) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
720 case 17: LPC1(17) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
721 case 16: LPC1(16) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
722 case 15: LPC1(15) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
723 case 14: LPC1(14) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
724 case 13: LPC1(13) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
725 case 12: LPC1(12) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
726 case 11: LPC1(11) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
727 case 10: LPC1(10) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
728 case 9: LPC1( 9) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
729 LPC1( 8) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
730 LPC1( 7) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
731 LPC1( 6) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
732 LPC1( 5) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
733 LPC1( 4) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
734 LPC1( 3) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
735 LPC1( 2) |
5742 | 736 LPC1( 1) |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
737 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
738 } else { |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
739 switch(order) { |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
740 case 8: LPC1( 8) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
741 case 7: LPC1( 7) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
742 case 6: LPC1( 6) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
743 case 5: LPC1( 5) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
744 case 4: LPC1( 4) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
745 case 3: LPC1( 3) |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
746 case 2: LPC1( 2) |
5742 | 747 case 1: LPC1( 1) |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
748 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
749 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
750 res[i ] = smp[i ] - (p0 >> shift); |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
751 res[i+1] = smp[i+1] - (p1 >> shift); |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
752 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
753 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
754 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
755 static void encode_residual_lpc(int32_t *res, const int32_t *smp, int n, |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
756 int order, const int32_t *coefs, int shift) |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
757 { |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
758 int i; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
759 for(i=0; i<order; i++) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
760 res[i] = smp[i]; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
761 } |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
762 #ifdef CONFIG_SMALL |
5720 | 763 for(i=order; i<n; i+=2) { |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
764 int j; |
5742 | 765 int s = smp[i]; |
766 int p0 = 0, p1 = 0; | |
767 for(j=0; j<order; j++) { | |
768 int c = coefs[j]; | |
769 p1 += c*s; | |
770 s = smp[i-j-1]; | |
5720 | 771 p0 += c*s; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
772 } |
5742 | 773 res[i ] = smp[i ] - (p0 >> shift); |
5720 | 774 res[i+1] = smp[i+1] - (p1 >> shift); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
775 } |
5724
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
776 #else |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
777 switch(order) { |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
778 case 1: encode_residual_lpc_unrolled(res, smp, n, 1, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
779 case 2: encode_residual_lpc_unrolled(res, smp, n, 2, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
780 case 3: encode_residual_lpc_unrolled(res, smp, n, 3, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
781 case 4: encode_residual_lpc_unrolled(res, smp, n, 4, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
782 case 5: encode_residual_lpc_unrolled(res, smp, n, 5, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
783 case 6: encode_residual_lpc_unrolled(res, smp, n, 6, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
784 case 7: encode_residual_lpc_unrolled(res, smp, n, 7, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
785 case 8: encode_residual_lpc_unrolled(res, smp, n, 8, coefs, shift, 0); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
786 default: encode_residual_lpc_unrolled(res, smp, n, order, coefs, shift, 1); break; |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
787 } |
96d1b6c30aad
unroll encode_residual_lpc(). speedup varies between 1.2x and 1.8x depending on lpc order.
lorenm
parents:
5722
diff
changeset
|
788 #endif |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
789 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
790 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
791 static int encode_residual(FlacEncodeContext *ctx, int ch) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
792 { |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
793 int i, n; |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
794 int min_order, max_order, opt_order, precision, omethod; |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
795 int min_porder, max_porder; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
796 FlacFrame *frame; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
797 FlacSubframe *sub; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
798 int32_t coefs[MAX_LPC_ORDER][MAX_LPC_ORDER]; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
799 int shift[MAX_LPC_ORDER]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
800 int32_t *res, *smp; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
801 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
802 frame = &ctx->frame; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
803 sub = &frame->subframes[ch]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
804 res = sub->residual; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
805 smp = sub->samples; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
806 n = frame->blocksize; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
807 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
808 /* CONSTANT */ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
809 for(i=1; i<n; i++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
810 if(smp[i] != smp[0]) break; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
811 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
812 if(i == n) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
813 sub->type = sub->type_code = FLAC_SUBFRAME_CONSTANT; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
814 res[0] = smp[0]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
815 return sub->obits; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
816 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
817 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
818 /* VERBATIM */ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
819 if(n < 5) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
820 sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
821 encode_residual_verbatim(res, smp, n); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
822 return sub->obits * n; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
823 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
824 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
825 min_order = ctx->options.min_prediction_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
826 max_order = ctx->options.max_prediction_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
827 min_porder = ctx->options.min_partition_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
828 max_porder = ctx->options.max_partition_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
829 precision = ctx->options.lpc_coeff_precision; |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
830 omethod = ctx->options.prediction_order_method; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
831 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
832 /* FIXED */ |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
833 if(!ctx->options.use_lpc || max_order == 0 || (n <= max_order)) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
834 uint32_t bits[MAX_FIXED_ORDER+1]; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
835 if(max_order > MAX_FIXED_ORDER) max_order = MAX_FIXED_ORDER; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
836 opt_order = 0; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
837 bits[0] = UINT32_MAX; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
838 for(i=min_order; i<=max_order; i++) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
839 encode_residual_fixed(res, smp, n, i); |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
840 bits[i] = calc_rice_params_fixed(&sub->rc, min_porder, max_porder, res, |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
841 n, i, sub->obits); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
842 if(bits[i] < bits[opt_order]) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
843 opt_order = i; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
844 } |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
845 } |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
846 sub->order = opt_order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
847 sub->type = FLAC_SUBFRAME_FIXED; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
848 sub->type_code = sub->type | sub->order; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
849 if(sub->order != max_order) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
850 encode_residual_fixed(res, smp, n, sub->order); |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
851 return calc_rice_params_fixed(&sub->rc, min_porder, max_porder, res, n, |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
852 sub->order, sub->obits); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
853 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
854 return bits[sub->order]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
855 } |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
856 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
857 /* LPC */ |
7592 | 858 opt_order = ff_lpc_calc_coefs(&ctx->dsp, smp, n, min_order, max_order, |
859 precision, coefs, shift, ctx->options.use_lpc, | |
860 omethod, MAX_LPC_SHIFT, 0); | |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
861 |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
862 if(omethod == ORDER_METHOD_2LEVEL || |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
863 omethod == ORDER_METHOD_4LEVEL || |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
864 omethod == ORDER_METHOD_8LEVEL) { |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
865 int levels = 1 << omethod; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
866 uint32_t bits[levels]; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
867 int order; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
868 int opt_index = levels-1; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
869 opt_order = max_order-1; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
870 bits[opt_index] = UINT32_MAX; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
871 for(i=levels-1; i>=0; i--) { |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
872 order = min_order + (((max_order-min_order+1) * (i+1)) / levels)-1; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
873 if(order < 0) order = 0; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
874 encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]); |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
875 bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder, |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
876 res, n, order+1, sub->obits, precision); |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
877 if(bits[i] < bits[opt_index]) { |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
878 opt_index = i; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
879 opt_order = order; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
880 } |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
881 } |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
882 opt_order++; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
883 } else if(omethod == ORDER_METHOD_SEARCH) { |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
884 // brute-force optimal order search |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
885 uint32_t bits[MAX_LPC_ORDER]; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
886 opt_order = 0; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
887 bits[0] = UINT32_MAX; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
888 for(i=min_order-1; i<max_order; i++) { |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
889 encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
890 bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder, |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
891 res, n, i+1, sub->obits, precision); |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
892 if(bits[i] < bits[opt_order]) { |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
893 opt_order = i; |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
894 } |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
895 } |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
896 opt_order++; |
3478 | 897 } else if(omethod == ORDER_METHOD_LOG) { |
898 uint32_t bits[MAX_LPC_ORDER]; | |
899 int step; | |
900 | |
901 opt_order= min_order - 1 + (max_order-min_order)/3; | |
902 memset(bits, -1, sizeof(bits)); | |
903 | |
904 for(step=16 ;step; step>>=1){ | |
905 int last= opt_order; | |
906 for(i=last-step; i<=last+step; i+= step){ | |
907 if(i<min_order-1 || i>=max_order || bits[i] < UINT32_MAX) | |
908 continue; | |
909 encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); | |
910 bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder, | |
911 res, n, i+1, sub->obits, precision); | |
912 if(bits[i] < bits[opt_order]) | |
913 opt_order= i; | |
914 } | |
915 } | |
916 opt_order++; | |
3477
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
917 } |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
918 |
30ac8a424448
Add lpc order search. This creates new compression levels 6 to 12.
jbr
parents:
3473
diff
changeset
|
919 sub->order = opt_order; |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
920 sub->type = FLAC_SUBFRAME_LPC; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
921 sub->type_code = sub->type | (sub->order-1); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
922 sub->shift = shift[sub->order-1]; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
923 for(i=0; i<sub->order; i++) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
924 sub->coefs[i] = coefs[sub->order-1][i]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
925 } |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
926 encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift); |
3397
bdfc530c417c
porder patch by (Justin Ruggles jruggle a t earthlink d ot net)
michael
parents:
3390
diff
changeset
|
927 return calc_rice_params_lpc(&sub->rc, min_porder, max_porder, res, n, sub->order, |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
928 sub->obits, precision); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
929 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
930 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
931 static int encode_residual_v(FlacEncodeContext *ctx, int ch) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
932 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
933 int i, n; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
934 FlacFrame *frame; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
935 FlacSubframe *sub; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
936 int32_t *res, *smp; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
937 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
938 frame = &ctx->frame; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
939 sub = &frame->subframes[ch]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
940 res = sub->residual; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
941 smp = sub->samples; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
942 n = frame->blocksize; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
943 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
944 /* CONSTANT */ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
945 for(i=1; i<n; i++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
946 if(smp[i] != smp[0]) break; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
947 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
948 if(i == n) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
949 sub->type = sub->type_code = FLAC_SUBFRAME_CONSTANT; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
950 res[0] = smp[0]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
951 return sub->obits; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
952 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
953 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
954 /* VERBATIM */ |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
955 sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
956 encode_residual_verbatim(res, smp, n); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
957 return sub->obits * n; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
958 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
959 |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
960 static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n) |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
961 { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
962 int i, best; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
963 int32_t lt, rt; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
964 uint64_t sum[4]; |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
965 uint64_t score[4]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
966 int k; |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
967 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
968 /* calculate sum of 2nd order residual for each channel */ |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
969 sum[0] = sum[1] = sum[2] = sum[3] = 0; |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
970 for(i=2; i<n; i++) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
971 lt = left_ch[i] - 2*left_ch[i-1] + left_ch[i-2]; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
972 rt = right_ch[i] - 2*right_ch[i-1] + right_ch[i-2]; |
4001 | 973 sum[2] += FFABS((lt + rt) >> 1); |
974 sum[3] += FFABS(lt - rt); | |
975 sum[0] += FFABS(lt); | |
976 sum[1] += FFABS(rt); | |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
977 } |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
978 /* estimate bit counts */ |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
979 for(i=0; i<4; i++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
980 k = find_optimal_param(2*sum[i], n); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
981 sum[i] = rice_encode_count(2*sum[i], n, k); |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
982 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
983 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
984 /* calculate score for each mode */ |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
985 score[0] = sum[0] + sum[1]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
986 score[1] = sum[0] + sum[3]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
987 score[2] = sum[1] + sum[3]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
988 score[3] = sum[2] + sum[3]; |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
989 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
990 /* return mode with lowest score */ |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
991 best = 0; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
992 for(i=1; i<4; i++) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
993 if(score[i] < score[best]) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
994 best = i; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
995 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
996 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
997 if(best == 0) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
998 return FLAC_CHMODE_LEFT_RIGHT; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
999 } else if(best == 1) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1000 return FLAC_CHMODE_LEFT_SIDE; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1001 } else if(best == 2) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1002 return FLAC_CHMODE_RIGHT_SIDE; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1003 } else { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1004 return FLAC_CHMODE_MID_SIDE; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1005 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1006 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1007 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1008 /** |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1009 * Perform stereo channel decorrelation |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1010 */ |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1011 static void channel_decorrelation(FlacEncodeContext *ctx) |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1012 { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1013 FlacFrame *frame; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1014 int32_t *left, *right; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1015 int i, n; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1016 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1017 frame = &ctx->frame; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1018 n = frame->blocksize; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1019 left = frame->subframes[0].samples; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1020 right = frame->subframes[1].samples; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1021 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1022 if(ctx->channels != 2) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1023 frame->ch_mode = FLAC_CHMODE_NOT_STEREO; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1024 return; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1025 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1026 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1027 frame->ch_mode = estimate_stereo_mode(left, right, n); |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1028 |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1029 /* perform decorrelation and adjust bits-per-sample */ |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1030 if(frame->ch_mode == FLAC_CHMODE_LEFT_RIGHT) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1031 return; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1032 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1033 if(frame->ch_mode == FLAC_CHMODE_MID_SIDE) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1034 int32_t tmp; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1035 for(i=0; i<n; i++) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1036 tmp = left[i]; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1037 left[i] = (tmp + right[i]) >> 1; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1038 right[i] = tmp - right[i]; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1039 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1040 frame->subframes[1].obits++; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1041 } else if(frame->ch_mode == FLAC_CHMODE_LEFT_SIDE) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1042 for(i=0; i<n; i++) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1043 right[i] = left[i] - right[i]; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1044 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1045 frame->subframes[1].obits++; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1046 } else { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1047 for(i=0; i<n; i++) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1048 left[i] -= right[i]; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1049 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1050 frame->subframes[0].obits++; |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1051 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1052 } |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1053 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1054 static void write_utf8(PutBitContext *pb, uint32_t val) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1055 { |
4149
3118e8afb8a5
Fix ASF format parser's broken UTF-16 string handling
gpoirier
parents:
4001
diff
changeset
|
1056 uint8_t tmp; |
3118e8afb8a5
Fix ASF format parser's broken UTF-16 string handling
gpoirier
parents:
4001
diff
changeset
|
1057 PUT_UTF8(val, tmp, put_bits(pb, 8, tmp);) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1058 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1059 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1060 static void output_frame_header(FlacEncodeContext *s) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1061 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1062 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1063 int crc; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1064 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1065 frame = &s->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1066 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1067 put_bits(&s->pb, 16, 0xFFF8); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1068 put_bits(&s->pb, 4, frame->bs_code[0]); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1069 put_bits(&s->pb, 4, s->sr_code[0]); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1070 if(frame->ch_mode == FLAC_CHMODE_NOT_STEREO) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1071 put_bits(&s->pb, 4, s->ch_code); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1072 } else { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1073 put_bits(&s->pb, 4, frame->ch_mode); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1074 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1075 put_bits(&s->pb, 3, 4); /* bits-per-sample code */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1076 put_bits(&s->pb, 1, 0); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1077 write_utf8(&s->pb, s->frame_count); |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1078 if(frame->bs_code[0] == 6) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1079 put_bits(&s->pb, 8, frame->bs_code[1]); |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1080 } else if(frame->bs_code[0] == 7) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1081 put_bits(&s->pb, 16, frame->bs_code[1]); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1082 } |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1083 if(s->sr_code[0] == 12) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1084 put_bits(&s->pb, 8, s->sr_code[1]); |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1085 } else if(s->sr_code[0] > 12) { |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1086 put_bits(&s->pb, 16, s->sr_code[1]); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1087 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1088 flush_put_bits(&s->pb); |
6108 | 1089 crc = av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, |
1090 s->pb.buf, put_bits_count(&s->pb)>>3); | |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1091 put_bits(&s->pb, 8, crc); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1092 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1093 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1094 static void output_subframe_constant(FlacEncodeContext *s, int ch) |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1095 { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1096 FlacSubframe *sub; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1097 int32_t res; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1098 |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1099 sub = &s->frame.subframes[ch]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1100 res = sub->residual[0]; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1101 put_sbits(&s->pb, sub->obits, res); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1102 } |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1103 |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1104 static void output_subframe_verbatim(FlacEncodeContext *s, int ch) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1105 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1106 int i; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1107 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1108 FlacSubframe *sub; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1109 int32_t res; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1110 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1111 frame = &s->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1112 sub = &frame->subframes[ch]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1113 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1114 for(i=0; i<frame->blocksize; i++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1115 res = sub->residual[i]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1116 put_sbits(&s->pb, sub->obits, res); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1117 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1118 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1119 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1120 static void output_residual(FlacEncodeContext *ctx, int ch) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1121 { |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1122 int i, j, p, n, parts; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1123 int k, porder, psize, res_cnt; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1124 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1125 FlacSubframe *sub; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1126 int32_t *res; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1127 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1128 frame = &ctx->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1129 sub = &frame->subframes[ch]; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1130 res = sub->residual; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1131 n = frame->blocksize; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1132 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1133 /* rice-encoded block */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1134 put_bits(&ctx->pb, 2, 0); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1135 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1136 /* partition order */ |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1137 porder = sub->rc.porder; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1138 psize = n >> porder; |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1139 parts = (1 << porder); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1140 put_bits(&ctx->pb, 4, porder); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1141 res_cnt = psize - sub->order; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1142 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1143 /* residual */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1144 j = sub->order; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1145 for(p=0; p<parts; p++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1146 k = sub->rc.params[p]; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1147 put_bits(&ctx->pb, 4, k); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1148 if(p == 1) res_cnt = psize; |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1149 for(i=0; i<res_cnt && j<n; i++, j++) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1150 set_sr_golomb_flac(&ctx->pb, res[j], k, INT32_MAX, 0); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1151 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1152 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1153 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1154 |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1155 static void output_subframe_fixed(FlacEncodeContext *ctx, int ch) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1156 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1157 int i; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1158 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1159 FlacSubframe *sub; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1160 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1161 frame = &ctx->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1162 sub = &frame->subframes[ch]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1163 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1164 /* warm-up samples */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1165 for(i=0; i<sub->order; i++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1166 put_sbits(&ctx->pb, sub->obits, sub->residual[i]); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1167 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1168 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1169 /* residual */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1170 output_residual(ctx, ch); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1171 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1172 |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1173 static void output_subframe_lpc(FlacEncodeContext *ctx, int ch) |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1174 { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1175 int i, cbits; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1176 FlacFrame *frame; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1177 FlacSubframe *sub; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1178 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1179 frame = &ctx->frame; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1180 sub = &frame->subframes[ch]; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1181 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1182 /* warm-up samples */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1183 for(i=0; i<sub->order; i++) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1184 put_sbits(&ctx->pb, sub->obits, sub->residual[i]); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1185 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1186 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1187 /* LPC coefficients */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1188 cbits = ctx->options.lpc_coeff_precision; |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1189 put_bits(&ctx->pb, 4, cbits-1); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1190 put_sbits(&ctx->pb, 5, sub->shift); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1191 for(i=0; i<sub->order; i++) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1192 put_sbits(&ctx->pb, cbits, sub->coefs[i]); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1193 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1194 |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1195 /* residual */ |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1196 output_residual(ctx, ch); |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1197 } |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1198 |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1199 static void output_subframes(FlacEncodeContext *s) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1200 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1201 FlacFrame *frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1202 FlacSubframe *sub; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1203 int ch; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1204 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1205 frame = &s->frame; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1206 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1207 for(ch=0; ch<s->channels; ch++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1208 sub = &frame->subframes[ch]; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1209 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1210 /* subframe header */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1211 put_bits(&s->pb, 1, 0); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1212 put_bits(&s->pb, 6, sub->type_code); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1213 put_bits(&s->pb, 1, 0); /* no wasted bits */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1214 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1215 /* subframe */ |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1216 if(sub->type == FLAC_SUBFRAME_CONSTANT) { |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1217 output_subframe_constant(s, ch); |
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1218 } else if(sub->type == FLAC_SUBFRAME_VERBATIM) { |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1219 output_subframe_verbatim(s, ch); |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1220 } else if(sub->type == FLAC_SUBFRAME_FIXED) { |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1221 output_subframe_fixed(s, ch); |
3385
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1222 } else if(sub->type == FLAC_SUBFRAME_LPC) { |
340e5d35b326
flac-lpc patch by (Justin Ruggles jruggle earthlink net)
michael
parents:
3384
diff
changeset
|
1223 output_subframe_lpc(s, ch); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1224 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1225 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1226 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1227 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1228 static void output_frame_footer(FlacEncodeContext *s) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1229 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1230 int crc; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1231 flush_put_bits(&s->pb); |
6108 | 1232 crc = bswap_16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, |
1233 s->pb.buf, put_bits_count(&s->pb)>>3)); | |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1234 put_bits(&s->pb, 16, crc); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1235 flush_put_bits(&s->pb); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1236 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1237 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1238 static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1239 int buf_size, void *data) |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1240 { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1241 int ch; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1242 FlacEncodeContext *s; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1243 int16_t *samples = data; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1244 int out_bytes; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1245 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1246 s = avctx->priv_data; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1247 |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1248 init_frame(s); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1249 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1250 copy_samples(s, samples); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1251 |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1252 channel_decorrelation(s); |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1253 |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1254 for(ch=0; ch<s->channels; ch++) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1255 encode_residual(s, ch); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1256 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1257 init_put_bits(&s->pb, frame, buf_size); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1258 output_frame_header(s); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1259 output_subframes(s); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1260 output_frame_footer(s); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1261 out_bytes = put_bits_count(&s->pb) >> 3; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1262 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1263 if(out_bytes > s->max_framesize || out_bytes >= buf_size) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1264 /* frame too large. use verbatim mode */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1265 for(ch=0; ch<s->channels; ch++) { |
3365
84f29207af3a
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
michael
parents:
3358
diff
changeset
|
1266 encode_residual_v(s, ch); |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1267 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1268 init_put_bits(&s->pb, frame, buf_size); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1269 output_frame_header(s); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1270 output_subframes(s); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1271 output_frame_footer(s); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1272 out_bytes = put_bits_count(&s->pb) >> 3; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1273 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1274 if(out_bytes > s->max_framesize || out_bytes >= buf_size) { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1275 /* still too large. must be an error. */ |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1276 av_log(avctx, AV_LOG_ERROR, "error encoding frame\n"); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1277 return -1; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1278 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1279 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1280 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1281 s->frame_count++; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1282 return out_bytes; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1283 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1284 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6341
diff
changeset
|
1285 static av_cold int flac_encode_close(AVCodecContext *avctx) |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1286 { |
3358
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1287 av_freep(&avctx->extradata); |
4ae69b5b596b
stereo decorrelation support by (Justin Ruggles jruggle earthlink net>)
michael
parents:
3357
diff
changeset
|
1288 avctx->extradata_size = 0; |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1289 av_freep(&avctx->coded_frame); |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1290 return 0; |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1291 } |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1292 |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1293 AVCodec flac_encoder = { |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1294 "flac", |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1295 CODEC_TYPE_AUDIO, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1296 CODEC_ID_FLAC, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1297 sizeof(FlacEncodeContext), |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1298 flac_encode_init, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1299 flac_encode_frame, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1300 flac_encode_close, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1301 NULL, |
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1302 .capabilities = CODEC_CAP_SMALL_LAST_FRAME, |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7260
diff
changeset
|
1303 .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6763
diff
changeset
|
1304 .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), |
3353
5b901881d6ed
first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder
michael
parents:
diff
changeset
|
1305 }; |