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

seek support for mp4/aac 

git-svn-id: https://svn.musicpd.org/mpd/trunk@281 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-03-18 22:20:26 +00:00
parent 692dd6bc29
commit b87cc3c164
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/decode.c
View File

@ -155,9 +155,10 @@ void decodeSeek(PlayerControl * pc, AudioFormat * af, DecoderControl * dc,
waitOnDecode(pc,af,dc,cb); waitOnDecode(pc,af,dc,cb);
} }
if(*decode_pid>0 && dc->state==DECODE_STATE_DECODE) { if(*decode_pid>0 && dc->state==DECODE_STATE_DECODE) {
dc->seekWhere = pc->seekWhere > pc->totalTime-1 ? dc->seekWhere = pc->seekWhere > pc->totalTime-0.1 ?
pc->totalTime-1 : pc->seekWhere; pc->totalTime-0.1 :
dc->seekWhere = 1 > dc->seekWhere ? 1 : dc->seekWhere; pc->seekWhere;
dc->seekWhere = 0 > dc->seekWhere ? 0 : dc->seekWhere;
cb->begin = 0; cb->begin = 0;
dc->seek = 1; dc->seek = 1;
pc->elapsedTime = dc->seekWhere; pc->elapsedTime = dc->seekWhere;

52
src/mp4_decode.c
View File

@ -88,14 +88,15 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) {
long sampleId; long sampleId;
long numSamples; long numSamples;
int eof = 0; int eof = 0;
int rc;
long dur; long dur;
unsigned int sampleCount; unsigned int sampleCount;
char * sampleBuffer; char * sampleBuffer;
size_t sampleBufferLen; size_t sampleBufferLen;
unsigned int initial = 1; unsigned int initial = 1;
int chunkLen = 0; int chunkLen = 0;
float * seekTable;
long seekTableEnd = -1;
int seekPositionFound = 0;
fh = fopen(dc->file,"r"); fh = fopen(dc->file,"r");
if(!fh) { if(!fh) {
@ -173,19 +174,46 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) {
dc->start = 0; dc->start = 0;
time = 0.0; time = 0.0;
seekTable = malloc(sizeof(float)*numSamples);
for(sampleId=0; sampleId<numSamples && !eof; sampleId++) { for(sampleId=0; sampleId<numSamples && !eof; sampleId++) {
if(dc->seek) { if(dc->seek && seekTableEnd>1 &&
seekTable[seekTableEnd]>=dc->seekWhere)
{
int i = 2;
while(seekTable[i]<dc->seekWhere) i++;
sampleId = i-1;
time = seekTable[sampleId];
}
if((dur=mp4ff_get_sample_duration(mp4fh,track,sampleId))==0) {
eof = 1;
break;
}
if(sampleId>seekTableEnd) {
seekTable[sampleId] = time;
seekTableEnd = sampleId;
}
if(sampleId==0) dur = 0;
time+=((float)dur)/scale;
if(dc->seek && time>dc->seekWhere) seekPositionFound = 1;
if(dc->seek && seekPositionFound) {
seekPositionFound = 0;
chunkLen = 0;
cb->end = 0; cb->end = 0;
cb->wrap = 0; cb->wrap = 0;
#warning implement seeking here!
dc->seek = 0; dc->seek = 0;
} }
dur = mp4ff_get_sample_duration(mp4fh,track,sampleId); if(dc->seek) continue;
rc = mp4ff_read_sample(mp4fh,track,sampleId,&mp4Buffer,
&mp4BufferSize); if(mp4ff_read_sample(mp4fh,track,sampleId,&mp4Buffer,
&mp4BufferSize) == 0)
if(rc==0) { {
eof = 1; eof = 1;
break; break;
} }
@ -193,13 +221,12 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) {
sampleBuffer = faacDecDecode(decoder,&frameInfo,mp4Buffer, sampleBuffer = faacDecDecode(decoder,&frameInfo,mp4Buffer,
mp4BufferSize); mp4BufferSize);
if(mp4Buffer) free(mp4Buffer); if(mp4Buffer) free(mp4Buffer);
if(sampleId==0) dur = 0;
time+=((float)dur)/scale;
sampleCount = (unsigned long)(dur*channels); sampleCount = (unsigned long)(dur*channels);
if(sampleCount>0) initial =0; if(sampleCount>0) initial =0;
sampleBufferLen = sampleCount*2; sampleBufferLen = sampleCount*2;
while(sampleBufferLen > 0) {
while(sampleBufferLen>0 && !dc->seek) {
size_t size = sampleBufferLen>CHUNK_SIZE-chunkLen ? size_t size = sampleBufferLen>CHUNK_SIZE-chunkLen ?
CHUNK_SIZE-chunkLen: CHUNK_SIZE-chunkLen:
sampleBufferLen; sampleBufferLen;
@ -255,6 +282,7 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) {
} }
else dc->state = DECODE_STATE_STOP; else dc->state = DECODE_STATE_STOP;
free(seekTable);
faacDecClose(decoder); faacDecClose(decoder);
mp4ff_close(mp4fh); mp4ff_close(mp4fh);
fclose(fh); fclose(fh);