len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set appropriate codec type for .m4a files (ALAC or AAC) inside get_metadata(). probe_file_format() is no longer an exported function. Make get_metadata() return false if it can not read the metadata - on the assumption that the codec will also fail.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8118 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2005-12-01 20:39:19 +00:00
parent 59e0ccb278
commit 15ca09106d
2 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
apps/metadata.c
View file

@ -1181,16 +1181,12 @@ static bool get_m4a_metadata(int fd, struct mp3entry* id3)
entry_size=(buf[i]<<24)|(buf[i+1]<<16)|(buf[i+2]<<8)|buf[i+3]; entry_size=(buf[i]<<24)|(buf[i+1]<<16)|(buf[i+2]<<8)|buf[i+3];
i+=4; i+=4;
/* Check the codec type - 'alac' for ALAC, 'mp4a' for AAC */ if (memcmp(&buf[i],"alac",4)==0) {
if ((id3->codectype==AFMT_ALAC) && id3->codectype=AFMT_ALAC;
(memcmp(&buf[i],"alac",4)!=0)) { } else if (memcmp(&buf[i],"mp4a",4)==0) {
logf("Not an ALAC file\n"); id3->codectype=AFMT_AAC;
return false; } else {
} logf("Not an ALAC or AAC file\n");
if ((id3->codectype==AFMT_AAC) &&
(memcmp(&buf[i],"mp4a",4)!=0)) {
logf("Not a MP4 AAC file\n");
return false; return false;
} }
@ -1330,7 +1326,7 @@ static bool get_musepack_metadata(int fd, struct mp3entry *id3)
} }
/* Simple file type probing by looking at the filename extension. */ /* Simple file type probing by looking at the filename extension. */
unsigned int probe_file_format(const char *filename) static unsigned int probe_file_format(const char *filename)
{ {
char *suffix; char *suffix;
unsigned int i; unsigned int i;
@ -1364,12 +1360,11 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
unsigned char* buf; unsigned char* buf;
unsigned long totalsamples; unsigned long totalsamples;
int i; int i;
/* We should detect the codec type here. */ /* Take our best guess at the codec type based on file extension */
track->id3.codectype = probe_file_format(trackname); track->id3.codectype = probe_file_format(trackname);
/* Load codec specific track tag information. */ /* Load codec specific track tag information and confirm the codec type. */
switch (track->id3.codectype) switch (track->id3.codectype)
{ {
case AFMT_MPA_L1: case AFMT_MPA_L1:
@ -1518,7 +1513,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
case AFMT_AAC: case AFMT_AAC:
if (!get_m4a_metadata(fd, &(track->id3))) if (!get_m4a_metadata(fd, &(track->id3)))
{ {
// return false; return false;
} }
break; break;
@ -1533,11 +1528,15 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
/* TODO: read the id3v2 header if it exists */ /* TODO: read the id3v2 header if it exists */
break; break;
/* If we don't know how to read the metadata, just store the filename */
default: default:
/* If we don't know how to read the metadata, assume we can't play
the file */
return false;
break; break;
} }
/* We have successfully read the metadata from the file */
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
strncpy(track->id3.path, trackname, sizeof(track->id3.path)); strncpy(track->id3.path, trackname, sizeof(track->id3.path));
track->taginfo_ready = true; track->taginfo_ready = true;

1
apps/metadata.h
View file

@ -22,7 +22,6 @@
#include "playback.h" #include "playback.h"
unsigned int probe_file_format(const char *filename);
bool get_metadata(struct track_info* track, int fd, const char* trackname, bool get_metadata(struct track_info* track, int fd, const char* trackname,
bool v1first); bool v1first);