actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup:

Browse Source 
hopefully deal with unknown extension headers (untested)
 require ogg, not vorbis
This commit is contained in:
Glenn Maynard
2005-10-21 05:44:33 +00:00
parent 9455ee6d54
commit 2513b7aac1
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MovieTexture/MovieTexture_Theora.cpp
+33 -12
View File
@@ -10,7 +10,7 @@
#include <theora/theora.h> #include <theora/theora.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma comment(lib, OGG_LIB_DIR "vorbis_static.lib") #pragma comment(lib, OGG_LIB_DIR "ogg_static.lib")
#pragma comment(lib, OGG_LIB_DIR "theora_static.lib") #pragma comment(lib, OGG_LIB_DIR "theora_static.lib")
#endif #endif
@@ -42,6 +42,7 @@ public:
private: private:
void Init(); void Init();
CString ProcessHeaders();
int ReadPage( ogg_page *pOggPage ); int ReadPage( ogg_page *pOggPage );
RageFile m_File; RageFile m_File;
@@ -107,15 +108,10 @@ int MovieDecoder_Theora::ReadPage( ogg_page *pOggPage )
} }
} }
CString MovieDecoder_Theora::Open( CString sFile ) CString MovieDecoder_Theora::ProcessHeaders()
{ {
if( !m_File.Open(sFile) )
return ssprintf( "error opening %s: %s", sFile.c_str(), m_File.GetError().c_str() );
Init();
int iTheoraPacketsProcessed = 0; int iTheoraPacketsProcessed = 0;
while( iTheoraPacketsProcessed < 3 ) while(1)
{ {
ogg_page OggPage; ogg_page OggPage;
int ret = ReadPage( &OggPage ); int ret = ReadPage( &OggPage );
@@ -136,7 +132,7 @@ CString MovieDecoder_Theora::Open( CString sFile )
ogg_packet op; ogg_packet op;
ogg_stream_packetout( &m_OggStream, &op ); ogg_stream_packetout( &m_OggStream, &op );
if( theora_decode_header(&m_TheoraInfo, &m_TheoraComment, &op) != 0 ) if( theora_decode_header(&m_TheoraInfo, &m_TheoraComment, &op) < 0 )
{ {
ogg_stream_clear( &m_OggStream ); ogg_stream_clear( &m_OggStream );
continue; continue;
@@ -149,19 +145,44 @@ CString MovieDecoder_Theora::Open( CString sFile )
ogg_stream_pagein( &m_OggStream, &OggPage ); ogg_stream_pagein( &m_OggStream, &OggPage );
/* Look for more headers in this page. */ /* Look for more headers in this page. */
while( iTheoraPacketsProcessed < 3 ) while(1)
{ {
ogg_packet op; ogg_packet op;
int ret = ogg_stream_packetout( &m_OggStream, &op ); int ret = ogg_stream_packetpeek( &m_OggStream, &op );
if( ret == 0 ) if( ret == 0 )
break; break;
if( ret < 0 ) if( ret < 0 )
return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() ); return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() );
if( theora_decode_header(&m_TheoraInfo, &m_TheoraComment, &op) < 0 )
if( !theora_packet_isheader(&op) )
{
/* This is a body packet, not a header packet, so we're done processing
* headers. We must have at least three header packets. */
if( iTheoraPacketsProcessed < 3 )
return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() );
return CString();
}
ret = theora_decode_header( &m_TheoraInfo, &m_TheoraComment, &op);
if( ret < 0 && ret != OC_NEWPACKET )
return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() ); return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() );
ogg_stream_packetout( &m_OggStream, NULL );
iTheoraPacketsProcessed++; iTheoraPacketsProcessed++;
} }
} }
}
CString MovieDecoder_Theora::Open( CString sFile )
{
if( !m_File.Open(sFile) )
return ssprintf( "error opening %s: %s", sFile.c_str(), m_File.GetError().c_str() );
Init();
CString sError = ProcessHeaders();
if( !sError.empty() )
return sError;
theora_decode_init( &m_TheoraState, &m_TheoraInfo ); theora_decode_init( &m_TheoraState, &m_TheoraInfo );