git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pmt handling: untested (as usual) AC3 support
[enigma2.git]
/
lib
/
dvb
/
decoder.cpp
diff --git
a/lib/dvb/decoder.cpp
b/lib/dvb/decoder.cpp
index 751796aeaea20f9f49e797740c7ec4c3bba6a662..26172e0c1c0c3496bf64cebfb52c7ad4d39abafb 100644
(file)
--- a/
lib/dvb/decoder.cpp
+++ b/
lib/dvb/decoder.cpp
@@
-49,12
+49,12
@@
eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
eWarning("%s: %m", filename);
}
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;
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;
pes.pid = pid;
pes.input = DMX_IN_FRONTEND;
pes.output = DMX_OUT_DECODER;
@@
-70,6
+70,27
@@
int eDVBAudio::startPid(int pid)
eWarning("audio: DMX_START: %m");
return -errno;
}
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;
if (::ioctl(m_fd, AUDIO_PLAY) < 0)
eWarning("audio: AUDIO_PLAY: %m");
return 0;
@@
-98,6
+119,18
@@
void eDVBAudio::flush()
if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
}
if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
}
+
+void eDVBAudio::freeze()
+{
+ if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
+ eDebug("video: AUDIO_PAUSE: %m");
+}
+
+void eDVBAudio::unfreeze()
+{
+ if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
+ eDebug("video: AUDIO_CONTINUE: %m");
+}
eDVBAudio::~eDVBAudio()
{
eDVBAudio::~eDVBAudio()
{
@@
-132,11
+165,10
@@
eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux)
int eDVBVideo::startPid(int pid)
{
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;
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;
pes.pid = pid;
pes.input = DMX_IN_FRONTEND;
pes.output = DMX_OUT_DECODER;
@@
-154,14
+186,12
@@
int eDVBVideo::startPid(int pid)
}
if (::ioctl(m_fd, VIDEO_PLAY) < 0)
eWarning("video: VIDEO_PLAY: %m");
}
if (::ioctl(m_fd, VIDEO_PLAY) < 0)
eWarning("video: VIDEO_PLAY: %m");
- else
- eDebug("video ok");
return 0;
}
void eDVBVideo::stop()
{
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)
eWarning("video: VIDEO_STOP: %m");
#if HAVE_DVB_API_VERSION > 2
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
@@
-220,7
+250,6
@@
eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux)
int eDVBPCR::startPid(int pid)
{
int eDVBPCR::startPid(int pid)
{
- eDebug("setting pcr pid to %x", pid);
if (m_fd_demux < 0)
return -1;
dmx_pes_filter_params pes;
if (m_fd_demux < 0)
return -1;
dmx_pes_filter_params pes;
@@
-260,7
+289,6
@@
DEFINE_REF(eTSMPEGDecoder);
int eTSMPEGDecoder::setState()
{
int res = 0;
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();
#if HAVE_DVB_API_VERSION < 3
if (m_changed & changeAudio && m_audio)
m_audio->stopPid();
@@
-286,7
+314,7
@@
int eTSMPEGDecoder::setState()
m_pcr = new eDVBPCR(m_demux);
if (m_pcr->startPid(m_pcrpid))
{
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;
res = -1;
}
m_changed &= ~changePCR;
@@
-304,7
+332,7
@@
int eTSMPEGDecoder::setState()
if (m_changed & changeAudio)
{
m_audio = new eDVBAudio(m_demux, 0);
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;
{
eWarning("audio: startpid failed!");
res = -1;
@@
-322,7
+350,7
@@
int eTSMPEGDecoder::setState()
m_pcr = new eDVBPCR(m_demux);
if (m_pcr->startPid(m_pcrpid))
{
m_pcr = new eDVBPCR(m_demux);
if (m_pcr->startPid(m_pcrpid))
{
- eWarning("
video
: startpid failed!");
+ eWarning("
pcr
: startpid failed!");
res = -1;
}
}
res = -1;
}
}
@@
-352,7
+380,7
@@
int eTSMPEGDecoder::setState()
if ((m_apid >= 0) && (m_apid < 0x1FFF))
{
m_audio = new eDVBAudio(m_demux, 0);
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;
{
eWarning("audio: startpid failed!");
res = -1;
@@
-421,8
+449,10
@@
RESULT eTSMPEGDecoder::freeze(int cont)
{
if (m_video)
m_video->freeze();
{
if (m_video)
m_video->freeze();
- else
- return -1;
+
+ if (m_audio)
+ m_audio->freeze();
+
return 0;
}
return 0;
}
@@
-430,8
+460,10
@@
RESULT eTSMPEGDecoder::unfreeze()
{
if (m_video)
m_video->unfreeze();
{
if (m_video)
m_video->unfreeze();
- else
- return -1;
+
+ if (m_audio)
+ m_audio->unfreeze();
+
return 0;
}
return 0;
}