diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-11-29 17:52:30 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-11-29 17:52:30 +0000 |
commit | 6ae46065b40691d5571252aeeb2ec5475e2f5e4c (patch) | |
tree | 6b53c5593a1b364fe078bfb1f82e2f54ff9b6a96 /apps/codecs/mp3_enc.c | |
parent | b57f23139bbcd3b631d4921e971095694f4a0d56 (diff) | |
download | rockbox-6ae46065b40691d5571252aeeb2ec5475e2f5e4c.tar.gz rockbox-6ae46065b40691d5571252aeeb2ec5475e2f5e4c.zip |
Add support for compiling encoders without adjustable CPU frequency and/or IRAM.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11625 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/mp3_enc.c')
-rw-r--r-- | apps/codecs/mp3_enc.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/apps/codecs/mp3_enc.c b/apps/codecs/mp3_enc.c index 12a24a7c9b..bbae3502bd 100644 --- a/apps/codecs/mp3_enc.c +++ b/apps/codecs/mp3_enc.c @@ -2265,9 +2265,9 @@ static void encode_frame(char *buffer, struct enc_chunk_hdr *chunk) chunk->enc_size = cfg.byte_per_frame + cfg.mpg.padding; - /* finish this chunk by adding sideinfo header data */ - CodedData.bitpos = 0; - encodeSideInfo( cfg.cod_info ); + /* finish this chunk by adding sideinfo header data */ + CodedData.bitpos = 0; + encodeSideInfo( cfg.cod_info ); #ifdef ROCKBOX_BIG_ENDIAN /* copy chunk to enc_buffer */ @@ -2419,7 +2419,9 @@ static bool enc_init(void) ci->enc_set_parameters == NULL || ci->enc_get_chunk == NULL || ci->enc_finish_chunk == NULL || +#ifdef HAVE_ADJUSTABLE_CPU_FREQ ci->enc_pcm_buf_near_empty == NULL || +#endif ci->enc_get_pcm_data == NULL || ci->enc_unget_pcm_data == NULL ) return false; @@ -2453,7 +2455,9 @@ static bool enc_init(void) enum codec_status codec_main(void) { +#ifdef HAVE_ADJUSTABLE_CPU_FREQ bool cpu_boosted; +#endif /* Generic codec initialisation */ if (!enc_init()) @@ -2465,8 +2469,10 @@ enum codec_status codec_main(void) /* main application waits for this flag during encoder loading */ ci->enc_codec_loaded = 1; +#ifdef HAVE_ADJUSTABLE_CPU_FREQ ci->cpu_boost(true); cpu_boosted = true; +#endif /* main encoding loop */ while (!ci->stop_codec) @@ -2480,12 +2486,13 @@ enum codec_status codec_main(void) if (ci->stop_codec) break; +#ifdef HAVE_ADJUSTABLE_CPU_FREQ if (!cpu_boosted && ci->enc_pcm_buf_near_empty() == 0) { ci->cpu_boost(true); cpu_boosted = true; } - +#endif chunk = ci->enc_get_chunk(); chunk->enc_data = ENC_CHUNK_SKIP_HDR(chunk->enc_data, chunk); @@ -2502,17 +2509,20 @@ enum codec_status codec_main(void) ci->yield(); } +#ifdef HAVE_ADJUSTABLE_CPU_FREQ if (cpu_boosted && ci->enc_pcm_buf_near_empty()) - { - ci->cpu_boost(false); - cpu_boosted = false; - } - + { + ci->cpu_boost(false); + cpu_boosted = false; + } +#endif ci->yield(); } - if(cpu_boosted) /* set initial boost state */ +#ifdef HAVE_ADJUSTABLE_CPU_FREQ + if (cpu_boosted) /* set initial boost state */ ci->cpu_boost(false); +#endif /* reset parameters to initial state */ ci->enc_set_parameters(NULL); |