[xiph-commits] r7368 - in trunk/oggdsf: docs sln/oggdsf_all
illiminable at dactyl.lonelymoon.com
illiminable
Tue Jul 27 01:44:45 PDT 2004
src/lib/core/directshow/dsfOggDemux src/lib/core/ogg/libOOOgg
src/lib/core/ogg/libOOOggSeek src/lib/core/ogg/libVorbisComment
Message-ID: <20040727084445.831449AAAB at dactyl.lonelymoon.com>
Author: illiminable
Date: Tue Jul 27 01:44:45 2004
New Revision: 7368
Modified:
trunk/oggdsf/docs/TODO.txt
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.cpp
Log:
* Integrated back into main project... all working again.
Modified: trunk/oggdsf/docs/TODO.txt
===================================================================
--- trunk/oggdsf/docs/TODO.txt 2004-07-27 07:34:06 UTC (rev 7367)
+++ trunk/oggdsf/docs/TODO.txt 2004-07-27 08:44:43 UTC (rev 7368)
@@ -4,15 +4,36 @@
* Fix flac decoder
* Fix wmp 9 issues, probably by rewriting the decoder :(
* Add seeking to annodex
-* Add application cmml interface
+
* I don't think non-renderer filters should expose the seeking interface.
* Fix up the seeking interface to provide choice of seek method.
+# Seeking very close to the end of speex or vorbis files, causes all audio to cease, requiring stop/play to resolve. Particularly noticable in small files, seems roughly 5 secs from end where this occurs.
+# There is no way to alter the audio encoding parameters, vorbis defaults to quality 0.3
+
+# Duration is wrong for all files except speex, vorbis and theora... doesn't affect playback
+# When transcoding theora, if a media decoder (WMV usually) doesn't advertise its framerate, output may be time distorted
+# Created files are not yet gauranteed to be correct. No produced encoded files should be distributed.
+# I think there may be a little memory leak in the encoders... nothing too serious, but if you try and encode really large files it may be a problem.
+# Theora will not playback with Windows Media Player 9 or 10, but vorbis and speex are just fine, but will in previous WMP's and other DS players like BSPlayer
+# Theora and annodex playback requires directX 9.
+# CMML decoding requires MSXML3.dll to be present. (it was installed with IE6)
+# DON'T try to stop a FLAC stream. It crashes. Running to the end is ok.
+# FLAC will make media player do the error sound or crash on exit
+# Only plays FLAC with 16 bit 2 channel 44100Hz settings. Still hardcoded.
+# Only plays Ogg encapsulated FLAC. Won't play normal FLAC files.
+
NEXT FEATURES
=============
* CMML Application interface
* Annodex seeking
-* flac encoder
+
* Raw flac support
* Annodex Muxer
-* WMP Ripping plug-in for vorbis and flac.
\ No newline at end of file
+* WMP Ripping plug-in for vorbis and flac.
+
+DONE
+====
+* flac encoder
+* Add application cmml interface
+# Seeking in theora occasionally seg faults (Ithink)
\ No newline at end of file
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-07-27 07:34:06 UTC (rev 7367)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-07-27 08:44:43 UTC (rev 7368)
@@ -1052,6 +1052,15 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggValidate", "..\..\src\tools\OOOggValidate\OOOggValidate.vcproj", "{B5BF942B-4864-414C-9855-65E5CC923401}"
+ ProjectSection(ProjectDependencies) = postProject
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testCircleBuffer", "..\..\src\tests\testCircleBuffer\testCircleBuffer.vcproj", "{191217F4-1F30-426D-A2AB-A9E613D9A401}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -1511,6 +1520,26 @@
{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release.Build.0 = Release|.NET
{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release Unicode.ActiveCfg = Release|.NET
{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release Unicode.Build.0 = Release|.NET
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Debug.ActiveCfg = Debug|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Debug.Build.0 = Debug|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Debug Unicode.ActiveCfg = Debug|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Debug Unicode.Build.0 = Debug|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.MakeFile.ActiveCfg = Release|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.MakeFile.Build.0 = Release|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Release.ActiveCfg = Release|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Release.Build.0 = Release|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Release Unicode.ActiveCfg = Release|Win32
+ {B5BF942B-4864-414C-9855-65E5CC923401}.Release Unicode.Build.0 = Release|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug.ActiveCfg = Debug|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug.Build.0 = Debug|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug Unicode.ActiveCfg = Debug|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug Unicode.Build.0 = Debug|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.MakeFile.ActiveCfg = Release|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.MakeFile.Build.0 = Release|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Release.ActiveCfg = Release|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Release.Build.0 = Release|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Release Unicode.ActiveCfg = Release|Win32
+ {191217F4-1F30-426D-A2AB-A9E613D9A401}.Release Unicode.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-07-27 07:34:06 UTC (rev 7367)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-07-27 08:44:43 UTC (rev 7368)
@@ -589,7 +589,7 @@
if (mJustReset) { //To avoid blocking problems... restart the loop if it was just reset while waiting for lock.
continue;
}
- locKeepGoing = ((mOggBuffer.feed(locBuff, locBytesRead)) == (OggDataBuffer::FEED_OK));;
+ locKeepGoing = ((mOggBuffer.feed((const unsigned char*)locBuff, locBytesRead)) == (OggDataBuffer::FEED_OK));;
}
if (!locKeepGoing) {
//debugLog << "DataProcessLoop : Feed in data buffer said stop"<<endl;
@@ -649,7 +649,7 @@
//
//BUG::: Need to actually see how many bytes were read !
if (locNumRead > 0) {
- mOggBuffer.feed(locBuff, locNumRead);
+ mOggBuffer.feed((const unsigned char*)locBuff, locNumRead);
}
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp 2004-07-27 07:34:06 UTC (rev 7367)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.cpp 2004-07-27 08:44:43 UTC (rev 7368)
@@ -63,10 +63,12 @@
retClone->mGranulePos = mGranulePos;
retClone->mHeaderFlags = mHeaderFlags;
retClone->mHeaderSize = mHeaderSize;
- //retClone->mNumPageSegments = mNumPageSegments;
+ retClone->mNumPageSegments = mNumPageSegments;
retClone->mPageSequenceNo = mPageSequenceNo;
retClone->mPageSize = mPageSize;
retClone->mPageState = mPageState;
+ retClone->mStreamSerialNo = mStreamSerialNo;
+ retClone->mStructureVersion = mStructureVersion;
//Copy the segment table.
unsigned char* locBuff = new unsigned char[mNumPageSegments];
@@ -75,9 +77,6 @@
locBuff = NULL;
//
- retClone->mStreamSerialNo = mStreamSerialNo;
- retClone->mStructureVersion = mStructureVersion;
-
return retClone;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-07-27 07:34:06 UTC (rev 7367)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-07-27 08:44:43 UTC (rev 7368)
@@ -150,7 +150,7 @@
unsigned char* locBuff = new unsigned char[BUFF_SIZE];
while (!mFile.eof()) {
mFile.read((char*)locBuff, BUFF_SIZE);
- mOggDemux->feed((const char*)locBuff, mFile.gcount());
+ mOggDemux->feed((const unsigned char*)locBuff, mFile.gcount());
}
mFile.close();
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.cpp 2004-07-27 07:34:06 UTC (rev 7367)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisComment/FileComments.cpp 2004-07-27 08:44:43 UTC (rev 7368)
@@ -99,7 +99,7 @@
while (!locFile.eof()) {
locFile.read(locBuff, BUFF_SIZE);
locBytesRead = locFile.gcount();
- locOggBuff.feed(locBuff, locBytesRead);
+ locOggBuff.feed((const unsigned char*)locBuff, locBytesRead);
}
delete locBuff;
More information about the commits
mailing list