eWarning("%s: %m", filename);
}
-int eDVBAudio::startPid(int pid)
+int eDVBAudio::startPid(int pid, int type)
{
- eDebug("setting audio pid to %x", pid);
if ((m_fd < 0) || (m_fd_demux < 0))
return -1;
dmx_pes_filter_params pes;
+
pes.pid = pid;
pes.input = DMX_IN_FRONTEND;
pes.output = DMX_OUT_DECODER;
eWarning("audio: DMX_START: %m");
return -errno;
}
+
+ int bypass = 0;
+
+ switch (type)
+ {
+ case aMPEG:
+ bypass = 1;
+ break;
+ case aAC3:
+ bypass = 0;
+ break;
+ /*
+ case aDTS:
+ bypass = 2;
+ break;
+ */
+ }
+
+ if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
+ eWarning("audio: AUDIO_SET_BYPASS_MODE: %m");
+
if (::ioctl(m_fd, AUDIO_PLAY) < 0)
eWarning("audio: AUDIO_PLAY: %m");
return 0;
int eDVBVideo::startPid(int pid)
{
- eDebug("setting video pid to %x", pid);
if ((m_fd < 0) || (m_fd_demux < 0))
return -1;
dmx_pes_filter_params pes;
-
+
pes.pid = pid;
pes.input = DMX_IN_FRONTEND;
pes.output = DMX_OUT_DECODER;
}
if (::ioctl(m_fd, VIDEO_PLAY) < 0)
eWarning("video: VIDEO_PLAY: %m");
- else
- eDebug("video ok");
return 0;
}
void eDVBVideo::stop()
{
- if (::ioctl(m_fd, VIDEO_STOP) < 0)
+ if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
eWarning("video: VIDEO_STOP: %m");
#if HAVE_DVB_API_VERSION > 2
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
int eDVBPCR::startPid(int pid)
{
- eDebug("setting pcr pid to %x", pid);
if (m_fd_demux < 0)
return -1;
dmx_pes_filter_params pes;
int eTSMPEGDecoder::setState()
{
int res = 0;
- eDebug("changed %x", m_changed);
#if HAVE_DVB_API_VERSION < 3
if (m_changed & changeAudio && m_audio)
m_audio->stopPid();
m_pcr = new eDVBPCR(m_demux);
if (m_pcr->startPid(m_pcrpid))
{
- eWarning("video: startpid failed!");
+ eWarning("pcr: startpid failed!");
res = -1;
}
m_changed &= ~changePCR;
if (m_changed & changeAudio)
{
m_audio = new eDVBAudio(m_demux, 0);
- if (m_audio->startPid(m_apid))
+ if (m_audio->startPid(m_apid, m_atype))
{
eWarning("audio: startpid failed!");
res = -1;
m_pcr = new eDVBPCR(m_demux);
if (m_pcr->startPid(m_pcrpid))
{
- eWarning("video: startpid failed!");
+ eWarning("pcr: startpid failed!");
res = -1;
}
}
if ((m_apid >= 0) && (m_apid < 0x1FFF))
{
m_audio = new eDVBAudio(m_demux, 0);
- if (m_audio->startPid(m_apid))
+ if (m_audio->startPid(m_apid, m_atype))
{
eWarning("audio: startpid failed!");
res = -1;