From 7345ac124e3b56a402b6a004d968d40b4ffeaa50 Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Thu, 3 Feb 2011 08:28:23 +0000 Subject: Submit FS#11918: Add 2 more codec types to be able to differentiate between AAC / AAC-HE and MPC SV7 / SV8. Additionally handle ATARI soundfiles in get_codec_base_type() as intended. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29199 a1c6a512-1295-4272-9138-f99709370657 --- apps/metadata.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'apps/metadata.c') diff --git a/apps/metadata.c b/apps/metadata.c index 79ef7ebcad..8ffd1a6af1 100644 --- a/apps/metadata.c +++ b/apps/metadata.c @@ -86,9 +86,12 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = /* FLAC */ [AFMT_FLAC] = AFMT_ENTRY("FLAC", "flac", NULL, get_flac_metadata, "flac\0"), - /* Musepack */ - [AFMT_MPC] = - AFMT_ENTRY("MPC", "mpc", NULL, get_musepack_metadata,"mpc\0"), + /* Musepack SV7 */ + [AFMT_MPC_SV7] = + AFMT_ENTRY("MPCv7", "mpc", NULL, get_musepack_metadata,"mpc\0"), + /* Musepack SV8 */ + [AFMT_MPC_SV8] = + AFMT_ENTRY("MPCv8", "mpc", NULL, get_musepack_metadata,"mpc\0"), /* A/52 (aka AC3) audio */ [AFMT_A52] = AFMT_ENTRY("AC3", "a52", NULL, get_a52_metadata, "a52\0ac3\0"), @@ -101,6 +104,9 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = /* Advanced Audio Coding in M4A container */ [AFMT_MP4_AAC] = AFMT_ENTRY("AAC", "aac", NULL, get_mp4_metadata, "mp4\0"), + /* Advanced Audio Coding High Efficiency in M4A container */ + [AFMT_MP4_AAC_HE] = + AFMT_ENTRY("AAC-HE","aac", NULL, get_mp4_metadata, "mp4\0"), /* Shorten */ [AFMT_SHN] = AFMT_ENTRY("SHN","shorten", NULL, get_shn_metadata, "shn\0"), -- cgit v1.2.3