RIO-8102: Allowing scrubbing inside playerengine

2 files changed, 37 insertions, 86 deletions

diff --git a/engines/player/test/src/test_pv_player_engine_testset1.cpp b/engines/player/test/src/test_pv_player_engine_testset1.cpp
index d576d34e9..3b1c28b8c 100644
--- a/engines/player/test/src/test_pv_player_engine_testset1.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset1.cpp
@@ -15466,7 +15466,7 @@ void pvplayer_async_test_capconfigiftest::Run()
             querykey = _STRLIT_CHAR("x-pvmf/player;attr=cap");
             iPlayerCapConfigIF->getParametersSync(NULL, querykey.get_str(), retparam, retnumparam, NULL);
             // Just check the number of returned entries
-            if (retparam != NULL && retnumparam == 11)
+            if (retparam != NULL && retnumparam == 9)
             {
                 PVPATB_TEST_IS_TRUE(true);
 
@@ -15704,21 +15704,18 @@ void pvplayer_async_test_capconfigiftest::Run()
 
         case STATE_CAPCONFIG4:
         {
-            // Set up KVPs for verify, set, and get
-            PvmiKvp paramkvp[2];
+            // Set up KVP for verify, set, and get
+            PvmiKvp paramkvp[1];
             OSCL_StackString<64> paramkey1(_STRLIT_CHAR("x-pvmf/player/pbpos_interval;valtype=uint32"));
-            OSCL_StackString<64> paramkey2(_STRLIT_CHAR("x-pvmf/player/seektosyncpoint;valtype=bool"));
             paramkvp[0].key = paramkey1.get_str();
             paramkvp[0].value.uint32_value = 2000;
-            paramkvp[1].key = paramkey2.get_str();
-            paramkvp[1].value.bool_value = false;
 
             // Verify the new settings
-            if (iPlayerCapConfigIF->verifyParametersSync(NULL, paramkvp, 2) == PVMFSuccess)
+            if (iPlayerCapConfigIF->verifyParametersSync(NULL, paramkvp, 1) == PVMFSuccess)
             {
                 // Set the new settings
                 iErrorKVP = NULL;
-                iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 2, iErrorKVP);
+                iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, iErrorKVP);
                 if (iErrorKVP == NULL)
                 {
                     // Check by calling get
@@ -15739,24 +15736,6 @@ void pvplayer_async_test_capconfigiftest::Run()
                     {
                         PVPATB_TEST_IS_TRUE(false);
                     }
-
-                    retparam = NULL;
-                    retnumparam = 0;
-                    paramkey2 += _STRLIT_CHAR(";attr=cur");
-                    iPlayerCapConfigIF->getParametersSync(NULL, paramkey2.get_str(), retparam, retnumparam, NULL);
-                    if (retparam != NULL && retnumparam == 1)
-                    {
-                        PVPATB_TEST_IS_TRUE(retparam->value.bool_value == paramkvp[1].value.bool_value);
-
-                        if (iPlayerCapConfigIF->releaseParameters(NULL, retparam, retnumparam) != PVMFSuccess)
-                        {
-                            PVPATB_TEST_IS_TRUE(false);
-                        }
-                    }
-                    else
-                    {
-                        PVPATB_TEST_IS_TRUE(false);
-                    }
                 }
                 else
                 {
diff --git a/engines/player/test/src/test_pv_player_engine_testset7.cpp b/engines/player/test/src/test_pv_player_engine_testset7.cpp
index ea019fd59..a77b703e1 100644
--- a/engines/player/test/src/test_pv_player_engine_testset7.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset7.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -5959,13 +5959,9 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
     int error = 0;
 
     PvmiKvp* retkvp = NULL;
-    PvmiKvp paramkvp[3];
-    OSCL_StackString<64> paramkey1(_STRLIT_CHAR("x-pvmf/player/seektosyncpoint;valtype=bool"));
-    paramkvp[0].key = paramkey1.get_str();
+    PvmiKvp paramkvp[1];
     OSCL_StackString<64> paramkey2(_STRLIT_CHAR("x-pvmf/player/syncpointseekwindow;valtype=uint32"));
-    paramkvp[1].key = paramkey2.get_str();
-    OSCL_StackString<64> paramkey3(_STRLIT_CHAR("x-pvmf/player/skiptorequestedpos;valtype=bool"));
-    paramkvp[2].key = paramkey3.get_str();
+    paramkvp[0].key = paramkey2.get_str();
 
     switch (iState)
     {
@@ -6084,14 +6080,10 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
 
         case STATE_SETPLAYBACKRANGE1:
         {
-            paramkvp[0].value.bool_value = true;
-            paramkvp[1].value.uint32_value = 0;
-            paramkvp[2].value.bool_value = false;
-            fprintf(iTestMsgOutputFile, "***seektosyncpoint=%d, syncpointseekwindow=%d, skiptorequestedpos=%d\n",
-                    paramkvp[0].value.bool_value,
-                    paramkvp[1].value.uint32_value,
-                    paramkvp[2].value.bool_value);
-            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 3, retkvp);
+            paramkvp[0].value.uint32_value = 0;
+            fprintf(iTestMsgOutputFile, "***seektosyncpoint=true, syncpointseekwindow=%d, skiptorequestedpos=false\n",
+                    paramkvp[0].value.uint32_value);
+            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, retkvp);
             PVPATB_TEST_IS_TRUE(retkvp == NULL);
 
             PVPPlaybackPosition start, end;
@@ -6101,7 +6093,7 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
             start.iPosValue.sec_value = 10;
             end.iIndeterminate = true;
             fprintf(iTestMsgOutputFile, "***Set PlayBackRange_1 - TargetNPT=%d secs\n", start.iPosValue.sec_value);
-            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject));
+            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject, false, true));
             OSCL_FIRST_CATCH_ANY(error, PVPATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;
@@ -6138,14 +6130,10 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
 
         case STATE_SETPLAYBACKRANGE3:
         {
-            paramkvp[0].value.bool_value = true;
-            paramkvp[1].value.uint32_value = 1000;
-            paramkvp[2].value.bool_value = false;
-            fprintf(iTestMsgOutputFile, "***seektosyncpoint=%d, syncpointseekwindow=%d, skiptorequestedpos=%d\n",
-                    paramkvp[0].value.bool_value,
-                    paramkvp[1].value.uint32_value,
-                    paramkvp[2].value.bool_value);
-            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 3, retkvp);
+            paramkvp[0].value.uint32_value = 1000;
+            fprintf(iTestMsgOutputFile, "***seektosyncpoint=true, syncpointseekwindow=%d, skiptorequestedpos=false\n",
+                    paramkvp[0].value.uint32_value);
+            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, retkvp);
             PVPATB_TEST_IS_TRUE(retkvp == NULL);
 
             PVPPlaybackPosition start, end;
