MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-20 04:24:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing sync frame on bad id3 headers

Browse Source
This commit is contained in:
Ron Pedde 2004-03-14 06:29:41 +00:00
parent 7c8f83684a
commit 1003467e63
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mp3-scanner.c
View File

@ -329,7 +329,6 @@ int scan_path(char *path) {
DPRINTF(ERR_DEBUG,"Found dir %s... recursing\n",pde->d_name); DPRINTF(ERR_DEBUG,"Found dir %s... recursing\n",pde->d_name);
scan_path(mp3_path); scan_path(mp3_path);
} else { } else {
DPRINTF(ERR_INFO,"Processing %s\n",mp3_path);
/* process the file */ /* process the file */
if(strlen(pde->d_name) > 4) { if(strlen(pde->d_name) > 4) {
if(strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) { if(strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) {
@ -771,8 +770,9 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
unsigned int size=0; unsigned int size=0;
off_t fp_size=0; off_t fp_size=0;
off_t file_size; off_t file_size;
unsigned char buffer[256]; unsigned char buffer[1024];
int time_seconds; int time_seconds;
int index;
int ver=0; int ver=0;
int layer=0; int layer=0;
@ -812,13 +812,23 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
fseek(infile,fp_size,SEEK_SET); fseek(infile,fp_size,SEEK_SET);
fread(buffer,1,sizeof(buffer),infile); fread(buffer,1,sizeof(buffer),infile);
if((buffer[0] == 0xFF)&&(buffer[1] >= 224)) { index=0;
ver=(buffer[1] & 0x18) >> 3; while(((buffer[index] != 0xFF) || (buffer[index+1] < 224)) &&
layer=(buffer[1] & 0x6) >> 1; (index < (sizeof(buffer)-10))) {
index++;
}
if(index) {
DPRINTF(ERR_DEBUG,"Scanned forward %d bytes to find frame header\n",index);
}
if((buffer[index] == 0xFF)&&(buffer[index+1] >= 224)) {
ver=(buffer[index+1] & 0x18) >> 3;
layer=(buffer[index+1] & 0x6) >> 1;
if((ver==3) && (layer==1)) { /* MPEG1, Layer 3 */ if((ver==3) && (layer==1)) { /* MPEG1, Layer 3 */
bitrate=(buffer[2] & 0xF0) >> 4; bitrate=(buffer[index+2] & 0xF0) >> 4;
bitrate=scan_br_table[bitrate]; bitrate=scan_br_table[bitrate];
samplerate=(buffer[2] & 0x0C) >> 2; samplerate=(buffer[index+2] & 0x0C) >> 2;
switch(samplerate) { switch(samplerate) {
case 0: case 0:
samplerate=44100; samplerate=44100;
@ -846,7 +856,7 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
/* FIXME: should really scan forward to next sync frame */ /* FIXME: should really scan forward to next sync frame */
fclose(infile); fclose(infile);
DPRINTF(ERR_DEBUG,"Could not find sync frame\n"); DPRINTF(ERR_DEBUG,"Could not find sync frame\n");
return -1; return 0;
} }