diff options
Diffstat (limited to 'apps/codecs/shorten.c')
-rw-r--r-- | apps/codecs/shorten.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c index b48a91ea17..1b9563a676 100644 --- a/apps/codecs/shorten.c +++ b/apps/codecs/shorten.c | |||
@@ -20,23 +20,12 @@ | |||
20 | #include "codeclib.h" | 20 | #include "codeclib.h" |
21 | #include <codecs/libffmpegFLAC/shndec.h> | 21 | #include <codecs/libffmpegFLAC/shndec.h> |
22 | 22 | ||
23 | #ifndef IBSS_ATTR_SHORTEN_DECODED0 | ||
24 | #define IBSS_ATTR_SHORTEN_DECODED0 IBSS_ATTR | ||
25 | #endif | ||
26 | |||
27 | CODEC_HEADER | 23 | CODEC_HEADER |
28 | 24 | ||
29 | #ifdef USE_IRAM | 25 | #ifndef IBSS_ATTR_SHORTEN_DECODED0 |
30 | extern char iramcopy[]; | 26 | #define IBSS_ATTR_SHORTEN_DECODED0 IBSS_ATTR |
31 | extern char iramstart[]; | ||
32 | extern char iramend[]; | ||
33 | extern char iedata[]; | ||
34 | extern char iend[]; | ||
35 | #endif | 27 | #endif |
36 | 28 | ||
37 | struct codec_api* rb; | ||
38 | struct codec_api* ci; | ||
39 | |||
40 | int32_t decoded0[MAX_DECODE_SIZE] IBSS_ATTR_SHORTEN_DECODED0; | 29 | int32_t decoded0[MAX_DECODE_SIZE] IBSS_ATTR_SHORTEN_DECODED0; |
41 | int32_t decoded1[MAX_DECODE_SIZE] IBSS_ATTR; | 30 | int32_t decoded1[MAX_DECODE_SIZE] IBSS_ATTR; |
42 | 31 | ||
@@ -46,7 +35,7 @@ int32_t offset1[MAX_OFFSET_SIZE] IBSS_ATTR; | |||
46 | int8_t ibuf[MAX_BUFFER_SIZE] IBSS_ATTR; | 35 | int8_t ibuf[MAX_BUFFER_SIZE] IBSS_ATTR; |
47 | 36 | ||
48 | /* this is the codec entry point */ | 37 | /* this is the codec entry point */ |
49 | enum codec_status codec_start(struct codec_api* api) | 38 | enum codec_status codec_main(void) |
50 | { | 39 | { |
51 | ShortenContext sc; | 40 | ShortenContext sc; |
52 | uint32_t samplesdone; | 41 | uint32_t samplesdone; |
@@ -56,14 +45,6 @@ enum codec_status codec_start(struct codec_api* api) | |||
56 | size_t bytesleft; | 45 | size_t bytesleft; |
57 | 46 | ||
58 | /* Generic codec initialisation */ | 47 | /* Generic codec initialisation */ |
59 | rb = api; | ||
60 | ci = api; | ||
61 | |||
62 | #ifdef USE_IRAM | ||
63 | ci->memcpy(iramstart, iramcopy, iramend-iramstart); | ||
64 | ci->memset(iedata, 0, iend - iedata); | ||
65 | #endif | ||
66 | |||
67 | ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); | 48 | ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); |
68 | ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); | 49 | ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); |
69 | 50 | ||
@@ -72,7 +53,7 @@ enum codec_status codec_start(struct codec_api* api) | |||
72 | 53 | ||
73 | next_track: | 54 | next_track: |
74 | /* Codec initialization */ | 55 | /* Codec initialization */ |
75 | if (codec_init(api)) { | 56 | if (codec_init()) { |
76 | LOGF("Shorten: codec_init error\n"); | 57 | LOGF("Shorten: codec_init error\n"); |
77 | return CODEC_ERROR; | 58 | return CODEC_ERROR; |
78 | } | 59 | } |