[xiph-commits] r17325 - in trunk/oggdsf: . src/lib/codecs/webm/webmdshow/libmkvparser

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2010-07-05 14:15:54 -0700 (Mon, 05 Jul 2010)
New Revision: 17325

Modified:
   trunk/oggdsf/ChangeLog.txt
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp
Log:
Bumped version. Enabled vorbis dshow decoder.

Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt	2010-07-05 19:56:22 UTC (rev 17324)
+++ trunk/oggdsf/ChangeLog.txt	2010-07-05 21:15:54 UTC (rev 17325)
@@ -1,4 +1,4 @@
-Version 0.84.17324 - 05.07.2010
+Version 0.84.17325 - 05.07.2010
 
     * Updated webmdshow to 0.9.9.0
     * Fixed installer script regarding URL registration 

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp	2010-07-05 19:56:22 UTC (rev 17324)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp	2010-07-05 21:15:54 UTC (rev 17325)
@@ -203,17 +203,17 @@
 
     //TODO: if we decide source filter should attempt to also
     //connect to Xiph Ogg Vorbis decoder filter:
-    //mt.majortype = VorbisTypes::MEDIATYPE_OggPacketStream;
-    //mt.subtype = MEDIASUBTYPE_None;
-    //mt.bFixedSizeSamples = FALSE;
-    //mt.bTemporalCompression = FALSE;
-    //mt.lSampleSize = 0;
-    //mt.formattype = VorbisTypes::FORMAT_OggIdentHeader;
-    //mt.pUnk = 0;
-    //mt.cbFormat = id_len;
-    //mt.pbFormat = const_cast<BYTE*>(id_hdr);
-    //
-    //mtv.Add(mt);
+    mt.majortype = VorbisTypes::MEDIATYPE_OggPacketStream;
+    mt.subtype = MEDIASUBTYPE_None;
+    mt.bFixedSizeSamples = FALSE;
+    mt.bTemporalCompression = FALSE;
+    mt.lSampleSize = 0;
+    mt.formattype = VorbisTypes::FORMAT_OggIdentHeader;
+    mt.pUnk = 0;
+    mt.cbFormat = id_len;
+    mt.pbFormat = const_cast<BYTE*>(id_hdr);
+
+    mtv.Add(mt);
 }
 
 
@@ -317,7 +317,7 @@
     assert(start_ns >= 0);
     assert((start_ns % 100) == 0);
 
-#if 1
+#if 0
     const __int64 basetime_ns = m_pBase->GetTime();
     assert(basetime_ns >= 0);
     assert((basetime_ns % 100) == 0);