RIO-7825: Added player engine test cases for a CPM plugin.

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index e4b6990..27c08b9 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1167984"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1168150"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100106
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index e7bc1d0..526e654 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1167984"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1168150"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100106
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 0097d6e..917105d 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1167984"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1168150"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100106
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/engines/player/test/src/test_pv_player_engine.cpp b/engines/player/test/src/test_pv_player_engine.cpp
index 402164a..d69ca7e 100644 (file)
--- a/engines/player/test/src/test_pv_player_engine.cpp
+++ b/engines/player/test/src/test_pv_player_engine.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.
@@ -3746,6 +3746,10 @@ void pvplayer_engine_test::test()
                 fprintf(file, "PlayReady CPM tests not enabled\n");
                 break;
 
+            case NonSilentLicAcquire_LUIUrlRetrieval_PlayReadyCPMTest:
+                fprintf(file, "PlayReady CPM tests not enabled\n");
+                break;
+
             case DLA_OpenPlayStop_PlayReadyCPMTest_zero_http_redirect:
                 fprintf(file, "PlayReady CPM tests not enabled\n");
                 break;
@@ -3875,6 +3879,10 @@ void pvplayer_engine_test::test()
                 fprintf(file, "PlayReady CPM tests not enabled\n");
                 break;
 
+            case LUIUrlParsing_PlayReadyCPMTest:
+                fprintf(file, "PlayReady CPM tests not enabled\n");
+                break;
+
             case ContentHeaderRetrieval_PlayReadyCPMTest:
                 fprintf(file, "PlayReady CPM tests not enabled\n");
                 break;

diff --git a/engines/player/test/src/test_pv_player_engine.h b/engines/player/test/src/test_pv_player_engine.h
index ab480dd..d597726 100644 (file)
--- a/engines/player/test/src/test_pv_player_engine.h
+++ b/engines/player/test/src/test_pv_player_engine.h
@@ -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.
@@ -2243,42 +2243,44 @@ class pvplayer_engine_test : public test_case,
             DLA_MeteringByMeterURL_PlayReadyCPMTest,//1433
             DLA_LicenseUpdateAll_PlayReadyCPMTest,//1434
             DLA_LicenseUpdateExpired_PlayReadyCPMTest,//1435
+            NonSilentLicAcquire_LUIUrlRetrieval_PlayReadyCPMTest,//1436
+            LUIUrlParsing_PlayReadyCPMTest, //1437
 
             //Utility Web-initiator tests
-            WebInitiatorParsing_PlayReadyCPMTest, //1436
-            WebInitiatorLicAcq_PlayReadyCPMTest, //1437
-            WebInitiatorLicAcqDomainBound_PlayReadyCPMTest, //1438
-            WebInitiatorMetering_PlayReadyCPMTest, //1439
-            WebInitiatorJoinAndLeaveDomain_PlayReadyCPMTest, //1440
+            WebInitiatorParsing_PlayReadyCPMTest, //1438
+            WebInitiatorLicAcq_PlayReadyCPMTest, //1439
+            WebInitiatorLicAcqDomainBound_PlayReadyCPMTest, //1440
+            WebInitiatorMetering_PlayReadyCPMTest, //1441
+            WebInitiatorJoinAndLeaveDomain_PlayReadyCPMTest, //1442
 
 
             //PlayReady Cancel tests
-            DLA_CancelAcquireLicense_PlayReadyCPMTest_v2_Content,//1441
-            DLA_CancelJoinDomain_PlayReadyCPMTest, //1442
+            DLA_CancelAcquireLicense_PlayReadyCPMTest_v2_Content,//1443
+            DLA_CancelJoinDomain_PlayReadyCPMTest, //1444
 
             //PlayReady streaming tests.
-            DLA_StreamingOpenPlayUntilEOST_PlayReadyCPMTest,//1443
-            DLA_StreamingOpenPlayPausePlayUntilEOS_PlayReadyCPMTest,//1444
-            DLA_StreamingOpenPlaySeekPlayUntilEOS_PlayReadyCPMTest,//1445
-            DLA_StreamingMultiplePlayUntilEOS_PlayReadyCPMTest,//1446
-            DLA_StreamingCancelAcquireLicense_PlayReadyCPMTest,//1447
-            DLA_StreamingProtocolRollOverTest_PlayReadyCPMTest,//1448
-            DLA_StreamingProtocolRollOverTestWithUnknownURLType_PlayReadyCPMTest,//1449
-            DLA_PDL_OpenPlayUntilEOS_PlayreadyCPMTest_v4_WMA,//1450
-            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_WMV,//1451
-            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_AAC,//1452
-            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_H264,//1453
-            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_H264_AAC,//1454
-
-            DLA_PPB_OpenPlayUntilEOS_PlayreadyCPMTest_v4_WMA,//1455
-            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_WMV,//1456
-            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_AAC,//1457
-            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_H264,//1458
-            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_H264_AAC,//1459
+            DLA_StreamingOpenPlayUntilEOST_PlayReadyCPMTest,//1445
+            DLA_StreamingOpenPlayPausePlayUntilEOS_PlayReadyCPMTest,//1446
+            DLA_StreamingOpenPlaySeekPlayUntilEOS_PlayReadyCPMTest,//1447
+            DLA_StreamingMultiplePlayUntilEOS_PlayReadyCPMTest,//1448
+            DLA_StreamingCancelAcquireLicense_PlayReadyCPMTest,//1449
+            DLA_StreamingProtocolRollOverTest_PlayReadyCPMTest,//1450
+            DLA_StreamingProtocolRollOverTestWithUnknownURLType_PlayReadyCPMTest,//1451
+            DLA_PDL_OpenPlayUntilEOS_PlayreadyCPMTest_v4_WMA,//1452
+            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_WMV,//1453
+            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_AAC,//1454
+            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_H264,//1455
+            DLA_PDL_OpenPlayStop_PlayreadyCPMTest_v4_H264_AAC,//1456
+
+            DLA_PPB_OpenPlayUntilEOS_PlayreadyCPMTest_v4_WMA,//1457
+            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_WMV,//1458
+            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_AAC,//1459
+            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_H264,//1460
+            DLA_PPB_OpenPlayStop_PlayreadyCPMTest_v4_H264_AAC,//1461
 
             //Miscellaneous tests
-            ContentHeaderRetrieval_PlayReadyCPMTest, //1460
-            LicenseCountVerification_PlayReadyCPMTest, //1461
+            ContentHeaderRetrieval_PlayReadyCPMTest, //1462
+            LicenseCountVerification_PlayReadyCPMTest, //1463
 
             //RESERVED FOR FUTURE PLAYREADY CPM TESTS.
             LastPlayReadyCPMTest = 1599,//placeholder

diff --git a/pvmi/pvmf/include/pvmf_return_codes.h b/pvmi/pvmf/include/pvmf_return_codes.h
index e076965..f192f31 100644 (file)
--- a/pvmi/pvmf/include/pvmf_return_codes.h
+++ b/pvmi/pvmf/include/pvmf_return_codes.h
@@ -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.
@@ -269,6 +269,10 @@ Error due to device currently not activated for drm-protected content playback
 */
 const PVMFStatus PVMFErrDrmDeviceNotActivated = (-52);
 /*
+Service specific server error.
+*/
+const PVMFStatus PVMFErrDrmServerServiceSpecific = (-53);
+/*
 ... this range reserved for future DRM-related errors
 */
 /*