@@ -6155,21 +6143,17 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
             start.iPosValue.sec_value = 20;
             end.iIndeterminate = true;
             fprintf(iTestMsgOutputFile, "***Set PlayBackRange_3 - TargetNPT=%d secs\n", start.iPosValue.sec_value);
-            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject));
+            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject, false, true));
             OSCL_FIRST_CATCH_ANY(error, PVPATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;
 
         case STATE_SETPLAYBACKRANGE4:
         {
-            paramkvp[0].value.bool_value = true;
-            paramkvp[1].value.uint32_value = 1000;
-            paramkvp[2].value.bool_value = true;
-            fprintf(iTestMsgOutputFile, "***seektosyncpoint=%d, syncpointseekwindow=%d, skiptorequestedpos=%d\n",
-                    paramkvp[0].value.bool_value,
-                    paramkvp[1].value.uint32_value,
-                    paramkvp[2].value.bool_value);
-            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 3, retkvp);
+            paramkvp[0].value.uint32_value = 1000;
+            fprintf(iTestMsgOutputFile, "***seektosyncpoint=true, syncpointseekwindow=%d, skiptorequestedpos=true\n",
+                    paramkvp[0].value.uint32_value);
+            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, retkvp);
             PVPATB_TEST_IS_TRUE(retkvp == NULL);
 
             PVPPlaybackPosition start, end;
