X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/45364af4f6ff01f3f3156f52262a456c77c59574..a34ef895210161a8820e96829ac87806566e7858:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 72c6e392..6ad39225 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -315,7 +315,7 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
 		eWarning("%s: %m", filename);
 	else
 	{
-		m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Priority);
+		m_sn = eSocketNotifier::create(eApp, m_fd, eSocketNotifier::Priority);
 		CONNECT(m_sn->activated, eDVBVideo::video_event);
 	}
 	eDebug("Video Device: %s", filename);
@@ -527,8 +527,6 @@ int eDVBVideo::getPTS(pts_t &now)
 
 eDVBVideo::~eDVBVideo()
 {
-	if (m_sn)
-		delete m_sn;
 	if (m_is_slow_motion)
 		setSlowMotion(0);
 	if (m_is_fast_forward)
@@ -563,6 +561,20 @@ void eDVBVideo::video_event(int)
 			event.width = evt.u.size.w;
 			/* emit */ m_event(event);
 		}
+		else if (evt.type == VIDEO_EVENT_FRAME_RATE_CHANGED)
+		{
+			struct iTSMPEGDecoder::videoEvent event;
+			event.type = iTSMPEGDecoder::videoEvent::eventFrameRateChanged;
+			event.framerate = evt.u.frame_rate;
+			/* emit */ m_event(event);
+		}
+		else if (evt.type == 16 /*VIDEO_EVENT_PROGRESSIVE_CHANGED*/)
+		{
+			struct iTSMPEGDecoder::videoEvent event;
+			event.type = iTSMPEGDecoder::videoEvent::eventProgressiveChanged;
+			event.progressive = evt.u.frame_rate;
+			/* emit */ m_event(event);
+		}
 		else
 			eDebug("unhandled DVBAPI Video Event %d", evt.type);
 	}
@@ -824,37 +836,40 @@ int eTSMPEGDecoder::setState()
 		if (m_pcr)
 			m_pcr->stop();
 		m_pcr = 0;
-		if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF))
-		{
-			m_pcr = new eDVBPCR(m_demux);
-			if (m_pcr->startPid(m_pcrpid))
-				res = -1;
-		}
-		m_changed &= ~changePCR;
 	}
 	if (m_changed & changeVideo)
 	{
-		eDebug("VIDEO CHANGED (to %04x)", m_vpid);
 		if (m_video)
 		{
 			m_video->stop();
 			m_video = 0;
 			m_video_event_conn = 0;
 		}
-		if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
-		{
-			m_video = new eDVBVideo(m_demux, m_decoder);
-			m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
-			if (m_video->startPid(m_vpid, m_vtype))
-				res = -1;
-		}
-		m_changed &= ~changeVideo;
 	}
 	if (m_changed & changeAudio)
 	{
 		if (m_audio)
 			m_audio->stop();
 		m_audio = 0;
+	}
+	if (m_changed & changeText)
+	{
+		if (m_text)
+			m_text->stop();
+		m_text = 0;
+	}
+	if (m_changed & changePCR)
+	{
+		if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF))
+		{
+			m_pcr = new eDVBPCR(m_demux);
+			if (m_pcr->startPid(m_pcrpid))
+				res = -1;
+		}
+		m_changed &= ~changePCR;
+	}
+	if (m_changed & changeAudio)
+	{
 		if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio)
 		{
 			m_audio = new eDVBAudio(m_demux, m_decoder);
@@ -863,11 +878,19 @@ int eTSMPEGDecoder::setState()
 		}
 		m_changed &= ~changeAudio;
 	}
+	if (m_changed & changeVideo)
+	{
+		if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
+		{
+			m_video = new eDVBVideo(m_demux, m_decoder);
+			m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
+			if (m_video->startPid(m_vpid, m_vtype))
+				res = -1;
+		}
+		m_changed &= ~changeVideo;
+	}
 	if (m_changed & changeText)
 	{
-		if (m_text)
-			m_text->stop();
-		m_text = 0;
 		if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
 		{
 			m_text = new eDVBTText(m_demux);
@@ -919,10 +942,10 @@ RESULT eTSMPEGDecoder::setAC3Delay(int delay)
 }
 
 eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder)
-	:m_demux(demux), m_changed(0), m_decoder(decoder), m_video_clip_fd(-1), m_showSinglePicTimer(eApp)
+	:m_demux(demux), m_changed(0), m_decoder(decoder), m_video_clip_fd(-1), m_showSinglePicTimer(eTimer::create(eApp))
 {
 	demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn);
-	CONNECT(m_showSinglePicTimer.timeout, eTSMPEGDecoder::finishShowSinglePic);
+	CONNECT(m_showSinglePicTimer->timeout, eTSMPEGDecoder::finishShowSinglePic);
 	m_is_ff = m_is_sm = m_is_trickmode = 0;
 }
 
@@ -1057,6 +1080,7 @@ RESULT eTSMPEGDecoder::setFastForward(int frames_to_skip)
 	m_is_ff = frames_to_skip != 0;
 
 	setState();
+	unfreeze(); // audio might be restarted and still in preroll (freezed) state.
 
 	if (m_video)
 		return m_video->setFastForward(frames_to_skip);
@@ -1069,6 +1093,7 @@ RESULT eTSMPEGDecoder::setSlowMotion(int repeat)
 	m_is_sm = repeat != 0;
 
 	setState();
+	unfreeze(); // audio might be restarted and still in preroll (freezed) state.
 
 	if (m_video)
 		return m_video->setSlowMotion(repeat);
@@ -1145,7 +1170,7 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
 	{
 		eDebug("showSinglePic %s", filename);
 		int f = open(filename, O_RDONLY);
-		if (f)
+		if (f >= 0)
 		{
 			struct stat s;
 			fstat(f, &s);
@@ -1173,11 +1198,13 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
 					++pos;
 				if ((iframe[3] >> 4) != 0xE) // no pes header
 					write(m_video_clip_fd, pes_header, sizeof(pes_header));
+				else
+					iframe[4] = iframe[5] = 0x00;
 				write(m_video_clip_fd, iframe, s.st_size);
 				if (!seq_end_avail)
 					write(m_video_clip_fd, seq_end, sizeof(seq_end));
 				write(m_video_clip_fd, stuffing, 8192);
-				m_showSinglePicTimer.start(150, true);
+				m_showSinglePicTimer->start(150, true);
 			}
 			close(f);
 		}