FCL/sf/os/devicesrv: comparison accessoryservices/pluggeddisplay/pluggeddisplayengine/src/hdmicablestateconnected.cpp

equal deleted inserted replaced

-:61516c5786af
+:00076e39386f
 #include "hdmicablestatusfsm.h"
 #include "hdmicablestateconnected.h"
 #include "tvoutconfigforhdmi.h"
 #include "edidhandler.h"
 #include "trace.h"
+#include <centralrepository.h>
+#include <accessoriescrkeys.h>
+#include <tvoutconfig.h>
 // ======== LOCAL FUNCTIONS ========
 if ( iTVOutConfigForSettingChanges )
 {
 iTVOutConfigForSettingChanges->Cancel();
 delete iTVOutConfigForSettingChanges;
 }
-}
+if ( iCRWatchForVOverScan )
+{
+iCRWatchForVOverScan->Cancel();
+delete iCRWatchForVOverScan;
+}
+}
+// ---------------------------------------------------------------------------
+// From MCentralRepositoryObserver.
+// ---------------------------------------------------------------------------
+//
+void CHDMICableStateConnected::CentRepKeyChanged(
+TUid    aRepositoryId,
+TUint32 aId )
+{
+FUNC_LOG;
+if ( KCRUidTvoutSettings == aRepositoryId )
+{
+if ( KSettingsTvoutVerticalOverscan == aId  )
+{
+			INFO("Cenrep Value Changed");
+			if( iEDIDHandler.UpdateOverscanValues() )
+				{
+				INFO( "There is a real change" );
+	Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged );
+				}
+}
+else
+{
+INFO_1("Unexpected CR key ID, aId 0x%x", aId );
+}
+}
+else
+{
+INFO_1("Unexpected Central Repository ID, aRepositoryId 0x%x", aRepositoryId);
+}
+}
+// ---------------------------------------------------------------------------
+// From MCentralRepositoryObserver.
+// ---------------------------------------------------------------------------
+//
+void CHDMICableStateConnected::CentRepGetKeyValueFailed(
+TUid    aRepositoryId,
+TUint32 aId,
+TInt    aError )
+{
+FUNC_LOG;
+// Make use of aError argument top get rid of compiler warning.
+TInt error( aError );
+if ( ( KCRUidTvoutSettings == aRepositoryId ) && ( KErrNone != error ) )
+{
+if ( KSettingsTvoutVerticalOverscan == aId  )
+{
+INFO_1(" Getting KSettingsTvoutVerticalOverscan from CR failed, aError %d", error );
+}
+else
+{
+INFO_1("Unexpected CR key ID, aId 0x%x", aId );
+}
+}
+else
+{
+INFO_1("Unexpected Central Repository ID, aRepositoryId 0x%x", aRepositoryId);
+}
+}
 // ---------------------------------------------------------------------------
 // From MFSMState.
 // ---------------------------------------------------------------------------
 //
 void CHDMICableStateConnected::Enter( )
 {
 FUNC_LOG;
 TInt retVal( KErrNone );
+	// Get the current overscan value
+	iEDIDHandler.UpdateOverscanValues();
+	iEDIDHandler.GetCurrentOverscanValue( iHOverscanValue, iVOverscanValue );
 iCopyProtectListenFailCounter.iCount = 0;
 iTVOutConfigForCopyProtect->ResetLatestRecordedCopyProtectionStatus();
 retVal = iEDIDHandler.FetchEDIDData();
 if ( KErrNone != retVal )
 {
 iTVOutConfigForSettingChanges->Cancel();
 iHDMICableStatusFSM.Transit( EHDMICableStateRejected );
 }
 else
 {
+						// Update the current overscan value
+						iEDIDHandler.GetCurrentOverscanValue( iHOverscanValue, iVOverscanValue );
 TFSMEventId event = iTVOutConfigForHDMI.ListenHDMICableStatusIfNoMissedEvents();
 if ( EIfTVOutConfigEventCableDisconnected == event )
 {
 INFO( "Retreating back to <Idle> since cable was disconnected while not listening!" );
 iTVOutConfigForSettingChanges->Cancel();
 iTVOutConfigForHDMI.Disable();
 }
 else
 {
 iSubState = ESubStateConnected;
 TRAPD( err, iHDMICableStatusFSM.SettingsChangedL() );
 if ( KErrNone != err )
 {
 INFO_1( "iHDMICableStatusFSM.SettingsChangedL() failed, error code %i", err );
 }
 ListenCopyProtectionStatusChanges();
 iTVOutConfigForSettingChanges->ListenSettingsChanges();
+				iCRWatchForVOverScan->Watch();
 }
 }
 else if ( EIfTVOutConfigEventEnableFailed == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventEnableFailed" );
 if ( EIfTVOutConfigEventDisabled == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventDisabled" );
 iSubState = ESubStateIdlingDisconnectAccessory;
 iAccessoryControlIf.DisconnectAccessory();
+			ClearAvailableTvOutConfig();
 }
 else if ( EIfTVOutConfigEventDisableFailed == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventDisableFailed" );
 iSubState = ESubStateIdlingDisconnectAccessory;
 iAccessoryControlIf.DisconnectAccessory();
+			ClearAvailableTvOutConfig();
 }
 else
 {
 INFO_1( "Unknown/unexpected Event Id: %i", aEvent );
 }
 else
 {
 iSubState = ESubStateConnected;
 ListenCopyProtectionStatusChanges();
 iTVOutConfigForSettingChanges->ListenSettingsChanges();
+				iCRWatchForVOverScan->Watch();
 }
 }
 else if ( EPDEIfAccessoryControlEventConnectFailed == aEvent )
 {
 INFO( "Event: EPDEIfAccessoryControlEventConnectFailed" );
 INFO( "Event: EIfTVOutConfigEventCableDisconnected occurred while not listening" );
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
 // Stop listen setting changes
 iTVOutConfigForSettingChanges->Cancel();
+				iCRWatchForVOverScan->Cancel();
 iSubState = ESubStateIdlingDisable;
 iTVOutConfigForHDMI.Disable();
 }
 }
 else if ( EIfTVOutConfigEventCableDisconnected == aEvent )
 iSubState = ESubStateIdlingDisable;
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
 // Stop listen setting changes
 iTVOutConfigForSettingChanges->Cancel();
