MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change return type to boolean

Browse Source 
Use a boolean return type instead of returning -1 with an unsigned return type.
This commit is contained in:
Julien BLACHE 2009-04-02 13:14:54 +02:00
parent 7565b02229
commit 93a97956a0
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/scan-aac.c
View File

@ -66,9 +66,8 @@ time_t scan_aac_mac_to_unix_time(int t) {
* @param atom_length the size of the atom "drilled to" * @param atom_length the size of the atom "drilled to"
* @returns offset of the atom, or -1 if unsuccessful * @returns offset of the atom, or -1 if unsuccessful
*/ */
uint64_t scan_aac_drilltoatom(IOHANDLE hfile,char *atom_path, int scan_aac_drilltoatom(IOHANDLE hfile,char *atom_path,
unsigned int *atom_length) { uint64_t *atom_offset, unsigned int *atom_length) {
uint64_t atom_offset;
uint64_t file_size,pos; uint64_t file_size,pos;
char *cur_p, *end_p; char *cur_p, *end_p;
char atom_name[5]; char atom_name[5];
@ -91,10 +90,10 @@ uint64_t scan_aac_drilltoatom(IOHANDLE hfile,char *atom_path,
return -1; return -1;
} }
strncpy(atom_name, cur_p, 4); strncpy(atom_name, cur_p, 4);
atom_offset = scan_aac_findatom(hfile, file_size,
atom_name, atom_length); if (!scan_aac_findatom(hfile, file_size,
if (atom_offset == -1) { atom_offset, atom_name, atom_length)) {
return -1; return FALSE;
} }
io_getpos(hfile,&pos); io_getpos(hfile,&pos);
@ -120,12 +119,11 @@ uint64_t scan_aac_drilltoatom(IOHANDLE hfile,char *atom_path,
} }
io_getpos(hfile, &pos); io_getpos(hfile, &pos);
return pos - 8; *atom_offset = pos - 8;
return TRUE;
} }
/* FIXME: return TRUE/FALSE */
/** /**
* Given a file, search for a particular aac atom. * Given a file, search for a particular aac atom.
* *
@ -134,8 +132,8 @@ uint64_t scan_aac_drilltoatom(IOHANDLE hfile,char *atom_path,
* @param which_atom what atom name we are searching for * @param which_atom what atom name we are searching for
* @param atom_size this will hold the size of the atom found * @param atom_size this will hold the size of the atom found
*/ */
uint64_t scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset, int scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset,
char *which_atom, unsigned int *atom_size) { uint64_t *atom_offset, char *which_atom, unsigned int *atom_size) {
uint64_t current_offset=0; uint64_t current_offset=0;
uint32_t size; uint32_t size;
char atom[4]; char atom[4];
@ -144,7 +142,7 @@ uint64_t scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset,
while((current_offset + 8) < max_offset) { while((current_offset + 8) < max_offset) {
bytes_read = sizeof(uint32_t); bytes_read = sizeof(uint32_t);
if(!io_read(hfile,(unsigned char *)&size,&bytes_read) || (!bytes_read)) { if(!io_read(hfile,(unsigned char *)&size,&bytes_read) || (!bytes_read)) {
return -1; return FALSE;
} }
size=ntohl(size); size=ntohl(size);
@ -152,17 +150,18 @@ uint64_t scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset,
if(size <= 7) { /* something not right */ if(size <= 7) { /* something not right */
DPRINTF(E_LOG,L_SCAN,"Bad aac file: atom length too short searching for %s\n", DPRINTF(E_LOG,L_SCAN,"Bad aac file: atom length too short searching for %s\n",
which_atom); which_atom);
return -1; return FALSE;
} }
bytes_read = 4; bytes_read = 4;
if(!io_read(hfile,(unsigned char *)atom,&bytes_read) || (!bytes_read)) { if(!io_read(hfile,(unsigned char *)atom,&bytes_read) || (!bytes_read)) {
return -1; return FALSE;
} }
if(strncasecmp(atom,which_atom,4) == 0) { if(strncasecmp(atom,which_atom,4) == 0) {
*atom_size=size; *atom_size=size;
return current_offset; *atom_offset = current_offset;
return TRUE;
} }
io_setpos(hfile,size-8,SEEK_CUR); io_setpos(hfile,size-8,SEEK_CUR);
@ -170,7 +169,7 @@ uint64_t scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset,
} }
DPRINTF(E_SPAM,L_SCAN,"Couldn't find atom %s as requested\n",which_atom); DPRINTF(E_SPAM,L_SCAN,"Couldn't find atom %s as requested\n",which_atom);
return -1; return FALSE;
} }
/** /**
@ -201,6 +200,7 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
unsigned char buffer[2]; unsigned char buffer[2];
uint32_t time = 0; uint32_t time = 0;
int ret;
hfile = io_new(); hfile = io_new();
if(!hfile) if(!hfile)
@ -213,8 +213,8 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
return FALSE; return FALSE;
} }
atom_offset=scan_aac_drilltoatom(hfile, "moov:udta:meta:ilst", &atom_length); ret = scan_aac_drilltoatom(hfile, "moov:udta:meta:ilst", &atom_offset, &atom_length);
if(atom_offset != -1) { if(ret) {
/* found the tag section - need to walk through now */ /* found the tag section - need to walk through now */
while (current_offset < (uint64_t)atom_length) { while (current_offset < (uint64_t)atom_length) {
bytes_read = sizeof(uint32_t); bytes_read = sizeof(uint32_t);
@ -228,7 +228,7 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
DPRINTF(E_SPAM,L_SCAN,"Current size: %d\n",current_size); DPRINTF(E_SPAM,L_SCAN,"Current size: %d\n",current_size);
if(current_size <= 7) { /* something not right */ if(current_size < 8) { /* something not right */
DPRINTF(E_LOG,L_SCAN,"mp4 atom too small. Bad aac tags?\n"); DPRINTF(E_LOG,L_SCAN,"mp4 atom too small. Bad aac tags?\n");
io_dispose(hfile); io_dispose(hfile);
return FALSE; return FALSE;
@ -324,13 +324,14 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
free(current_data); free(current_data);
} }
current_offset+=current_size; current_offset+=current_size;
} }
} }
/* got the tag info, now let's get bitrate, etc */ /* got the tag info, now let's get bitrate, etc */
atom_offset = scan_aac_drilltoatom(hfile, "moov:mvhd", &atom_length); ret = scan_aac_drilltoatom(hfile, "moov:mvhd", &atom_offset, &atom_length);
if(atom_offset != -1) { if(ret) {
io_setpos(hfile,4,SEEK_CUR); io_setpos(hfile,4,SEEK_CUR);
/* FIXME: error handling */ /* FIXME: error handling */
@ -391,11 +392,11 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
pmp3->bitrate = 0; pmp3->bitrate = 0;
/* see if it is aac or alac */ /* see if it is aac or alac */
atom_offset = scan_aac_drilltoatom(hfile, ret = scan_aac_drilltoatom(hfile,
"moov:trak:mdia:minf:stbl:stsd:alac", "moov:trak:mdia:minf:stbl:stsd:alac",
&atom_length); &atom_offset, &atom_length);
if(atom_offset != -1) { if(ret) {
/* should we still pull samplerate, etc from the this atom? */ /* should we still pull samplerate, etc from the this atom? */
if(pmp3->codectype) { if(pmp3->codectype) {
free(pmp3->codectype); free(pmp3->codectype);
@ -406,16 +407,16 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
/* Get the sample rate from the 'mp4a' atom (timescale). This is also /* Get the sample rate from the 'mp4a' atom (timescale). This is also
found in the 'mdhd' atom which is a bit closer but we need to found in the 'mdhd' atom which is a bit closer but we need to
navigate to the 'mp4a' atom anyways to get to the 'esds' atom. */ navigate to the 'mp4a' atom anyways to get to the 'esds' atom. */
atom_offset=scan_aac_drilltoatom(hfile, ret = scan_aac_drilltoatom(hfile,
"moov:trak:mdia:minf:stbl:stsd:mp4a", "moov:trak:mdia:minf:stbl:stsd:mp4a",
&atom_length); &atom_offset, &atom_length);
if(atom_offset == -1) { if(!ret) {
atom_offset=scan_aac_drilltoatom(hfile, ret = scan_aac_drilltoatom(hfile,
"moov:trak:mdia:minf:stbl:stsd:drms", "moov:trak:mdia:minf:stbl:stsd:drms",
&atom_length); &atom_offset, &atom_length);
} }
if (atom_offset != -1) { if (ret) {
io_setpos(hfile, atom_offset + 32, SEEK_SET); io_setpos(hfile, atom_offset + 32, SEEK_SET);
/* Timescale here seems to be 2 bytes here (the 2 bytes before it are /* Timescale here seems to be 2 bytes here (the 2 bytes before it are
@ -437,11 +438,11 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
/* Get the bit rate from the 'esds' atom. We are already positioned /* Get the bit rate from the 'esds' atom. We are already positioned
in the parent atom so just scan ahead. */ in the parent atom so just scan ahead. */
io_getpos(hfile,&pos); io_getpos(hfile,&pos);
atom_offset = scan_aac_findatom(hfile, ret = scan_aac_findatom(hfile,
atom_length-(pos-atom_offset), atom_length-(pos-atom_offset),
"esds", &atom_length); &atom_offset, "esds", &atom_length);
if (atom_offset != -1) { if (ret) {
/* Roku Soundbridge seems to believe anything above 320K is /* Roku Soundbridge seems to believe anything above 320K is
* an ALAC encoded m4a. We'll lie on their behalf. * an ALAC encoded m4a. We'll lie on their behalf.
*/ */
@ -472,8 +473,8 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
if (pmp3->bitrate == 0) { if (pmp3->bitrate == 0) {
/* calculate bitrate from song length... Kinda cheesy */ /* calculate bitrate from song length... Kinda cheesy */
DPRINTF(E_DBG,L_SCAN, "Guesstimating bit rate.\n"); DPRINTF(E_DBG,L_SCAN, "Guesstimating bit rate.\n");
atom_offset=scan_aac_drilltoatom(hfile,"mdat",&atom_length); ret = scan_aac_drilltoatom(hfile, "mdat", &atom_offset, &atom_length);
if ((atom_offset != -1) && (pmp3->song_length >= 1000)) { if ((ret) && (pmp3->song_length >= 1000)) {
pmp3->bitrate = atom_length / ((pmp3->song_length / 1000) * 128); pmp3->bitrate = atom_length / ((pmp3->song_length / 1000) * 128);
} }
} }

4
src/scan-aac.h
View File

@ -21,7 +21,7 @@
#include "io.h" #include "io.h"
extern uint64_t scan_aac_drilltoatom(IOHANDLE hfile, char *atom_path, unsigned int *atom_length); extern int scan_aac_drilltoatom(IOHANDLE hfile, char *atom_path, uint64_t *atom_offset, unsigned int *atom_length);
extern uint64_t scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset, char *which_atom, unsigned int *atom_size); extern int scan_aac_findatom(IOHANDLE hfile, uint64_t max_offset, uint64_t *atom_offset, char *which_atom, unsigned int *atom_size);
#endif #endif