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

add compatibility chunk interpretation for extractors not providing OGG_PACKET_DATA_TYPE

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9839 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-11-08 05:17:37 +00:00
parent 8b8d5f70ad
commit 72c89788b2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
+14 -6
View File
@@ -189,9 +189,19 @@ VorbisDecoder::Decode(void *buffer, int64 *frameCount,
TRACE("VorbisDecoder::Decode: GetNextChunk failed\n"); TRACE("VorbisDecoder::Decode: GetNextChunk failed\n");
return status; return status;
} }
if (mh.user_data_type != OGG_PACKET_DATA_TYPE) { ogg_packet packet;
TRACE("VorbisDecoder::Decode: chunk missing ogg_packet data"); if (mh.user_data_type == OGG_PACKET_DATA_TYPE) {
return B_ERROR; memcpy(&packet, mh.user_data, sizeof(packet));
} else {
// According to http://lists.xiph.org/pipermail/theora-dev/2004-May/002161.html
// this is invalid, but results from it are tolerable and better than nothing.
TRACE("VorbisDecoder::Decode: using compatibility chunk interpretation\n");
packet.b_o_s = 0;
packet.e_o_s = 0;
packet.granulepos = -1;
packet.packetno = 7;
packet.packet = static_cast<unsigned char *>(chunkBuffer);
packet.bytes = chunkSize;
} }
if (!synced) { if (!synced) {
if (mh.start_time > 0) { if (mh.start_time > 0) {
@@ -199,9 +209,7 @@ VorbisDecoder::Decode(void *buffer, int64 *frameCount,
synced = true; synced = true;
} }
} }
ogg_packet * packet = reinterpret_cast<ogg_packet*>(mh.user_data); if (vorbis_synthesis(&fBlock, &packet)==0) {
packet->packet = static_cast<unsigned char *>(chunkBuffer);
if (vorbis_synthesis(&fBlock, packet)==0) {
vorbis_synthesis_blockin(&fDspState,&fBlock); vorbis_synthesis_blockin(&fDspState,&fBlock);
} }
} }