[matroska] r981 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-12-17 01:55:58 +0300 (Fri, 17 Dec 2004)
New Revision: 981

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/VobParser.cpp
Log:
DMX: use the correct width & height for the button frame

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-12-16 13:41:20 UTC (rev 980)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-12-16 22:55:58 UTC (rev 981)
@@ -645,8 +645,7 @@
 					}
 				}
 				// create a possible button demuxer too
-				// _todo_ get image width from somewhere
-				_muxer = new BtnDemuxWriter(outputDirectory + newFilename, 576, 400);
+				_muxer = new BtnDemuxWriter(outputDirectory + newFilename, _width, _height);
 				if (!demuxer.AddDemuxer(SUBSTREAM_PCI, _muxer))
 					delete _muxer;
 			}

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2004-12-16 13:41:20 UTC (rev 980)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2004-12-16 22:55:58 UTC (rev 981)
@@ -253,7 +253,7 @@
 				{ // there are some buttons
 					uint32_t t3 = m_pci.vobu_s_ptm/90 - m_pci_vob_timecode_offset;
 					uint32_t t4 = m_pci.vobu_e_ptm/90 - m_pci_vob_timecode_offset;
-					m_demuxer.ProcessStream(SUBSTREAM_PCI, &m_buff[m_pci_position], m_pci_size+2, t3, t4, wxString::Format("%X / %X / %d / %d\n", m_dsi.c_eltm, m_pci.c_eltm, t3, t4));
+					m_demuxer.ProcessStream(SUBSTREAM_PCI, &m_buff[m_pci_position], m_pci_size+2, t3, t4, wxString::Format("# %d -> %d / %X / %X / %d / %d / off %d\n", m_pci.vobu_s_ptm/90, m_pci.vobu_e_ptm/90, m_dsi.c_eltm, m_pci.c_eltm, t3, t4, m_pci_vob_timecode_offset));
 				}
 			}
 			else if ((_StreamID & VIDEO_STREAM) == VIDEO_STREAM)
@@ -843,6 +843,7 @@
 
 void BtnDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
 {
+//static uint32_t time =0;
 	m_TimecodeFile = GetTimecodeFile();
 	if (start_time > m_last_end_timecode)
 	{
@@ -852,6 +853,9 @@
 		fprintf(m_TimecodeFile, "gap,%lf\n", (start_time - m_last_end_timecode) / 1000.0);
 		m_start_timecode = start_time;
 	}
+//fwrite(debug.c_str(), debug.size(), 1, m_TimecodeFile);
+//fprintf(m_TimecodeFile, "# %d => %d\n",time, time + end_time - start_time);
+//time += end_time - start_time;
 	m_last_start_timecode = start_time;
 	m_last_end_timecode = end_time;
 }