Mercurial > libavcodec.hg
annotate shorten.c @ 9896:bbefbca72722 libavcodec
Drop code that attempts to decode frames that are prefixed by junk.
Too often it ends up decoding random data into noise without detecting
it (for example after seeking of some MP3 data with oddly often occurring
startcode emulation).
Fixes issue1154.
author | michael |
---|---|
date | Tue, 30 Jun 2009 03:57:27 +0000 |
parents | 0dce4fe6e6f3 |
children | 8a4984c5cacc |
rev | line source |
---|---|
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
1 /* |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
2 * Shorten decoder |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
3 * Copyright (c) 2005 Jeff Muizelaar |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
4 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3303
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3303
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3303
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
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:
3303
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3303
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
16 * |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
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:
3303
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:
2525
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
20 */ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
21 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
22 /** |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8715
diff
changeset
|
23 * @file libavcodec/shorten.c |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
24 * Shorten decoder |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
25 * @author Jeff Muizelaar |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
26 * |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
27 */ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
28 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
29 #define DEBUG |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
30 #include <limits.h> |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
31 #include "avcodec.h" |
9428 | 32 #include "get_bits.h" |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
33 #include "golomb.h" |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
34 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
35 #define MAX_CHANNELS 8 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
36 #define MAX_BLOCKSIZE 65535 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
37 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
38 #define OUT_BUFFER_SIZE 16384 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
39 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
40 #define ULONGSIZE 2 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
41 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
42 #define WAVE_FORMAT_PCM 0x0001 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
43 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
44 #define DEFAULT_BLOCK_SIZE 256 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
45 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
46 #define TYPESIZE 4 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
47 #define CHANSIZE 0 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
48 #define LPCQSIZE 2 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
49 #define ENERGYSIZE 3 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
50 #define BITSHIFTSIZE 2 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
51 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
52 #define TYPE_S16HL 3 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
53 #define TYPE_S16LH 5 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
54 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
55 #define NWRAP 3 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
56 #define NSKIPSIZE 1 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
57 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
58 #define LPCQUANT 5 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
59 #define V2LPCQOFFSET (1 << LPCQUANT) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
60 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
61 #define FNSIZE 2 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
62 #define FN_DIFF0 0 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
63 #define FN_DIFF1 1 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
64 #define FN_DIFF2 2 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
65 #define FN_DIFF3 3 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
66 #define FN_QUIT 4 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
67 #define FN_BLOCKSIZE 5 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
68 #define FN_BITSHIFT 6 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
69 #define FN_QLPC 7 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
70 #define FN_ZERO 8 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
71 #define FN_VERBATIM 9 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
72 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
73 #define VERBATIM_CKSIZE_SIZE 5 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
74 #define VERBATIM_BYTE_SIZE 8 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
75 #define CANONICAL_HEADER_SIZE 44 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
76 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
77 typedef struct ShortenContext { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
78 AVCodecContext *avctx; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
79 GetBitContext gb; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
80 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
81 int min_framesize, max_framesize; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
82 int channels; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
83 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
84 int32_t *decoded[MAX_CHANNELS]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
85 int32_t *offset[MAX_CHANNELS]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
86 uint8_t *bitstream; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
87 int bitstream_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
88 int bitstream_index; |
3066
04b924f8f5a5
warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents:
3036
diff
changeset
|
89 unsigned int allocated_bitstream_size; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
90 int header_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
91 uint8_t header[OUT_BUFFER_SIZE]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
92 int version; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
93 int cur_chan; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
94 int bitshift; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
95 int nmean; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
96 int internal_ftype; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
97 int nwrap; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
98 int blocksize; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
99 int bitindex; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
100 int32_t lpcqoffset; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
101 } ShortenContext; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
102 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6249
diff
changeset
|
103 static av_cold int shorten_decode_init(AVCodecContext * avctx) |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
104 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
105 ShortenContext *s = avctx->priv_data; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
106 s->avctx = avctx; |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7040
diff
changeset
|
107 avctx->sample_fmt = SAMPLE_FMT_S16; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
108 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
109 return 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
110 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
111 |
3303
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
112 static int allocate_buffers(ShortenContext *s) |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
113 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
114 int i, chan; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
115 for (chan=0; chan<s->channels; chan++) { |
3303
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
116 if(FFMAX(1, s->nmean) >= UINT_MAX/sizeof(int32_t)){ |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
117 av_log(s->avctx, AV_LOG_ERROR, "nmean too large\n"); |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
118 return -1; |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
119 } |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
120 if(s->blocksize + s->nwrap >= UINT_MAX/sizeof(int32_t) || s->blocksize + s->nwrap <= (unsigned)s->nwrap){ |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
121 av_log(s->avctx, AV_LOG_ERROR, "s->blocksize + s->nwrap too large\n"); |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
122 return -1; |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
123 } |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
124 |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
125 s->offset[chan] = av_realloc(s->offset[chan], sizeof(int32_t)*FFMAX(1, s->nmean)); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
126 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
127 s->decoded[chan] = av_realloc(s->decoded[chan], sizeof(int32_t)*(s->blocksize + s->nwrap)); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
128 for (i=0; i<s->nwrap; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
129 s->decoded[chan][i] = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
130 s->decoded[chan] += s->nwrap; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
131 } |
3303
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3066
diff
changeset
|
132 return 0; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
133 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
134 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
135 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
136 static inline unsigned int get_uint(ShortenContext *s, int k) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
137 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
138 if (s->version != 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
139 k = get_ur_golomb_shorten(&s->gb, ULONGSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
140 return get_ur_golomb_shorten(&s->gb, k); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
141 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
142 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
143 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
144 static void fix_bitshift(ShortenContext *s, int32_t *buffer) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
145 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
146 int i; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
147 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
148 if (s->bitshift != 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
149 for (i = 0; i < s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
150 buffer[s->nwrap + i] <<= s->bitshift; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
151 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
152 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
153 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
154 static void init_offset(ShortenContext *s) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
155 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
156 int32_t mean = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
157 int chan, i; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
158 int nblock = FFMAX(1, s->nmean); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
159 /* initialise offset */ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
160 switch (s->internal_ftype) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
161 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
162 case TYPE_S16HL: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
163 case TYPE_S16LH: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
164 mean = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
165 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
166 default: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
167 av_log(s->avctx, AV_LOG_ERROR, "unknown audio type"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
168 abort(); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
169 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
170 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
171 for (chan = 0; chan < s->channels; chan++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
172 for (i = 0; i < nblock; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
173 s->offset[chan][i] = mean; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
174 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
175 |
4908
777f250df232
Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents:
4734
diff
changeset
|
176 static inline int get_le32(GetBitContext *gb) |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
177 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
178 return bswap_32(get_bits_long(gb, 32)); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
179 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
180 |
4908
777f250df232
Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents:
4734
diff
changeset
|
181 static inline short get_le16(GetBitContext *gb) |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
182 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
183 return bswap_16(get_bits_long(gb, 16)); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
184 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
185 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
186 static int decode_wave_header(AVCodecContext *avctx, uint8_t *header, int header_size) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
187 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
188 GetBitContext hb; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
189 int len; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
190 int chunk_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
191 short wave_format; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
192 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
193 init_get_bits(&hb, header, header_size*8); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
194 if (get_le32(&hb) != MKTAG('R','I','F','F')) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
195 av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
196 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
197 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
198 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
199 chunk_size = get_le32(&hb); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
200 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
201 if (get_le32(&hb) != MKTAG('W','A','V','E')) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
202 av_log(avctx, AV_LOG_ERROR, "missing WAVE tag\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
203 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
204 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
205 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
206 while (get_le32(&hb) != MKTAG('f','m','t',' ')) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
207 len = get_le32(&hb); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
208 skip_bits(&hb, 8*len); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
209 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
210 len = get_le32(&hb); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
211 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
212 if (len < 16) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
213 av_log(avctx, AV_LOG_ERROR, "fmt chunk was too short\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
214 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
215 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
216 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
217 wave_format = get_le16(&hb); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
218 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
219 switch (wave_format) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
220 case WAVE_FORMAT_PCM: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
221 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
222 default: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
223 av_log(avctx, AV_LOG_ERROR, "unsupported wave format\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
224 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
225 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
226 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
227 avctx->channels = get_le16(&hb); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
228 avctx->sample_rate = get_le32(&hb); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
229 avctx->bit_rate = get_le32(&hb) * 8; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
230 avctx->block_align = get_le16(&hb); |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7451
diff
changeset
|
231 avctx->bits_per_coded_sample = get_le16(&hb); |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
232 |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7451
diff
changeset
|
233 if (avctx->bits_per_coded_sample != 16) { |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
234 av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
235 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
236 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
237 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
238 len -= 16; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
239 if (len > 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
240 av_log(avctx, AV_LOG_INFO, "%d header bytes unparsed\n", len); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
241 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
242 return 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
243 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
244 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
245 static int16_t * interleave_buffer(int16_t *samples, int nchan, int blocksize, int32_t **buffer) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
246 int i, chan; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
247 for (i=0; i<blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
248 for (chan=0; chan < nchan; chan++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
249 *samples++ = FFMIN(buffer[chan][i], 32768); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
250 return samples; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
251 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
252 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
253 static void decode_subframe_lpc(ShortenContext *s, int channel, int residual_size, int pred_order) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
254 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
255 int sum, i, j; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
256 int coeffs[pred_order]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
257 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
258 for (i=0; i<pred_order; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
259 coeffs[i] = get_sr_golomb_shorten(&s->gb, LPCQUANT); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
260 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
261 for (i=0; i < s->blocksize; i++) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
262 sum = s->lpcqoffset; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
263 for (j=0; j<pred_order; j++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
264 sum += coeffs[j] * s->decoded[channel][i-j-1]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
265 s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) + (sum >> LPCQUANT); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
266 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
267 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
268 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
269 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
270 static int shorten_decode_frame(AVCodecContext *avctx, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
271 void *data, int *data_size, |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
272 AVPacket *avpkt) |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
273 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
274 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
275 int buf_size = avpkt->size; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
276 ShortenContext *s = avctx->priv_data; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
277 int i, input_buf_size = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
278 int16_t *samples = data; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
279 if(s->max_framesize == 0){ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
280 s->max_framesize= 1024; // should hopefully be enough for the first header |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
281 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
282 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
283 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
284 if(1 && s->max_framesize){//FIXME truncated |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
285 buf_size= FFMIN(buf_size, s->max_framesize - s->bitstream_size); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
286 input_buf_size= buf_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
287 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
288 if(s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size){ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
289 // printf("memmove\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
290 memmove(s->bitstream, &s->bitstream[s->bitstream_index], s->bitstream_size); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
291 s->bitstream_index=0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
292 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
293 memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf, buf_size); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
294 buf= &s->bitstream[s->bitstream_index]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
295 buf_size += s->bitstream_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
296 s->bitstream_size= buf_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
297 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
298 if(buf_size < s->max_framesize){ |
4652 | 299 //dprintf(avctx, "wanna more data ... %d\n", buf_size); |
4734
d2db36185222
properly set *data_size when returning >= 0 values in shorten_decode_frame()
aurel
parents:
4652
diff
changeset
|
300 *data_size = 0; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
301 return input_buf_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
302 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
303 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
304 init_get_bits(&s->gb, buf, buf_size*8); |
5518 | 305 skip_bits(&s->gb, s->bitindex); |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
306 if (!s->blocksize) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
307 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
308 int maxnlpc = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
309 /* shorten signature */ |
8715 | 310 if (get_bits_long(&s->gb, 32) != AV_RB32("ajkg")) { |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
311 av_log(s->avctx, AV_LOG_ERROR, "missing shorten magic 'ajkg'\n"); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
312 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
313 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
314 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
315 s->lpcqoffset = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
316 s->blocksize = DEFAULT_BLOCK_SIZE; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
317 s->channels = 1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
318 s->nmean = -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
319 s->version = get_bits(&s->gb, 8); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
320 s->internal_ftype = get_uint(s, TYPESIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
321 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
322 s->channels = get_uint(s, CHANSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
323 if (s->channels > MAX_CHANNELS) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
324 av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
325 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
326 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
327 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
328 /* get blocksize if version > 0 */ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
329 if (s->version > 0) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
330 int skip_bytes; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
331 s->blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE)); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
332 maxnlpc = get_uint(s, LPCQSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
333 s->nmean = get_uint(s, 0); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
334 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
335 skip_bytes = get_uint(s, NSKIPSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
336 for (i=0; i<skip_bytes; i++) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
337 skip_bits(&s->gb, 8); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
338 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
339 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
340 s->nwrap = FFMAX(NWRAP, maxnlpc); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
341 |
4226
43ebe9279fa0
fix some potential security issues, patch by Matthias Hopf, mat at mshopf dot de
bcoudurier
parents:
3947
diff
changeset
|
342 if (allocate_buffers(s)) |
43ebe9279fa0
fix some potential security issues, patch by Matthias Hopf, mat at mshopf dot de
bcoudurier
parents:
3947
diff
changeset
|
343 return -1; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
344 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
345 init_offset(s); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
346 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
347 if (s->version > 1) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
348 s->lpcqoffset = V2LPCQOFFSET; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
349 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
350 if (get_ur_golomb_shorten(&s->gb, FNSIZE) != FN_VERBATIM) { |
6068 | 351 av_log(s->avctx, AV_LOG_ERROR, "missing verbatim section at beginning of stream\n"); |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
352 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
353 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
354 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
355 s->header_size = get_ur_golomb_shorten(&s->gb, VERBATIM_CKSIZE_SIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
356 if (s->header_size >= OUT_BUFFER_SIZE || s->header_size < CANONICAL_HEADER_SIZE) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
357 av_log(s->avctx, AV_LOG_ERROR, "header is wrong size: %d\n", s->header_size); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
358 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
359 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
360 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
361 for (i=0; i<s->header_size; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
362 s->header[i] = (char)get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
363 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
364 if (decode_wave_header(avctx, s->header, s->header_size) < 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
365 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
366 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
367 s->cur_chan = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
368 s->bitshift = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
369 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
370 else |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
371 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
372 int cmd; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
373 int len; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
374 cmd = get_ur_golomb_shorten(&s->gb, FNSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
375 switch (cmd) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
376 case FN_ZERO: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
377 case FN_DIFF0: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
378 case FN_DIFF1: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
379 case FN_DIFF2: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
380 case FN_DIFF3: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
381 case FN_QLPC: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
382 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
383 int residual_size = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
384 int channel = s->cur_chan; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
385 int32_t coffset; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
386 if (cmd != FN_ZERO) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
387 residual_size = get_ur_golomb_shorten(&s->gb, ENERGYSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
388 /* this is a hack as version 0 differed in defintion of get_sr_golomb_shorten */ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
389 if (s->version == 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
390 residual_size--; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
391 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
392 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
393 if (s->nmean == 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
394 coffset = s->offset[channel][0]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
395 else { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
396 int32_t sum = (s->version < 2) ? 0 : s->nmean / 2; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
397 for (i=0; i<s->nmean; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
398 sum += s->offset[channel][i]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
399 coffset = sum / s->nmean; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
400 if (s->version >= 2) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
401 coffset >>= FFMIN(1, s->bitshift); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
402 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
403 switch (cmd) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
404 case FN_ZERO: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
405 for (i=0; i<s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
406 s->decoded[channel][i] = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
407 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
408 case FN_DIFF0: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
409 for (i=0; i<s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
410 s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) + coffset; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
411 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
412 case FN_DIFF1: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
413 for (i=0; i<s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
414 s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) + s->decoded[channel][i - 1]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
415 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
416 case FN_DIFF2: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
417 for (i=0; i<s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
418 s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) + 2*s->decoded[channel][i-1] |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
419 - s->decoded[channel][i-2]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
420 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
421 case FN_DIFF3: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
422 for (i=0; i<s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
423 s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) + 3*s->decoded[channel][i-1] |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
424 - 3*s->decoded[channel][i-2] |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
425 + s->decoded[channel][i-3]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
426 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
427 case FN_QLPC: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
428 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
429 int pred_order = get_ur_golomb_shorten(&s->gb, LPCQSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
430 for (i=0; i<pred_order; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
431 s->decoded[channel][i - pred_order] -= coffset; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
432 decode_subframe_lpc(s, channel, residual_size, pred_order); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
433 if (coffset != 0) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
434 for (i=0; i < s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
435 s->decoded[channel][i] += coffset; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
436 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
437 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
438 if (s->nmean > 0) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
439 int32_t sum = (s->version < 2) ? 0 : s->blocksize / 2; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
440 for (i=0; i<s->blocksize; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
441 sum += s->decoded[channel][i]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
442 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
443 for (i=1; i<s->nmean; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
444 s->offset[channel][i-1] = s->offset[channel][i]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
445 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
446 if (s->version < 2) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
447 s->offset[channel][s->nmean - 1] = sum / s->blocksize; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
448 else |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
449 s->offset[channel][s->nmean - 1] = (sum / s->blocksize) << s->bitshift; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
450 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
451 for (i=-s->nwrap; i<0; i++) |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
452 s->decoded[channel][i] = s->decoded[channel][i + s->blocksize]; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
453 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
454 fix_bitshift(s, s->decoded[channel]); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
455 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
456 s->cur_chan++; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
457 if (s->cur_chan == s->channels) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
458 samples = interleave_buffer(samples, s->channels, s->blocksize, s->decoded); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
459 s->cur_chan = 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
460 goto frame_done; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
461 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
462 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
463 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
464 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
465 case FN_VERBATIM: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
466 len = get_ur_golomb_shorten(&s->gb, VERBATIM_CKSIZE_SIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
467 while (len--) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
468 get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
469 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
470 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
471 case FN_BITSHIFT: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
472 s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
473 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
474 case FN_BLOCKSIZE: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
475 s->blocksize = get_uint(s, av_log2(s->blocksize)); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
476 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
477 case FN_QUIT: |
4734
d2db36185222
properly set *data_size when returning >= 0 values in shorten_decode_frame()
aurel
parents:
4652
diff
changeset
|
478 *data_size = 0; |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
479 return buf_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
480 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
481 default: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
482 av_log(avctx, AV_LOG_ERROR, "unknown shorten function %d\n", cmd); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
483 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
484 break; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
485 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
486 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
487 frame_done: |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
488 *data_size = (int8_t *)samples - (int8_t *)data; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
489 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
490 // s->last_blocksize = s->blocksize; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
491 s->bitindex = get_bits_count(&s->gb) - 8*((get_bits_count(&s->gb))/8); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
492 i= (get_bits_count(&s->gb))/8; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
493 if (i > buf_size) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
494 av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
495 s->bitstream_size=0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
496 s->bitstream_index=0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
497 return -1; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
498 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
499 if (s->bitstream_size) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
500 s->bitstream_index += i; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
501 s->bitstream_size -= i; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
502 return input_buf_size; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
503 } else |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
504 return i; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
505 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
506 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6249
diff
changeset
|
507 static av_cold int shorten_decode_close(AVCodecContext *avctx) |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
508 { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
509 ShortenContext *s = avctx->priv_data; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
510 int i; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
511 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
512 for (i = 0; i < s->channels; i++) { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
513 s->decoded[i] -= s->nwrap; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
514 av_freep(&s->decoded[i]); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
515 av_freep(&s->offset[i]); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
516 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
517 av_freep(&s->bitstream); |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
518 return 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
519 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
520 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
521 static void shorten_flush(AVCodecContext *avctx){ |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
522 ShortenContext *s = avctx->priv_data; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
523 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
524 s->bitstream_size= |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
525 s->bitstream_index= 0; |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
526 } |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
527 |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
528 AVCodec shorten_decoder = { |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
529 "shorten", |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
530 CODEC_TYPE_AUDIO, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
531 CODEC_ID_SHORTEN, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
532 sizeof(ShortenContext), |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
533 shorten_decode_init, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
534 NULL, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
535 shorten_decode_close, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
536 shorten_decode_frame, |
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
537 .flush= shorten_flush, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6710
diff
changeset
|
538 .long_name= NULL_IF_CONFIG_SMALL("Shorten"), |
2525
b47af698085e
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
diff
changeset
|
539 }; |