diff options
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] = | |||
64 | [AFMT_UNKNOWN] = | 64 | [AFMT_UNKNOWN] = |
65 | AFMT_ENTRY("???", NULL, NULL, NULL, NULL ), | 65 | AFMT_ENTRY("???", NULL, NULL, NULL, NULL ), |
66 | 66 | ||
67 | /* MPEG Audio layer 1 */ | ||
68 | [AFMT_MPA_L1] = | ||
69 | AFMT_ENTRY("MP1", "mpa", NULL, get_mp3_metadata, "mp1\0"), | ||
70 | /* MPEG Audio layer 2 */ | 67 | /* MPEG Audio layer 2 */ |
71 | [AFMT_MPA_L2] = | 68 | [AFMT_MPA_L2] = |
72 | AFMT_ENTRY("MP2", "mpa", NULL, get_mp3_metadata, "mpa\0mp2\0"), | 69 | AFMT_ENTRY("MP2", "mpa", NULL, get_mp3_metadata, "mpa\0mp2\0"), |
73 | /* MPEG Audio layer 3 */ | 70 | |
71 | #if CONFIG_CODEC != SWCODEC | ||
72 | /* MPEG Audio layer 3 on HWCODEC: .talk clips, no encoder */ | ||
73 | [AFMT_MPA_L3] = | ||
74 | AFMT_ENTRY("MP3", "mpa", NULL, get_mp3_metadata, "mp3\0talk\0"), | ||
75 | |||
76 | #else /* CONFIG_CODEC == SWCODEC */ | ||
77 | /* MPEG Audio layer 3 on SWCODEC */ | ||
74 | [AFMT_MPA_L3] = | 78 | [AFMT_MPA_L3] = |
75 | AFMT_ENTRY("MP3", "mpa", "mp3_enc", get_mp3_metadata, "mp3\0"), | 79 | AFMT_ENTRY("MP3", "mpa", "mp3_enc", get_mp3_metadata, "mp3\0"), |
76 | 80 | ||
77 | #if CONFIG_CODEC == SWCODEC | 81 | /* MPEG Audio layer 1 */ |
82 | [AFMT_MPA_L1] = | ||
83 | AFMT_ENTRY("MP1", "mpa", NULL, get_mp3_metadata, "mp1\0"), | ||
78 | /* Audio Interchange File Format */ | 84 | /* Audio Interchange File Format */ |
79 | [AFMT_AIFF] = | 85 | [AFMT_AIFF] = |
80 | AFMT_ENTRY("AIFF", "aiff", "aiff_enc", get_aiff_metadata, "aiff\0aif\0"), | 86 | AFMT_ENTRY("AIFF", "aiff", "aiff_enc", get_aiff_metadata, "aiff\0aif\0"), |