diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2011-06-19 22:34:40 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2011-06-19 22:34:40 +0000 |
| commit | c56cca261a4e8a72443a3fdf79152782c7c731e5 (patch) | |
| tree | 19658cfd2a2d49db68e6a38313c113abb88a4a8b /apps/metadata.c | |
| parent | 91ce4b2a60c4cbe8e3568f79c3a73572461ff40d (diff) | |
Fix non-working .talk clips on hwcodec (follow-up to r28672 and r29432): .talk clips
must be evaluated as MP3. Also fix supported formats: hwcodec doesn't support MP1.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30019 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata.c')
| -rw-r--r-- | apps/metadata.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/metadata.c b/apps/metadata.c index e88603721b..cbb5b42795 100644 --- a/apps/metadata.c +++ b/apps/metadata.c @@ -64,17 +64,23 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = [AFMT_UNKNOWN] = AFMT_ENTRY("???", NULL, NULL, NULL, NULL ), - /* MPEG Audio layer 1 */ - [AFMT_MPA_L1] = - AFMT_ENTRY("MP1", "mpa", NULL, get_mp3_metadata, "mp1\0"), /* MPEG Audio layer 2 */ [AFMT_MPA_L2] = AFMT_ENTRY("MP2", "mpa", NULL, get_mp3_metadata, "mpa\0mp2\0"), - /* MPEG Audio layer 3 */ + +#if CONFIG_CODEC != SWCODEC + /* MPEG Audio layer 3 on HWCODEC: .talk clips, no encoder */ + [AFMT_MPA_L3] = + AFMT_ENTRY("MP3", "mpa", NULL, get_mp3_metadata, "mp3\0talk\0"), + +#else /* CONFIG_CODEC == SWCODEC */ + /* MPEG Audio layer 3 on SWCODEC */ [AFMT_MPA_L3] = AFMT_ENTRY("MP3", "mpa", "mp3_enc", get_mp3_metadata, "mp3\0"), -#if CONFIG_CODEC == SWCODEC + /* MPEG Audio layer 1 */ + [AFMT_MPA_L1] = + AFMT_ENTRY("MP1", "mpa", NULL, get_mp3_metadata, "mp1\0"), /* Audio Interchange File Format */ [AFMT_AIFF] = AFMT_ENTRY("AIFF", "aiff", "aiff_enc", get_aiff_metadata, "aiff\0aif\0"), |