Patch #1426489 - Shorten codec optimisations from Mark Arigo

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8615 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 30 insertions, 14 deletions

diff --git a/apps/codecs/libffmpegFLAC/shndec.h b/apps/codecs/libffmpegFLAC/shndec.h
index 6b830dcafa..713a5b56dc 100644
--- a/apps/codecs/libffmpegFLAC/shndec.h
+++ b/apps/codecs/libffmpegFLAC/shndec.h
@@ -1,11 +1,31 @@
 #include "bitstream.h"
 
 #define SHN_OUTPUT_DEPTH 28
+
+#define MAX_CHANNELS   2
+#define MAX_PRED_ORDER 16
+#define MAX_NWRAP      MAX_PRED_ORDER
+#define MAX_NMEAN      4
+
+/* NUM_DEC_LOOPS should be even number */
+#define NUM_DEC_LOOPS      26
 #define DEFAULT_BLOCK_SIZE 256
-#define MAX_FRAMESIZE 1024
-#define MAX_CHANNELS 2
-#define MAX_NWRAP 3
-#define MAX_NMEAN 4
+#define MAX_HEADER_SIZE    DEFAULT_BLOCK_SIZE*4
+#define MAX_BUFFER_SIZE    2*DEFAULT_BLOCK_SIZE*NUM_DEC_LOOPS
+#define MAX_DECODE_SIZE    ((DEFAULT_BLOCK_SIZE*NUM_DEC_LOOPS/2) + MAX_NWRAP)
+#define MAX_OFFSET_SIZE    MAX_NMEAN
+
+#define FN_DIFF0     0
+#define FN_DIFF1     1
+#define FN_DIFF2     2
+#define FN_DIFF3     3
+#define FN_QUIT      4
+#define FN_BLOCKSIZE 5
+#define FN_BITSHIFT  6
+#define FN_QLPC      7
+#define FN_ZERO      8
+#define FN_VERBATIM  9
+#define FN_ERROR     10
 
 typedef struct ShortenContext {
     GetBitContext gb;
@@ -17,20 +37,16 @@ typedef struct ShortenContext {
     int bits_per_sample;
     int version;
     int bitshift;
+    int last_bitshift;
     int nmean;
     int nwrap;
     int blocksize;
     int bitindex;
-/* Not needed...
-    int bit_rate;
-    int block_align;
-    int chunk_size;
-*/
 } ShortenContext;
 
 int shorten_init(ShortenContext* s, uint8_t *buf, int buf_size);
-int shorten_decode_frame(ShortenContext *s,
-                         int32_t *decoded,
-                         int32_t *offset,
-                         uint8_t *buf,
-                         int buf_size) ICODE_ATTR;
+int shorten_decode_frames(ShortenContext *s, int *nsamples,
+                         int32_t *decoded0, int32_t *decoded1,
+                         int32_t *offset0, int32_t *offset1,
+                         uint8_t *buf, int buf_size,
+                         void (*yield)(void)) ICODE_ATTR;