[servicedvb]

* re-enable precise recovery feature to fix time shift issues
* add extra setting for hardware latency correction for DM9x0

Author: jbleyel

data/setup.xml

@@ -1036,6 +1036,7 @@
 		<item level="2" text="Time shift buffer delete after zap" description="Select 'No' to save older events even after zapping or interrupting time shifting.">config.timeshift.deleteAfterZap</item>
 		<item level="2" text="Time shift event based file splitting" description="Select 'No' to make time shift use a single buffer file. Use 'Time shift checking for older files [in minutes]' and 'Time shift checking for free space?' to control the size of the buffer file.">config.timeshift.fileSplitting</item>
 		<item level="2" text="Streaming recovery delay" description="Enter the duration to be added to the streaming buffer after a streaming error. This extra buffer can help to avoid further streaming issues due to a lack of buffer space.">config.timeshift.recoveryBufferDelay</item>
+		<item level="2" text="Hardware latency correction" description="Adjusts compensation for hardware buffer latency for DM9x0." requires="DM9X0">config.timeshift.hwLatencyCorrection</item>
 	</setup>
 	<setup key="Tuner" title="Tuner Settings" level="1">
 		<item level="1" text="Force LNB Power" description="Force LNB Tuner Power settings." requires="ForceLNBPowerChanged">config.tunermisc.forceLnbPower</item>

lib/python/Components/SystemInfo.py

@@ -2,12 +2,11 @@
 from glob import glob
 from hashlib import md5
 from os import listdir, readlink
-from os.path import basename, exists, isfile, join, islink
+from os.path import basename, exists, isfile, islink, join
 from subprocess import PIPE, Popen
 
-from enigma import Misc_Options, eDVBResourceManager, eGetEnigmaDebugLvl, eDBoxLCD, eDVBCIInterfaces, getE2Rev, eDVBCSAEngine
-
-from Tools.Directories import SCOPE_LIBDIR, SCOPE_SKINS, isPluginInstalled, fileCheck, fileReadLine, fileReadLines, resolveFilename, fileExists, fileHas, pathExists
+from enigma import eDBoxLCD, eDVBCIInterfaces, eDVBCSAEngine, eDVBResourceManager, eGetEnigmaDebugLvl, getE2Rev, Misc_Options
+from Tools.Directories import fileCheck, fileExists, fileHas, fileReadLine, fileReadLines, isPluginInstalled, pathExists, resolveFilename, SCOPE_LIBDIR, SCOPE_SKINS
 from Tools.MultiBoot import MultiBoot
 
 MODULE_NAME = __name__.split(".")[-1]
@@ -363,7 +362,7 @@ def getWakeOnLANType(fileName):
 # ]
 # BoxInfo.setItem("InformationDistributionWelcome", welcome)
 
-BoxInfo.setItem("12V_Output", Misc_Options.getInstance().detected_12V_output())  #FIXME : Do we need this?
+BoxInfo.setItem("12V_Output", Misc_Options.getInstance().detected_12V_output())  # FIXME : Do we need this?
 BoxInfo.setItem("3DMode", fileCheck("/proc/stb/fb/3dmode") or fileCheck("/proc/stb/fb/primary/3d"))
 BoxInfo.setItem("3DZNorm", fileCheck("/proc/stb/fb/znorm") or fileCheck("/proc/stb/fb/primary/zoffset"))
 BoxInfo.setItem("7segment", DISPLAYTYPE in ("7segment",))
@@ -455,6 +454,8 @@ def getWakeOnLANType(fileName):
 BoxInfo.setItem("XcoreVFD", MODEL in ("xc7346", "xc7439"))
 BoxInfo.setItem("ZapMode", fileCheck("/proc/stb/video/zapmode") or fileCheck("/proc/stb/video/zapping_mode"))
 BoxInfo.setItem("DisplaySetup", MODEL not in ("dreamone",))
+BoxInfo.setItem("DM9X0", MODEL in ("dm900", "dm920"))
+
 
 # Dont't sort.
 BoxInfo.setItem("ConfigDisplay", BoxInfo.getItem("FrontpanelDisplay") and DISPLAYTYPE not in ("7segment",))

lib/python/Components/UsageConfig.py

@@ -2493,6 +2493,7 @@ def partitionListChanged(action, device):
 	config.timeshift.startDelay = ConfigSelection(default=0, choices=choiceList)
 	config.timeshift.stopWhileRecording = ConfigYesNo(default=False)
 	config.timeshift.recoveryBufferDelay = ConfigSelection(default=300, choices=[(x, _("%d ms") % x) for x in range(100, 1500, 100)])
+	config.timeshift.hwLatencyCorrection = ConfigSelection(default=2000, choices=[(x, _("%d ms") % x) for x in range(0, 2100, 100)])
 
 	defaultPath = resolveFilename(SCOPE_TIMESHIFT)
 	config.timeshift.allowedPaths = ConfigLocations(default=[defaultPath])

lib/service/servicedvb.cpp

@@ -1285,7 +1285,7 @@ void eDVBServicePlay::serviceEvent(int event)
 	case eDVBServicePMTHandler::eventNoPAT:
 	case eDVBServicePMTHandler::eventNoPMT:
 	{
-		bool recovery_enabled = false; // Disable precise recovery for now
+		bool recovery_enabled = true;
 		// Check if timeshift is active and we are not already in a recovery state
 		if (recovery_enabled && m_timeshift_enabled && !m_stream_corruption_detected)
 		{
@@ -1456,12 +1456,17 @@ void eDVBServicePlay::startPreciseRecoveryCheck() {
 	pts_t final_target_delay = m_original_timeshift_delay + safety_buffer_pts;
 
 #ifdef ENABLE_TIMESHIFT_HW_LATENCY_FIX
-	const pts_t latency_correction = 2000 * 90;
+	int hw_latency_ms = eSimpleConfig::getInt("config.timeshift.hwLatencyCorrection", 2000);
+
+	if (hw_latency_ms < 0) hw_latency_ms = 0;
+	if (hw_latency_ms > 5000) hw_latency_ms = 5000;
+
+	const pts_t latency_correction = hw_latency_ms * 90;
 
 	if (final_target_delay > latency_correction)
 		final_target_delay -= latency_correction;
 	else
-		final_target_delay = 9000;
+		final_target_delay = 9000; 
 #endif
 
 	if (current_delay >= final_target_delay) {
@@ -2014,24 +2019,32 @@ RESULT eDVBServicePlay::getPlayPosition(pts_t &pos)
 
 	int r = 0;
 
-		/* if there is a decoder, use audio or video PTS */
-	// Check SoftDecoder only if session is active AND not in timeshift playback
-	if (m_soft_decoder && m_csa_session && m_csa_session->isActive() && !m_timeshift_active)
-	{
-		r = m_soft_decoder->getPTS(0, pos);
+	/* if there is a decoder, use audio or video PTS */
+
+	// Case 1: SoftDecoder active (for live descrambling, NOT during timeshift playback)
+	if (m_soft_decoder && m_csa_session && m_csa_session->isActive() && !m_timeshift_active) {
+		if (m_noaudio && m_have_video_pid)
+			r = m_soft_decoder->getPTS(1, pos); // Video PTS
+		else
+			r = m_soft_decoder->getPTS(0, pos); // Auto
+
 		if (r)
 			return r;
 	}
-	else if (m_decoder)
-	{
-		r = m_decoder->getPTS(0, pos);
+	// Case 2: Normal hardware decoder
+	else if (m_decoder) {
+		if (m_noaudio && m_have_video_pid)
+			r = m_decoder->getPTS(1, pos); // Video PTS
+		else
+			r = m_decoder->getPTS(0, pos); // Auto (original behavior)
+
 		if (r)
 			return r;
 	}
 
-		/* fixup */
-	ePtr<iTSMPEGDecoder> decoder = (m_soft_decoder && m_csa_session && m_csa_session->isActive() && !m_timeshift_active)
-		? m_soft_decoder->getDecoder() : m_decoder;
+	/* fixup */
+	ePtr<iTSMPEGDecoder> decoder = (m_soft_decoder && m_csa_session && m_csa_session->isActive() && !m_timeshift_active) ? m_soft_decoder->getDecoder() : m_decoder;
+
 	return pvr_channel->getCurrentPosition(m_decode_demux, pos, decoder);
 }
 
@@ -3107,7 +3120,6 @@ void eDVBServicePlay::recordEvent(int event) {
 			eWarning("[eDVBServicePlay] recordEvent write error");
 			return;
 		case iDVBTSRecorder::eventStreamCorrupt: {
-			return; // Disabled for now.
 			// Do not re-trigger if a recovery is already in progress.
 			if (m_stream_corruption_detected)
 				return;