kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WMAs now play. Seek is still lacking, also metadata readers. Code needs cleanup.

CQTexperiment
areff 2008-02-28 19:29:22 +00:00
parent d59e118e1d
commit e073f48dd5
2 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/WMA/WMADecoder.h
View File

@ -15,6 +15,9 @@
@interface WMADecoder : NSObject <CogDecoder> @interface WMADecoder : NSObject <CogDecoder>
{ {
id<CogSource> source; id<CogSource> source;
void *sampleBuffer;
int numSamples;
int samplePos;
AVFormatContext *ic; AVFormatContext *ic;
AVCodecContext *c; AVCodecContext *c;

77
Plugins/WMA/WMADecoder.m
View File

@ -25,7 +25,9 @@
const char *filename = [[[source url] path] UTF8String]; const char *filename = [[[source url] path] UTF8String];
ic = NULL; ic = NULL;
numSamples = 0;
samplePos = 0;
sampleBuffer = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
// register all available codecs // register all available codecs
av_register_all(); av_register_all();
@ -97,6 +99,7 @@
{ {
avcodec_close(c); avcodec_close(c);
av_close_input_file(ic); av_close_input_file(ic);
av_free(sampleBuffer);
[source close]; [source close];
[source release]; [source release];
@ -104,51 +107,61 @@
- (int)readAudio:(void *)buf frames:(UInt32)frames - (int)readAudio:(void *)buf frames:(UInt32)frames
{ {
uint8_t *outbuf, *s_outbuf, *inbuf_ptr; uint8_t *inbuf_ptr;
int size, out_size, st_buff, len; int size, out_size, len;
AVPacket framePacket; AVPacket framePacket;
//int bytesPerFrame = (bitsPerSample/8) * channels; int framesRead = 0;
st_buff = ST_BUFF; int bytesPerFrame = (bitsPerSample/8) * channels;
outbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
s_outbuf = av_malloc(st_buff);
// this NSLog is the only one I've ever seen activate for the end of file while (frames > 0)
if (av_read_frame(ic, &framePacket) < 0) {
NSLog(@"Uh oh..."); if (samplePos < numSamples)
{
int samplesLeft;
samplesLeft = numSamples - samplePos;
size = framePacket.size; if (samplesLeft > frames)
inbuf_ptr = framePacket.data; samplesLeft = frames;
if (size < 0) memcpy(buf, sampleBuffer + (samplePos * bytesPerFrame), samplesLeft * bytesPerFrame);
NSLog(@"NOES!"); buf += samplesLeft * bytesPerFrame;
framesRead += samplesLeft;
frames -= samplesLeft;
samplePos += samplesLeft;
}
if (frames > 0)
{
if (av_read_frame(ic, &framePacket) < 0)
{
NSLog(@"Uh oh...");
break;
}
len = avcodec_decode_audio(c, (short *)outbuf, &out_size, size = framePacket.size;
inbuf_ptr, size); inbuf_ptr = framePacket.data;
len = avcodec_decode_audio(c, (void *)sampleBuffer, &numSamples,
inbuf_ptr, size);
if (out_size == 0) if (len < 0)
NSLog(@"out_size is 0"); break;
/* need to do both looping for the right amount of frames and memcpy'ing around if (out_size <= 0)
this neck of the woods. */ continue;
// loops loops, memcpy(buffer, readbuffer, length), epic lulz numSamples /= bytesPerFrame;
samplePos = 0;
// the frame packet needs to be freed before we av_read_frame a new one // the frame packet needs to be freed before we av_read_frame a new one
if (framePacket.data) if (framePacket.data)
av_free_packet(&framePacket); av_free_packet(&framePacket);
}
}
return framesRead;
if (outbuf)
av_free(outbuf);
if (s_outbuf)
av_free(s_outbuf);
// return the actual number of frames read here, not the wanted number
return frames;
} }