annotate flacenc.c @ 10022:e60ed9255bf4 libavcodec

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