annotate flacdec.c @ 8656:6565469fb8d1 libavcodec

flacdec: cosmetics: use consistent coding style (K&R)
author jbr
date Sat, 24 Jan 2009 18:51:43 +0000
parents cc6f01be6614
children 62c52fff9ac0
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 /**
8642
178d5dfccad4 rename flac.c to flacdec.c
jbr
parents: 8638
diff changeset
23 * @file 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
3649
3335f51b6cd3 force usage of ALT_BITSTREAM_READER where needed
aurel
parents: 3436
diff changeset
38 #define ALT_BITSTREAM_READER
6763
f7cbb7733146 Use full path for #includes from another directory.
diego
parents: 6746
diff changeset
39 #include "libavutil/crc.h"
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
40 #include "avcodec.h"
2398
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2098
diff changeset
41 #include "bitstream.h"
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
42 #include "golomb.h"
6728
56c5bbd0996f split out some decoder context params to a shared macro
jbr
parents: 6727
diff changeset
43 #include "flac.h"
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
44
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
45 #undef NDEBUG
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
46 #include <assert.h>
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
47
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
48 #define MAX_CHANNELS 8
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
49 #define MAX_BLOCKSIZE 65535
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
50 #define FLAC_STREAMINFO_SIZE 34
1811
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
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
62 AVCodecContext *avctx;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
63 GetBitContext gb;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
64
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
65 int blocksize/*, last_blocksize*/;
6728
56c5bbd0996f split out some decoder context params to a shared macro
jbr
parents: 6727
diff changeset
66 int curr_bps;
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
67 enum decorrelation_type decorrelation;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
68
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
69 int32_t *decoded[MAX_CHANNELS];
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
70 uint8_t *bitstream;
7303
f0fc58bb9780 Make bitstream_* fields unsigned.
michael
parents: 7302
diff changeset
71 unsigned int bitstream_size;
f0fc58bb9780 Make bitstream_* fields unsigned.
michael
parents: 7302
diff changeset
72 unsigned int bitstream_index;
3066
04b924f8f5a5 warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents: 3036
diff changeset
73 unsigned int allocated_bitstream_size;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
74 } FLACContext;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
75
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
76 #define METADATA_TYPE_STREAMINFO 0
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
77
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
78 static const int sample_rate_table[] =
8638
1088ea188568 flacdec: add support for 3 additional sample rate codes
jbr
parents: 7785
diff changeset
79 { 0,
1088ea188568 flacdec: add support for 3 additional sample rate codes
jbr
parents: 7785
diff changeset
80 88200, 176400, 192000,
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
81 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
82 0, 0, 0, 0 };
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
83
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
84 static const int sample_size_table[] =
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
85 { 0, 8, 12, 0, 16, 20, 24, 0 };
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
86
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
87 static const int blocksize_table[] = {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
88 0, 192, 576<<0, 576<<1, 576<<2, 576<<3, 0, 0,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
89 256<<0, 256<<1, 256<<2, 256<<3, 256<<4, 256<<5, 256<<6, 256<<7
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
90 };
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
91
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
92 static int64_t get_utf8(GetBitContext *gb)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
93 {
3436
3ccec186532f moving utf8 reading function to libavutil
michael
parents: 3434
diff changeset
94 int64_t val;
3ccec186532f moving utf8 reading function to libavutil
michael
parents: 3434
diff changeset
95 GET_UTF8(val, get_bits(gb, 8), return -1;)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
96 return val;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
97 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
98
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
99 static void allocate_buffers(FLACContext *s);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
100 static int metadata_parse(FLACContext *s);
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
101
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
102 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
103 {
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
104 FLACContext *s = avctx->priv_data;
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
105 s->avctx = avctx;
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
106
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
107 if (avctx->extradata_size > 4) {
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
108 /* initialize based on the demuxer-supplied streamdata header */
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
109 if (avctx->extradata_size == FLAC_STREAMINFO_SIZE) {
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
110 ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, avctx->extradata);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
111 allocate_buffers(s);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
112 } else {
6730
362abbd862f1 move call to init_get_bits inside conditional
jbr
parents: 6729
diff changeset
113 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
114 metadata_parse(s);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
115 }
2071
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
116 }
41d30bae5019 attempt to create some separation in the FLAC system with respect to
melanson
parents: 2028
diff changeset
117
7451
85ab7655ad4d Modify all codecs to report their supported input and output sample format(s).
pross
parents: 7304
diff changeset
118 avctx->sample_fmt = SAMPLE_FMT_S16;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
119 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
120 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
121
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
122 static void dump_headers(AVCodecContext *avctx, FLACStreaminfo *s)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
123 {
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
124 av_log(avctx, AV_LOG_DEBUG, " Blocksize: %d .. %d\n", s->min_blocksize, s->max_blocksize);
6727
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
125 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
126 av_log(avctx, AV_LOG_DEBUG, " Samplerate: %d\n", s->samplerate);
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
127 av_log(avctx, AV_LOG_DEBUG, " Channels: %d\n", s->channels);
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
128 av_log(avctx, AV_LOG_DEBUG, " Bits: %d\n", s->bps);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
129 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
130
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
131 static void allocate_buffers(FLACContext *s)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
132 {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
133 int i;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
134
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
135 assert(s->max_blocksize);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
136
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
137 if (s->max_framesize == 0 && s->max_blocksize) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
138 s->max_framesize= (s->channels * s->bps * s->max_blocksize + 7)/ 8; //FIXME header overhead
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
139 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
140
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
141 for (i = 0; i < s->channels; i++) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
142 s->decoded[i] = av_realloc(s->decoded[i], sizeof(int32_t)*s->max_blocksize);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
143 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
144
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
145 if (s->allocated_bitstream_size < s->max_framesize)
7302
3d8cf33fbafb Only realloc() bitstream buffer when the needed size increased,
michael
parents: 7301
diff changeset
146 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
147 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
148
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
149 void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
150 const uint8_t *buffer)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
151 {
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
152 GetBitContext gb;
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
153 init_get_bits(&gb, buffer, FLAC_STREAMINFO_SIZE*8);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
154
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
155 /* mandatory streaminfo */
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
156 s->min_blocksize = get_bits(&gb, 16);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
157 s->max_blocksize = get_bits(&gb, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
158
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
159 skip_bits(&gb, 24); /* skip min frame size */
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
160 s->max_framesize = get_bits_long(&gb, 24);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
161
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
162 s->samplerate = get_bits_long(&gb, 20);
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
163 s->channels = get_bits(&gb, 3) + 1;
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
164 s->bps = get_bits(&gb, 5) + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
165
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
166 avctx->channels = s->channels;
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
167 avctx->sample_rate = s->samplerate;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
168
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
169 skip_bits(&gb, 36); /* total num of samples */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
170
6726
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
171 skip_bits(&gb, 64); /* md5 sum */
08bdfd7f3ab4 change function parameters for metadata_streaminfo()
jbr
parents: 6715
diff changeset
172 skip_bits(&gb, 64); /* md5 sum */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
173
6727
706dd1afb389 change function parameters for dump_headers()
jbr
parents: 6726
diff changeset
174 dump_headers(avctx, s);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
175 }
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
176
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
177 /**
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
178 * Parse a list of metadata blocks. This list of blocks must begin with
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
179 * the fLaC marker.
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
180 * @param s the flac decoding context containing the gb bit reader used to
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
181 * parse metadata
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
182 * @return 1 if some metadata was read, 0 if no fLaC marker was found
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
183 */
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
184 static int metadata_parse(FLACContext *s)
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
185 {
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
186 int i, metadata_last, metadata_type, metadata_size, streaminfo_updated=0;
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
187 int initial_pos= get_bits_count(&s->gb);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
188
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
189 if (show_bits_long(&s->gb, 32) == MKBETAG('f','L','a','C')) {
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
190 skip_bits(&s->gb, 32);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
191
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
192 do {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5141
diff changeset
193 metadata_last = get_bits1(&s->gb);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
194 metadata_type = get_bits(&s->gb, 7);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
195 metadata_size = get_bits_long(&s->gb, 24);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
196
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
197 if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) {
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
198 skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
199 break;
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
200 }
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
201
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
202 if (metadata_size) {
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
203 switch (metadata_type) {
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
204 case METADATA_TYPE_STREAMINFO:
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
205 ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, s->gb.buffer+get_bits_count(&s->gb)/8);
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
206 streaminfo_updated = 1;
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
207
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
208 default:
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
209 for (i = 0; i < metadata_size; i++)
4231
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
210 skip_bits(&s->gb, 8);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
211 }
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
212 }
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
213 } while (!metadata_last);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
214
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
215 if (streaminfo_updated)
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
216 allocate_buffers(s);
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
217 return 1;
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
218 }
c769e4b0c75e flac: allow reading of full metadata headers from extradata
aurel
parents: 3947
diff changeset
219 return 0;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
220 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
221
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
222 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
223 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
224 int i, tmp, partition, method_type, rice_order;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
225 int sample = 0, samples;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
226
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
227 method_type = get_bits(&s->gb, 2);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
228 if (method_type > 1) {
8652
1a88ffbd3233 flacdec: change several AV_LOG_DEBUG to AV_LOG_ERROR
jbr
parents: 8651
diff changeset
229 av_log(s->avctx, AV_LOG_ERROR, "illegal residual coding method %d\n", method_type);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
230 return -1;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
231 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
232
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
233 rice_order = get_bits(&s->gb, 4);
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
234
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
235 samples= s->blocksize >> rice_order;
4366
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
236 if (pred_order > samples) {
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
237 av_log(s->avctx, AV_LOG_ERROR, "invalid predictor order: %i > %i\n", pred_order, samples);
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
238 return -1;
f8753597422c Fix crash when pred_order greater s->blocksize >> rice_order.
reimar
parents: 4351
diff changeset
239 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
240
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
241 sample=
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
242 i= pred_order;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
243 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
244 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
245 if (tmp == (method_type == 0 ? 15 : 31)) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
246 tmp = get_bits(&s->gb, 5);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
247 for (; i < samples; i++, sample++)
1813
ec0e71b1fc3a remove residual array, it isnt really needed
michael
parents: 1812
diff changeset
248 s->decoded[channel][sample] = get_sbits(&s->gb, tmp);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
249 } else {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
250 for (; i < samples; i++, sample++) {
1813
ec0e71b1fc3a remove residual array, it isnt really needed
michael
parents: 1812
diff changeset
251 s->decoded[channel][sample] = get_sr_golomb_flac(&s->gb, tmp, INT_MAX, 0);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
252 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
253 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
254 i= 0;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
255 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
256
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
257 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
258 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
259
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
260 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
261 {
5740
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
262 const int blocksize = s->blocksize;
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
263 int32_t *decoded = s->decoded[channel];
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
264 int a, b, c, d, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
265
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
266 /* warm up samples */
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
267 for (i = 0; i < pred_order; i++) {
5740
4d62c0055174 replace FIR with finite differences.
lorenm
parents: 5721
diff changeset
268 decoded[i] = get_sbits(&s->gb, s->curr_bps);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
269 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
270
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
271 if (decode_residuals(s, channel, pred_order) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
272 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
273
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
274 if (pred_order > 0)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
275 a = decoded[pred_order-1];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
276 if (pred_order > 1)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
277 b = a - decoded[pred_order-2];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
278 if (pred_order > 2)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
279 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
280 if (pred_order > 3)
6746
459562f7f2ce Indent.
ramiro
parents: 6745
diff changeset
281 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
282
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
283 switch (pred_order) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
284 case 0:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
285 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
286 case 1:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
287 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
288 decoded[i] = a += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
289 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
290 case 2:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
291 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
292 decoded[i] = a += b += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
293 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
294 case 3:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
295 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
296 decoded[i] = a += b += c += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
297 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
298 case 4:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
299 for (i = pred_order; i < blocksize; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
300 decoded[i] = a += b += c += d += decoded[i];
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
301 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
302 default:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
303 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
304 return -1;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
305 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
306
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
307 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
308 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
309
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
310 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
311 {
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
312 int i, j;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
313 int coeff_prec, qlevel;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
314 int coeffs[pred_order];
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
315 int32_t *decoded = s->decoded[channel];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
316
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
317 /* warm up samples */
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
318 for (i = 0; i < pred_order; i++) {
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
319 decoded[i] = get_sbits(&s->gb, s->curr_bps);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
320 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
321
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
322 coeff_prec = get_bits(&s->gb, 4) + 1;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
323 if (coeff_prec == 16) {
8652
1a88ffbd3233 flacdec: change several AV_LOG_DEBUG to AV_LOG_ERROR
jbr
parents: 8651
diff changeset
324 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
325 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
326 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
327 qlevel = get_sbits(&s->gb, 5);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
328 if (qlevel < 0) {
8652
1a88ffbd3233 flacdec: change several AV_LOG_DEBUG to AV_LOG_ERROR
jbr
parents: 8651
diff changeset
329 av_log(s->avctx, AV_LOG_ERROR, "qlevel %d not supported, maybe buggy stream\n", 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
330 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
331 }
4804dddf2d0e crc8 checking, based upon a patch by (Miroslav Lichvar <lichvarm at phoenix dot inf dot upol dot cz>)
michael
parents: 1813
diff changeset
332
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
333 for (i = 0; i < pred_order; i++) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
334 coeffs[i] = get_sbits(&s->gb, coeff_prec);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
335 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
336
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
337 if (decode_residuals(s, channel, pred_order) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
338 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
339
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
340 if (s->bps > 16) {
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
341 int64_t sum;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
342 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
343 sum = 0;
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
344 for (j = 0; j < pred_order; j++)
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
345 sum += (int64_t)coeffs[j] * decoded[i-j-1];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
346 decoded[i] += sum >> qlevel;
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
347 }
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
348 } else {
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
349 for (i = pred_order; i < s->blocksize-1; i += 2) {
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
350 int c;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
351 int d = decoded[i-pred_order];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
352 int s0 = 0, s1 = 0;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
353 for (j = pred_order-1; j > 0; j--) {
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
354 c = coeffs[j];
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
355 s0 += c*d;
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
356 d = decoded[i-j];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
357 s1 += c*d;
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
358 }
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
359 c = coeffs[0];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
360 s0 += c*d;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
361 d = decoded[i] += s0 >> qlevel;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
362 s1 += c*d;
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
363 decoded[i+1] += s1 >> qlevel;
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
364 }
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
365 if (i < s->blocksize) {
5721
0c92562f1330 optimize decode_subframe_lpc()
lorenm
parents: 5513
diff changeset
366 int sum = 0;
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
367 for (j = 0; j < pred_order; j++)
5741
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
368 sum += coeffs[j] * decoded[i-j-1];
154b02065699 20% faster lpc, 6% overall flac decoding
lorenm
parents: 5740
diff changeset
369 decoded[i] += sum >> qlevel;
3351
42b85e03b408 fix 24bit flac support, revised from Thibaut Mattern <thibaut.mattern@gmail.com>
lu_zero
parents: 3171
diff changeset
370 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
371 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
372
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
373 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
374 }
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 static inline int decode_subframe(FLACContext *s, int channel)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
377 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
378 int type, wasted = 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
379 int i, tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
380
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
381 s->curr_bps = s->bps;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
382 if (channel == 0) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
383 if (s->decorrelation == RIGHT_SIDE)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
384 s->curr_bps++;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
385 } else {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
386 if (s->decorrelation == LEFT_SIDE || s->decorrelation == MID_SIDE)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
387 s->curr_bps++;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
388 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
389
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
390 if (get_bits1(&s->gb)) {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
391 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
392 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
393 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
394 type = get_bits(&s->gb, 6);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
395
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
396 if (get_bits1(&s->gb)) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
397 wasted = 1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
398 while (!get_bits1(&s->gb))
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
399 wasted++;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
400 s->curr_bps -= wasted;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
401 }
8649
470a3af1bf4f flacdec: remove some unused code
jbr
parents: 8642
diff changeset
402
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
403 //FIXME use av_log2 for types
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
404 if (type == 0) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
405 tmp = get_sbits(&s->gb, s->curr_bps);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
406 for (i = 0; i < s->blocksize; i++)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
407 s->decoded[channel][i] = tmp;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
408 } else if (type == 1) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
409 for (i = 0; i < s->blocksize; i++)
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
410 s->decoded[channel][i] = get_sbits(&s->gb, s->curr_bps);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
411 } else if ((type >= 8) && (type <= 12)) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
412 if (decode_subframe_fixed(s, channel, type & ~0x8) < 0)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
413 return -1;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
414 } else if (type >= 32) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
415 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
416 return -1;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
417 } else {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
418 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
419 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
420 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
421
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
422 if (wasted) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
423 int i;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
424 for (i = 0; i < s->blocksize; i++)
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
425 s->decoded[channel][i] <<= wasted;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
426 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
427
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
428 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
429 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
430
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
431 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
432 {
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
433 int blocksize_code, sample_rate_code, sample_size_code, assignment, i, crc8;
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
434 int decorrelation, bps, blocksize, samplerate;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
435
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
436 blocksize_code = get_bits(&s->gb, 4);
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
437
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
438 sample_rate_code = get_bits(&s->gb, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
439
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
440 assignment = get_bits(&s->gb, 4); /* channel assignment */
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
441 if (assignment < 8 && s->channels == assignment+1)
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
442 decorrelation = INDEPENDENT;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
443 else if (assignment >=8 && assignment < 11 && s->channels == 2)
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
444 decorrelation = LEFT_SIDE + assignment - 8;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
445 else {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
446 av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n", assignment, s->channels);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
447 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
448 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
449
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
450 sample_size_code = get_bits(&s->gb, 3);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
451 if (sample_size_code == 0)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
452 bps= s->bps;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
453 else if ((sample_size_code != 3) && (sample_size_code != 7))
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
454 bps = sample_size_table[sample_size_code];
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
455 else {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
456 av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n", sample_size_code);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
457 return -1;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
458 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
459
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
460 if (get_bits1(&s->gb)) {
2859
079b5cca2497 AV_LOG_DEBUG vs. AV_LOG_ERROR
michael
parents: 2628
diff changeset
461 av_log(s->avctx, AV_LOG_ERROR, "broken stream, invalid padding\n");
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
462 return -1;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
463 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
464
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
465 if (get_utf8(&s->gb) < 0) {
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
466 av_log(s->avctx, AV_LOG_ERROR, "utf8 fscked\n");
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
467 return -1;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
468 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
469
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
470 if (blocksize_code == 0)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
471 blocksize = s->min_blocksize;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
472 else if (blocksize_code == 6)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
473 blocksize = get_bits(&s->gb, 8)+1;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
474 else if (blocksize_code == 7)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
475 blocksize = get_bits(&s->gb, 16)+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
476 else
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
477 blocksize = blocksize_table[blocksize_code];
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
478
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
479 if (blocksize > s->max_blocksize) {
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
480 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, s->max_blocksize);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
481 return -1;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
482 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
483
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
484 if (blocksize * s->channels * sizeof(int16_t) > alloc_data_size)
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
485 return -1;
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
486
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
487 if (sample_rate_code == 0)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
488 samplerate= s->samplerate;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
489 else if (sample_rate_code < 12)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
490 samplerate = sample_rate_table[sample_rate_code];
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
491 else if (sample_rate_code == 12)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
492 samplerate = get_bits(&s->gb, 8) * 1000;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
493 else if (sample_rate_code == 13)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
494 samplerate = get_bits(&s->gb, 16);
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
495 else if (sample_rate_code == 14)
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
496 samplerate = get_bits(&s->gb, 16) * 10;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
497 else {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
498 av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n", sample_rate_code);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
499 return -1;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
500 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
501
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
502 skip_bits(&s->gb, 8);
6108
75804d49f33b improve CRC API
aurel
parents: 5872
diff changeset
503 crc8 = av_crc(av_crc_get_table(AV_CRC_8_ATM), 0,
75804d49f33b improve CRC API
aurel
parents: 5872
diff changeset
504 s->gb.buffer, get_bits_count(&s->gb)/8);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
505 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
506 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
507 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
508 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
509
1816
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
510 s->blocksize = blocksize;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
511 s->samplerate = samplerate;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
512 s->bps = bps;
fa7d0134f9f0 simplify
michael
parents: 1814
diff changeset
513 s->decorrelation= decorrelation;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
514
6729
071888974d8a share streaminfo parsing function
jbr
parents: 6728
diff changeset
515 // dump_headers(s->avctx, (FLACStreaminfo *)s);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
516
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
517 /* subframes */
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
518 for (i = 0; i < s->channels; i++) {
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
519 if (decode_subframe(s, i) < 0)
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 align_get_bits(&s->gb);
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
524
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
525 /* frame footer */
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
526 skip_bits(&s->gb, 16); /* data crc */
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
527
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
528 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
529 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
530
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
531 static int flac_decode_frame(AVCodecContext *avctx,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
532 void *data, int *data_size,
6235
michael
parents: 6108
diff changeset
533 const uint8_t *buf, int buf_size)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
534 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
535 FLACContext *s = avctx->priv_data;
2078
3dabadc91d19 warning vigilance
melanson
parents: 2071
diff changeset
536 int tmp = 0, i, j = 0, input_buf_size = 0;
3dabadc91d19 warning vigilance
melanson
parents: 2071
diff changeset
537 int16_t *samples = data;
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
538 int alloc_data_size= *data_size;
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
539
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4231
diff changeset
540 *data_size=0;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
541
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
542 if (s->max_framesize == 0) {
7785
a969253a82ff fix issue 616 on roundup : decoding of short flac files
jai_menon
parents: 7451
diff changeset
543 s->max_framesize= FFMAX(4, buf_size); // should hopefully be enough for the first header
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
544 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
545 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
546
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
547 if (1 && s->max_framesize) { //FIXME truncated
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
548 if (s->bitstream_size < 4 || AV_RL32(s->bitstream) != MKTAG('f','L','a','C'))
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
549 buf_size= FFMIN(buf_size, s->max_framesize - FFMIN(s->bitstream_size, s->max_framesize));
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
550 input_buf_size= buf_size;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
551
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
552 if (s->bitstream_size + buf_size < buf_size || s->bitstream_index + s->bitstream_size + buf_size < s->bitstream_index)
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
553 return -1;
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
554
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
555 if (s->allocated_bitstream_size < s->bitstream_size + buf_size)
7304
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
556 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->bitstream_size + buf_size);
ac25a6f7147e Support reading large metadata.
michael
parents: 7303
diff changeset
557
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
558 if (s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
559 memmove(s->bitstream, &s->bitstream[s->bitstream_index], s->bitstream_size);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
560 s->bitstream_index=0;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
561 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
562 memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf, buf_size);
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
563 buf= &s->bitstream[s->bitstream_index];
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
564 buf_size += s->bitstream_size;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
565 s->bitstream_size= buf_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
566
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
567 if (buf_size < s->max_framesize && input_buf_size) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
568 return input_buf_size;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
569 }
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
570 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
571
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
572 init_get_bits(&s->gb, buf, buf_size*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
573
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
574 if (metadata_parse(s))
7301
aab7f1fb59ea If metadata has been parsed goto end instead of trying to
michael
parents: 7273
diff changeset
575 goto end;
aab7f1fb59ea If metadata has been parsed goto end instead of trying to
michael
parents: 7273
diff changeset
576
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
577 tmp = show_bits(&s->gb, 16);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
578 if ((tmp & 0xFFFE) != 0xFFF8) {
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
579 av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n");
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
580 while (get_bits_count(&s->gb)/8+2 < buf_size && (show_bits(&s->gb, 16) & 0xFFFE) != 0xFFF8)
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
581 skip_bits(&s->gb, 8);
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
582 goto end; // we may not have enough bits left to decode a frame, so try next time
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
583 }
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
584 skip_bits(&s->gb, 16);
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
585 if (decode_frame(s, alloc_data_size) < 0) {
8653
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
586 av_log(s->avctx, AV_LOG_ERROR, "decode_frame() failed\n");
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
587 s->bitstream_size=0;
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
588 s->bitstream_index=0;
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
589 return -1;
cc6f01be6614 cosmetics: indentation
jbr
parents: 8652
diff changeset
590 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
591
3434
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
592 #define DECORRELATE(left, right)\
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
593 assert(s->channels == 2);\
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
594 for (i = 0; i < s->blocksize; i++) {\
3434
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
595 int a= s->decoded[0][i];\
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
596 int b= s->decoded[1][i];\
5141
67953f3ef896 add and remove some parentheses
benoit
parents: 5125
diff changeset
597 *samples++ = ((left) << (24 - s->bps)) >> 8;\
67953f3ef896 add and remove some parentheses
benoit
parents: 5125
diff changeset
598 *samples++ = ((right) << (24 - s->bps)) >> 8;\
3434
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
599 }\
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
600 break;
d42ab8824434 seems i forgot to commit this simplification ...
michael
parents: 3351
diff changeset
601
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
602 switch (s->decorrelation) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
603 case INDEPENDENT:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
604 for (j = 0; j < s->blocksize; j++) {
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
605 for (i = 0; i < s->channels; i++)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
606 *samples++ = (s->decoded[i][j] << (24 - s->bps)) >> 8;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
607 }
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
608 break;
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
609 case LEFT_SIDE:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
610 DECORRELATE(a,a-b)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
611 case RIGHT_SIDE:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
612 DECORRELATE(a+b,b)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
613 case MID_SIDE:
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
614 DECORRELATE( (a-=b>>1) + b, a)
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
615 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
616
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
617 *data_size = (int8_t *)samples - (int8_t *)data;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
618
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
619 end:
6377
michael
parents: 6235
diff changeset
620 i= (get_bits_count(&s->gb)+7)/8;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
621 if (i > buf_size) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
622 av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - 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
623 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
624 s->bitstream_index=0;
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
625 return -1;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
626 }
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
627
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
628 if (s->bitstream_size) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
629 s->bitstream_index += i;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
630 s->bitstream_size -= i;
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
631 return input_buf_size;
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
632 } else
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
633 return i;
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
634 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
635
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6377
diff changeset
636 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
637 {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
638 FLACContext *s = avctx->priv_data;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
639 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
640
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
641 for (i = 0; i < s->channels; i++) {
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
642 av_freep(&s->decoded[i]);
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
643 }
1812
6d762acfff5d flac fixes:
michael
parents: 1811
diff changeset
644 av_freep(&s->bitstream);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
645
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
646 return 0;
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
647 }
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
648
8656
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
649 static void flac_flush(AVCodecContext *avctx)
6565469fb8d1 flacdec: cosmetics: use consistent coding style (K&R)
jbr
parents: 8653
diff changeset
650 {
1817
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
651 FLACContext *s = avctx->priv_data;
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
652
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
653 s->bitstream_size=
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
654 s->bitstream_index= 0;
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
655 }
93029a89c173 flac_flush()
michael
parents: 1816
diff changeset
656
1811
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
657 AVCodec flac_decoder = {
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
658 "flac",
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
659 CODEC_TYPE_AUDIO,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
660 CODEC_ID_FLAC,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
661 sizeof(FLACContext),
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
662 flac_decode_init,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
663 NULL,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
664 flac_decode_close,
98d4d32b90e8 flac decoder by (Alex Beregszaszi <alex at fsn dot hu>)
michael
parents:
diff changeset
665 flac_decode_frame,
7273
3511d8cdd310 Make our flac decoder decode all the data at EOF.
michael
parents: 7129
diff changeset
666 CODEC_CAP_DELAY,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2859
diff changeset
667 .flush= flac_flush,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6763
diff changeset
668 .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
669 };