int eDVBTSTools::openFile(const char *filename, int nostreaminfo)
{
eRawFile *f = new eRawFile();
- ePtr<iDataSource> src = f;
-
- eSingleLocker l(f->getLock());
+ ePtr<iTsSource> src = f;
if (f->open(filename, 1) < 0)
return -1;
- setSource(src, filename);
+ setSource(src, nostreaminfo ? NULL : filename);
return 0;
}
-void eDVBTSTools::setSource(ePtr<iDataSource> source, const char *stream_info_filename)
+void eDVBTSTools::setSource(ePtr<iTsSource> &source, const char *stream_info_filename)
{
closeFile();
void eDVBTSTools::closeFile()
{
- if (m_source) {
- eSingleLocker l(m_source->getLock());
+ if (m_source)
closeSource();
- }
}
void eDVBTSTools::setSyncPID(int pid)
if (!m_streaminfo.getPTS(offset, pts))
return 0;
- if (!m_source->valid())
+ if (!m_source || !m_source->valid())
return -1;
offset -= offset % 188;
- iDataSourcePositionRestorer r(m_source);
-
- eSingleLocker l(m_source->getLock());
-
- if (m_source->lseek(offset, SEEK_SET) < 0)
- {
- eDebug("lseek failed");
- return -1;
- }
-
int left = m_maxrange;
while (left >= 188)
{
unsigned char packet[188];
- if (m_source->read(packet, 188) != 188)
+ if (m_source->read(offset, packet, 188) != 188)
{
eDebug("read error");
break;
}
left -= 188;
offset += 188;
-
+
if (packet[0] != 0x47)
{
eDebug("resync");
if (packet[i] == 0x47)
break;
++i;
+ --offset;
}
- offset = m_source->lseek(i - 188, SEEK_CUR);
continue;
}
break;
case 0x71: // AC3 / DTS
break;
+ case 0x72: // DTS - HD
+ break;
default:
eDebug("skip unknwn stream_id_extension %02x\n", payload[9+offs]);
continue;
void eDVBTSTools::calcBegin()
{
- if (!m_source->valid())
+ if (!m_source || !m_source->valid())
return;
if (!(m_begin_valid || m_futile))
void eDVBTSTools::calcEnd()
{
- if (!m_source->valid())
+ if (!m_source || !m_source->valid())
return;
- iDataSourcePositionRestorer r(m_source);
-
- eSingleLocker l(m_source->getLock());
-
off_t end = m_source->lseek(0, SEEK_END);
if (llabs(end - m_last_filelength) > 1*1024*1024)
int eDVBTSTools::findPMT(int &pmt_pid, int &service_id)
{
/* FIXME: this will be factored out soon! */
- if (!m_source->valid())
+ if (!m_source || !m_source->valid())
{
eDebug(" file not valid");
return -1;
}
- iDataSourcePositionRestorer r(m_source);
-
- eSingleLocker l(m_source->getLock());
-
- if (m_source->lseek(0, SEEK_SET) < 0)
- {
- eDebug("seek failed");
- return -1;
- }
+ off_t position=0;
int left = 5*1024*1024;
while (left >= 188)
{
unsigned char packet[188];
- if (m_source->read(packet, 188) != 188)
+ int ret = m_source->read(position, packet, 188);
+ if (ret != 188)
{
eDebug("read error");
break;
}
left -= 188;
-
+ position += 188;
+
if (packet[0] != 0x47)
{
int i = 0;
{
if (packet[i] == 0x47)
break;
+ --position;
++i;
}
- m_source->lseek(i - 188, SEEK_CUR);
continue;
}
-
int pid = ((packet[1] << 8) | packet[2]) & 0x1FFF;
int pusi = !!(packet[1] & 0x40);
else if (direction == +1)
direction = 0;
}
- /* let's find the next frame after the given offset */
off_t start = offset;
+#if 0
+ /* backtrack to find the previous sequence start, in case of MPEG2 */
+ if ((data & 0xFF) == 0x00) {
+ do {
+ --start;
+ if (m_streaminfo.getStructureEntry(start, data, 0))
+ {
+ eDebug("get previous failed");
+ return -1;
+ }
+ } while (((data & 0xFF) != 9) && ((data & 0xFF) != 0x00) && ((data & 0xFF) != 0xB3)); /* sequence start or previous frame */
+ if ((data & 0xFF) != 0xB3)
+ start = offset; /* Failed to find corresponding sequence start, so never mind */
+ }
+
+#endif
+
+ /* let's find the next frame after the given offset */
do {
if (m_streaminfo.getStructureEntry(offset, data, 1))
{
// eDebug("%08llx@%llx (next)", data, offset);
} while (((data & 0xFF) != 9) && ((data & 0xFF) != 0x00)); /* next frame */
+#if 0
/* align to TS pkt start */
-// start = start - (start % 188);
-// offset = offset - (offset % 188);
+ start = start - (start % 188);
+ offset = offset - (offset % 188);
+#endif
len = offset - start;
_offset = start;