--- a/videoplayback/hbvideoplaybackview/tsrc/testmpxvideoviewwrapper/src/testmpxvideoviewwrapper.cpp Fri Jun 11 09:44:20 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/tsrc/testmpxvideoviewwrapper/src/testmpxvideoviewwrapper.cpp Thu Jun 24 09:49:13 2010 +0300
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -12,10 +12,10 @@
* Contributors:
*
* Description: tester for methods in VideoSortFilterProxyModel
-*
+*
*/
-// Version : %version: 8 %
+// Version : %version: 9 %
#include <e32err.h>
#include <w32std.h>
@@ -53,16 +53,16 @@
{
HbApplication app(argc, argv);
HbMainWindow window;
-
+
TestMPXVideoViewWrapper tv;
char *pass[3];
pass[0] = argv[0];
pass[1] = "-o";
pass[2] = "c:\\data\\testmpxvideoviewwrapper.txt";
-
+
int res = QTest::qExec(&tv, 3, pass);
-
+
return res;
}
@@ -71,9 +71,9 @@
// ---------------------------------------------------------------------------
//
void TestMPXVideoViewWrapper::init()
-{
+{
mBaseVideoView = new HbVideoBasePlaybackView();
- TRAPD( err, mVideoViewWrapper = CMPXVideoViewWrapper::NewL( mBaseVideoView ) );
+ TRAPD( err, mVideoViewWrapper = CMPXVideoViewWrapper::NewL( mBaseVideoView ) );
QVERIFY( err == KErrNone );
}
@@ -86,7 +86,7 @@
if ( mVideoViewWrapper )
{
delete mVideoViewWrapper;
- mVideoViewWrapper = NULL;
+ mVideoViewWrapper = NULL;
}
if ( mBaseVideoView )
@@ -102,9 +102,9 @@
TRAPD(err, mVideoViewWrapper->RequestMediaL());
QVERIFY( err == KErrNone );
-
+
QVERIFY( mVideoViewWrapper->iMediaRequestStatus == MediaRequested );
-
+
cleanup();
}
@@ -114,13 +114,13 @@
TRAPD(err, mVideoViewWrapper->RequestMediaL());
QVERIFY( err == KErrNone );
-
+
mVideoViewWrapper->iFileDetails->mPlaybackMode = EMPXVideoLiveStreaming;
QVERIFY( mVideoViewWrapper->IsLive() );
mVideoViewWrapper->iFileDetails->mPlaybackMode = EMPXVideoLocal;
QVERIFY( ! mVideoViewWrapper->IsLive() );
-
+
cleanup();
}
@@ -130,7 +130,7 @@
mVideoViewWrapper->iPlaylistView = true;
QVERIFY( mVideoViewWrapper->IsPlaylist() == true );
-
+
mVideoViewWrapper->iPlaylistView = false;
QVERIFY( mVideoViewWrapper->IsPlaylist() == false );
@@ -140,180 +140,180 @@
void TestMPXVideoViewWrapper::testHandleCommand()
{
init();
-
+
TRAPD( errReqMedia, mVideoViewWrapper->RequestMediaL() );
QVERIFY( errReqMedia == KErrNone );
//
// Test 'Play' command
//
- TRAPD( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPlay ) );
+ TRAPD( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPlay ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdPlay );
-
+
//
// Test 'Pause' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPause ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPause ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdPause );
//
// Test 'Close' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdClose ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdClose ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdClose );
-
+
//
// Test 'Seek Forward' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdSeekForward ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdSeekForward ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdStartVideoSeekingForward );
//
// Test 'Seek Backward' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdSeekBackward ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdSeekBackward ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdStartVideoSeekingBackward );
-
+
//
// Test 'End Seek' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdEndSeek ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdEndSeek ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdStopVideoSeeking );
-
+
//
// Test 'PlayPause' command
//
mVideoViewWrapper->iPlaybackState = EPbStatePlaying;
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPlayPause ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPlayPause ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdPause );
mVideoViewWrapper->iPlaybackState = EPbStatePaused;
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPlayPause ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPlayPause ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdPlay );
//
// Test 'Stop' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdStop ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdStop ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdStop );
-
+
//
// Test 'Decrease Volume' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdDecreaseVolume ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdDecreaseVolume ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdHandleDecreaseVolume );
-
+
//
// Test 'Increase Volume' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdIncreaseVolume ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdIncreaseVolume ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdHandleIncreaseVolume );
-
+
//
// Test 'Natural Aspect Ratio' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdNaturalAspectRatio ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdNaturalAspectRatio ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iDisplayHandler->iCommand == EPbCmdNaturalAspectRatio );
-
+
//
// Test 'Zoom Aspect Ratio' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdZoomAspectRatio ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdZoomAspectRatio ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iDisplayHandler->iCommand == EPbCmdZoomAspectRatio );
-
+
//
// Test 'Stretch Aspect Ratio' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdStretchAspectRatio ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdStretchAspectRatio ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iDisplayHandler->iCommand == EPbCmdStretchAspectRatio );
-
+
//
// Test 'Mute' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdMute ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdMute ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdMuteVolume );
-
+
//
// Test 'Un-mute' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdUnMute ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdUnMute ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdUnMuteVolume );
-
+
//
// Test 'Short Press Backward' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdShortPressBackward ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdShortPressBackward ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iProperty == EPbPropertyPosition );
-
+
//
// Test 'Reset Controls' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdResetControls ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdResetControls ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdInitView );
-
+
//
// Test 'Next List Item' command
//
mVideoViewWrapper->iPlaylistView = true;
- mVideoViewWrapper->iFileDetails->mMultiItemPlaylist = true;
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdNextListItem ) );
+ mVideoViewWrapper->iFileDetails->mMultiItemPlaylist = true;
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdNextListItem ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdNext );
-
+
//
// Test 'Previous List Item' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPreviousListItem ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdPreviousListItem ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdPrevious );
-
+
//
// Test 'End Of Clip' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdEndOfClip ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdEndOfClip ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdEndofClipReached );
-
+
//
// Test 'Custom Pause' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdCustomPause ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdCustomPause ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdCustomPause );
-
+
//
// Test 'Custom Play' command
//
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdCustomPlay ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdCustomPlay ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdCustomPlay );
-
+
//
// Test 'RealOne Bitmap Timeout' command
//
mVideoViewWrapper->iMediaRequestStatus = MediaDelivered;
- TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdRealOneBitmapTimeout ) );
+ TRAP( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdRealOneBitmapTimeout ) );
QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdPlay );
-
+
cleanup();
}
@@ -323,11 +323,11 @@
TRAPD(errReqMedia, mVideoViewWrapper->RequestMediaL());
QVERIFY( errReqMedia == KErrNone );
-
+
mVideoViewWrapper->HandlePluginError( KErrNotSupported );
-
+
QVERIFY( mVideoViewWrapper->iView->mCurrentError == KErrNotSupported );
-
+
cleanup();
}
@@ -339,51 +339,51 @@
// Test Video Msg
//***************************
CMPXMessage* message = NULL;
- TRAP_IGNORE(
- message = CMPXMessage::NewL();
+ TRAP_IGNORE(
+ message = CMPXMessage::NewL();
message->SetTObjectValueL<TMPXMessageId>( KMPXMessageGeneralId, KMPXMediaIdVideoPlayback );
message->SetTObjectValueL<TMPXVideoPlaybackCommand>
( KMPXMediaVideoPlaybackCommand, EPbCmdTvOutEvent );
message->SetTObjectValueL<TInt>( KMPXMediaVideoTvOutConnected, ETrue );
);
mVideoViewWrapper->HandlePlaybackMessage( message, KErrNone );
- QVERIFY( mVideoViewWrapper->iFileDetails->mTvOutConnected );
+ QVERIFY( mVideoViewWrapper->iFileDetails->mTvOutConnected );
if ( message )
{
delete message;
message = NULL;
- }
+ }
//***************************
// Test General Msg
//***************************
- TRAP_IGNORE(
+ TRAP_IGNORE(
message = CMPXMessage::NewL();
message->SetTObjectValueL<TMPXMessageId>( KMPXMessageGeneralId, KMPXMessageGeneral );
- message->SetTObjectValueL<TInt>( KMPXMessageGeneralEvent, 28 ); // EReachedEndOfPlaylist = 28
+ message->SetTObjectValueL<TInt>( KMPXMessageGeneralEvent, 28 ); // EReachedEndOfPlaylist = 28
message->SetTObjectValueL<TInt>( KMPXMessageGeneralType, 0 );
- message->SetTObjectValueL<TInt>( KMPXMessageGeneralData, 0 );
+ message->SetTObjectValueL<TInt>( KMPXMessageGeneralData, 0 );
);
- mVideoViewWrapper->HandlePlaybackMessage( message, KErrNone );
- QVERIFY( ! mVideoViewWrapper->iView->mViewActive );
+ mVideoViewWrapper->HandlePlaybackMessage( message, KErrNone );
+ QVERIFY( ! mVideoViewWrapper->iView->mViewActive );
if ( message )
{
delete message;
message = NULL;
- }
+ }
//***************************
// Test Video Msg with err
//***************************
TRAP_IGNORE( message = CMPXMessage::NewL() );
mVideoViewWrapper->HandlePlaybackMessage( message, KErrNotFound );
- QVERIFY( mVideoViewWrapper->iView->mCurrentError == KErrNotFound );
+ QVERIFY( mVideoViewWrapper->iView->mCurrentError == KErrNotFound );
if ( message )
{
delete message;
message = NULL;
- }
-
+ }
+
cleanup();
}
@@ -417,7 +417,7 @@
// Duration
//
int value = 5000;
- TRAPD(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyDuration, value, KErrNone ) );
+ TRAPD(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyDuration, value, KErrNone ) );
QVERIFY( errHdlProp == KErrNone );
QVERIFY( mVideoViewWrapper->iControlsController->mReceivedEvent == EMPXControlCmdSetDuration );
@@ -428,7 +428,7 @@
//
value = 500;
- TRAP(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyPosition, value, KErrNone ) );
+ TRAP(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyPosition, value, KErrNone ) );
QVERIFY( errHdlProp == KErrNone );
QVERIFY( mVideoViewWrapper->iControlsController->mReceivedEvent == EMPXControlCmdSetPosition );
@@ -439,7 +439,7 @@
//
value = 10;
- TRAP(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyVolume, value, KErrNone ) );
+ TRAP(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyVolume, value, KErrNone ) );
QVERIFY( errHdlProp == KErrNone );
QVERIFY( mVideoViewWrapper->iControlsController->mReceivedEvent == EMPXControlCmdSetVolume );
@@ -450,7 +450,7 @@
//
value = 1;
- TRAP(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyMute, value, KErrNone ) );
+ TRAP(errHdlProp, mVideoViewWrapper->HandlePropertyL( EPbPropertyMute, value, KErrNone ) );
QVERIFY( errHdlProp == KErrNone );
QVERIFY( mVideoViewWrapper->iControlsController->mReceivedEvent == EMPXControlCmdSetVolume );
@@ -463,19 +463,19 @@
{
init();
- mVideoViewWrapper->iFileDetails->clearFileDetails();
+ mVideoViewWrapper->iFileDetails->clearFileDetails();
CMPXCommand* cmd = NULL;
-
+
TRAP_IGNORE( cmd = CMPXCommand::NewL() );
if ( cmd )
{
TRAPD(errRetFileName, mVideoViewWrapper->RetrieveFileNameAndModeL( cmd ) );
QVERIFY( errRetFileName == KErrNone );
-
- QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdInitView );
-
+
+ QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdInitView );
+
QCOMPARE( mVideoViewWrapper->iFileDetails->mClipName, QString("testClip.3gp"));
delete cmd;
@@ -500,8 +500,8 @@
{
init();
- TRAPD(err, mVideoViewWrapper->DoClosePlayerL());
- QVERIFY( err == KErrNone );
+ TRAPD(err, mVideoViewWrapper->DoClosePlayer());
+ QVERIFY( err == KErrNone );
QVERIFY( ! mVideoViewWrapper->iView->mViewActive );
@@ -562,7 +562,7 @@
TRAPD( errHdlCmd, mVideoViewWrapper->HandleCommandL( EMPXPbvCmdDecreaseVolume ) );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iCommand == EPbCmdHandleDecreaseVolume );
- QVERIFY( errHdlCmd == KErrNone );
+ QVERIFY( errHdlCmd == KErrNone );
QVERIFY( mVideoViewWrapper->iFileDetails->mAudioEnabled );
@@ -584,7 +584,7 @@
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iProperty == EPbPropertyPosition );
QVERIFY( mVideoViewWrapper->iPlaybackUtility->iPropertyValue == 0 );
- QVERIFY( errHdlCmd == KErrNone );
+ QVERIFY( errHdlCmd == KErrNone );
cleanup();
}
@@ -651,8 +651,8 @@
TRect rect( 0, 0, 50, 50 );
- mVideoViewWrapper->UpdateVideoRect(
- rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, rect.iBr.iY, false );
+ mVideoViewWrapper->UpdateVideoRect(
+ rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, rect.iBr.iY, false );
QVERIFY( rect == mVideoViewWrapper->iDisplayHandler->iRect );
@@ -687,22 +687,22 @@
CMPXMessage* message = NULL;
TRAP_IGNORE(
- message = CMPXMessage::NewL();
+ message = CMPXMessage::NewL();
message->SetTObjectValueL<TMPXMessageId>( KMPXMessageGeneralId, KMPXMediaIdVideoPlayback );
message->SetTObjectValueL<TMPXVideoPlaybackCommand>
( KMPXMediaVideoPlaybackCommand, EPbCmdPluginError );
message->SetTObjectValueL<TInt>( KMPXMediaVideoError, KErrNotSupported );
);
-
- mVideoViewWrapper->HandleVideoPlaybackMessage( message );
-
- QCOMPARE( mVideoViewWrapper->iView->mCurrentError, KErrNotSupported );
+
+ mVideoViewWrapper->HandleVideoPlaybackMessage( message );
+
+ QCOMPARE( mVideoViewWrapper->iView->mCurrentError, KErrNotSupported );
if ( message )
{
delete message;
- message = NULL;
+ message = NULL;
}
-
+
cleanup();
}
@@ -711,23 +711,23 @@
init();
CMPXCommand* cmd = NULL;
-
+
TRAP_IGNORE( cmd = CMPXCommand::NewL() );
-
- mVideoViewWrapper->HandlePlaybackCommandComplete( cmd, KErrNone );
-
+
+ mVideoViewWrapper->HandlePlaybackCommandComplete( cmd, KErrNone );
+
QVERIFY( mVideoViewWrapper );
-
+
delete cmd;
- cmd = NULL;
-
+ cmd = NULL;
+
cleanup();
}
void TestMPXVideoViewWrapper::testHandleMedia()
{
init();
-
+
CMPXMedia* media = NULL;
//
@@ -735,38 +735,38 @@
//
TRAP_IGNORE(
RArray<TInt> suppIds;
- CleanupClosePushL( suppIds );
+ CleanupClosePushL( suppIds );
suppIds.AppendL( KMPXMediaIdGeneral );
suppIds.AppendL( KMPXMediaIdVideo );
-
+
media = CMPXMedia::NewL( suppIds.Array() );
CleanupStack::PopAndDestroy( &suppIds );
-
+
media->SetTObjectValueL<TInt>( TMPXAttribute( KMPXMediaVideoError ), KErrCancel );
);
-
+
TRAPD( err, mVideoViewWrapper->HandleMediaL( *media, KErrNone ) );
QVERIFY( err == KErrNone );
-
+
QCOMPARE( mVideoViewWrapper->iView->mCurrentError, KErrCancel );
QVERIFY( ! mVideoViewWrapper->iControlsController->mFileDetailsAdded );
QVERIFY( mVideoViewWrapper->iMediaRequestStatus == MediaNotRequested );
if ( media )
- {
+ {
delete media;
- media = NULL;
+ media = NULL;
}
-
+
//
// working case - RN logo is not visible
//
TRAP_IGNORE(
RArray<TInt> suppIds;
- CleanupClosePushL( suppIds );
+ CleanupClosePushL( suppIds );
suppIds.AppendL( KMPXMediaIdGeneral );
suppIds.AppendL( KMPXMediaIdVideo );
-
+
media = CMPXMedia::NewL( suppIds.Array() );
CleanupStack::PopAndDestroy( &suppIds );
);
@@ -787,9 +787,9 @@
QVERIFY( mVideoViewWrapper->iMediaRequestStatus == MediaDelivered );
if ( media )
- {
+ {
delete media;
- media = NULL;
+ media = NULL;
}
//
@@ -797,10 +797,10 @@
//
TRAP_IGNORE(
RArray<TInt> suppIds;
- CleanupClosePushL( suppIds );
+ CleanupClosePushL( suppIds );
suppIds.AppendL( KMPXMediaIdGeneral );
suppIds.AppendL( KMPXMediaIdVideo );
-
+
media = CMPXMedia::NewL( suppIds.Array() );
CleanupStack::PopAndDestroy( &suppIds );
);
@@ -822,9 +822,9 @@
QVERIFY( mVideoViewWrapper->iMediaRequestStatus == MediaDelivered );
if ( media )
- {
+ {
delete media;
- media = NULL;
+ media = NULL;
}
cleanup();