Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

divide GetNextChunk and non-const media_format behavior into new member function InitializeInput

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6148 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty 2004-01-19 19:11:44 +00:00
parent a498eb5fda
commit e065a2e0e7
2 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
View File

@ -27,6 +27,10 @@ vorbisDecoder::vorbisDecoder()
vorbis_info_init(&fInfo);
vorbis_comment_init(&fComment);
fHeaderPacketParsed = false;
fCommentPacketParsed = false;
fCodebookPacketParsed = false;
fStartTime = 0;
fFrameSize = 0;
fOutputBufferSize = 0;
@ -40,51 +44,82 @@ vorbisDecoder::~vorbisDecoder()
status_t
vorbisDecoder::Setup(media_format *ioEncodedFormat,
vorbisDecoder::Setup(media_format *inputFormat,
const void *infoBuffer, int32 infoSize)
{
if ((ioEncodedFormat->type != B_MEDIA_UNKNOWN_TYPE)
&& (ioEncodedFormat->type != B_MEDIA_ENCODED_AUDIO)) {
if ((inputFormat->type != B_MEDIA_UNKNOWN_TYPE)
&& (inputFormat->type != B_MEDIA_ENCODED_AUDIO)) {
TRACE("vorbisDecoder::Setup not called with audio/unknown stream: not vorbis");
return B_ERROR;
}
if (infoSize != sizeof(ogg_packet)) {
TRACE("vorbisDecoder::Setup not called with ogg_packet info: not vorbis");
if (inputFormat->MetaDataSize() == sizeof(ogg_packet)) {
if (!fHeaderPacketParsed) {
// header packet passed in meta data
ogg_packet * packet = (ogg_packet*)inputFormat->MetaData();
// parse header packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbisDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis header");
return B_ERROR;
}
fHeaderPacketParsed = true;
}
} else if (inputFormat->MetaDataSize() != 0) {
// unexpected meta data
return B_ERROR;
}
ogg_packet * packet = (ogg_packet*)infoBuffer;
// parse header packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbisDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis header");
return B_ERROR;
}
// get comment packet
}
return InitializeInput(inputFormat);
}
status_t
vorbisDecoder::InitializeInput(media_format *ioEncodedFormat)
{
ogg_packet * packet;
int32 size;
media_header mh;
if (GetNextChunk((void**)&packet, &size, &mh) != B_OK) {
TRACE("vorbisDecoder::Setup: GetNextChunk failed to get comment\n");
return B_ERROR;
if (!fHeaderPacketParsed) {
// get header packet
if (GetNextChunk((void**)&packet, &size, &mh) != B_OK) {
TRACE("vorbisDecoder::Setup: GetNextChunk failed to get comment\n");
return B_ERROR;
}
// parse header packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbisDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis header");
return B_ERROR;
}
fHeaderPacketParsed = true;
}
// parse comment packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbiseDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis comment");
return B_ERROR;
if (!fCommentPacketParsed) {
// get comment packet
if (GetNextChunk((void**)&packet, &size, &mh) != B_OK) {
TRACE("vorbisDecoder::Setup: GetNextChunk failed to get comment\n");
return B_ERROR;
}
// parse comment packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbiseDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis comment");
return B_ERROR;
}
fCommentPacketParsed = true;
}
// get codebook packet
if (GetNextChunk((void**)&packet, &size, &mh) != B_OK) {
TRACE("vorbisDecoder::Setup: GetNextChunk failed to get codebook\n");
return B_ERROR;
if (!fCodebookPacketParsed) {
// get codebook packet
if (GetNextChunk((void**)&packet, &size, &mh) != B_OK) {
TRACE("vorbisDecoder::Setup: GetNextChunk failed to get codebook\n");
return B_ERROR;
}
// parse codebook packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbiseDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis codebook");
return B_ERROR;
}
// initialize decoder
vorbis_synthesis_init(&fDspState,&fInfo);
vorbis_block_init(&fDspState,&fBlock);
}
// parse codebook packet
if (vorbis_synthesis_headerin(&fInfo,&fComment,packet) != 0) {
TRACE("vorbiseDecoder::Setup: vorbis_synthesis_headerin failed: not vorbis codebook");
return B_ERROR;
}
// initialize decoder
vorbis_synthesis_init(&fDspState,&fInfo);
vorbis_block_init(&fDspState,&fBlock);
// fill out the encoding format
CopyInfoToEncodedFormat(ioEncodedFormat);
return B_OK;
}

7
src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.h
View File

@ -8,9 +8,11 @@ public:
vorbisDecoder();
~vorbisDecoder();
status_t Setup(media_format *ioEncodedFormat,
status_t Setup(media_format *inputFormat,
const void *infoBuffer, int32 infoSize);
status_t InitializeInput(media_format * ioEncodedFormat);
status_t NegotiateOutputFormat(media_format *ioDecodedFormat);
status_t Seek(uint32 seekTo,
@ -25,6 +27,9 @@ private:
void CopyInfoToEncodedFormat(media_format * format);
void CopyInfoToDecodedFormat(media_raw_audio_format * raf);
bool fHeaderPacketParsed;
bool fCommentPacketParsed;
bool fCodebookPacketParsed;
vorbis_info fInfo;
vorbis_comment fComment;
vorbis_dsp_state fDspState;