@@ -6186,14 +6170,10 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
 
         case STATE_SETPLAYBACKRANGE5:
         {
-            paramkvp[0].value.bool_value = false;
-            paramkvp[1].value.uint32_value = 0;
-            paramkvp[2].value.bool_value = false;
-            fprintf(iTestMsgOutputFile, "***seektosyncpoint=%d, syncpointseekwindow=%d, skiptorequestedpos=%d\n",
-                    paramkvp[0].value.bool_value,
-                    paramkvp[1].value.uint32_value,
-                    paramkvp[2].value.bool_value);
-            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 3, retkvp);
+            paramkvp[0].value.uint32_value = 0;
+            fprintf(iTestMsgOutputFile, "***seektosyncpoint=false, syncpointseekwindow=%d, skiptorequestedpos=false\n",
+                    paramkvp[0].value.uint32_value);
+            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, retkvp);
             PVPATB_TEST_IS_TRUE(retkvp == NULL);
 
             PVPPlaybackPosition start, end;
@@ -6203,21 +6183,17 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
             start.iPosValue.sec_value = 20;
             end.iIndeterminate = true;
             fprintf(iTestMsgOutputFile, "***Set PlayBackRange_5 - TargetNPT=%d secs\n", start.iPosValue.sec_value);
-            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject));
+            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject, false, false));
             OSCL_FIRST_CATCH_ANY(error, PVPATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;
 
         case STATE_SETPLAYBACKRANGE6:
         {
-            paramkvp[0].value.bool_value = false;
-            paramkvp[1].value.uint32_value = 0;
-            paramkvp[2].value.bool_value = true;
-            fprintf(iTestMsgOutputFile, "***seektosyncpoint=%d, syncpointseekwindow=%d, skiptorequestedpos=%d\n",
-                    paramkvp[0].value.bool_value,
-                    paramkvp[1].value.uint32_value,
-                    paramkvp[2].value.bool_value);
-            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 3, retkvp);
+            paramkvp[0].value.uint32_value = 0;
+            fprintf(iTestMsgOutputFile, "***seektosyncpoint=false, syncpointseekwindow=%d, skiptorequestedpos=true\n",
+                    paramkvp[0].value.uint32_value);
+            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, retkvp);
             PVPATB_TEST_IS_TRUE(retkvp == NULL);
 
             PVPPlaybackPosition start, end;
@@ -6227,21 +6203,17 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
             start.iPosValue.sec_value = 20;
             end.iIndeterminate = true;
             fprintf(iTestMsgOutputFile, "***Set PlayBackRange_6 - TargetNPT=%d secs\n", start.iPosValue.sec_value);
-            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject));
+            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject, true, false));
             OSCL_FIRST_CATCH_ANY(error, PVPATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;
 
         case STATE_SETPLAYBACKRANGE7:
         {
-            paramkvp[0].value.bool_value = true;
-            paramkvp[1].value.uint32_value = 100;
-            paramkvp[2].value.bool_value = false;
-            fprintf(iTestMsgOutputFile, "***seektosyncpoint=%d, syncpointseekwindow=%d, skiptorequestedpos=%d\n",
-                    paramkvp[0].value.bool_value,
-                    paramkvp[1].value.uint32_value,
-                    paramkvp[2].value.bool_value);
-            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 3, retkvp);
+            paramkvp[0].value.uint32_value = 100;
+            fprintf(iTestMsgOutputFile, "***seektosyncpoint=true, syncpointseekwindow=%d, skiptorequestedpos=false\n",
+                    paramkvp[0].value.uint32_value);
+            iPlayerCapConfigIF->setParametersSync(NULL, paramkvp, 1, retkvp);
             PVPATB_TEST_IS_TRUE(retkvp == NULL);
 
             PVPPlaybackPosition start, end;
@@ -6251,7 +6223,7 @@ void pvplayer_async_test_mediaionode_repositionconfig::Run()
             start.iPosValue.sec_value = 30;
             end.iIndeterminate = true;
             fprintf(iTestMsgOutputFile, "***Set PlayBackRange_7 - TargetNPT=%d secs\n", start.iPosValue.sec_value);
-            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject));
+            OSCL_TRY(error, iCurrentCmdId = iPlayer->SetPlaybackRange(start, end, false, (OsclAny*) & iContextObject, false, true));
             OSCL_FIRST_CATCH_ANY(error, PVPATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;