Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Assumption about there being MPEG1-only samplerates available and therefore MPEG1-only bitrates for recording is no longer valid. Fix that.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13579 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-06-06 21:24:20 +00:00
parent e8c94d898d
commit eae3a6a3c2
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/enc_config.c
View file

@ -134,7 +134,7 @@ static bool mp3_enc_bitrate(struct menucallback_data *data)
/* mono only */ /* mono only */
{ "16 kBit/s", TALK_ID(16, UNIT_KBIT) }, /* 2 */ { "16 kBit/s", TALK_ID(16, UNIT_KBIT) }, /* 2 */
{ "24 kBit/s", TALK_ID(24, UNIT_KBIT) }, /* 2 */ { "24 kBit/s", TALK_ID(24, UNIT_KBIT) }, /* 2 */
#endif #endif /* HAVE_MPEG2_SAMPR */
/* stereo/mono */ /* stereo/mono */
{ "32 kBit/s", TALK_ID(32, UNIT_KBIT) }, /* 1,2 */ { "32 kBit/s", TALK_ID(32, UNIT_KBIT) }, /* 1,2 */
{ "40 kBit/s", TALK_ID(40, UNIT_KBIT) }, /* 1,2 */ { "40 kBit/s", TALK_ID(40, UNIT_KBIT) }, /* 1,2 */
@ -145,16 +145,19 @@ static bool mp3_enc_bitrate(struct menucallback_data *data)
{ "96 kBit/s", TALK_ID(96, UNIT_KBIT) }, /* 1,2 */ { "96 kBit/s", TALK_ID(96, UNIT_KBIT) }, /* 1,2 */
{ "112 kBit/s", TALK_ID(112, UNIT_KBIT) }, /* 1,2 */ { "112 kBit/s", TALK_ID(112, UNIT_KBIT) }, /* 1,2 */
{ "128 kBit/s", TALK_ID(128, UNIT_KBIT) }, /* 1,2 */ { "128 kBit/s", TALK_ID(128, UNIT_KBIT) }, /* 1,2 */
#if 0 /* Leave out 144 when there is both MPEG 1 and 2 */
#if defined(HAVE_MPEG2_SAMPR) && !defined (HAVE_MPEG1_SAMPR)
/* oddball MPEG2-only rate stuck in the middle */ /* oddball MPEG2-only rate stuck in the middle */
{ "144 kBit/s", TALK_ID(144, UNIT_KBIT) }, /* 2 */ { "144 kBit/s", TALK_ID(144, UNIT_KBIT) }, /* 2 */
#endif #endif
{ "160 kBit/s", TALK_ID(160, UNIT_KBIT) }, /* 1,2 */ { "160 kBit/s", TALK_ID(160, UNIT_KBIT) }, /* 1,2 */
#ifdef HAVE_MPEG1_SAMPR
/* stereo only */ /* stereo only */
{ "192 kBit/s", TALK_ID(192, UNIT_KBIT) }, /* 1 */ { "192 kBit/s", TALK_ID(192, UNIT_KBIT) }, /* 1 */
{ "224 kBit/s", TALK_ID(224, UNIT_KBIT) }, /* 1 */ { "224 kBit/s", TALK_ID(224, UNIT_KBIT) }, /* 1 */
{ "256 kBit/s", TALK_ID(256, UNIT_KBIT) }, /* 1 */ { "256 kBit/s", TALK_ID(256, UNIT_KBIT) }, /* 1 */
{ "320 kBit/s", TALK_ID(320, UNIT_KBIT) }, /* 1 */ { "320 kBit/s", TALK_ID(320, UNIT_KBIT) }, /* 1 */
#endif
}; };
unsigned long rate_list[ARRAYLEN(items)]; unsigned long rate_list[ARRAYLEN(items)];
@ -163,10 +166,17 @@ static bool mp3_enc_bitrate(struct menucallback_data *data)
storing and maintaining yet another list of numbers */ storing and maintaining yet another list of numbers */
int n_rates = make_list_from_caps32( int n_rates = make_list_from_caps32(
MPEG1_BITR_CAPS | MPEG2_BITR_CAPS, mp3_enc_bitr, MPEG1_BITR_CAPS | MPEG2_BITR_CAPS, mp3_enc_bitr,
MPEG1_BITR_CAPS 0
#ifdef HAVE_MPEG2_SAMPR #ifdef HAVE_MPEG1_SAMPR
| (MPEG2_BITR_CAPS & ~(MP3_BITR_CAP_144 | MP3_BITR_CAP_8)) | MPEG1_BITR_CAPS
#endif #endif
#ifdef HAVE_MPEG2_SAMPR
#ifdef HAVE_MPEG1_SAMPR
| (MPEG2_BITR_CAPS & ~(MP3_BITR_CAP_144 | MP3_BITR_CAP_8))
#else
| (MPEG2_BITR_CAPS & ~(MP3_BITR_CAP_8))
#endif
#endif /* HAVE_MPEG2_SAMPR */
, rate_list); , rate_list);
int index = round_value_to_list32(cfg->mp3_enc.bitrate, rate_list, int index = round_value_to_list32(cfg->mp3_enc.bitrate, rate_list,

10
firmware/export/enc_base.h
View file

@ -75,15 +75,17 @@ struct aiff_enc_config
#define MPEG2_5_BITR_CAPS MPEG2_BITR_CAPS #define MPEG2_5_BITR_CAPS MPEG2_BITR_CAPS
#endif #endif
/* Assume 44100 is always available and therefore MPEG1 */
/* HAVE_MPEG* defines mainly apply to the bitrate menu */ /* HAVE_MPEG* defines mainly apply to the bitrate menu */
#if (REC_SAMPR_CAPS & MPEG2_SAMPR_CAPS) || defined (HAVE_SPDIF_IN) #if (REC_SAMPR_CAPS & MPEG1_SAMPR_CAPS) || defined (HAVE_SPDIF_REC)
#define HAVE_MPEG1_SAMPR
#endif
#if (REC_SAMPR_CAPS & MPEG2_SAMPR_CAPS) || defined (HAVE_SPDIF_REC)
#define HAVE_MPEG2_SAMPR #define HAVE_MPEG2_SAMPR
#endif #endif
#if 0 #if 0
#if (REC_SAMPR_CAPS & MPEG2_5_SAMPR_CAPS) || defined (HAVE_SPDIF_IN) #if (REC_SAMPR_CAPS & MPEG2_5_SAMPR_CAPS) || defined (HAVE_SPDIF_REC)
#define HAVE_MPEG2_5_SAMPR #define HAVE_MPEG2_5_SAMPR
#endif #endif
#endif /* 0 */ #endif /* 0 */