Skip to content

M
mpd
Commit 4c1eb922 authored by Warren Dukes's avatar Warren Dukes
Browse files
Options

add aac_decode.[ch] and start working on it

also, if locale is C or POSIX, set fs charset to iso-8859-1 git-svn-id: https://svn.musicpd.org/mpd/trunk@347 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent b72f5916
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 192 deletions
src/Makefile.am
View file @ 4c1eb922
......@@ -5,13 +5,13 @@ mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \
tag.h player.h listen.h conf.h ogg_decode.h volume.h flac_decode.h \
audio.h playerData.h stats.h myfprintf.h sig_handlers.h decode.h log.h \
audiofile_decode.h charConv.h permission.h mpd_types.h pcm_utils.h \
mp4_decode.h
mp4_decode.h aac_decode.h
mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \
song.c list.c directory.c tables.c utils.c path.c mp3_decode.c \
tag.c player.c listen.c conf.c ogg_decode.c volume.c flac_decode.c \
audio.c playerData.c stats.c myfprintf.c sig_handlers.c decode.c log.c \
audiofile_decode.c charConv.c permission.c pcm_utils.c mp4_decode.c \
$(mpd_headers)
aac_decode.c $(mpd_headers)
mpd_CFLAGS = $(MPD_CFLAGS)
mpd_LDADD = $(MPD_LIBS) $(ID3_LIB) $(MAD_LIB) $(MP4FF_LIB)
......
src/aac_decode.h 0 → 100644
View file @ 4c1eb922
/* the Music Player Daemon (MPD)
* (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org
*
* libaudiofile (wave) support added by Eric Wong <normalperson@yhbt.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef AAC_DECODE_H
#define AAC_DECODE_H
#include "../config.h"
#ifdef HAVE_FAAD
#include "playerData.h"
int getAacTotalTime(char * file);
int aac_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc);
#endif /* HAVE_FAAD */
#endif
src/directory.c
View file @ 4c1eb922
......@@ -548,7 +548,8 @@ int readDirectoryDB() {
else if(0==strncmp(DIRECTORY_FS_CHARSET,buffer,
strlen(DIRECTORY_FS_CHARSET)))
{
char * fsCharset;
char * fsCharset;
char * tempCharset;
if(foundFsCharset) {
ERROR("already found "
......@@ -560,15 +561,14 @@ int readDirectoryDB() {
fsCharset = &(buffer[strlen(
DIRECTORY_FS_CHARSET)]);
if(getConf()[CONF_FS_CHARSET] &&
strcmp(fsCharset,
getFsCharset()))
if((tempCharset =
getConf()[CONF_FS_CHARSET]) &&
strcmp(fsCharset,tempCharset))
{
ERROR("Using \"%s\" for the "
"filesystem charset "
"instead of \"%s\"\n",
fsCharset,
getFsCharset());
fsCharset,tempCharset);
ERROR("maybe you need to "
"recreate the db?\n");
setFsCharset(fsCharset);
......
src/main.c
View file @ 4c1eb922
......@@ -69,12 +69,12 @@ void usage(char * argv[]) {
SYSTEM_CONFIG_FILE_LOCATION);
ERROR("\n");
ERROR("options:\n");
ERROR(" --help this usage statement\n");
ERROR(" --no-daemon don't detach from console\n");
ERROR(" --create-db force (re)creation database\n");
ERROR(" --no-create-db don't create database\n");
ERROR(" --verbose verbose logging\n");
ERROR(" --version prints version information\n");
ERROR(" --help this usage statement\n");
ERROR(" --no-daemon don't detach from console\n");
ERROR(" --create-db force (re)creation database\n");
ERROR(" --no-create-db don't create database\n");
ERROR(" --verbose verbose logging\n");
ERROR(" --version prints version information\n");
}
void version() {
......
src/mp4_decode.h
View file @ 4c1eb922
......@@ -19,7 +19,7 @@
*/
#ifndef MP4_DECODE_H
#define MP$_DECODE_H
#define MP4_DECODE_H
#include "../config.h"
......
src/path.c
View file @ 4c1eb922
......@@ -87,40 +87,52 @@ char * getFsCharset() {
}
void initPaths() {
#ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO
char * originalLocale;
#endif
#endif
char * charset = NULL;
char * originalLocale;
if(getConf()[CONF_FS_CHARSET]) {
charset = strdup(getConf()[CONF_FS_CHARSET]);
}
#ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO
else if((originalLocale = setlocale(LC_CTYPE,""))) {
else if((originalLocale = setlocale(LC_CTYPE,NULL))) {
char * temp;
char * currentLocale;
originalLocale = strdup(originalLocale);
if((temp = nl_langinfo(CODESET))) {
charset = strdup(temp);
if(!(currentLocale = setlocale(LC_CTYPE,""))) {
ERROR("problems setting current locale with "
"setlocale()\n");
}
else ERROR("problems getting charset for locale\n");
if(!setlocale(LC_CTYPE,originalLocale)) {
ERROR("problems resetting locale with setlocale()\n");
else {
if(strcmp(currentLocale,"C")==0 ||
strcmp(currentLocale,"POSIX")==0)
{
ERROR("current locale is \"%s\"\n",
currentLocale);
}
else if((temp = nl_langinfo(CODESET))) {
charset = strdup(temp);
}
else ERROR("problems getting charset for locale\n");
if(!setlocale(LC_CTYPE,originalLocale)) {
ERROR("problems resetting locale with setlocale()\n");
}
}
free(originalLocale);
}
else ERROR("problems getting locale with setlocale()\n");
#endif
#endif
else ERROR("problems getting locale with setlocale()\n");
if(charset) {
setFsCharset(charset);
free(charset);
}
else {
ERROR("setting filesystem charset to UTF-8\n");
setFsCharset("UTF-8");
ERROR("setting filesystem charset to ISO-8859-1\n");
setFsCharset("ISO-8859-1");
}
}
......
src/tag.c
View file @ 4c1eb922
......@@ -23,6 +23,7 @@
#include "mp3_decode.h"
#include "audiofile_decode.h"
#include "mp4_decode.h"
#include "aac_decode.h"
#include "utils.h"
#include <sys/stat.h>
......@@ -46,7 +47,6 @@
#endif
#endif
#ifdef HAVE_FAAD
#include <faad.h>
#include "mp4ff/mp4ff.h"
#endif
......@@ -173,177 +173,21 @@ MpdTag * mp3TagDup(char * utf8file) {
#endif
#ifdef HAVE_FAAD
typedef struct {
long bytesIntoBuffer;
long bytesConsumed;
long fileOffset;
unsigned char *buffer;
int atEof;
FILE *infile;
} AacBuffer;
void fillAacBuffer(AacBuffer *b) {
if(b->bytesConsumed > 0) {
int bread;
if(b->bytesIntoBuffer) {
memmove((void *)b->buffer,(void*)(b->buffer+
b->bytesConsumed),b->bytesIntoBuffer);
}
if(!b->atEof) {
bread = fread((void *)(b->buffer+b->bytesIntoBuffer),1,
b->bytesConsumed,b->infile);
if(bread!=b->bytesConsumed) b->atEof = 1;
b->bytesIntoBuffer+=bread;
}
b->bytesConsumed = 0;
if(b->bytesIntoBuffer > 3) {
if(memcmp(b->buffer,"TAG",3)==0) b->bytesIntoBuffer = 0;
}
if(b->bytesIntoBuffer > 11) {
if(memcmp(b->buffer,"LYRICSBEGIN",11)==0) {
b->bytesIntoBuffer = 0;
}
}
if(b->bytesIntoBuffer > 8) {
if(memcmp(b->buffer,"APETAGEX",8)==0) {
b->bytesIntoBuffer = 0;
}
}
}
}
void advanceAacBuffer(AacBuffer * b, int bytes) {
b->fileOffset+=bytes;
b->bytesConsumed = bytes;
b->bytesIntoBuffer-=bytes;
}
static int adtsSampleRates[] = {96000,88200,64000,48000,44100,32000,24000,22050,
16000,12000,11025,8000,7350,0,0,0};
int adtsParse(AacBuffer * b, float * length) {
int frames, frameLength;
int tFrameLength = 0;
int sampleRate = 0;
float framesPerSec, bytesPerFrame;
/* Read all frames to ensure correct time and bitrate */
for(frames = 0; ;frames++) {
fillAacBuffer(b);
if(b->bytesIntoBuffer > 7) {
/* check syncword */
if (!((b->buffer[0] == 0xFF) &&
((b->buffer[1] & 0xF6) == 0xF0)))
{
break;
}
if(frames==0) {
sampleRate = adtsSampleRates[
(b->buffer[2]&0x3c)>>2];
}
frameLength = ((((unsigned int)b->buffer[3] & 0x3))
<< 11) | (((unsigned int)b->buffer[4])
<< 3) | (b->buffer[5] >> 5);
tFrameLength+=frameLength;
if(frameLength > b->bytesIntoBuffer) break;
advanceAacBuffer(b,frameLength);
}
else break;
}
framesPerSec = (float)sampleRate/1024.0;
if(frames!=0) {
bytesPerFrame = (float)tFrameLength/(float)(frames*1000);
}
else bytesPerFrame = 0;
if(framesPerSec!=0) *length = (float)frames/framesPerSec;
return 1;
}
#define AAC_MAX_CHANNELS 6
MpdTag * aacTagDup(char * utf8file) {
MpdTag * ret = NULL;
AacBuffer b;
size_t fileread;
size_t bread;
size_t tagsize;
float length = -1;
memset(&b,0,sizeof(AacBuffer));
int time;
blockSignals();
b.infile = fopen(rmp2amp(utf8ToFsCharset(utf8file)),"r");
if(b.infile == NULL) return NULL;
fseek(b.infile,0,SEEK_END);
fileread = ftell(b.infile);
fseek(b.infile,0,SEEK_SET);
b.buffer = malloc(FAAD_MIN_STREAMSIZE*AAC_MAX_CHANNELS);
memset(b.buffer,0,FAAD_MIN_STREAMSIZE*AAC_MAX_CHANNELS);
bread = fread(b.buffer,1,FAAD_MIN_STREAMSIZE*AAC_MAX_CHANNELS,b.infile);
b.bytesIntoBuffer = bread;
b.bytesConsumed = 0;
b.fileOffset = 0;
if(bread!=FAAD_MIN_STREAMSIZE*AAC_MAX_CHANNELS) b.atEof = 1;
time = getAacTotalTime(rmp2amp(utf8ToFsCharset(utf8file)));
tagsize = 0;
if(!memcmp(b.buffer,"ID3",3)) {
tagsize = (b.buffer[6] << 21) | (b.buffer[7] << 14) |
(b.buffer[8] << 7) | (b.buffer[9] << 0);
tagsize+=10;
advanceAacBuffer(&b,tagsize);
fillAacBuffer(&b);
}
if((b.buffer[0] == 0xFF) && ((b.buffer[1] & 0xF6) == 0xF0)) {
adtsParse(&b,&length);
fseek(b.infile,tagsize, SEEK_SET);
bread = fread(b.buffer,1,FAAD_MIN_STREAMSIZE*AAC_MAX_CHANNELS,
b.infile);
if(bread != FAAD_MIN_STREAMSIZE*AAC_MAX_CHANNELS) b.atEof = 1;
else b.atEof = 0;
b.bytesIntoBuffer = bread;
b.bytesConsumed = 0;
b.fileOffset = tagsize;
}
else if(memcmp(b.buffer,"ADIF",4) == 0) {
int bitRate;
int skipSize = (b.buffer[4] & 0x80) ? 9 : 0;
bitRate = ((unsigned int)(b.buffer[4 + skipSize] & 0x0F)<<19) |
((unsigned int)b.buffer[5 + skipSize]<<11) |
((unsigned int)b.buffer[6 + skipSize]<<3) |
((unsigned int)b.buffer[7 + skipSize] & 0xE0);
length = fileread;
if(length!=0) length = length*8.0/bitRate;
}
if(b.buffer) free(b.buffer);
fclose(b.infile);
if(length>=0) {
if(time>=0) {
if((ret = id3Dup(utf8file))==NULL) ret = newMpdTag();
ret->time = length+0.5;
ret->time = time;
}
unblockSignals();
return ret;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment