diff options
| author | PacketVideo CM <engbuild@pv.com> | 2010-03-19 17:52:59 -0700 |
|---|---|---|
| committer | PacketVideo CM <engbuild@pv.com> | 2010-03-19 17:52:59 -0700 |
| commit | 63411a201a0b67d9f29b4ce014bb93f074798dfe (patch) | |
| tree | 69284212620bdfd07aaf94c06dc6c4f8cbcf50b2 /engines/player/test | |
| parent | 90f1bbabdb53c4c6131e273d97686e7ea60f9b8d (diff) | |
| download | opencore-63411a201a0b67d9f29b4ce014bb93f074798dfe.tar.gz | |
RIO-8845: Revert RIO-8485
Change-Id: I1722eb99383ecf1cbcc9f3230208d1d33d1d8a2a
Diffstat (limited to 'engines/player/test')
3 files changed, 0 insertions, 22 deletions
diff --git a/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp b/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp index 6a3f06168..376d0edc6 100644 --- a/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp +++ b/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp @@ -339,13 +339,6 @@ int32 CreatePlaylist(const char* aFileName, PVMFFormatType& aFileType, char**& a invalidFileName += DEFAULT_INVALID_MP4_PLAYLIST; defaultPlaylist = true; } - else if (oscl_strstr(aFileName, ".wma") != NULL || oscl_strstr(aFileName, ".WMA") != NULL || - oscl_strstr(aFileName, ".asf") != NULL || oscl_strstr(aFileName, ".ASF") != NULL) - { - validFileName += DEFAULT_VALID_WMA_PLAYLIST; - invalidFileName += DEFAULT_INVALID_WMA_PLAYLIST; - defaultPlaylist = true; - } else if (oscl_strstr(aFileName, ".txt") != NULL || oscl_strstr(aFileName, ".TXT") != NULL) { // using input text file from command line diff --git a/engines/player/test/src/test_pv_player_engine_testset_playlist.h b/engines/player/test/src/test_pv_player_engine_testset_playlist.h index 9118a032d..38e684cef 100644 --- a/engines/player/test/src/test_pv_player_engine_testset_playlist.h +++ b/engines/player/test/src/test_pv_player_engine_testset_playlist.h @@ -338,15 +338,6 @@ class pvplayer_async_test_playlist_playback : public pvplayer_async_test_base iAlternateMimeType = PVMF_MIME_MPEG4FF; } } - else if (iFileType == PVMF_MIME_ASFFF) - { - iSinkFileNameSubString += _STRLIT_WCHAR("wma"); - - if (iInvalidMimeTypeTest) - { - iAlternateMimeType = PVMF_MIME_MP3FF; - } - } else //(iFileType == PVMF_MIME_MP4FF) { iSinkFileNameSubString += _STRLIT_WCHAR("mp4"); @@ -718,10 +709,6 @@ class pvplayer_async_test_playlist_seek_skip : public pvplayer_async_test_base { iSinkFileNameSubString += _STRLIT_WCHAR("mp3"); } - else if (iFileType == PVMF_MIME_ASFFF) - { - iSinkFileNameSubString += _STRLIT_WCHAR("wma"); - } else //(iFileType == PVMF_MIME_MP4FF) { iSinkFileNameSubString += _STRLIT_WCHAR("mp4"); diff --git a/engines/player/test/src/test_pv_player_engine_testset_playlist_clipinfo.h b/engines/player/test/src/test_pv_player_engine_testset_playlist_clipinfo.h index be62b2504..b311228d0 100644 --- a/engines/player/test/src/test_pv_player_engine_testset_playlist_clipinfo.h +++ b/engines/player/test/src/test_pv_player_engine_testset_playlist_clipinfo.h @@ -43,10 +43,8 @@ #define DEFAULT_VALID_MP3_PLAYLIST "test_valid_mp3_playlist.txt" #define DEFAULT_VALID_MP4_PLAYLIST "test_valid_mp4_playlist.txt" -#define DEFAULT_VALID_WMA_PLAYLIST "test_valid_wma_playlist.txt" #define DEFAULT_INVALID_MP3_PLAYLIST "test_invalid_mp3_playlist.txt" #define DEFAULT_INVALID_MP4_PLAYLIST "test_invalid_mp4_playlist.txt" -#define DEFAULT_INVALID_WMA_PLAYLIST "test_invalid_wma_playlist.txt" #define PLAYLIST_READ_BUFFER_SIZE 6 * 1024 |