i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allocate ogg_stream_states dynamically, hold pointers to them in the map, check sync return result during GetPage, add myriad of vorbisDecoder debug calls, introduce temporary variables to ease debugging

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5764 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2003-12-26 17:39:43 +00:00
parent 0b18a76480
commit 77ae533d3c
3 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
+14 -2
View File
@@ -17,6 +17,7 @@
vorbisDecoder::vorbisDecoder()
{
TRACE("vorbisDecoder::vorbisDecoder\n");
vorbis_info_init(&fInfo);
vorbis_comment_init(&fComment);
@@ -32,6 +33,8 @@ vorbisDecoder::vorbisDecoder()
vorbisDecoder::~vorbisDecoder()
{
debugger("vorbisDecoder::~vorbisDecoder");
TRACE("vorbisDecoder::~vorbisDecoder\n");
delete [] fDecodeBuffer;
}
@@ -40,6 +43,8 @@ status_t
vorbisDecoder::Setup(media_format *ioEncodedFormat,
const void *infoBuffer, int32 infoSize)
{
debugger("vorbisDecoder::Setup");
TRACE("vorbisDecoder::Setup\n");
if ((ioEncodedFormat->type != B_MEDIA_UNKNOWN_TYPE)
&& (ioEncodedFormat->type != B_MEDIA_ENCODED_AUDIO)) {
TRACE("vorbisDecoder::Setup not called with audio/unknown stream: not vorbis");
@@ -49,13 +54,13 @@ vorbisDecoder::Setup(media_format *ioEncodedFormat,
TRACE("vorbisDecoder::Setup not called with ogg_packet info: not vorbis");
return B_ERROR;
}
ogg_packet * packet = (ogg_packet*)infoBuffer;
// parse header packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,(ogg_packet*)infoBuffer) != 0) {
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbisDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis header");
return B_ERROR;
}
// get comment packet
ogg_packet * packet;
int32 size;
media_header mh;
if (GetNextChunk((void**)&packet, &size, &mh) != B_OK) {
@@ -91,6 +96,8 @@ size_t get_audio_buffer_size(const media_raw_audio_format & raf) {
status_t
vorbisDecoder::NegotiateOutputFormat(media_format *ioDecodedFormat)
{
debugger("vorbisDecoder::NegotiateOutputFormat");
TRACE("vorbisDecoder::NegotiateOutputFormat\n");
// BeBook says: The codec will find and return in ioFormat its best matching format
// => This means, we never return an error, and always change the format values
// that we don't support to something more applicable
@@ -122,6 +129,7 @@ vorbisDecoder::Seek(uint32 seekTo,
bigtime_t seekTime, bigtime_t *time)
{
debugger("vorbisDecoder::Seek");
TRACE("vorbisDecoder::Seek\n");
fResidualBytes = 0;
return B_OK;
}
@@ -131,6 +139,8 @@ status_t
vorbisDecoder::Decode(void *buffer, int64 *frameCount,
media_header *mediaHeader, media_decode_info *info /* = 0 */)
{
debugger("vorbisDecoder::Decode");
TRACE("vorbisDecoder::Decode\n");
uint8 * out_buffer = static_cast<uint8 *>(buffer);
int32 out_bytes_needed = fOutputBufferSize;
@@ -165,6 +175,8 @@ vorbisDecoder::Decode(void *buffer, int64 *frameCount,
status_t
vorbisDecoder::DecodeNextChunk()
{
debugger("vorbisDecoder::DecodeNextChunk");
TRACE("vorbisDecoder::DecodeNextChunk\n");
void *chunkBuffer;
int32 chunkSize;
media_header mh;