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