# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276254218 -10800 # Node ID 434647e7f45bfb61ea8258746081702e8377d73b # Parent f58ead8cf73c5b314b857e7add85b1498e8ff234 Revision: 201021 Kit: 2010123 diff -r f58ead8cf73c -r 434647e7f45b ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp --- a/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp Thu May 27 13:16:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -component ipappsrv_metadata -source \sf\mw\ipappsrv\ipappsrv_info\ipappsrv_metadata -source \sf\mw\ipappsrv\package_definition.xml -source \sf\mw\ipappsrv\distribution.policy.s60 -notes_source \component_defs\release.src -ipr T diff -r f58ead8cf73c -r 434647e7f45b ipappsrv_plat/media_control_api/inc/mmccinterfacedef.h --- a/ipappsrv_plat/media_control_api/inc/mmccinterfacedef.h Thu May 27 13:16:26 2010 +0300 +++ b/ipappsrv_plat/media_control_api/inc/mmccinterfacedef.h Fri Jun 11 14:03:38 2010 +0300 @@ -104,6 +104,12 @@ class TMccVideoSinkSetting { public: + TMccVideoSinkSetting() : iLocation(0,0), iSize(0,0), iVideoPayloadType(0), + iAudioPayloadType(0), iIAPId(0), iDeviceIndex(0), iWindowOrdinalPosition(0), + iWindowOrdinalPriority(0), iRotation(EMccNone), iVideoFrameRate(0.0), iEnabled(ETrue) + { + } + TPoint iLocation; TSize iSize; TUint iVideoPayloadType; @@ -115,6 +121,7 @@ TInt iWindowOrdinalPriority; TMccVideoRotation iRotation; TReal iVideoFrameRate; + TBool iEnabled; }; typedef TPckgBuf TMccVideoSinkSettingBuf; diff -r f58ead8cf73c -r 434647e7f45b ipappsrv_plat/multimedia_comms_api/inc/mcefilesink.h --- a/ipappsrv_plat/multimedia_comms_api/inc/mcefilesink.h Thu May 27 13:16:26 2010 +0300 +++ b/ipappsrv_plat/multimedia_comms_api/inc/mcefilesink.h Fri Jun 11 14:03:38 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS diff -r f58ead8cf73c -r 434647e7f45b ipappsrv_plat/multimedia_comms_api/inc/mcertpsink.h --- a/ipappsrv_plat/multimedia_comms_api/inc/mcertpsink.h Thu May 27 13:16:26 2010 +0300 +++ b/ipappsrv_plat/multimedia_comms_api/inc/mcertpsink.h Fri Jun 11 14:03:38 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include // CONSTANTS const TMceSinkType KMceRTPSink = 1; diff -r f58ead8cf73c -r 434647e7f45b multimediacommscontroller/mmcccontroller/src/mcccamerahandler.cpp --- a/multimediacommscontroller/mmcccontroller/src/mcccamerahandler.cpp Thu May 27 13:16:26 2010 +0300 +++ b/multimediacommscontroller/mmcccontroller/src/mcccamerahandler.cpp Fri Jun 11 14:03:38 2010 +0300 @@ -150,6 +150,10 @@ iViewFinderSettings = aSetting; + if ( !iViewFinderSettings.iEnabled ){ + __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, param update, exit" ) + return; + } __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, starting vf" ) CCamera* cam = IsCameraReady() ? iCamera : NULL; @@ -217,8 +221,9 @@ iViewFinderSettings.iSize.iWidth) __CONTROLLER_INT2( "CMccCameraHandler::GetViewFinderSettingsL, location", iViewFinderSettings.iLocation.iX, - iViewFinderSettings.iLocation.iY) - aSetting = iViewFinderSettings; + iViewFinderSettings.iLocation.iY) + aSetting = iViewFinderSettings; + aSetting.iEnabled = iViewFinderEnabled; __CONTROLLER( "CMccCameraHandler::GetViewFinderSettingsL,exit" ) } diff -r f58ead8cf73c -r 434647e7f45b multimediacommscontroller/mmcccontroller/tsrc/ut_controller/src/UT_CMccCameraHandler.cpp --- a/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/src/UT_CMccCameraHandler.cpp Thu May 27 13:16:26 2010 +0300 +++ b/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/src/UT_CMccCameraHandler.cpp Fri Jun 11 14:03:38 2010 +0300 @@ -286,6 +286,22 @@ iCameraHandler->GetViewFinderSettingsL( settings2 ); EUNIT_ASSERT_EQUALS( settings2.iSize.iWidth, 0 ); EUNIT_ASSERT( iCameraHandler->iCamera->iVfStarted == EFalse ) + + // Check that iEnabled in settings is handled correctly + iCameraHandler->iViewFinderEnabled = EFalse; + settings.iEnabled = EFalse; + iCameraHandler->EnableViewFinderL( settings ); + EUNIT_ASSERT( iCameraHandler->iViewFinderEnabled == EFalse ) + EUNIT_ASSERT( iCameraHandler->iCamera->iVfStarted == EFalse ) + iCameraHandler->GetViewFinderSettingsL( settings2 ); + EUNIT_ASSERT( settings2.iEnabled == EFalse ) + + settings.iEnabled = ETrue; + iCameraHandler->EnableViewFinderL( settings ); + EUNIT_ASSERT( iCameraHandler->iViewFinderEnabled == ETrue ) + EUNIT_ASSERT( iCameraHandler->iCamera->iVfStarted == EFalse ) + iCameraHandler->GetViewFinderSettingsL( settings2 ); + EUNIT_ASSERT( settings2.iEnabled == ETrue ) } void UT_CMccCameraHandler::UT_CMccCameraHandler_DisableViewFinderL() diff -r f58ead8cf73c -r 434647e7f45b multimediacommsengine/mmceshared/src/mcecomamrwbcodec.cpp --- a/multimediacommsengine/mmceshared/src/mcecomamrwbcodec.cpp Thu May 27 13:16:26 2010 +0300 +++ b/multimediacommsengine/mmceshared/src/mcecomamrwbcodec.cpp Fri Jun 11 14:03:38 2010 +0300 @@ -315,7 +315,6 @@ ( mceBitrates && mccBitrates == 0 || mceBitrates < mccBitrates ); - User::LeaveIfError( notValid ? KErrNotSupported : KErrNone ); if ( aMccCodec.CodecMode() != (TCodecMode)iCodecMode ) { // codec-mode was different, fail. diff -r f58ead8cf73c -r 434647e7f45b multimediacommsengine/mmceshared/src/mcecomdisplaysink.cpp --- a/multimediacommsengine/mmceshared/src/mcecomdisplaysink.cpp Thu May 27 13:16:26 2010 +0300 +++ b/multimediacommsengine/mmceshared/src/mcecomdisplaysink.cpp Fri Jun 11 14:03:38 2010 +0300 @@ -347,6 +347,7 @@ displaySetting.iWindowOrdinalPosition = 1; displaySetting.iWindowOrdinalPriority = iPriority; displaySetting.iRotation = EMccNone; + displaySetting.iEnabled = ETrue; if ( aCodec.Stream() && aCodec.Stream()->iType == KMceVideo ) { diff -r f58ead8cf73c -r 434647e7f45b natfw/natfwconnectionmultiplexer/src/cncmconnectionobserverhandler.cpp --- a/natfw/natfwconnectionmultiplexer/src/cncmconnectionobserverhandler.cpp Thu May 27 13:16:26 2010 +0300 +++ b/natfw/natfwconnectionmultiplexer/src/cncmconnectionobserverhandler.cpp Fri Jun 11 14:03:38 2010 +0300 @@ -260,20 +260,25 @@ const TInt KRtpRtcpDiffByteOffset( 1 ); const TInt KLowestAssignedRtcpMsgType = 200; const TInt KHighestAssignedRtcpMsgType = 209; + TInt rtcpType = aMessage[KRtpRtcpDiffByteOffset]; TBool isRtcp = - ( KLowestAssignedRtcpMsgType <= aMessage[KRtpRtcpDiffByteOffset] && - aMessage[KRtpRtcpDiffByteOffset] <= KHighestAssignedRtcpMsgType ); + ( KLowestAssignedRtcpMsgType <= rtcpType && + rtcpType <= KHighestAssignedRtcpMsgType ); - // This offset refers either to SR RTP timestamp or RR highest - // sequence number received. These are unique for a distinct - // RTCP packet. - const TInt KRtcpDiffByteOffset( 19 ); + // This offset refers to RR highest sequence number received. + const TInt KRRtcpDiffByteOffset( 19 ); + + // This offset refers either to SR RTP packet count received. + const TInt KSRtcpDiffByteOffset( 23 ); // This offset refers to lower byte of unique RTP sequence number. const TInt KRtpDiffByteOffset( 3 ); TInt diffByteOffset - = isRtcp ? KRtcpDiffByteOffset : KRtpDiffByteOffset; + = isRtcp ? KRRtcpDiffByteOffset : KRtpDiffByteOffset; + diffByteOffset = (rtcpType == KLowestAssignedRtcpMsgType)? + KSRtcpDiffByteOffset : diffByteOffset; + if ( diffByteOffset < aMessage.Size() ) { hash = aMessage[diffByteOffset]; @@ -294,14 +299,12 @@ } else { - isDuplicate = EFalse; - } - - iLatestHashes.Append( hash ); - const TInt KMaxHashCount( 5 ); - if ( KMaxHashCount <= iLatestHashes.Count() ) - { - iLatestHashes.Remove( 0 ); + iLatestHashes.Append( hash ); + const TInt KMaxHashCount( 5 ); + if ( KMaxHashCount <= iLatestHashes.Count() ) + { + iLatestHashes.Remove( 0 ); + } } } else diff -r f58ead8cf73c -r 434647e7f45b package_definition.xml --- a/package_definition.xml Thu May 27 13:16:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -