--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Fri Sep 03 13:48:38 2010 +0300
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.1" xmlns:qt="http://www.nokia.com/qt">
+ <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
+ <collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
+ <component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
+ <meta rel="Api" href="videotelephony_plat/video_telephony_media_configuration_api/video_telephony_media_configuration_api.metaxml"/>
+ <unit bldFile="videotelephony_plat/video_telephony_media_configuration_api/group"/>
+ </component>
+ </collection>
+ <collection id="vtengines" name="Video Telephony Engines" level="engine">
+ <component id="videoteleng" filter="s60" name="Video Telephony Engine">
+ <unit bldFile="vtengines/videoteleng/Group"/>
+ </component>
+ <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
+ <unit bldFile="vtengines/vtmediatorplugin/group"/>
+ </component>
+ </collection>
+ <collection id="vtuis" name="Video Telephony UIs" level="ui">
+ <component id="lcvtplugin" filter="s60" name="Video Telephony Plugin" class="plugin">
+ <unit bldFile="vtuis/lcvtplugin/group"/>
+ </component>
+ <component id="lcvtapp" filter="s60" name="Video Telephony Application" introduced="^4">
+ <unit bldFile="vtuis/lcvtapp" qt:proFile="lcvtapp.pro"/>
+ </component>
+ <component id="lcvtindicatorplugin" filter="s60" name="Video Telephony Indicator Plugin" class="plugin" introduced="^4">
+ <unit bldFile="vtuis/lcvtindicatorplugin" qt:proFile="lcvtindicatorplugin.pro"/>
+ </component>
+ <component id="lcvtindicatorcontroller" filter="s60" name="Video Telephony Indicator Controller" introduced="^4">
+ <unit bldFile="vtuis/lcvtindicatorcontroller" qt:proFile="lcvtindicatorcontroller.pro"/>
+ </component>
+ </collection>
+ <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
+ <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
+ <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
+ </component>
+ <component id="videosource" filter="s60" name="Video Source" introduced="^2">
+ <unit bldFile="vtprotocolplugins/VideoSource/group"/>
+ </component>
+ </collection>
+ <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
+ <!-- this collection is really a component, move down a directory -->
+ <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
+ <unit bldFile="vtprotocolsstub/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Fri Sep 03 13:48:38 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="app"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/videotelephony_info/nokia_videotelephony_metadata/package_definition.xml Fri Sep 03 13:48:38 2010 +0300
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition xmlns:sf="http://www.symbian.org/system-definition" id-namespace="http://www.nokia.com/schema/drd/system-definition" schema="3.0.1">
+ <package id="sf:videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
+ <collection id="packetvideoengine" name="PacketVideo Engine" level="engine">
+ <component id="packetvideoenginebinaries" filter="s60" name="Packet Video Engine Binaries">
+ <unit bldFile="../../packetvideoengine/packetvideoenginebinaries/group"/>
+ </component>
+ </collection>
+ <collection id="vtprotocols" name="Video Telephony Protocols" level="prot" replace="sf:vtprotocolsstub">
+ <!-- this collection is really a component, move down a directory -->
+ <component id="vtprotocols_build" filter="s60" name="Video Telephony Protocols Build">
+ <unit bldFile="../../vtprotocols/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp Mon Aug 23 15:49:33 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp Fri Sep 03 13:48:38 2010 +0300
@@ -1511,7 +1511,7 @@
//
TInt CVtEngDrawDP::GetFrameBufferSize( const TSize& aSize ) const
{
- TInt size( -1 );
+ TInt size( 0 );
__VTPRINTENTER( "RVD(DP).GetFrameBufferSize" )
switch( iPostingFormat )
{
--- a/vtengines/videoteleng/Src/Media/CVtEngLocalVideo.cpp Mon Aug 23 15:49:33 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngLocalVideo.cpp Fri Sep 03 13:48:38 2010 +0300
@@ -2615,14 +2615,19 @@
if ( iActiveProvider )
{
CVSDataProvider* provider = iActiveProvider->iProvider;
- __VTPRINT2 ( DEBUG_MEDIA, "LocVideo.UpdateState, provider active",
- provider->ViewFinderActive() )
- if ( provider && provider->ViewFinderActive())
+
+ if ( provider )
{
- iViewFinderState = ( iRenderingMethod == EWindowServer ) ?
- EVFReceivingBitmaps : EVFRenderingDsa;
+ __VTPRINT2 ( DEBUG_MEDIA, "LocVideo.UpdateState, provider active",
+ provider->ViewFinderActive() )
+ if ( provider->ViewFinderActive() )
+ {
+ iViewFinderState = ( iRenderingMethod == EWindowServer ) ?
+ EVFReceivingBitmaps : EVFRenderingDsa;
+ }
}
}
+
ClearFlag( EFlagInitializeOnly );
__VTPRINT2( DEBUG_MEDIA | DEBUG_RETURN,
"LocVideo.UpdateState iViewFinderState %d", iViewFinderState )
--- a/vtengines/videoteleng/Src/State/CVtEngStateNegotiating.cpp Mon Aug 23 15:49:33 2010 +0300
+++ b/vtengines/videoteleng/Src/State/CVtEngStateNegotiating.cpp Fri Sep 03 13:48:38 2010 +0300
@@ -57,7 +57,7 @@
const MVtProtocolCommand::TVtProtocolState state( MediaHandler().ProtoState() );
CVtEngStateBase* newState = NULL;
- if ( bearerstate != MVtCtlCallControl::EConnected ||
+ if ( bearerstate != MVtCtlCallControl::EConnected &&
state == MVtProtocolCommand::ESetup ) // <- connect failed
{
newState = NewStateL( MVtEngSessionInfo::EClearing );
--- a/vtuis/lcvtplugin/inc/base/clcvtsession.h Mon Aug 23 15:49:33 2010 +0300
+++ b/vtuis/lcvtplugin/inc/base/clcvtsession.h Fri Sep 03 13:48:38 2010 +0300
@@ -560,6 +560,8 @@
TInt VideoSendingKey;
LcVtIndicatorController* iIndicatorCtr;
+
+ TBool iForeGroundStatus;
};
--- a/vtuis/lcvtplugin/src/base/clcvtsession.cpp Mon Aug 23 15:49:33 2010 +0300
+++ b/vtuis/lcvtplugin/src/base/clcvtsession.cpp Fri Sep 03 13:48:38 2010 +0300
@@ -285,6 +285,9 @@
delete repository;
iIndicatorCtr = new ( ELeave ) LcVtIndicatorController();
+
+ iForeGroundStatus = EFalse;
+
__VTPRINTEXIT( "CLcVtSession.ConstructL" )
}
@@ -954,10 +957,12 @@
{
__VTPRINTENTER( "CLcVtSession.SetForegroundStatus" )
__VTPRINT2( DEBUG_MEDIA , " foreground: %d", aIsForeground )
+
+ iForeGroundStatus = aIsForeground;
if ( iRwGroup )
{
- TInt priority = aIsForeground ? ECoeWinPriorityNormal : ECoeWinPriorityNeverAtFront;
+ TInt priority = iForeGroundStatus ? ECoeWinPriorityNormal : ECoeWinPriorityNeverAtFront;
iRwGroup->SetOrdinalPosition( 1 , priority );
iRemoteVideoWindow->SetOrdinalPosition( 1 , priority );
iLocalVideoWindow->SetOrdinalPosition( 1 , priority );
@@ -1235,7 +1240,6 @@
break;
case EVtSessionAnsweredDoPrepareCamera:
{
- MVtEngMedia& media = iModel->Media();
MVtEngMedia::TMediaSource source = MVtEngMedia::EMediaCamera;
ActiveExecInitPrepareCameraL( source, aRequest );
aNextState = EVtSessionAnsweredSetlectCamera;
@@ -1888,12 +1892,14 @@
void CLcVtSession::UpdateRenderingParametersL()
{
__VTPRINTENTER( "CLcVtSession.UpdateRenderingParametersL" )
+
+ TInt priority = iForeGroundStatus ? ECoeWinPriorityNormal : ECoeWinPriorityNeverAtFront;
- iRwGroup->SetOrdinalPosition( 1 , ECoeWinPriorityNormal );
+ iRwGroup->SetOrdinalPosition( 1 , priority );
TRect RMRect = RemoteVideoPlayer()->LcWindow()->LcWindowRect();
iRemoteVideoWindow->SetExtent( RMRect.iTl, RMRect.Size() );
- iRemoteVideoWindow->SetOrdinalPosition( 1 , ECoeWinPriorityNeverAtFront );
+ iRemoteVideoWindow->SetOrdinalPosition( 1 , priority );
iRemoteVideoWindow->SetTransparencyAlphaChannel();
__VTPRINT2( DEBUG_MEDIA , " RemoteVideoPlayer.RMRect.iTl.iX: %d", RMRect.iTl.iX )
@@ -1904,7 +1910,7 @@
TRect VFRect = LocalVideoPlayer()->LcWindow()->LcWindowRect();
iLocalVideoWindow->SetExtent( VFRect.iTl, VFRect.Size() );
- iLocalVideoWindow->SetOrdinalPosition( 1, ECoeWinPriorityNeverAtFront );
+ iLocalVideoWindow->SetOrdinalPosition( 1, priority );
iLocalVideoWindow->SetTransparencyAlphaChannel();
__VTPRINT2( DEBUG_MEDIA , " LocalVideoPlayer.VFRect.iTl.iX: %d", VFRect.iTl.iX )
--- a/vtuis/lcvtplugin/src/common/tlcvtstates.cpp Mon Aug 23 15:49:33 2010 +0300
+++ b/vtuis/lcvtplugin/src/common/tlcvtstates.cpp Fri Sep 03 13:48:38 2010 +0300
@@ -58,25 +58,23 @@
// Get supported whitebalance modes
if ( iCameraPref )
{
- if ( iCameraPref->GetSupportedColorTones( supportedModes ) )
+ if ( iCameraPref->GetSupportedColorTones( supportedModes ) == KErrNone )
{
- // error occured
- __VTPRINTEXIT( "TLcVtStates.IsColorToneSettingAvailableErr" )
- return EFalse;
+ // Clean the flag, flags that are possible are
+ // A bitfield of suported colortones
+ // ENormal = 0x00,
+ // ESepia = 0x01,
+ // EGrayscale = 0x02,
+ // ENegative = 0x04
+ supportedModes &= 0x07;
+ __VTPRINTEXITR( "TLcVtStates.IsColorToneSettingAvailable mode=%d",
+ supportedModes )
+ return supportedModes;
}
}
- // Clean the flag, flags that are possible are
- // A bitfield of suported colortones
- // ENormal = 0x00,
- // ESepia = 0x01,
- // EGrayscale = 0x02,
- // ENegative = 0x04
- supportedModes &= 0x07;
-
- // If supported modes is 0 automatic,then return EFalse
- __VTPRINTEXIT( "TLcVtStates.IsColorToneSettingAvailable" )
- return supportedModes;
+ __VTPRINTEXIT( "TLcVtStates.IsColorToneSettingAvailableErr" )
+ return EFalse;
}
// -----------------------------------------------------------------------------
@@ -90,17 +88,16 @@
// Get supported whitebalance modes
if ( iCameraPref )
{
- if ( iCameraPref->GetSupportedWhiteBalanceModes( supportedModes ) )
+ if ( iCameraPref->GetSupportedWhiteBalanceModes( supportedModes ) == KErrNone )
{
- // error occured
- __VTPRINTEXIT( "TLcVtStates.IsWhiteBalanceSettingAvailableErr" )
- return EFalse;
+ __VTPRINTEXITR( "TLcVtStates.IsWhiteBalanceSettingAvailable mode=%d",
+ supportedModes )
+ return supportedModes;
}
}
- __VTPRINT2( DEBUG_GEN, "IsWhiteBalanceSettingAvailable=%d", supportedModes )
- // If supported modes is 0 ,then return EFalse
- __VTPRINTEXIT( "TLcVtStates.IsWhiteBalanceSettingAvailable2" )
- return supportedModes;
+
+ __VTPRINTEXIT( "TLcVtStates.IsWhiteBalanceSettingAvailableErr" )
+ return EFalse;
}
// -----------------------------------------------------------------------------
--- a/vtuis/lcvtplugin/src/states/tlcvtstaterunning.cpp Mon Aug 23 15:49:33 2010 +0300
+++ b/vtuis/lcvtplugin/src/states/tlcvtstaterunning.cpp Fri Sep 03 13:48:38 2010 +0300
@@ -233,16 +233,23 @@
//
void TLcVtStateRunning::ShutdownWithEngineCommandL( const TInt aCommand )
{
- __VTPRINTENTER(
- "TLcVtStateRunning.ShutdownWithEngineCommandL" )
+ __VTPRINTENTER( "TLcVtStateRunning.ShutdownWithEngineCommandL" )
+
TLcVtStateBase* resetState =
TLcVtStateResetting::InstanceL( iCtx, iUiStates, aCommand );
CLcVtAppShutter* shutter = CLcVtAppShutter::InstanceL( *resetState );
- // open resetting state, handles engine command request/reply
- ChangeStateL( *resetState );
-
- __VTPRINTEXIT( "TLcVtStateRunning.ShutdownWithEngineCommandL" )
+ if ( shutter )
+ {
+ // open resetting state, handles engine command request/reply
+ ChangeStateL( *resetState );
+#ifdef _DEBUG
+ __VTPRINTEXIT( "TLcVtStateRunning.ShutdownWithEngineCommandL 1" )
+ return;
+#endif
+ }
+
+ __VTPRINTEXIT( "TLcVtStateRunning.ShutdownWithEngineCommandL 0" )
}
// -----------------------------------------------------------------------------