[xiph-commits] r11850 - trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-09-23 01:52:36 -0700 (Sat, 23 Sep 2006)
New Revision: 11850

Modified:
   trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp
   trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.cpp
Log:
* Subtitles work far more reliably when you don't screw up the timestamp.
* Also fixed the media type for the subtitle streams

Modified: trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp	2006-09-23 07:25:32 UTC (rev 11849)
+++ trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeFilter.cpp	2006-09-23 08:52:36 UTC (rev 11850)
@@ -184,9 +184,10 @@
 			break;
 			case OGMDecodeInputPin::OGM_TEXT_TYPE:
 
+                outMediaType->InitMediaType();
 				outMediaType->majortype = MEDIATYPE_Text;
-				outMediaType->subtype = MEDIASUBTYPE_None;
-				outMediaType->formattype = FORMAT_None;
+				//outMediaType->subtype = MEDIASUBTYPE_NULL; //MEDIASUBTYPE_None;
+				//outMediaType->formattype = FORMAT_NULL; //FORMAT_None;
 				break;
 
 			default:

Modified: trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.cpp	2006-09-23 07:25:32 UTC (rev 11849)
+++ trunk/oggdsf/src/lib/codecs/ogm/filters/dsfOGMDecoder/OGMDecodeInputPin.cpp	2006-09-23 08:52:36 UTC (rev 11850)
@@ -122,7 +122,8 @@
 		case OGM_AUDIO_TYPE:
 			return (inGranule * UNITS) / mAudioFormatBlock->nSamplesPerSec;
 		case OGM_TEXT_TYPE:
-			return (inGranule * UNITS * mGranuleRateDenominator) / mGranuleRateNumerator;
+			//return (inGranule * UNITS * mGranuleRateDenominator) / mGranuleRateNumerator;
+            return (inGranule * mGranuleRateNumerator) / mGranuleRateDenominator;
 		default:
 			return 0;
 	};