[xiph-commits] r8644 - in trunk/oggdsf: sln/oggdsf_all src/lib/codecs/theora/libs/libOOTheora src/lib/core/directshow/dsfOggDemux src/tools/OOOggSeekFileReader

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2005-01-06 06:06:52 -0800 (Thu, 06 Jan 2005)
New Revision: 8644

Modified:
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
   trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp
   trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj
Log:
* Send proper \r\n to servers

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-06 13:22:45 UTC (rev 8643)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-06 14:06:52 UTC (rev 8644)
@@ -1089,7 +1089,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggSeekFileReader", "..\..\src\tools\OOOggSeekFileReader\OOOggSeekFileReader.vcproj", "{F6B75B61-4BEF-4323-B15E-37AFFC9CB52A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection

Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp	2005-01-06 13:22:45 UTC (rev 8643)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp	2005-01-06 14:06:52 UTC (rev 8644)
@@ -96,6 +96,7 @@
 
 	return locOldPacket;		//Gives a poitner to the caller.
 }
+
 bool TheoraDecoder::decodeHeader(StampedOggPacket* inHeaderPacket) {		//inHeaderPacket is accepted and deleted.
 
 	ogg_packet* locOldPack = simulateOldOggPacket(inHeaderPacket);		//Accepts packet and deletes it.

Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h	2005-01-06 13:22:45 UTC (rev 8643)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h	2005-01-06 14:06:52 UTC (rev 8644)
@@ -51,8 +51,8 @@
 	ogg_packet* simulateOldOggPacket(StampedOggPacket* inPacket);
 
 
-	
-	unsigned char* convertYUV(yuv_buffer* inBuffer, unsigned long inFormat);
+	bool isKeyFrame(const StampedOggPacket* inPacket);
+	//unsigned char* convertYUV(yuv_buffer* inBuffer, unsigned long inFormat);
 		theora_info mTheoraInfo;
 protected:
 	//theora_info mTheoraInfo;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2005-01-06 13:22:45 UTC (rev 8643)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2005-01-06 14:06:52 UTC (rev 8644)
@@ -167,7 +167,7 @@
 	int locNumRead = 0;
 	char* locBuff = NULL;
 	DWORD locCommand = 0;
-	const unsigned long RECV_BUFF_SIZE = 1024;
+
 	locBuff = new char[RECV_BUFF_SIZE];
 
 	while(true) {

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp	2005-01-06 13:22:45 UTC (rev 8643)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp	2005-01-06 14:06:52 UTC (rev 8644)
@@ -133,7 +133,7 @@
 
 string HTTPSocket::assembleRequest(string inFilePath) {
 	string retRequest;
-	retRequest = "GET " + inFilePath+ " HTTP/1.1\n" + "Host: " + mServerName+ "\n" + "Connection: close" + "\n\n";
+	retRequest = "GET " + inFilePath+ " HTTP/1.1\r\n" + "Host: " + mServerName+ "\r\n" + "Connection: close" + "\r\n\r\n";
 	//debugLog2<<"Assembled Req : "<<endl<<retRequest<<endl;
 	return retRequest;
 }

Modified: trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj	2005-01-06 13:22:45 UTC (rev 8643)
+++ trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj	2005-01-06 14:06:52 UTC (rev 8644)
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\helper;..\..\lib\core\ogg"
+				AdditionalIncludeDirectories="..\..\lib\helper;..\..\lib\core\ogg\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\lib\helper;..\..\lib\core\ogg"
+				AdditionalIncludeDirectories="..\..\lib\helper;..\..\lib\core\ogg\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="3"