X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/47367fb1c159557cb3676f67172b9839531c8dc9..f769a73f621f88d4b4e64be8fae3f79ca3ef6c1b:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index cd4d3394..c259a811 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -166,15 +166,25 @@ void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &fe
 		default:
 		case eDVBFrontendParametersSatellite::System::DVB_S: tmp="DVB-S"; break;
 		case eDVBFrontendParametersSatellite::System::DVB_S2:
-			switch(feparm.roll_off)
+			switch(feparm.rolloff)
 			{
+				default:
 				case eDVBFrontendParametersSatellite::RollOff::alpha_0_35: tmp="0.35"; break;
 				case eDVBFrontendParametersSatellite::RollOff::alpha_0_25: tmp="0.25"; break;
 				case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break;
-				default:
-				case eDVBFrontendParametersSatellite::RollOff::alpha_auto: tmp="AUTO"; break;
 			}
 			PutToDict(dict, "roll off", tmp);
+			if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+			{
+				switch(feparm.pilot)
+				{
+					case eDVBFrontendParametersSatellite::Pilot::On: tmp="ON"; break;
+					case eDVBFrontendParametersSatellite::Pilot::Off: tmp="OFF"; break;
+					default:
+					case eDVBFrontendParametersSatellite::Pilot::Unknown: tmp="AUTO"; break;
+				}
+				PutToDict(dict, "pilot", tmp);
+			}
 			tmp="DVB-S2";
 			break;
 	}
@@ -1100,6 +1110,7 @@ void eDVBServicePlay::serviceEvent(int event)
 			else
 				m_event_handler.start(m_demux, sid);
 		}
+		m_event((iPlayableService*)this, evTunedIn);
 		break;
 	}
 	case eDVBServicePMTHandler::eventNoResources:
@@ -1220,8 +1231,8 @@ RESULT eDVBServicePlay::stop()
 			{
 				int perc = play_position * 100LL / length;
 			
-					/* only store last play position when between 5% and 95% */
-				if ((5 < perc) && (perc < 95))
+					/* only store last play position when between 1% and 99% */
+				if ((1 < perc) && (perc < 99))
 					m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
 			}
 			m_cuesheet_changed = 1;
@@ -1558,38 +1569,67 @@ RESULT eDVBServicePlay::getEvent(ePtr<eServiceEvent> &evt, int nownext)
 	return m_event_handler.getEvent(evt, nownext);
 }
 
+static int readMpegProc(char *str, int decoder)
+{
+	int val = -1;
+	char tmp[64];
+	sprintf(tmp, "/proc/stb/vmpeg/%d/%s", decoder, str);
+	FILE *f = fopen(tmp, "r");
+	if (f)
+	{
+		fscanf(f, "%x", &val);
+		fclose(f);
+	}
+	return val;
+}
+
 int eDVBServicePlay::getInfo(int w)
 {
 	eDVBServicePMTHandler::program program;
-	
+
 	if (w == sCAIDs)
 		return resIsPyObject;
 
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
-	
+
 	int no_program_info = 0;
-	
+
 	if (h.getProgramInfo(program))
 		no_program_info = 1;
-	
+
 	switch (w)
 	{
 #if HAVE_DVB_API_VERSION >= 3
 	case sVideoHeight:
 		if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
 			return m_videoEventData.height;
-		return -1;
+		else
+			return readMpegProc("yres", !m_is_primary);
 	case sVideoWidth:
 		if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
 			return m_videoEventData.width;
-		return -1;
+		else
+			return readMpegProc("xres", !m_is_primary);
+	case sFrameRate:
+		if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+			return m_videoEventData.framerate;
+		else
+			return readMpegProc("framerate", !m_is_primary);
+	case sProgressive:
+		if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+			return m_videoEventData.progressive;
+		return readMpegProc("progressive", !m_is_primary);
 #else
-#warning "FIXMEE implement sVideoHeight, sVideoWidth for old DVB API"
+#warning "FIXMEE implement sFrameRate, sProgressive, sVideoHeight, sVideoWidth for old DVB API"
 #endif
 	case sAspect:
+	{
+		int val;
 #if HAVE_DVB_API_VERSION >= 3
 		if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
 			return m_videoEventData.aspect == VIDEO_FORMAT_4_3 ? 1 : 3;
+		else if ((val=readMpegProc("aspect", !m_is_primary)) != -1)
+			return val;
 		else
 #else
 #warning "FIXMEE implement sAspect for old DVB API"
@@ -1634,6 +1674,7 @@ int eDVBServicePlay::getInfo(int w)
 			}
 		}
 		return -1;
+	}
 	case sIsCrypted: if (no_program_info) return -1; return program.isCrypted();
 	case sVideoPID: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
 	case sVideoType: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type;
@@ -2942,8 +2983,20 @@ void eDVBServicePlay::setPCMDelay(int delay)
 
 void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)
 {
-	memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent));
-	m_event((iPlayableService*)this, evVideoSizeChanged);
+	memcpy(&m_videoEventData, &event, sizeof(event));
+	switch(event.type) {
+		case iTSMPEGDecoder::videoEvent::eventSizeChanged:
+			m_event((iPlayableService*)this, evVideoSizeChanged);
+			break;
+		case iTSMPEGDecoder::videoEvent::eventFrameRateChanged:
+			m_event((iPlayableService*)this, evVideoFramerateChanged);
+			break;
+		case iTSMPEGDecoder::videoEvent::eventProgressiveChanged:
+			m_event((iPlayableService*)this, evVideoProgressiveChanged);
+			break;
+		default:
+			break;
+	}
 }
 
 RESULT eDVBServicePlay::stream(ePtr<iStreamableService> &ptr)