+			iCRWatchForVOverScan->Cancel();
 // Disable tv out
 iTVOutConfigForHDMI.Disable();
 }
 else if ( EIfTVOutConfigEventCableStatusListenFailed == aEvent )
 {
 iCableStatusListenFailCounter.iCounter = 0;
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
 // Stop listen setting changes
 iTVOutConfigForSettingChanges->Cancel();
+				iCRWatchForVOverScan->Cancel();
 iTVOutConfigForHDMI.Disable();
 }
 else
 {
 // Try once again
 INFO( "Event: EIfTVOutConfigEventCableDisconnected occurred while not listening" );
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
 // Stop listen setting changes
 iTVOutConfigForSettingChanges->Cancel();
+					iCRWatchForVOverScan->Cancel();
 iSubState = ESubStateIdlingDisable;
 iTVOutConfigForHDMI.Disable();
 }
 }
 }
 iCopyProtectListenFailCounter.iCount = 0;
 // Stop listening cable status changes while disabling.
 iTVOutConfigForHDMI.Cancel();
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
+				iCRWatchForVOverScan->Cancel();
 iSubState = ESubStateRejectingDisable;
 iTVOutConfigForHDMI.Disable();
 }
 }
 else if ( EIfTVOutConfigEventSettingsChanged == aEvent )
 INFO( "Event: EIfTVOutConfigEventSettingsChanged" );
 // Stop listening cable connection status
 iTVOutConfigForHDMI.Cancel();
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
+			iCRWatchForVOverScan->Cancel();
 if ( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
 {
 iSubState = ESubStateResettingDisable;
 iTVOutConfigForHDMI.Disable();
 }
 {
 iSubState = ESubStateResettingEnable;
 iTVOutConfigForHDMI.Enable();
 }
 }
