nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rockbox does not support encrypted ADX. Clearly state this in the manual and the debug messages. 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31094 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-11-29 20:36:11 +00:00
parent 3c63cb29e9
commit bdaac8ba04
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/codecs/adx.c
View File

@ -149,7 +149,7 @@ enum codec_status codec_run(void)
/* Get loop data */
looping = 0; start_adr = 0; end_adr = 0;
if (!memcmp(buf+0x10,"\x01\xF4\x03\x00",4)) {
if (!memcmp(buf+0x10,"\x01\xF4\x03",3)) {
/* Soul Calibur 2 style (type 03) */
DEBUGF("ADX: type 03 found\n");
/* check if header is too small for loop data */
@ -171,7 +171,7 @@ enum codec_status codec_run(void)
(buf[0x1f])
)/32*channels*18+chanstart;
}
} else if (!memcmp(buf+0x10,"\x01\xF4\x04\x00",4)) {
} else if (!memcmp(buf+0x10,"\x01\xF4\x04",3)) {
/* Standard (type 04) */
DEBUGF("ADX: type 04 found\n");
/* check if header is too small for loop data */
@ -196,6 +196,12 @@ enum codec_status codec_run(void)
DEBUGF("ADX: error, couldn't determine ADX type\n");
return CODEC_ERROR;
}
/* is file using encryption */
if (buf[0x13]==0x08) {
DEBUGF("ADX: error, encrypted ADX not supported\n");
return false;
}
if (looping) {
DEBUGF("ADX: looped, start: %lx end: %lx\n",start_adr,end_adr);

10
apps/metadata/adx.c
View File

@ -73,7 +73,7 @@ bool get_adx_metadata(int fd, struct mp3entry* id3)
id3->filesize = filesize(fd);
/* get loop info */
if (!memcmp(buf+0x10,"\x01\xF4\x03\x00",4)) {
if (!memcmp(buf+0x10,"\x01\xF4\x03",3)) {
/* Soul Calibur 2 style (type 03) */
DEBUGF("get_adx_metadata: type 03 found\n");
/* check if header is too small for loop data */
@ -83,7 +83,7 @@ bool get_adx_metadata(int fd, struct mp3entry* id3)
end_adr = get_long_be(&buf[0x28]);
start_adr = get_long_be(&buf[0x1c])/32*channels*18+chanstart;
}
} else if (!memcmp(buf+0x10,"\x01\xF4\x04\x00",4)) {
} else if (!memcmp(buf+0x10,"\x01\xF4\x04",3)) {
/* Standard (type 04) */
DEBUGF("get_adx_metadata: type 04 found\n");
/* check if header is too small for loop data */
@ -98,6 +98,12 @@ bool get_adx_metadata(int fd, struct mp3entry* id3)
return false;
}
/* is file using encryption */
if (buf[0x13]==0x08) {
DEBUGF("get_adx_metadata: error, encrypted ADX not supported\n");
return false;
}
if (looping) {
/* 2 loops, 10 second fade */
id3->length = (start_adr-chanstart + 2*(end_adr-start_adr))

2
manual/appendix/file_formats.tex
View File

@ -114,7 +114,7 @@
& Supports downmixing for playback of 5.1 streams in stereo\\
ADX
& \fname{.adx}
& \\
& Encrypted ADX is not supported.\\
Advanced Audio Coding
& \fname{.m4a}, \fname{.m4b}, \fname{.mp4}, \fname{.rm}, \fname{.ra}, \fname{.rmvb}
\nopt{clipv1,c200v2}{