diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-06-27 18:11:07 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-06-27 18:11:07 +0000 |
commit | 4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47 (patch) | |
tree | 18c1d4ae3392fb904dd981d0bcd110a46a1bbd35 /apps/codecs/libmad/frame.c | |
parent | 9e86287946517e06893f4950d45d60056c00d9e7 (diff) | |
download | rockbox-4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47.tar.gz rockbox-4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47.zip |
Comment unused code in libmad. Clean up initialization and memset'ing of decoder arrays.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27159 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmad/frame.c')
-rw-r--r-- | apps/codecs/libmad/frame.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/apps/codecs/libmad/frame.c b/apps/codecs/libmad/frame.c index 7fd4235e30..f5e0cf8d32 100644 --- a/apps/codecs/libmad/frame.c +++ b/apps/codecs/libmad/frame.c | |||
@@ -92,8 +92,10 @@ void mad_frame_init(struct mad_frame *frame) | |||
92 | mad_header_init(&frame->header); | 92 | mad_header_init(&frame->header); |
93 | 93 | ||
94 | frame->options = 0; | 94 | frame->options = 0; |
95 | 95 | /* rockbox: comment this to proper zero this array in mad_frame_mute(). overlap | |
96 | * is linked to an array in rockbox' apps/codecs/mpa.c before calling this. | ||
96 | frame->overlap = 0; | 97 | frame->overlap = 0; |
98 | */ | ||
97 | mad_frame_mute(frame); | 99 | mad_frame_mute(frame); |
98 | } | 100 | } |
99 | 101 | ||
@@ -101,6 +103,7 @@ void mad_frame_init(struct mad_frame *frame) | |||
101 | * NAME: frame->finish() | 103 | * NAME: frame->finish() |
102 | * DESCRIPTION: deallocate any dynamic memory associated with frame | 104 | * DESCRIPTION: deallocate any dynamic memory associated with frame |
103 | */ | 105 | */ |
106 | /* rockbox: unused | ||
104 | void mad_frame_finish(struct mad_frame *frame) | 107 | void mad_frame_finish(struct mad_frame *frame) |
105 | { | 108 | { |
106 | mad_header_finish(&frame->header); | 109 | mad_header_finish(&frame->header); |
@@ -110,6 +113,7 @@ void mad_frame_finish(struct mad_frame *frame) | |||
110 | frame->overlap = 0; | 113 | frame->overlap = 0; |
111 | } | 114 | } |
112 | } | 115 | } |
116 | */ | ||
113 | 117 | ||
114 | /* | 118 | /* |
115 | * NAME: decode_header() | 119 | * NAME: decode_header() |
@@ -484,21 +488,7 @@ int mad_frame_decode(struct mad_frame *frame, struct mad_stream *stream) | |||
484 | */ | 488 | */ |
485 | void mad_frame_mute(struct mad_frame *frame) | 489 | void mad_frame_mute(struct mad_frame *frame) |
486 | { | 490 | { |
487 | unsigned int s, sb; | 491 | memset((*frame->sbsample_prev), 0, sizeof(*frame->sbsample_prev)); |
488 | 492 | memset((*frame->sbsample) , 0, sizeof(*frame->sbsample)); | |
489 | for (s = 0; s < 36; ++s) { | 493 | memset((*frame->overlap) , 0, sizeof(*frame->overlap)); |
490 | for (sb = 0; sb < 32; ++sb) { | ||
491 | (*frame->sbsample)[0][s][sb] = | ||
492 | (*frame->sbsample)[1][s][sb] = 0; | ||
493 | } | ||
494 | } | ||
495 | |||
496 | if (frame->overlap) { | ||
497 | for (s = 0; s < 18; ++s) { | ||
498 | for (sb = 0; sb < 32; ++sb) { | ||
499 | (*frame->overlap)[0][sb][s] = | ||
500 | (*frame->overlap)[1][sb][s] = 0; | ||
501 | } | ||
502 | } | ||
503 | } | ||
504 | } | 494 | } |