[xiph-commits] r8301 - trunk/oggdsf/src/lib/core/directshow/dsfAnxMux

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-11-29 06:40:25 -0800 (Mon, 29 Nov 2004)
New Revision: 8301

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
Log:
* Bit better... anx mux still doesn't work properly.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp	2004-11-29 13:22:48 UTC (rev 8300)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.cpp	2004-11-29 14:40:25 UTC (rev 8301)
@@ -34,7 +34,7 @@
 {
 
 	mInterleaver = new AnxPageInterleaver(this, this, 2, 0);
-	mInputPins.push_back(new OggMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
+	mInputPins.push_back(new AnxMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
 
 
 		//Make our delegate pin[0], the top pin... we send all out requests there.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h	2004-11-29 13:22:48 UTC (rev 8300)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxFilter.h	2004-11-29 14:40:25 UTC (rev 8301)
@@ -2,6 +2,7 @@
 #include "anxmuxdllstuff.h"
 #include "OggMuxFilter.h"
 #include "AnxPageInterleaver.h"
+#include "AnxMuxInputPin.h"
 class AnxMuxFilter
 	:	public OggMuxFilter
 {

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-11-29 13:22:48 UTC (rev 8300)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-11-29 14:40:25 UTC (rev 8301)
@@ -4,6 +4,7 @@
 AnxMuxInputPin::AnxMuxInputPin(AnxMuxFilter* inOwningFilter, CCritSec* inFilterLock, HRESULT* inHR, OggMuxStream* inMuxStream)
 :	OggMuxInputPin(inOwningFilter, inFilterLock, inHR, inMuxStream)
 {
+	debugLog.open("g:\\logs\\anxmuxinputpin.log", ios_base::out);
 }
 
 AnxMuxInputPin::~AnxMuxInputPin(void)
@@ -16,7 +17,7 @@
 	HRESULT locHR = OggMuxInputPin::SetMediaType(inMediaType);
 
 	if (locHR == S_OK) {
-
+		debugLog<<"Set media type ok in base class"<<endl;
 		mPaginator.acceptStampedOggPacket(AnxPacketMaker::makeAnxData_2_0(mMuxStream, &mPaginator));
 	}
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h	2004-11-29 13:22:48 UTC (rev 8300)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.h	2004-11-29 14:40:25 UTC (rev 8301)
@@ -4,6 +4,12 @@
 #include "OggMuxInputPin.h"
 #include "AnxMuxFilter.h"
 #include "AnxPacketMaker.h"
+
+
+#include <fstream>
+using namespace std;
+
+class AnxMuxFilter;
 class AnxMuxInputPin
 	:	public OggMuxInputPin
 {
@@ -13,4 +19,7 @@
 
 
 	virtual HRESULT SetMediaType(const CMediaType* inMediaType);
+
+protected:
+	fstream debugLog;
 };

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp	2004-11-29 13:22:48 UTC (rev 8300)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp	2004-11-29 14:40:25 UTC (rev 8301)
@@ -82,7 +82,7 @@
 {
 
 	StampedOggPacket* locPack = NULL;
-	OggPage* retPage = NULL;
+	//OggPage* retPage = NULL;
 	unsigned char* locBuff = NULL;
 	unsigned long locUpto = 0;
 	unsigned long locPacketSize = 0;
@@ -127,7 +127,7 @@
 			locBuff[locUpto++] = '\n';
 			
 			locPack = new StampedOggPacket(locBuff, locPacketSize, false, false, 0, 0, StampedOggPacket::OGG_END_ONLY);
-			retPage = new OggPage;
+			return locPack;
 
 			
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp	2004-11-29 13:22:48 UTC (rev 8300)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp	2004-11-29 14:40:25 UTC (rev 8301)
@@ -41,7 +41,7 @@
 }
 
 void AnxPageInterleaver::addAllAnxData_2_0_BOS() {
-	for (int i = 1; i < mInputStreams.size() - 1; i++) {
+	for (int i = 0; i < mInputStreams.size() - 1; i++) {
 		mFileWriter->acceptOggPage(mInputStreams[i]->popFront());
 	}