oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

bitRate support for audiofile 

git-svn-id: https://svn.musicpd.org/mpd/trunk@443 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-03-24 02:23:40 +00:00
parent 9b38a1e63e
commit 7479bfacbb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/audiofile_decode.c
View File

@ -32,6 +32,9 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <audiofile.h> #include <audiofile.h>
int getAudiofileTotalTime(char * file) int getAudiofileTotalTime(char * file)
@ -53,10 +56,17 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
int fs, frame_count; int fs, frame_count;
AFfilehandle af_fp; AFfilehandle af_fp;
int bits; int bits;
mpd_uint16 bitRate;
struct stat st;
if(stat(dc->file,&st) < 0) {
ERROR("failed to stat: %s\n",dc->file);
return -1;
}
af_fp = afOpenFile(dc->file,"r", NULL); af_fp = afOpenFile(dc->file,"r", NULL);
if(af_fp == AF_NULL_FILEHANDLE) { if(af_fp == AF_NULL_FILEHANDLE) {
ERROR("failed to open %s\n",dc->file); ERROR("failed to open: %s\n",dc->file);
return -1; return -1;
} }
@ -68,6 +78,8 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
frame_count = afGetFrameCount(af_fp,AF_DEFAULT_TRACK); frame_count = afGetFrameCount(af_fp,AF_DEFAULT_TRACK);
cb->totalTime = ((float)frame_count/(float)af->sampleRate); cb->totalTime = ((float)frame_count/(float)af->sampleRate);
bitRate = st.st_size*8.0/cb->totalTime/1024.0+0.5;
if (af->bits != 8 && af->bits != 16) { if (af->bits != 8 && af->bits != 16) {
ERROR("Only 8 and 16-bit files are supported. %s is %i-bit\n", ERROR("Only 8 and 16-bit files are supported. %s is %i-bit\n",
@ -110,6 +122,7 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
current += ret; current += ret;
cb->times[cb->end] = (float)current/(float)af->sampleRate; cb->times[cb->end] = (float)current/(float)af->sampleRate;
cb->bitRate[cb->end] = bitRate;
++cb->end; ++cb->end;

4
src/mp3_decode.c
View File

@ -190,7 +190,9 @@ int decodeNextFrameHeader(mp3DecodeData * data) {
} }
if(mad_header_decode(&data->frame.header,&data->stream)) { if(mad_header_decode(&data->frame.header,&data->stream)) {
#ifdef HAVE_ID3TAG #ifdef HAVE_ID3TAG
if((data->stream).error==MAD_ERROR_LOSTSYNC) { if((data->stream).error==MAD_ERROR_LOSTSYNC &&
(data->stream).this_frame)
{
signed long tagsize = id3_tag_query( signed long tagsize = id3_tag_query(
(data->stream).this_frame, (data->stream).this_frame,
(data->stream).bufend- (data->stream).bufend-