-else if ( EIfTVOutConfigEventSettingsChangesListenStarted )
+else if ( EIfTVOutConfigEventSettingsChangesListenStarted == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventSettingsChangesListenStarted" );
 // Everything is OK. Stay in the same state.
+			// Should not miss the cenrep value change
+			TInt newOverScanValue = 0;
+			iCRWatchForVOverScan->GetCurrentValue(newOverScanValue);
+			if( iVOverscanValue != newOverScanValue )
+				{
+				Input( EPDEIfCentralRepositoryWatch, EPDEIfCentralRepositoryWatchEventKeyChanged );
+				}
 }
 else if ( EIfTVOutConfigEventSettingsChangesListenFailed == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventSettingsChangesListenFailed" );
 INFO( "Going to state <Rejected> since setting changes listening failed!" );
 iSubState = ESubStateRejectingDisable;
 // Stop listening cable connection status
 iTVOutConfigForHDMI.Cancel();
 // Stop listening Copy Protection status
 iTVOutConfigForCopyProtect->Cancel();
+			iCRWatchForVOverScan->Cancel();
 iTVOutConfigForHDMI.Disable();
 }
 else
 {
 INFO_1( "Unknown/unexpected Event Id: %i", aEvent );
 }
 break;
 }
+case EPDEIfCentralRepositoryWatch:
+{
+INFO( "Interface: EPDEIfCentralRepositoryWatch" );
+if ( EPDEIfCentralRepositoryWatchEventKeyChanged == aEvent )
+{
+INFO( "Event: EPDEIfCentralRepositoryWatchEventKeyChanged" );
+			// Get the available config
+			THdmiDviTimings curConfig;
+			iTVOutConfigForHDMI.GetTvOutConfig()->GetConfig( curConfig );
+			if( (TTvSettings::EHDMI == curConfig.iConnector) && (!curConfig.iUnderscanEnabled) )
+				{
+				TInt retVal = iEDIDHandler.SetVideoParameters();
+				if ( KErrNone != retVal )
+					{
+					INFO( "Going to state <Rejected> since video parameter setting failed!" );
+					iTVOutConfigForSettingChanges->Cancel();
+					iCRWatchForVOverScan->Cancel();
+					iSubState = ESubStateIdlingDisable;
+					iTVOutConfigForHDMI.Disable();
+					}
+				else
+					{
+					// Update the current overscan value
+					iEDIDHandler.GetCurrentOverscanValue( iHOverscanValue, iVOverscanValue );
+					TFSMEventId event = iTVOutConfigForHDMI.ListenHDMICableStatusIfNoMissedEvents();
+					if ( EIfTVOutConfigEventCableDisconnected == event )
+						{
+						INFO( "Retreating back to <Idle> since cable was disconnected while not listening!" );
+						iTVOutConfigForSettingChanges->Cancel();
+						iCRWatchForVOverScan->Cancel();
+						iSubState = ESubStateIdlingDisable;
+						iTVOutConfigForHDMI.Disable();
+						}
+					}
+				}
+}
+else
+{
+INFO_1( "Unknown Event Id: %i", aEvent );
+}
+break;
+}
 default:
 {
 INFO_1( "Event received from unknown/unexpected interface Id: %i", aInterfaceId );
 break;
 }
 INFO( "Event: EIfTVOutConfigEventCableConnected" );
 TFSMEventId event = iTVOutConfigForHDMI.ListenHDMICableStatusIfNoMissedEvents();
 if ( EIfTVOutConfigEventCableDisconnected == event )
 {
 INFO( "Retreating back to <Idle> since cable was disconnected while WF setting changes!" );
+// Stop listening Copy Protection status
+iTVOutConfigForCopyProtect->Cancel();
+// Stop listen setting changes
 iTVOutConfigForSettingChanges->Cancel();
-iHDMICableStatusFSM.Transit( EHDMICableStateIdle );
+				iCRWatchForVOverScan->Cancel();
+				if( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
+					{
+					iSubState = ESubStateIdlingDisable;
+					iTVOutConfigForHDMI.Disable();
+					}
+				else
+					{
+					iHDMICableStatusFSM.Transit( EHDMICableStateIdle );
+					}
 }
 }
 else if ( EIfTVOutConfigEventCableDisconnected == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventCableDisconnected" );
 INFO( "Retreating back to <Idle> since cable was disconnected while WF setting changes!" );
-iTVOutConfigForSettingChanges->Cancel();
+			// Stop listening Copy Protection status
-iHDMICableStatusFSM.Transit( EHDMICableStateIdle );
+			iTVOutConfigForCopyProtect->Cancel();
+			// Stop listen setting changes
+			iTVOutConfigForSettingChanges->Cancel();
+			iCRWatchForVOverScan->Cancel();
+			if( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
+				{
+				iSubState = ESubStateIdlingDisable;
+				iTVOutConfigForHDMI.Disable();
+				}
+			else
+				{
+				iHDMICableStatusFSM.Transit( EHDMICableStateIdle );
+				}
 }
 else if ( EIfTVOutConfigEventSettingsChanged == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventSettingsChanged" );
 iSubState = ESubStateEnable;
 }
 else if ( EIfTVOutConfigEventSettingsChangesListenFailed == aEvent )
 {
 INFO( "Event: EIfTVOutConfigEventSettingsChangesListenFailed" );
 INFO( "Going to state <Rejected> since setting changes listening failed!" );
-iHDMICableStatusFSM.Transit( EHDMICableStateRejected );
+			// Stop listening Copy Protection status
+			iTVOutConfigForCopyProtect->Cancel();
+			// Stop listen setting changes
+			iCRWatchForVOverScan->Cancel();
+			if( iTVOutConfigForHDMI.GetTvOutConfig()->Enabled() )
+				{
+				iSubState = ESubStateIdlingDisable;
+				iTVOutConfigForHDMI.Disable();
+				}
+			else
+				{
+				iHDMICableStatusFSM.Transit( EHDMICableStateRejected );
+				}
 }
 else
 {
 INFO_1( "Unknown/unexpected Event Id: %i", aEvent );
 }
 }
 }
 }
 // ---------------------------------------------------------------------------
