RIO-8707: Improvements at the Download Manager, Protocol Engine node in order to accomodate new Progressive Streaming protocols

Change-Id: If5918822e602a307dde35028b3ad8c85c42da139

3 files changed, 25 insertions, 0 deletions

diff --git a/engines/player/test/src/test_pv_player_engine.cpp b/engines/player/test/src/test_pv_player_engine.cpp
index cd9bc5f90..717a5fb30 100644
--- a/engines/player/test/src/test_pv_player_engine.cpp
+++ b/engines/player/test/src/test_pv_player_engine.cpp
@@ -3593,6 +3593,13 @@ void pvplayer_engine_test::test()
                 ((pvplayer_async_test_ppb_normal*)iCurrentTest)->iTestCaseName = _STRLIT_CHAR("MP4 Progressive Playback Start Pause Resume Seek Stop");
                 break;
 
+            case ProgPlaybackMPEG2UntilEOSTest:
+                testparam.iFileType = PVMF_MIME_DATA_SOURCE_ALS_URL;
+                iCurrentTest = new pvplayer_async_test_ppb_normal(testparam);
+                ((pvplayer_async_test_ppb_normal*)iCurrentTest)->enablePlayUntilEOS();
+                ((pvplayer_async_test_ppb_normal*)iCurrentTest)->iTestCaseName = _STRLIT_CHAR("MPEG-2 Progressive Playback Until EOS");
+                break;
+
 
             case ShoutcastPlayback5MinuteTest:
                 testparam.iFileType = PVMF_MIME_DATA_SOURCE_SHOUTCAST_URL;
diff --git a/engines/player/test/src/test_pv_player_engine.h b/engines/player/test/src/test_pv_player_engine.h
index 33530e800..af4e152f7 100644
--- a/engines/player/test/src/test_pv_player_engine.h
+++ b/engines/player/test/src/test_pv_player_engine.h
@@ -923,6 +923,14 @@ class pvplayer_engine_test
             * Output YUV and PCM data files from Playback.
             */
             ProgPlaybackMP4StartPauseResumeSeekStopTest, //162
+            /**
+            * @test (163) Progressive Playback until EOS Test
+            * Input http url to a M3U8 file.
+            * Default url is an http url to an MPEG-2 file.
+            * Output YUV and PCM data files from Playback.
+            */
+            ProgPlaybackMPEG2UntilEOSTest, //163
+
 
             LastProgressivePlaybackTest, //placeholder
 
diff --git a/engines/player/test/src/test_pv_player_engine_testset5.cpp b/engines/player/test/src/test_pv_player_engine_testset5.cpp
index c18d1524d..efba250ab 100644
--- a/engines/player/test/src/test_pv_player_engine_testset5.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset5.cpp
@@ -137,6 +137,7 @@
 
 #define DEFAULT_SMOOTHSTREAMING_URL "http://wms2008.pv.com:8080/SSContent/BendIt2/BendIt_5min.ism/Manifest"
 
+#define DEFAULT_ALS_URL "http://devimages.apple.com/iphone/samples/bipbop/gear1/prog_index.m3u8"
 
 extern FILE* file;
 
@@ -4885,6 +4886,11 @@ void pvplayer_async_test_ppb_normal::CreateDataSource()
             fprintf(file, "Setting source to %s\n", DEFAULT_SMOOTHSTREAMING_URL);
             url = DEFAULT_SMOOTHSTREAMING_URL;
         }
+        else if (iFileType == PVMF_MIME_DATA_SOURCE_ALS_URL)
+        {
+            fprintf(file, "Setting source to %s\n", DEFAULT_ALS_URL);
+            url = DEFAULT_ALS_URL;
+        }
         else
         {
             // progressive playback
@@ -4934,6 +4940,10 @@ void pvplayer_async_test_ppb_normal::CreateDataSource()
         {
             iDataSource->SetDataSourceFormatType(PVMF_MIME_DATA_SOURCE_SMOOTH_STREAMING_URL);
         }
+        else if (iFileType == PVMF_MIME_DATA_SOURCE_ALS_URL)
+        {
+            iDataSource->SetDataSourceFormatType(PVMF_MIME_DATA_SOURCE_ALS_URL);
+        }
         else
         {
             iDataSource->SetDataSourceFormatType(PVMF_MIME_DATA_SOURCE_HTTP_URL);