summaryrefslogtreecommitdiffstats
path: root/lib/rbcodec/codecs/libffmpegFLAC
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2021-03-02 13:26:38 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2021-03-02 23:48:05 +0000
commita01721948883d45bc73577a6c8185a5a630ef237 (patch)
tree6e18cff3af0dd4365efab656abfd0c1820f039ce /lib/rbcodec/codecs/libffmpegFLAC
parent7d78958f9d52cf7de921738fb063cdf9a5012699 (diff)
downloadrockbox-a01721948883d45bc73577a6c8185a5a630ef237.tar.gz
rockbox-a01721948883d45bc73577a6c8185a5a630ef237.tar.bz2
rockbox-a01721948883d45bc73577a6c8185a5a630ef237.zip
Nudge flac towards upstream FS#13266
Some flac encoded files contain junk that our decoder picked up upstream has some sign and overflow fixes too Change-Id: I5857b2fe56906a48f04944cdfee8fe2306f2c3fd
Diffstat (limited to 'lib/rbcodec/codecs/libffmpegFLAC')
-rw-r--r--lib/rbcodec/codecs/libffmpegFLAC/decoder.c248
-rw-r--r--lib/rbcodec/codecs/libffmpegFLAC/decoder.h11
-rw-r--r--lib/rbcodec/codecs/libffmpegFLAC/golomb.h77
3 files changed, 198 insertions, 138 deletions
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
index 2e92c4b90d..107315c2f7 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
+++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
@@ -135,64 +135,73 @@ static int get_crc8(const uint8_t *buf, int count)
}
static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR_FLAC;
-static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order)
+static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
{
+ GetBitContext gb = s->gb;
int i, tmp, partition, method_type, rice_order;
- int sample = 0, samples;
+ int rice_bits, rice_esc;
+ int samples;
- method_type = get_bits(&s->gb, 2);
- if (method_type > 1){
- //fprintf(stderr,"illegal residual coding method %d\n", method_type);
- return -3;
- }
-
- rice_order = get_bits(&s->gb, 4);
+ method_type = get_bits(&gb, 2);
+ rice_order = get_bits(&gb, 4);
+
+ samples = s->blocksize >> rice_order;
+ rice_bits = 4 + method_type;
+ rice_esc = (1 << rice_bits) - 1;
- samples= s->blocksize >> rice_order;
+ decoded += pred_order;
+ i = pred_order;
- sample=
- i= pred_order;
- for (partition = 0; partition < (1 << rice_order); partition++)
+ if (method_type > 1 || (samples << rice_order != s->blocksize) || pred_order > samples)
{
- tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
- if (tmp == (method_type == 0 ? 15 : 31))
- {
- //fprintf(stderr,"fixed len partition\n");
- tmp = get_bits(&s->gb, 5);
- for (; i < samples; i++, sample++)
- decoded[sample] = get_sbits(&s->gb, tmp);
- }
- else
- {
- for (; i < samples; i++, sample++){
- decoded[sample] = get_sr_golomb_flac(&s->gb, tmp, INT_MAX, 0);
+ return -3;
+ }
+
+ for (partition = 0; partition < (1 << rice_order); partition++) {
+ tmp = get_bits(&gb, rice_bits);
+ if (tmp == rice_esc) {
+ tmp = get_bits(&gb, 5);
+ for (; i < samples; i++)
+ *decoded++ = get_sbits(&gb, tmp);
+ } else {
+ int real_limit = tmp ? (INT_MAX >> tmp) + 2 : INT_MAX;
+ for (; i < samples; i++) {
+ int v = get_sr_golomb_flac(&gb, tmp, real_limit, 0);
+ if ((unsigned) v == 0x80000000){
+ return -3;
+ }
+
+ *decoded++ = v;
}
}
i= 0;
}
+ s->gb = gb;
+
return 0;
-}
+}
-static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR_FLAC;
-static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order)
+static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order, int bps) ICODE_ATTR_FLAC;
+static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order, int bps)
{
const int blocksize = s->blocksize;
- int a, b, c, d, i;
-
+ unsigned a, b, c, d;
+ int i;
+
/* warm up samples */
for (i = 0; i < pred_order; i++)
{
- decoded[i] = get_sbits(&s->gb, s->curr_bps);
+ decoded[i] = get_sbits(&s->gb, bps);
}
-
+
if (decode_residuals(s, decoded, pred_order) < 0)
return -4;
a = decoded[pred_order-1];
b = a - decoded[pred_order-2];
c = b - decoded[pred_order-2] + decoded[pred_order-3];
- d = c - decoded[pred_order-2] + 2*decoded[pred_order-3] - decoded[pred_order-4];
+ d = c - decoded[pred_order-2] + 2U*decoded[pred_order-3] - decoded[pred_order-4];
switch(pred_order)
{
@@ -221,20 +230,63 @@ static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_orde
return 0;
}
-static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR_FLAC;
-static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order)
+static void flac_lpc_32_c(int32_t *decoded, int coeffs[],
+ int pred_order, int qlevel, int len) ICODE_ATTR_FLAC;
+static void flac_lpc_32_c(int32_t *decoded, int coeffs[],
+ int pred_order, int qlevel, int len)
+{
+ int i, j;
+ /*NOTE coeffs[] is in reverse order compared to upstream*/
+ for (i = pred_order; i < len; i++, decoded++) {
+ int64_t sum = 0;
+ for (j = 0; j < pred_order; j++)
+ sum += (int64_t)coeffs[pred_order-j-1] * decoded[j];
+ decoded[j] += sum >> qlevel;
+ }
+
+}
+
+static void lpc_analyze_remodulate(int32_t *decoded, int coeffs[],
+ int order, int qlevel, int len, int bps)
+{
+ /*NOTE coeffs[] is in reverse order compared to upstream*/
+ int i, j;
+ int ebps = 1 << (bps-1);
+ unsigned sigma = 0;
+
+ for (i = order; i < len; i++)
+ sigma |= decoded[i] + ebps;
+
+ if (sigma < 2U*ebps)
+ return;
+
+ for (i = len - 1; i >= order; i--) {
+ int64_t p = 0;
+ for (j = 0; j < order; j++)
+ p += coeffs[order-j-1] * (int64_t)(int32_t)decoded[i-order+j];
+ decoded[i] -= p >> qlevel;
+ }
+ for (i = order; i < len; i++, decoded++) {
+ int32_t p = 0;
+ for (j = 0; j < order; j++)
+ p += coeffs[order-j-1] * (uint32_t)decoded[j];
+ decoded[j] += p >> qlevel;
+ }
+}
+
+static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, int bps) ICODE_ATTR_FLAC;
+static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, int bps)
{
int sum, i, j;
- int64_t wsum;
int coeff_prec, qlevel;
int coeffs[pred_order];
/* warm up samples */
for (i = 0; i < pred_order; i++)
{
- decoded[i] = get_sbits(&s->gb, s->curr_bps);
+ decoded[i] = get_sbits(&s->gb, bps);
}
-
+
coeff_prec = get_bits(&s->gb, 4) + 1;
if (coeff_prec == 16)
{
@@ -276,21 +328,18 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order)
#endif
} else {
#if defined(CPU_COLDFIRE)
- (void)wsum;
(void)j;
lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order,
decoded + pred_order, coeffs);
#else
- for (i = pred_order; i < s->blocksize; i++)
- {
- wsum = 0;
- for (j = 0; j < pred_order; j++)
- wsum += (int64_t)coeffs[j] * (int64_t)decoded[i-j-1];
- decoded[i] += wsum >> qlevel;
- }
+
+ flac_lpc_32_c(decoded, coeffs, pred_order, qlevel, s->blocksize);
+
+ if (bps <= 16)
+ lpc_analyze_remodulate(decoded, coeffs, pred_order, qlevel, s->blocksize, bps);
#endif
}
-
+
return 0;
}
@@ -298,14 +347,13 @@ static inline int decode_subframe(FLACContext *s, int channel, int32_t* decoded)
{
int type, wasted = 0;
int i, tmp;
-
- s->curr_bps = s->bps;
+ int bps = s->bps;
if(channel == 0){
- if(s->decorrelation == RIGHT_SIDE)
- s->curr_bps++;
+ if(s->ch_mode == RIGHT_SIDE)
+ bps++;
}else{
- if(s->decorrelation == LEFT_SIDE || s->decorrelation == MID_SIDE)
- s->curr_bps++;
+ if(s->ch_mode == LEFT_SIDE || s->ch_mode == MID_SIDE)
+ bps++;
}
if (get_bits1(&s->gb))
@@ -314,35 +362,21 @@ static inline int decode_subframe(FLACContext *s, int channel, int32_t* decoded)
return -9;
}
type = get_bits(&s->gb, 6);
-// wasted = get_bits1(&s->gb);
-
-// if (wasted)
-// {
-// while (!get_bits1(&s->gb))
-// wasted++;
-// if (wasted)
-// wasted++;
-// s->curr_bps -= wasted;
-// }
-#if 0
- wasted= 16 - av_log2(show_bits(&s->gb, 17));
- skip_bits(&s->gb, wasted+1);
- s->curr_bps -= wasted;
-#else
+
if (get_bits1(&s->gb))
{
wasted = 1;
while (!get_bits1(&s->gb))
wasted++;
- s->curr_bps -= wasted;
+ bps -= wasted;
//fprintf(stderr,"%d wasted bits\n", wasted);
}
-#endif
+
//FIXME use av_log2 for types
if (type == 0)
{
//fprintf(stderr,"coding type: constant\n");
- tmp = get_sbits(&s->gb, s->curr_bps);
+ tmp = get_sbits(&s->gb, bps);
for (i = 0; i < s->blocksize; i++)
decoded[i] = tmp;
}
@@ -350,18 +384,18 @@ static inline int decode_subframe(FLACContext *s, int channel, int32_t* decoded)
{
//fprintf(stderr,"coding type: verbatim\n");
for (i = 0; i < s->blocksize; i++)
- decoded[i] = get_sbits(&s->gb, s->curr_bps);
+ decoded[i] = get_sbits(&s->gb, bps);
}
else if ((type >= 8) && (type <= 12))
{
//fprintf(stderr,"coding type: fixed\n");
- if (decode_subframe_fixed(s, decoded, type & ~0x8) < 0)
+ if (decode_subframe_fixed(s, decoded, type & ~0x8, bps) < 0)
return -10;
}
else if (type >= 32)
{
//fprintf(stderr,"coding type: lpc\n");
- if (decode_subframe_lpc(s, decoded, (type & ~0x20)+1) < 0)
+ if (decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps) < 0)
return -11;
}
else
@@ -369,12 +403,12 @@ static inline int decode_subframe(FLACContext *s, int channel, int32_t* decoded)
//fprintf(stderr,"Unknown coding type: %d\n",type);
return -12;
}
-
- if (wasted)
+
+ if (wasted && wasted < 32)
{
int i;
for (i = 0; i < s->blocksize; i++)
- decoded[i] <<= wasted;
+ decoded[i] = (unsigned)decoded[i] << wasted;
}
return 0;
@@ -385,25 +419,26 @@ static int decode_frame(FLACContext *s,
static int decode_frame(FLACContext *s,
void (*yield)(void))
{
- int blocksize_code, sample_rate_code, sample_size_code, assignment, crc8;
- int decorrelation, bps, blocksize, samplerate;
+ int blocksize_code, sample_rate_code, sample_size_code, crc8;
+ int ch_mode, bps, blocksize, samplerate;
int res, ch;
-
- blocksize_code = get_bits(&s->gb, 4);
+ GetBitContext *gb = &s->gb;
- sample_rate_code = get_bits(&s->gb, 4);
-
- assignment = get_bits(&s->gb, 4); /* channel assignment */
- if (assignment < 8 && s->channels == assignment+1)
- decorrelation = INDEPENDENT;
- else if (assignment >=8 && assignment < 11 && s->channels == 2)
- decorrelation = LEFT_SIDE + assignment - 8;
+ blocksize_code = get_bits(gb, 4);
+
+ sample_rate_code = get_bits(gb, 4);
+
+ ch_mode = get_bits(gb, 4); /* channel assignment */
+ if (ch_mode < 8 && s->channels == ch_mode+1)
+ ch_mode = INDEPENDENT;
+ else if (ch_mode >=8 && ch_mode < 11 && s->channels == 2)
+ ch_mode = LEFT_SIDE + ch_mode - 8;
else
{
return -13;
}
-
- sample_size_code = get_bits(&s->gb, 3);
+
+ sample_size_code = get_bits(gb, 3);
if(sample_size_code == 0)
bps= s->bps;
else if((sample_size_code != 3) && (sample_size_code != 7))
@@ -413,13 +448,13 @@ static int decode_frame(FLACContext *s,
return -14;
}
- if (get_bits1(&s->gb))
+ if (get_bits1(gb))
{
return -15;
}
/* Get the samplenumber of the first sample in this block */
- s->samplenumber=get_utf8(&s->gb);
+ s->samplenumber=get_utf8(gb);
/* samplenumber actually contains the frame number for streams
with a constant block size - so we multiply by blocksize to
@@ -438,9 +473,9 @@ static int decode_frame(FLACContext *s,
if (blocksize_code == 0)
blocksize = s->min_blocksize;
else if (blocksize_code == 6)
- blocksize = get_bits(&s->gb, 8)+1;
+ blocksize = get_bits(gb, 8)+1;
else if (blocksize_code == 7)
- blocksize = get_bits(&s->gb, 16)+1;
+ blocksize = get_bits(gb, 16)+1;
else
blocksize = blocksize_table[blocksize_code];
@@ -453,17 +488,17 @@ static int decode_frame(FLACContext *s,
}else if ((sample_rate_code < 12))
samplerate = sample_rate_table[sample_rate_code];
else if (sample_rate_code == 12)
- samplerate = get_bits(&s->gb, 8) * 1000;
+ samplerate = get_bits(gb, 8) * 1000;
else if (sample_rate_code == 13)
- samplerate = get_bits(&s->gb, 16);
+ samplerate = get_bits(gb, 16);
else if (sample_rate_code == 14)
- samplerate = get_bits(&s->gb, 16) * 10;
+ samplerate = get_bits(gb, 16) * 10;
else{
return -17;
}
- skip_bits(&s->gb, 8);
- crc8= get_crc8(s->gb.buffer, get_bits_count(&s->gb)/8);
+ skip_bits(gb, 8);
+ crc8= get_crc8(s->gb.buffer, get_bits_count(gb)/8);
if(crc8){
return -18;
}
@@ -471,7 +506,7 @@ static int decode_frame(FLACContext *s,
s->blocksize = blocksize;
s->samplerate = samplerate;
s->bps = bps;
- s->decorrelation= decorrelation;
+ s->ch_mode = ch_mode;
for (ch=0; ch<s->channels; ++ch) {
yield();
@@ -480,10 +515,10 @@ static int decode_frame(FLACContext *s,
}
yield();
- align_get_bits(&s->gb);
+ align_get_bits(gb);
/* frame footer */
- skip_bits(&s->gb, 16); /* data crc */
+ skip_bits(gb, 16); /* data crc */
return 0;
}
@@ -576,6 +611,13 @@ int flac_decode_frame(FLACContext *s,
int framesize;
int scale;
+ /* check that there is at least the smallest decodable amount of data.
+ this amount corresponds to the smallest valid FLAC frame possible.
+ this amount corresponds to the smallest valid FLAC frame possible.
+ FF F8 69 02 00 00 9A 00 00 34 46 */
+ if (buf_size < MIN_FRAME_SIZE)
+ return buf_size;
+
init_get_bits(&s->gb, buf, buf_size*8);
tmp = get_bits(&s->gb, 16);
@@ -600,7 +642,7 @@ int flac_decode_frame(FLACContext *s,
}\
scale=FLAC_OUTPUT_DEPTH-s->bps;
- switch(s->decorrelation)
+ switch(s->ch_mode)
{
case INDEPENDENT:
if (s->channels <= 2) {
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/decoder.h b/lib/rbcodec/codecs/libffmpegFLAC/decoder.h
index 677a21ac98..7bd021dce6 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/decoder.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.h
@@ -3,9 +3,10 @@
#include "bitstream.h"
-#define MAX_CHANNELS 6 /* Maximum supported channels, only left/right will be played back */
-#define MAX_BLOCKSIZE 4608 /* Maxsize in samples of one uncompressed frame */
-#define MAX_FRAMESIZE 65536 /* Maxsize in bytes of one compressed frame */
+#define MAX_CHANNELS 6 /* Maximum supported channels, only left/right will be played back */
+#define MAX_BLOCKSIZE 4608 /* Maxsize in samples of one uncompressed frame */
+#define MAX_FRAMESIZE 65536 /* Maxsize in bytes of one compressed frame */
+#define MIN_FRAME_SIZE 11 /* smallest valid FLAC frame possible */
#define FLAC_OUTPUT_DEPTH 29 /* Provide samples left-shifted to 28 bits+sign */
@@ -23,10 +24,10 @@ typedef struct FLACContext {
int min_framesize, max_framesize;
int samplerate, channels;
int blocksize/*, last_blocksize*/;
- int bps, curr_bps;
+ int bps;
unsigned long samplenumber;
unsigned long totalsamples;
- enum decorrelation_type decorrelation;
+ enum decorrelation_type ch_mode;
int filesize;
int length;
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/golomb.h b/lib/rbcodec/codecs/libffmpegFLAC/golomb.h
index 197b78ee1c..68d2558e1d 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/golomb.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/golomb.h
@@ -33,49 +33,69 @@
/**
* read unsigned golomb rice code (jpegls).
*/
-static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int esc_len){
+static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
+ int esc_len)
+{
unsigned int buf;
int log;
-
+
OPEN_READER(re, gb);
UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
+
+ log = av_log2(buf);
- log= av_log2(buf);
-
- if(log - k >= 32-MIN_CACHE_BITS+(MIN_CACHE_BITS==32) && 32-log < limit){
+ if (log - k >= 32 - MIN_CACHE_BITS + (MIN_CACHE_BITS == 32) &&
+ 32 - log < limit) {
buf >>= log - k;
- buf += (30-log)<<k;
+ buf += (30U - log) << k;
LAST_SKIP_BITS(re, gb, 32 + k - log);
CLOSE_READER(re, gb);
-
+
return buf;
- }else{
+ } else {
int i;
- for(i=0; SHOW_UBITS(re, gb, 1) == 0; i++){
- LAST_SKIP_BITS(re, gb, 1);
+ for (i = 0; i + MIN_CACHE_BITS <= limit && SHOW_UBITS(re, gb, MIN_CACHE_BITS) == 0; i += MIN_CACHE_BITS) {
+ if (gb->size_in_bits <= (signed) re_index) {
+ CLOSE_READER(re, gb);
+ return -1;
+ }
+ LAST_SKIP_BITS(re, gb, MIN_CACHE_BITS);
UPDATE_CACHE(re, gb);
}
- SKIP_BITS(re, gb, 1);
+ for (; i < limit && SHOW_UBITS(re, gb, 1) == 0; i++) {
+ SKIP_BITS(re, gb, 1);
+ }
+ LAST_SKIP_BITS(re, gb, 1);
+ UPDATE_CACHE(re, gb);
- if(i < limit - 1){
- if(k){
- buf = SHOW_UBITS(re, gb, k);
- LAST_SKIP_BITS(re, gb, k);
- }else{
- buf=0;
+ if (i < limit - 1) {
+ if (k) {
+ if (k > MIN_CACHE_BITS - 1) {
+ buf = SHOW_UBITS(re, gb, 16) << (k-16);
+ LAST_SKIP_BITS(re, gb, 16);
+ UPDATE_CACHE(re, gb);
+ buf |= SHOW_UBITS(re, gb, k-16);
+ LAST_SKIP_BITS(re, gb, k-16);
+ } else {
+ buf = SHOW_UBITS(re, gb, k);
+ LAST_SKIP_BITS(re, gb, k);
+ }
+ } else {
+ buf = 0;
}
- CLOSE_READER(re, gb);
- return buf + (i<<k);
- }else if(i == limit - 1){
+ buf += ((int32_t)i << k);
+ } else if (i == limit - 1) {
buf = SHOW_UBITS(re, gb, esc_len);
LAST_SKIP_BITS(re, gb, esc_len);
- CLOSE_READER(re, gb);
-
- return buf + 1;
- }else
- return -1;
+
+ buf ++;
+ } else {
+ buf = -1;
+ }
+ CLOSE_READER(re, gb);
+ return buf;
}
}
@@ -103,8 +123,5 @@ static inline unsigned int get_ur_golomb_shorten(GetBitContext *gb, int k){
static inline int get_sr_golomb_shorten(GetBitContext* gb, int k)
{
int uvar = get_ur_golomb_jpegls(gb, k + 1, INT_MAX, 0);
- if (uvar & 1)
- return ~(uvar >> 1);
- else
- return uvar >> 1;
+ return (uvar >> 1) ^ -(uvar & 1);
}