annotate flacdec.c @ 9152:788aa0c09382 libavcodec

VQF demuxer
author vitor
date Sat, 07 Mar 2009 22:42:09 +0000
parents b980183eb831
children f534d0cca450
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
1 /*
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
2 * FLAC (Free Lossless Audio Codec) decoder
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
3 * Copyright (c) 2003 Alex Beregszaszi
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3649
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3649
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3649
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
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: 3649
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3649
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
15 * Lesser General Public License for more details.
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
16 *
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
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: 3649
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
20 */
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
21
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
22 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8712
diff changeset
23 * @file libavcodec/flacdec.c
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
24 * FLAC (Free Lossless Audio Codec) decoder
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
25 * @author Alex Beregszaszi
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
26 *
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
27 * For more information on the FLAC format, visit:
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
28 * http://flac.sourceforge.net/
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
29 *
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
30 * This decoder can be used in 1 of 2 ways: Either raw FLAC data can be fed
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
31 * through, starting from the initial 'fLaC' signature; or by passing the
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
32 * 34-byte streaminfo structure through avctx->extradata[_size] followed
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
33 * by data starting with the 0xFFF8 marker.
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
34 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
35
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
36 #include <limits.h>
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
37
6763
f7cbb7733146 Use full path for #includes from another directory.
diego
parents: 6746
diff changeset
38 #include "libavutil/crc.h"
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
39 #include "avcodec.h"
9101
03a05f3afbae flacdec: Avoid trying to read 33 bits. This occurs when the source
jbr
parents: 9100
diff changeset
40 #include "internal.h"
2398
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2098
diff changeset
41 #include "bitstream.h"
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
42 #include "bytestream.h"
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
43 #include "golomb.h"
6728
56c5bbd0996f split out some decoder context params to a shared macro
jbr
parents: 6727
diff changeset
44 #include "flac.h"
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
45
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
46 #undef NDEBUG
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
47 #include <assert.h>
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
48
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
49 #define MAX_CHANNELS 8
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
50 #define MAX_BLOCKSIZE 65535
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
51
1814
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
52 enum decorrelation_type {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
53 INDEPENDENT,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
54 LEFT_SIDE,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
55 RIGHT_SIDE,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
56 MID_SIDE,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
57 };
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
58
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
59 typedef struct FLACContext {
6728
56c5bbd0996f split out some decoder context params to a shared macro
jbr
parents: 6727
diff changeset
60 FLACSTREAMINFO
56c5bbd0996f split out some decoder context params to a shared macro
jbr
parents: 6727
diff changeset
61
8711
f284b60e2bc5 cosmetics: add some documentation to FLACContext
jbr
parents: 8701
diff changeset
62 AVCodecContext *avctx; ///< parent AVCodecContext
f284b60e2bc5 cosmetics: add some documentation to FLACContext
jbr
parents: 8701
diff changeset
63 GetBitContext gb; ///< GetBitContext initialized to start at the current frame
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
64
8711
f284b60e2bc5 cosmetics: add some documentation to FLACContext
jbr
parents: 8701
diff changeset
65 int blocksize; ///< number of samples in the current frame
f284b60e2bc5 cosmetics: add some documentation to FLACContext
jbr
parents: 8701
diff changeset
66 int curr_bps; ///< bps for current subframe, adjusted for channel correlation and wasted bits
8712
eae97a6f2553 cosmetics: change comment type and vertical alignment
jbr
parents: 8711
diff changeset
67 int sample_shift; ///< shift required to make output samples 16-bit or 32-bit
eae97a6f2553 cosmetics: change comment type and vertical alignment
jbr
parents: 8711
diff changeset
68 int is32; ///< flag to indicate if output should be 32-bit instead of 16-bit
8711
f284b60e2bc5 cosmetics: add some documentation to FLACContext
jbr
parents: 8701
diff changeset
69 enum decorrelation_type decorrelation; ///< channel decorrelation type in the current frame
9115
1b68b8e9b4c9 flacdec: Avoid parsing the STREAMINFO multiple times.
jbr
parents: 9109
diff changeset
70 int got_streaminfo; ///< indicates if the STREAMINFO has been read
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
71
8711
f284b60e2bc5 cosmetics: add some documentation to FLACContext
jbr
parents: 8701
diff changeset
72 int32_t *decoded[MAX_CHANNELS]; ///< decoded samples
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
73 uint8_t *bitstream;
7303
f0fc58bb9780 Make bitstream_* fields unsigned.
michael
parents: 7302
diff changeset
74 unsigned int bitstream_size;
f0fc58bb9780 Make bitstream_* fields unsigned.
michael
parents: 7302
diff changeset
75 unsigned int bitstream_index;
3066
04b924f8f5a5 warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents: 3036
diff changeset
76 unsigned int allocated_bitstream_size;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
77 } FLACContext;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
78
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
79 static const int sample_rate_table[] =
8638
1088ea188568 flacdec: add support for 3 additional sample rate codes
jbr
parents: 7785
diff changeset
80 { 0,
1088ea188568 flacdec: add support for 3 additional sample rate codes
jbr
parents: 7785
diff changeset
81 88200, 176400, 192000,
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
82 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
83 0, 0, 0, 0 };
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
84
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
85 static const int sample_size_table[] =
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
86 { 0, 8, 12, 0, 16, 20, 24, 0 };
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
87
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
88 static const int blocksize_table[] = {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
89 0, 192, 576<<0, 576<<1, 576<<2, 576<<3, 0, 0,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
90 256<<0, 256<<1, 256<<2, 256<<3, 256<<4, 256<<5, 256<<6, 256<<7
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
91 };
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
92
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
93 static int64_t get_utf8(GetBitContext *gb)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
94 {
3436
3ccec186532f moving utf8 reading function to libavutil
michael
parents: 3434
diff changeset
95 int64_t val;
3ccec186532f moving utf8 reading function to libavutil
michael
parents: 3434
diff changeset
96 GET_UTF8(val, get_bits(gb, 8), return -1;)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
97 return val;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
98 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
99
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
100 static void allocate_buffers(FLACContext *s);
9054
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
101
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
102 int ff_flac_is_extradata_valid(AVCodecContext *avctx,
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
103 enum FLACExtradataFormat *format,
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
104 uint8_t **streaminfo_start)
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
105 {
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
106 if (!avctx->extradata || avctx->extradata_size < FLAC_STREAMINFO_SIZE) {
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
107 av_log(avctx, AV_LOG_ERROR, "extradata NULL or too small.\n");
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
108 return 0;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
109 }
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
110 if (AV_RL32(avctx->extradata) != MKTAG('f','L','a','C')) {
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
111 /* extradata contains STREAMINFO only */
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
112 if (avctx->extradata_size != FLAC_STREAMINFO_SIZE) {
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
113 av_log(avctx, AV_LOG_WARNING, "extradata contains %d bytes too many.\n",
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
114 FLAC_STREAMINFO_SIZE-avctx->extradata_size);
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
115 }
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
116 *format = FLAC_EXTRADATA_FORMAT_STREAMINFO;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
117 *streaminfo_start = avctx->extradata;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
118 } else {
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
119 if (avctx->extradata_size < 8+FLAC_STREAMINFO_SIZE) {
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
120 av_log(avctx, AV_LOG_ERROR, "extradata too small.\n");
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
121 return 0;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
122 }
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
123 *format = FLAC_EXTRADATA_FORMAT_FULL_HEADER;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
124 *streaminfo_start = &avctx->extradata[8];
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
125 }
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
126 return 1;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
127 }
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
128
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
129 static av_cold int flac_decode_init(AVCodecContext *avctx)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
130 {
9054
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
131 enum FLACExtradataFormat format;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
132 uint8_t *streaminfo;
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
133 FLACContext *s = avctx->priv_data;
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
134 s->avctx = avctx;
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
135
8728
329e332e829f flacdec: set default sample_fmt before parsing extradata
jbr
parents: 8718
diff changeset
136 avctx->sample_fmt = SAMPLE_FMT_S16;
329e332e829f flacdec: set default sample_fmt before parsing extradata
jbr
parents: 8718
diff changeset
137
9054
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
138 /* for now, the raw FLAC header is allowed to be passed to the decoder as
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
139 frame data instead of extradata. */
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
140 if (!avctx->extradata)
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
141 return 0;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
142
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
143 if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo))
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
144 return -1;
7eedb5796dd8 Use a shared function to validate FLAC extradata.
jbr
parents: 8952
diff changeset
145
9055
15515243f476 cosmetics: line wrap and indentation after last commit.
jbr
parents: 9054
diff changeset
146 /* initialize based on the demuxer-supplied streamdata header */
15515243f476 cosmetics: line wrap and indentation after last commit.
jbr
parents: 9054
diff changeset
147 ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo);
15515243f476 cosmetics: line wrap and indentation after last commit.
jbr
parents: 9054
diff changeset
148 allocate_buffers(s);
9115
1b68b8e9b4c9 flacdec: Avoid parsing the STREAMINFO multiple times.
jbr
parents: 9109
diff changeset
149 s->got_streaminfo = 1;
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
150
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
151 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
152 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
153
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
154 static void dump_headers(AVCodecContext *avctx, FLACStreaminfo *s)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
155 {
9106
4984f305def8 flacdec: Remove unused variable, min_blocksize.
jbr
parents: 9105
diff changeset
156 av_log(avctx, AV_LOG_DEBUG, " Max Blocksize: %d\n", s->max_blocksize);
6727
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
157 av_log(avctx, AV_LOG_DEBUG, " Max Framesize: %d\n", s->max_framesize);
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
158 av_log(avctx, AV_LOG_DEBUG, " Samplerate: %d\n", s->samplerate);
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
159 av_log(avctx, AV_LOG_DEBUG, " Channels: %d\n", s->channels);
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
160 av_log(avctx, AV_LOG_DEBUG, " Bits: %d\n", s->bps);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
161 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
162
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
163 static void allocate_buffers(FLACContext *s)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
164 {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
165 int i;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
166
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
167 assert(s->max_blocksize);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
168
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
169 if (s->max_framesize == 0 && s->max_blocksize) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
170 // FIXME header overhead
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
171 s->max_framesize= (s->channels * s->bps * s->max_blocksize + 7)/ 8;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
172 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
173
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
174 for (i = 0; i < s->channels; i++) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
175 s->decoded[i] = av_realloc(s->decoded[i],
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
176 sizeof(int32_t)*s->max_blocksize);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
177 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
178
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
179 if (s->allocated_bitstream_size < s->max_framesize)
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
180 s->bitstream= av_fast_realloc(s->bitstream,
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
181 &s->allocated_bitstream_size,
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
182 s->max_framesize);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
183 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
184
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
185 void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
186 const uint8_t *buffer)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
187 {
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
188 GetBitContext gb;
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
189 init_get_bits(&gb, buffer, FLAC_STREAMINFO_SIZE*8);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
190
9106
4984f305def8 flacdec: Remove unused variable, min_blocksize.
jbr
parents: 9105
diff changeset
191 skip_bits(&gb, 16); /* skip min blocksize */
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
192 s->max_blocksize = get_bits(&gb, 16);
9109
8053722e1c7f flacdec: Warn about invalid max blocksize and limit the minimum value.
jbr
parents: 9107
diff changeset
193 if (s->max_blocksize < 16) {
8053722e1c7f flacdec: Warn about invalid max blocksize and limit the minimum value.
jbr
parents: 9107
diff changeset
194 av_log(avctx, AV_LOG_WARNING, "invalid max blocksize: %d\n",
8053722e1c7f flacdec: Warn about invalid max blocksize and limit the minimum value.
jbr
parents: 9107
diff changeset
195 s->max_blocksize);
8053722e1c7f flacdec: Warn about invalid max blocksize and limit the minimum value.
jbr
parents: 9107
diff changeset
196 s->max_blocksize = 16;
8053722e1c7f flacdec: Warn about invalid max blocksize and limit the minimum value.
jbr
parents: 9107
diff changeset
197 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
198
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
199 skip_bits(&gb, 24); /* skip min frame size */
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
200 s->max_framesize = get_bits_long(&gb, 24);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
201
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
202 s->samplerate = get_bits_long(&gb, 20);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
203 s->channels = get_bits(&gb, 3) + 1;
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
204 s->bps = get_bits(&gb, 5) + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
205
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
206 avctx->channels = s->channels;
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
207 avctx->sample_rate = s->samplerate;
8701
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
208 avctx->bits_per_raw_sample = s->bps;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
209 if (s->bps > 16)
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
210 avctx->sample_fmt = SAMPLE_FMT_S32;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
211 else
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
212 avctx->sample_fmt = SAMPLE_FMT_S16;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
213
8661
94f7aca055d5 flacdec: get total number of samples from STREAMINFO
jbr
parents: 8660
diff changeset
214 s->samples = get_bits_long(&gb, 32) << 4;
9094
39425084bd5c flacdec: Use get/skip_bits_long() for more than 17-bits and
jbr
parents: 9055
diff changeset
215 s->samples |= get_bits(&gb, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
216
9094
39425084bd5c flacdec: Use get/skip_bits_long() for more than 17-bits and
jbr
parents: 9055
diff changeset
217 skip_bits_long(&gb, 64); /* md5 sum */
39425084bd5c flacdec: Use get/skip_bits_long() for more than 17-bits and
jbr
parents: 9055
diff changeset
218 skip_bits_long(&gb, 64); /* md5 sum */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
219
6727
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
220 dump_headers(avctx, s);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
221 }
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
222
9146
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
223 void ff_flac_parse_block_header(const uint8_t *block_header,
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
224 int *last, int *type, int *size)
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
225 {
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
226 int tmp = bytestream_get_byte(&block_header);
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
227 if (last)
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
228 *last = tmp & 0x80;
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
229 if (type)
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
230 *type = tmp & 0x7F;
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
231 if (size)
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
232 *size = bytestream_get_be24(&block_header);
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
233 }
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
234
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
235 /**
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
236 * Parse the STREAMINFO from an inline header.
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
237 * @param s the flac decoding context
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
238 * @param buf input buffer, starting with the "fLaC" marker
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
239 * @param buf_size buffer size
9119
f3d87e34599f flacdec: Check for an inline header before calling metadata_parse().
jbr
parents: 9118
diff changeset
240 * @return non-zero if metadata is invalid
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
241 */
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
242 static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size)
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
243 {
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
244 int metadata_type, metadata_size;
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
245
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
246 if (buf_size < FLAC_STREAMINFO_SIZE+8) {
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
247 /* need more data */
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
248 return 0;
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
249 }
9146
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
250 ff_flac_parse_block_header(&buf[4], NULL, &metadata_type, &metadata_size);
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
251 if (metadata_type != FLAC_METADATA_TYPE_STREAMINFO ||
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
252 metadata_size != FLAC_STREAMINFO_SIZE) {
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
253 return AVERROR_INVALIDDATA;
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
254 }
9146
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
255 ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, &buf[8]);
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
256 allocate_buffers(s);
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
257 s->got_streaminfo = 1;
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
258
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
259 return 0;
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
260 }
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
261
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
262 /**
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
263 * Determine the size of an inline header.
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
264 * @param buf input buffer, starting with the "fLaC" marker
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
265 * @param buf_size buffer size
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
266 * @return number of bytes in the header, or 0 if more data is needed
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
267 */
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
268 static int get_metadata_size(const uint8_t *buf, int buf_size)
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
269 {
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
270 int metadata_last, metadata_size;
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
271 const uint8_t *buf_end = buf + buf_size;
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
272
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
273 buf += 4;
9120
dfd80d6fabfe cosmetics: indentation after last commit
jbr
parents: 9119
diff changeset
274 do {
9146
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
275 ff_flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size);
b980183eb831 flacdec: Add a shared function for parsing a FLAC metadata block header.
jbr
parents: 9139
diff changeset
276 buf += 4;
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
277 if (buf + metadata_size > buf_end) {
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
278 /* need more data in order to read the complete header */
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
279 return 0;
9120
dfd80d6fabfe cosmetics: indentation after last commit
jbr
parents: 9119
diff changeset
280 }
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
281 buf += metadata_size;
9120
dfd80d6fabfe cosmetics: indentation after last commit
jbr
parents: 9119
diff changeset
282 } while (!metadata_last);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
283
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
284 return buf_size - (buf_end - buf);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
285 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
286
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
287 static int decode_residuals(FLACContext *s, int channel, int pred_order)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
288 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
289 int i, tmp, partition, method_type, rice_order;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
290 int sample = 0, samples;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
291
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
292 method_type = get_bits(&s->gb, 2);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
293 if (method_type > 1) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
294 av_log(s->avctx, AV_LOG_ERROR, "illegal residual coding method %d\n",
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
295 method_type);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
296 return -1;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
297 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
298
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
299 rice_order = get_bits(&s->gb, 4);
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
300
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
301 samples= s->blocksize >> rice_order;
4366
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
302 if (pred_order > samples) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
303 av_log(s->avctx, AV_LOG_ERROR, "invalid predictor order: %i > %i\n",
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
304 pred_order, samples);
4366
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
305 return -1;
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
306 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
307
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
308 sample=
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
309 i= pred_order;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
310 for (partition = 0; partition < (1 << rice_order); partition++) {
5871
83554c0e9ce6 Add support for FLAC's new RICE2 entropy coding method. Patch by Josh Coalson.
jbr
parents: 5741
diff changeset
311 tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
312 if (tmp == (method_type == 0 ? 15 : 31)) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
313 tmp = get_bits(&s->gb, 5);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
314 for (; i < samples; i++, sample++)
9099
152bee4c0722 flacdec: use get_sbits_long() where needed.
jbr
parents: 9094
diff changeset
315 s->decoded[channel][sample] = get_sbits_long(&s->gb, tmp);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
316 } else {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
317 for (; i < samples; i++, sample++) {
1813
ec0e71b1fc3a remove residual array, it isnt really needed
michael
parents: 1812
diff changeset
318 s->decoded[channel][sample] = get_sr_golomb_flac(&s->gb, tmp, INT_MAX, 0);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
319 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
320 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
321 i= 0;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
322 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
323
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
324 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
325 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
326
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
327 static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
328 {
5740
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
329 const int blocksize = s->blocksize;
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
330 int32_t *decoded = s->decoded[channel];
8952
49817775b44f flacdec: Silence false positive warning about uninitialized variables in
jbr
parents: 8728
diff changeset
331 int av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d), i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
332
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
333 /* warm up samples */
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
334 for (i = 0; i < pred_order; i++) {
9099
152bee4c0722 flacdec: use get_sbits_long() where needed.
jbr
parents: 9094
diff changeset
335 decoded[i] = get_sbits_long(&s->gb, s->curr_bps);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
336 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
337
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
338 if (decode_residuals(s, channel, pred_order) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
339 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
340
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
341 if (pred_order > 0)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
342 a = decoded[pred_order-1];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
343 if (pred_order > 1)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
344 b = a - decoded[pred_order-2];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
345 if (pred_order > 2)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
346 c = b - decoded[pred_order-2] + decoded[pred_order-3];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
347 if (pred_order > 3)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
348 d = c - decoded[pred_order-2] + 2*decoded[pred_order-3] - decoded[pred_order-4];
5740
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
349
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
350 switch (pred_order) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
351 case 0:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
352 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
353 case 1:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
354 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
355 decoded[i] = a += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
356 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
357 case 2:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
358 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
359 decoded[i] = a += b += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
360 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
361 case 3:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
362 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
363 decoded[i] = a += b += c += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
364 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
365 case 4:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
366 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
367 decoded[i] = a += b += c += d += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
368 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
369 default:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
370 av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order);
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
371 return -1;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
372 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
373
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
374 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
375 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
376
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
377 static int decode_subframe_lpc(FLACContext *s, int channel, int pred_order)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
378 {
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
379 int i, j;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
380 int coeff_prec, qlevel;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
381 int coeffs[pred_order];
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
382 int32_t *decoded = s->decoded[channel];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
383
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
384 /* warm up samples */
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
385 for (i = 0; i < pred_order; i++) {
9099
152bee4c0722 flacdec: use get_sbits_long() where needed.
jbr
parents: 9094
diff changeset
386 decoded[i] = get_sbits_long(&s->gb, s->curr_bps);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
387 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
388
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
389 coeff_prec = get_bits(&s->gb, 4) + 1;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
390 if (coeff_prec == 16) {
8652
1a88ffbd3233 flacdec: change several AV_LOG_DEBUG to AV_LOG_ERROR
jbr
parents: 8651
diff changeset
391 av_log(s->avctx, AV_LOG_ERROR, "invalid coeff precision\n");
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
392 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
393 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
394 qlevel = get_sbits(&s->gb, 5);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
395 if (qlevel < 0) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
396 av_log(s->avctx, AV_LOG_ERROR, "qlevel %d not supported, maybe buggy stream\n",
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
397 qlevel);
1814
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
398 return -1;
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
399 }
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
400
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
401 for (i = 0; i < pred_order; i++) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
402 coeffs[i] = get_sbits(&s->gb, coeff_prec);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
403 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
404
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
405 if (decode_residuals(s, channel, pred_order) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
406 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
407
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
408 if (s->bps > 16) {
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
409 int64_t sum;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
410 for (i = pred_order; i < s->blocksize; i++) {
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
411 sum = 0;
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
412 for (j = 0; j < pred_order; j++)
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
413 sum += (int64_t)coeffs[j] * decoded[i-j-1];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
414 decoded[i] += sum >> qlevel;
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
415 }
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
416 } else {
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
417 for (i = pred_order; i < s->blocksize-1; i += 2) {
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
418 int c;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
419 int d = decoded[i-pred_order];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
420 int s0 = 0, s1 = 0;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
421 for (j = pred_order-1; j > 0; j--) {
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
422 c = coeffs[j];
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
423 s0 += c*d;
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
424 d = decoded[i-j];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
425 s1 += c*d;
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
426 }
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
427 c = coeffs[0];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
428 s0 += c*d;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
429 d = decoded[i] += s0 >> qlevel;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
430 s1 += c*d;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
431 decoded[i+1] += s1 >> qlevel;
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
432 }
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
433 if (i < s->blocksize) {
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
434 int sum = 0;
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
435 for (j = 0; j < pred_order; j++)
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
436 sum += coeffs[j] * decoded[i-j-1];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
437 decoded[i] += sum >> qlevel;
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
438 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
439 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
440
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
441 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
442 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
443
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
444 static inline int decode_subframe(FLACContext *s, int channel)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
445 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
446 int type, wasted = 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
447 int i, tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
448
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
449 s->curr_bps = s->bps;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
450 if (channel == 0) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
451 if (s->decorrelation == RIGHT_SIDE)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
452 s->curr_bps++;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
453 } else {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
454 if (s->decorrelation == LEFT_SIDE || s->decorrelation == MID_SIDE)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
455 s->curr_bps++;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
456 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
457
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
458 if (get_bits1(&s->gb)) {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
459 av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n");
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
460 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
461 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
462 type = get_bits(&s->gb, 6);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
463
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
464 if (get_bits1(&s->gb)) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
465 wasted = 1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
466 while (!get_bits1(&s->gb))
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
467 wasted++;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
468 s->curr_bps -= wasted;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
469 }
9130
721e21aca252 flacdec: Check curr_bps after wasted bits are subtracted.
jbr
parents: 9121
diff changeset
470 if (s->curr_bps > 32) {
721e21aca252 flacdec: Check curr_bps after wasted bits are subtracted.
jbr
parents: 9121
diff changeset
471 ff_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0);
721e21aca252 flacdec: Check curr_bps after wasted bits are subtracted.
jbr
parents: 9121
diff changeset
472 return -1;
721e21aca252 flacdec: Check curr_bps after wasted bits are subtracted.
jbr
parents: 9121
diff changeset
473 }
8649
470a3af1bf4f flacdec: remove some unused code
jbr
parents: 8642
diff changeset
474
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
475 //FIXME use av_log2 for types
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
476 if (type == 0) {
9099
152bee4c0722 flacdec: use get_sbits_long() where needed.
jbr
parents: 9094
diff changeset
477 tmp = get_sbits_long(&s->gb, s->curr_bps);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
478 for (i = 0; i < s->blocksize; i++)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
479 s->decoded[channel][i] = tmp;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
480 } else if (type == 1) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
481 for (i = 0; i < s->blocksize; i++)
9099
152bee4c0722 flacdec: use get_sbits_long() where needed.
jbr
parents: 9094
diff changeset
482 s->decoded[channel][i] = get_sbits_long(&s->gb, s->curr_bps);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
483 } else if ((type >= 8) && (type <= 12)) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
484 if (decode_subframe_fixed(s, channel, type & ~0x8) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
485 return -1;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
486 } else if (type >= 32) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
487 if (decode_subframe_lpc(s, channel, (type & ~0x20)+1) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
488 return -1;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
489 } else {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
490 av_log(s->avctx, AV_LOG_ERROR, "invalid coding type\n");
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
491 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
492 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
493
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
494 if (wasted) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
495 int i;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
496 for (i = 0; i < s->blocksize; i++)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
497 s->decoded[channel][i] <<= wasted;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
498 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
499
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
500 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
501 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
502
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
503 static int decode_frame(FLACContext *s, int alloc_data_size)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
504 {
1814
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
505 int blocksize_code, sample_rate_code, sample_size_code, assignment, i, crc8;
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
506 int decorrelation, bps, blocksize, samplerate;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
507
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
508 blocksize_code = get_bits(&s->gb, 4);
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
509
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
510 sample_rate_code = get_bits(&s->gb, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
511
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
512 assignment = get_bits(&s->gb, 4); /* channel assignment */
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
513 if (assignment < 8 && s->channels == assignment+1)
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
514 decorrelation = INDEPENDENT;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
515 else if (assignment >=8 && assignment < 11 && s->channels == 2)
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
516 decorrelation = LEFT_SIDE + assignment - 8;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
517 else {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
518 av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n",
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
519 assignment, s->channels);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
520 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
521 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
522
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
523 sample_size_code = get_bits(&s->gb, 3);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
524 if (sample_size_code == 0)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
525 bps= s->bps;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
526 else if ((sample_size_code != 3) && (sample_size_code != 7))
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
527 bps = sample_size_table[sample_size_code];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
528 else {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
529 av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n",
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
530 sample_size_code);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
531 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
532 }
8701
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
533 if (bps > 16) {
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
534 s->avctx->sample_fmt = SAMPLE_FMT_S32;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
535 s->sample_shift = 32 - bps;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
536 s->is32 = 1;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
537 } else {
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
538 s->avctx->sample_fmt = SAMPLE_FMT_S16;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
539 s->sample_shift = 16 - bps;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
540 s->is32 = 0;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
541 }
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
542 s->bps = s->avctx->bits_per_raw_sample = bps;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
543
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
544 if (get_bits1(&s->gb)) {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
545 av_log(s->avctx, AV_LOG_ERROR, "broken stream, invalid padding\n");
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
546 return -1;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
547 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
548
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
549 if (get_utf8(&s->gb) < 0) {
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
550 av_log(s->avctx, AV_LOG_ERROR, "utf8 fscked\n");
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
551 return -1;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
552 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
553
9105
9ae9d486669a flacdec: Return error when blocksize code of 0 is found. It is a
jbr
parents: 9101
diff changeset
554 if (blocksize_code == 0) {
9ae9d486669a flacdec: Return error when blocksize code of 0 is found. It is a
jbr
parents: 9101
diff changeset
555 av_log(s->avctx, AV_LOG_ERROR, "reserved blocksize code: 0\n");
9ae9d486669a flacdec: Return error when blocksize code of 0 is found. It is a
jbr
parents: 9101
diff changeset
556 return -1;
9ae9d486669a flacdec: Return error when blocksize code of 0 is found. It is a
jbr
parents: 9101
diff changeset
557 } else if (blocksize_code == 6)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
558 blocksize = get_bits(&s->gb, 8)+1;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
559 else if (blocksize_code == 7)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
560 blocksize = get_bits(&s->gb, 16)+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
561 else
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
562 blocksize = blocksize_table[blocksize_code];
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
563
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
564 if (blocksize > s->max_blocksize) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
565 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize,
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
566 s->max_blocksize);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
567 return -1;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
568 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
569
9131
dfa6b3358c61 flacdec: Handle 32 bps data when checking allocated size.
jbr
parents: 9130
diff changeset
570 if (blocksize * s->channels * (s->is32 ? 4 : 2) > alloc_data_size)
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
571 return -1;
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
572
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
573 if (sample_rate_code == 0)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
574 samplerate= s->samplerate;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
575 else if (sample_rate_code < 12)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
576 samplerate = sample_rate_table[sample_rate_code];
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
577 else if (sample_rate_code == 12)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
578 samplerate = get_bits(&s->gb, 8) * 1000;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
579 else if (sample_rate_code == 13)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
580 samplerate = get_bits(&s->gb, 16);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
581 else if (sample_rate_code == 14)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
582 samplerate = get_bits(&s->gb, 16) * 10;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
583 else {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
584 av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n",
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
585 sample_rate_code);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
586 return -1;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
587 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
588
1814
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
589 skip_bits(&s->gb, 8);
6108
75804d49f33b improve CRC API
aurel
parents: 5872
diff changeset
590 crc8 = av_crc(av_crc_get_table(AV_CRC_8_ATM), 0,
75804d49f33b improve CRC API
aurel
parents: 5872
diff changeset
591 s->gb.buffer, get_bits_count(&s->gb)/8);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
592 if (crc8) {
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2529
diff changeset
593 av_log(s->avctx, AV_LOG_ERROR, "header crc mismatch crc=%2X\n", crc8);
1814
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
594 return -1;
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
595 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
596
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
597 s->blocksize = blocksize;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
598 s->samplerate = samplerate;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
599 s->bps = bps;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
600 s->decorrelation= decorrelation;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
601
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
602 // dump_headers(s->avctx, (FLACStreaminfo *)s);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
603
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
604 /* subframes */
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
605 for (i = 0; i < s->channels; i++) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
606 if (decode_subframe(s, i) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
607 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
608 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
609
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
610 align_get_bits(&s->gb);
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
611
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
612 /* frame footer */
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
613 skip_bits(&s->gb, 16); /* data crc */
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
614
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
615 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
616 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
617
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
618 static int flac_decode_frame(AVCodecContext *avctx,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
619 void *data, int *data_size,
6235
michael
parents: 6108
diff changeset
620 const uint8_t *buf, int buf_size)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
621 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
622 FLACContext *s = avctx->priv_data;
9135
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
623 int i, j = 0, input_buf_size = 0, bytes_read = 0;
8701
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
624 int16_t *samples_16 = data;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
625 int32_t *samples_32 = data;
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
626 int alloc_data_size= *data_size;
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
627
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
628 *data_size=0;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
629
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
630 if (s->max_framesize == 0) {
7785
a969253a82ff fix issue 616 on roundup : decoding of short flac files
jai_menon
parents: 7451
diff changeset
631 s->max_framesize= FFMAX(4, buf_size); // should hopefully be enough for the first header
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
632 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
633 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
634
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
635 if (1 && s->max_framesize) { //FIXME truncated
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
636 if (s->bitstream_size < 4 || AV_RL32(s->bitstream) != MKTAG('f','L','a','C'))
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
637 buf_size= FFMIN(buf_size, s->max_framesize - FFMIN(s->bitstream_size, s->max_framesize));
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
638 input_buf_size= buf_size;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
639
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
640 if (s->bitstream_size + buf_size < buf_size || s->bitstream_index + s->bitstream_size + buf_size < s->bitstream_index)
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
641 return -1;
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
642
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
643 if (s->allocated_bitstream_size < s->bitstream_size + buf_size)
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
644 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->bitstream_size + buf_size);
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
645
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
646 if (s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size) {
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
647 memmove(s->bitstream, &s->bitstream[s->bitstream_index],
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
648 s->bitstream_size);
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
649 s->bitstream_index=0;
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
650 }
8658
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
651 memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size],
dc8fd7c55928 flacdec: cosmetics: some line wrapping at 80 chars
jbr
parents: 8657
diff changeset
652 buf, buf_size);
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
653 buf= &s->bitstream[s->bitstream_index];
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
654 buf_size += s->bitstream_size;
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
655 s->bitstream_size= buf_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
656
8657
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
657 if (buf_size < s->max_framesize && input_buf_size) {
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
658 return input_buf_size;
62c52fff9ac0 flacdec: cosmetics: indentation
jbr
parents: 8656
diff changeset
659 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
660 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
661
9133
c78af85f414d flacdec: Add a check for small buffer size. This ensures reading as
jbr
parents: 9132
diff changeset
662 /* check that there is at least the smallest decodable amount of data.
9139
4564ec1f21b0 flacdec: cosmetics: Add a comment with the data of the smallest FLAC
jbr
parents: 9138
diff changeset
663 this amount corresponds to the smallest valid FLAC frame possible.
4564ec1f21b0 flacdec: cosmetics: Add a comment with the data of the smallest FLAC
jbr
parents: 9138
diff changeset
664 FF F8 69 02 00 00 9A 00 00 34 46 */
9138
063854fdfe73 flacdec: There is an even smaller FLAC frame size possibility.
jbr
parents: 9137
diff changeset
665 if (buf_size < 11)
9133
c78af85f414d flacdec: Add a check for small buffer size. This ensures reading as
jbr
parents: 9132
diff changeset
666 goto end;
c78af85f414d flacdec: Add a check for small buffer size. This ensures reading as
jbr
parents: 9132
diff changeset
667
9119
f3d87e34599f flacdec: Check for an inline header before calling metadata_parse().
jbr
parents: 9118
diff changeset
668 /* check for inline header */
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
669 if (AV_RB32(buf) == MKBETAG('f','L','a','C')) {
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
670 if (!s->got_streaminfo && parse_streaminfo(s, buf, buf_size)) {
9119
f3d87e34599f flacdec: Check for an inline header before calling metadata_parse().
jbr
parents: 9118
diff changeset
671 av_log(s->avctx, AV_LOG_ERROR, "invalid header\n");
f3d87e34599f flacdec: Check for an inline header before calling metadata_parse().
jbr
parents: 9118
diff changeset
672 return -1;
f3d87e34599f flacdec: Check for an inline header before calling metadata_parse().
jbr
parents: 9118
diff changeset
673 }
9134
e82d5e006de5 flacdec: Split the metadata_parse() function into 2 separate functions,
jbr
parents: 9133
diff changeset
674 bytes_read = get_metadata_size(buf, buf_size);
7301
aab7f1fb59ea If metadata has been parsed goto end instead of trying to
michael
parents: 7273
diff changeset
675 goto end;
9119
f3d87e34599f flacdec: Check for an inline header before calling metadata_parse().
jbr
parents: 9118
diff changeset
676 }
7301
aab7f1fb59ea If metadata has been parsed goto end instead of trying to
michael
parents: 7273
diff changeset
677
9135
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
678 /* check for frame sync code and resync stream if necessary */
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
679 if ((AV_RB16(buf) & 0xFFFE) != 0xFFF8) {
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
680 const uint8_t *buf_end = buf + buf_size;
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
681 av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n");
9135
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
682 while (buf+2 < buf_end && (AV_RB16(buf) & 0xFFFE) != 0xFFF8)
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
683 buf++;
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
684 bytes_read = buf_size - (buf_end - buf);
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
685 goto end; // we may not have enough bits left to decode a frame, so try next time
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
686 }
9135
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
687
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
688 /* decode frame */
05c6e8598143 flacdec: Simplify frame sync by not using the bitstream reader.
jbr
parents: 9134
diff changeset
689 init_get_bits(&s->gb, buf, buf_size*8);
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
690 skip_bits(&s->gb, 16);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
691 if (decode_frame(s, alloc_data_size) < 0) {
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
692 av_log(s->avctx, AV_LOG_ERROR, "decode_frame() failed\n");
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
693 s->bitstream_size=0;
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
694 s->bitstream_index=0;
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
695 return -1;
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
696 }
9136
ebad2cb9e015 flacdec: cosmetics: move 2 statements to immediately after frame
jbr
parents: 9135
diff changeset
697 *data_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
ebad2cb9e015 flacdec: cosmetics: move 2 statements to immediately after frame
jbr
parents: 9135
diff changeset
698 bytes_read = (get_bits_count(&s->gb)+7)/8;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
699
3434
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
700 #define DECORRELATE(left, right)\
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
701 assert(s->channels == 2);\
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
702 for (i = 0; i < s->blocksize; i++) {\
3434
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
703 int a= s->decoded[0][i];\
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
704 int b= s->decoded[1][i];\
8701
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
705 if (s->is32) {\
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
706 *samples_32++ = (left) << s->sample_shift;\
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
707 *samples_32++ = (right) << s->sample_shift;\
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
708 } else {\
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
709 *samples_16++ = (left) << s->sample_shift;\
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
710 *samples_16++ = (right) << s->sample_shift;\
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
711 }\
3434
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
712 }\
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
713 break;
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
714
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
715 switch (s->decorrelation) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
716 case INDEPENDENT:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
717 for (j = 0; j < s->blocksize; j++) {
8701
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
718 for (i = 0; i < s->channels; i++) {
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
719 if (s->is32)
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
720 *samples_32++ = s->decoded[i][j] << s->sample_shift;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
721 else
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
722 *samples_16++ = s->decoded[i][j] << s->sample_shift;
bb7f9053df83 flacdec: add support for SAMPLE_FMT_32
jbr
parents: 8661
diff changeset
723 }
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
724 }
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
725 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
726 case LEFT_SIDE:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
727 DECORRELATE(a,a-b)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
728 case RIGHT_SIDE:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
729 DECORRELATE(a+b,b)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
730 case MID_SIDE:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
731 DECORRELATE( (a-=b>>1) + b, a)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
732 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
733
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
734 end:
9132
37bb2785a35b flacdec: cosmetics: Use a more descriptive variable name for the number
jbr
parents: 9131
diff changeset
735 if (bytes_read > buf_size) {
37bb2785a35b flacdec: cosmetics: Use a more descriptive variable name for the number
jbr
parents: 9131
diff changeset
736 av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size);
1814
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
737 s->bitstream_size=0;
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
738 s->bitstream_index=0;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
739 return -1;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
740 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
741
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
742 if (s->bitstream_size) {
9132
37bb2785a35b flacdec: cosmetics: Use a more descriptive variable name for the number
jbr
parents: 9131
diff changeset
743 s->bitstream_index += bytes_read;
37bb2785a35b flacdec: cosmetics: Use a more descriptive variable name for the number
jbr
parents: 9131
diff changeset
744 s->bitstream_size -= bytes_read;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
745 return input_buf_size;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
746 } else
9132
37bb2785a35b flacdec: cosmetics: Use a more descriptive variable name for the number
jbr
parents: 9131
diff changeset
747 return bytes_read;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
748 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
749
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6377
diff changeset
750 static av_cold int flac_decode_close(AVCodecContext *avctx)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
751 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
752 FLACContext *s = avctx->priv_data;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
753 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
754
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
755 for (i = 0; i < s->channels; i++) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
756 av_freep(&s->decoded[i]);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
757 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
758 av_freep(&s->bitstream);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
759
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
760 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
761 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
762
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
763 static void flac_flush(AVCodecContext *avctx)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
764 {
1817
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
765 FLACContext *s = avctx->priv_data;
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
766
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
767 s->bitstream_size=
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
768 s->bitstream_index= 0;
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
769 }
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
770
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
771 AVCodec flac_decoder = {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
772 "flac",
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
773 CODEC_TYPE_AUDIO,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
774 CODEC_ID_FLAC,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
775 sizeof(FLACContext),
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
776 flac_decode_init,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
777 NULL,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
778 flac_decode_close,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
779 flac_decode_frame,
7273
3511d8cdd310 Make our flac decoder decode all the data at EOF.
michael
parents: 7129
diff changeset
780 CODEC_CAP_DELAY,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
781 .flush= flac_flush,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6763
diff changeset
782 .long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
783 };