[xiph-commits] r7974 - in trunk/oggdsf: sln/oggdsf_all
src/lib/core/directshow/dsfAnxDemux
src/lib/core/directshow/dsfOggDemux
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Mon Oct 11 01:48:45 PDT 2004
Author: illiminable
Date: 2004-10-11 01:48:45 -0700 (Mon, 11 Oct 2004)
New Revision: 7974
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
Log:
* Fixed a bug in the annodex filter (caused no audio and permanent blocking) which was caused by the hack for icecast. Some of the changes were only made to the ogg demuxer and the new way was not propagated into the anx demux.
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-10-11 08:48:45 UTC (rev 7974)
@@ -1195,6 +1195,10 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DotNETOggTools", "..\..\build\DotNETOggTools\DotNETOggTools.vdproj", "{16474157-607B-483C-8C31-2EB9ED724AD1}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -2338,6 +2342,14 @@
{7F213248-16F2-4AAE-B941-C402670082BC}.Release_SSE.Build.0 = Release|Win32
{7F213248-16F2-4AAE-B941-C402670082BC}.Release_SSE2.ActiveCfg = Release|Win32
{7F213248-16F2-4AAE-B941-C402670082BC}.Release_SSE2.Build.0 = Release|Win32
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Debug.ActiveCfg = Debug
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Debug Unicode.ActiveCfg = Debug
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.MakeFile.ActiveCfg = Release
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Release.ActiveCfg = Release
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Release Unicode.ActiveCfg = Release
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Release_NoDotNET.ActiveCfg = Release
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Release_SSE.ActiveCfg = Release
+ {16474157-607B-483C-8C31-2EB9ED724AD1}.Release_SSE2.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2004-10-11 08:48:45 UTC (rev 7974)
@@ -116,7 +116,8 @@
//for (int i = 0; i < mSeenStreams.size(); i++) {
if (mSeenStreams[i] == inOggPage->header()->StreamSerialNo()) {
//If the page is a BOS we need to start a new stream
- OggStream* locStream = OggStreamFactory::CreateStream(inOggPage, mOwningFilter, false);
+ const bool ALLOW_OTHERS_TO_SEEK = true;
+ OggStream* locStream = OggStreamFactory::CreateStream(inOggPage, mOwningFilter, ALLOW_OTHERS_TO_SEEK);
//FIX::: Need to check for NULL
if (locStream != NULL) {
mStreamList.push_back(locStream);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp 2004-10-11 08:48:45 UTC (rev 7974)
@@ -40,6 +40,7 @@
, mCMMLFormatBlock(NULL)
{
InitCodec(inBOSPage->getStampedPacket(0));
+ debugLog.open("G:\\logs\\cmmlstream.log", ios_base::out);
}
CMMLStream::~CMMLStream(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-10-11 08:48:45 UTC (rev 7974)
@@ -61,7 +61,7 @@
virtual ~OggDemuxSourcePin(void);
static const unsigned long BUFFER_SIZE = 1024*512; //What should this be ????
- static const unsigned long NUM_BUFFERS = 50;
+ static const unsigned long NUM_BUFFERS = 100;
virtual bool deliverOggPacket(StampedOggPacket* inOggPacket);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2004-10-11 08:48:45 UTC (rev 7974)
@@ -50,8 +50,8 @@
//Need to do something here !
mSerialNo = inBOSPage->header()->StreamSerialNo();
- string locLogName = "G:\\logs\\oggstream" + StringHelper::numToString(mSerialNo) + ".log";
- debugLog.open(locLogName.c_str(), ios_base::out);
+ //string locLogName = "G:\\logs\\oggstream" + StringHelper::numToString(mSerialNo) + ".log";
+ //debugLog.open(locLogName.c_str(), ios_base::out);
mStreamLock = new CCritSec;
//This may need to be moved to derived class
//Yep, Sure did !
@@ -219,8 +219,10 @@
}
bool OggStream::acceptOggPage(OggPage* inOggPage) {
+ debugLog<<"Accepting ogg page..."<<endl;
//Chaining hack for icecast.
if ( (!mAllowSeek) && (inOggPage->header()->isBOS() )) {
+ debugLog<<"ice case hack"<<endl;
//A BOS page can only be sent here if it's a chain... otherwise
// it would have already been stripped by the demux if it was at the
// start of the file.
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2004-10-11 08:48:45 UTC (rev 7974)
@@ -36,6 +36,7 @@
, mTheoraFormatBlock(NULL)
{
InitCodec(inBOSPage->getStampedPacket(0));
+ debugLog.open("G:\\logs\\theorastream.log", ios_base::out);
}
TheoraStream::~TheoraStream(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2004-10-11 07:58:47 UTC (rev 7973)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2004-10-11 08:48:45 UTC (rev 7974)
@@ -36,6 +36,7 @@
, mVorbisFormatBlock(NULL)
{
InitCodec(inBOSPage->getStampedPacket(0));
+ debugLog.open("G:\\logs\\vorbisstream.log", ios_base::out);
}
VorbisStream::~VorbisStream(void)
More information about the commits
mailing list