[xiph-commits] r8528 - in trunk/oggdsf: build/oggcodecs
src/lib/core/directshow/dsfOggDemux src/tools/OOOggSeekFileMaker
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Thu Dec 23 01:44:30 PST 2004
Author: illiminable
Date: 2004-12-23 01:44:30 -0800 (Thu, 23 Dec 2004)
New Revision: 8528
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp
Log:
* Fixed stopping problem for annodex... no more crash.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-23 07:58:21 UTC (rev 8527)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-23 09:44:30 UTC (rev 8528)
@@ -124,12 +124,6 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
@@ -286,6 +280,12 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
@@ -364,12 +364,6 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
@@ -550,6 +544,12 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
@@ -947,7 +947,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -1107,7 +1107,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{727A6F40-2315-4437-B2FB-B06B7E6CF430}"
+ "PackageCode" = "8:{A3F86D80-4BCC-4F1A-8975-B48A0A3236AF}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3431,7 +3431,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_27330A8D56F34785A52342ADD956700F"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggseekfilequery\\debug\\OOOggSeekFileQuery.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileQuery\\Debug\\OOOggSeekFileQuery.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-12-23 07:58:21 UTC (rev 8527)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-12-23 09:44:30 UTC (rev 8528)
@@ -316,7 +316,7 @@
CAutoLock locSourceLock(mSourceFileLock);
-
+ mSetIgnorePackets = false;
DeliverBeginFlush();
//debugLog<<" : Begin flush Delviered."<<endl;
@@ -329,6 +329,9 @@
//.first is the time in DS units
if (locStartPos.second == mStreamMapper->startOfData()) {
locSendExcess = true;
+ //GGFF:::
+ //mStreamMapper->toStartOfData();
+ mSetIgnorePackets = true;
}
@@ -509,10 +512,21 @@
{
CAutoLock locLock(m_pLock);
debugLog << "Delivering End Flush"<<endl;
- for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
- mStreamMapper->getOggStream(i)->flush();
- mStreamMapper->getOggStream(i)->getPin()->DeliverEndFlush();
+ if (mSetIgnorePackets == true) {
+ mStreamMapper->toStartOfData();
+ for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
+ //mStreamMapper->getOggStream(i)->flush();
+ mStreamMapper->getOggStream(i)->getPin()->DeliverEndFlush();
+ }
+
+ } else {
+
+ for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
+ mStreamMapper->getOggStream(i)->flush();
+ mStreamMapper->getOggStream(i)->getPin()->DeliverEndFlush();
+ }
}
+ mSetIgnorePackets = false;
}
void OggDemuxSourceFilter::DeliverEOS()
{
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-12-23 07:58:21 UTC (rev 8527)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-12-23 09:44:30 UTC (rev 8528)
@@ -188,6 +188,8 @@
bool mJustReset; //This is pretty dodgy !
+ bool mSetIgnorePackets;
+
//SOURCE ABSTRACTION::: declaration
//fstream mSourceFile;
//
Modified: trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp 2004-12-23 07:58:21 UTC (rev 8527)
+++ trunk/oggdsf/src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp 2004-12-23 09:44:30 UTC (rev 8528)
@@ -34,6 +34,7 @@
#include "stdafx.h"
#include "AutoOggSeekTable.h"
+#include "AutoAnxSeekTable.h"
#include <iostream>
@@ -53,8 +54,13 @@
cout<<"Usage : OOOggSeekFileMaker <in_ogg_file> <out_seek_table_file>"<<endl;
} else {
-
- AutoOggSeekTable* locSeekTable = new AutoOggSeekTable(argv[1]);
+ string inFileName = argv[1];
+ AutoOggSeekTable* locSeekTable = NULL;
+ if (inFileName.find(".anx") != string::npos) {
+ locSeekTable = new AutoAnxSeekTable(argv[1]);
+ } else {
+ locSeekTable = new AutoOggSeekTable(argv[1]);
+ }
locSeekTable->buildTable();
fstream outputFile;
More information about the commits
mailing list