+// ClearAvailableConfig
+// ---------------------------------------------------------------------------
+//
+void CHDMICableStateConnected::ClearAvailableTvOutConfig()
+{
+FUNC_LOG;
+if( iTVOutConfigForHDMI.GetTvOutConfig() )
+{
+RArray<THdmiDviTimings> HdmiSettingsArray;
+	RArray<TTvSettings> TvSettingsArray;
+TInt err = iTVOutConfigForHDMI.GetTvOutConfig()->SetAvailableTvConfigList( TvSettingsArray, HdmiSettingsArray );
+HdmiSettingsArray.Close();
+	TvSettingsArray.Close();
+}
+}
+// ---------------------------------------------------------------------------
 // ConstructL
 // ---------------------------------------------------------------------------
 //
 void CHDMICableStateConnected::ConstructL()
 {
 FUNC_LOG;
+// Create Central Repository Watchers
+iCRWatchForVOverScan = CCentralRepositoryWatch::NewL(*this, KCRUidTvoutSettings, KSettingsTvoutVerticalOverscan );
 iTVOutConfigForCopyProtect = CTVOutConfigForHDMI::NewL( iHDMICableStatusFSM );
 iTVOutConfigForSettingChanges = CTVOutConfigForHDMI::NewL( iHDMICableStatusFSM );
 }
 // ---------------------------------------------------------------------------
 //  C++ constructor

branch	GCC_SURGE
changeset 49	00076e39386f
parent 45	c6215323ad55
child 60	ccb4f6b3db21