[matroska] r978 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-12-16 00:45:06 +0300 (Thu, 16 Dec 2004)
New Revision: 978

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/VobParser.cpp
Log:
DMX: the scroll range should be OK this time, extracted buttons include the MPEG PCI header

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-12-15 14:24:04 UTC (rev 977)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-12-15 21:45:06 UTC (rev 978)
@@ -651,10 +651,10 @@
 			}
 
 			m_gaDemuxProgress->SetValue(0);
-			m_gaDemuxProgress->SetRange(aVobParser.GetPacketCount() >> 4);
+			m_gaDemuxProgress->SetRange(aVobParser.GetPacketCount() >> 8);
             while(aVobParser.ParseNextPacket(*IfoFile))
             {
-				m_gaDemuxProgress->SetValue(aVobParser.GetPacketIndex() >> 4);
+				m_gaDemuxProgress->SetValue(aVobParser.GetPacketIndex() >> 8);
                 wxYield();
             }
 			m_txtDemuxLog->AppendText("Done demuxing\n");

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2004-12-15 14:24:04 UTC (rev 977)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2004-12-15 21:45:06 UTC (rev 978)
@@ -432,8 +432,8 @@
 		DebugLog("PCI {\n");
 		inc_lvl();
 		ParsePCI();
-		m_pci_position = position;
-		m_pci_size = length;
+		m_pci_position = position-4; // keep the Private Stream 2 header
+		m_pci_size = length+4;
 		dec_lvl();
 		DebugLog("}\n");
 		break;