Fix the bugs on VPSS-963

Change-Id: I510f0bbefcd319becb71e4cb7fe73f8435729c1a
Signed-off-by: EonseokLee <eonseok.lee@samsung.com>

diff --git a/src/FMedia_PlayerImpl.cpp b/src/FMedia_PlayerImpl.cpp
index ff8a260..c8152a5 100644 (file)
--- a/src/FMedia_PlayerImpl.cpp
+++ b/src/FMedia_PlayerImpl.cpp
@@ -1154,6 +1154,7 @@ result
 _PlayerImpl::CaptureVideo(void)
 {
        result r = E_SUCCESS;
+       result res = E_SUCCESS;
        int ret = ::PLAYER_ERROR_NONE;
        bool playbackFlag = false;
 
@@ -1194,11 +1195,11 @@ CATCH:
        if (playbackFlag)
        {
                ret = player_stop(__hPlayer);
-               r = MapExceptionToResult(ret);
-               SysTryLog(NID_MEDIA,r==E_SUCCESS, "[%s] Failed to perform player_stop operation with - 0x%x ", GetErrorMessage(r), ret);
+               res = MapExceptionToResult(ret);
+               SysTryLog(NID_MEDIA,res == E_SUCCESS, "[%s] Failed to perform player_stop operation with - 0x%x ", GetErrorMessage(res), ret);
 
-               r = SetVolume(__currentVolume);
-               SysTryLog(NID_MEDIA,r == E_SUCCESS, "[%s] Propagating ", GetErrorMessage(r));
+               res = SetVolume(__currentVolume);
+               SysTryLog(NID_MEDIA,res == E_SUCCESS, "[%s] Propagating ", GetErrorMessage(res));
 
                playbackFlag = false;
        }
@@ -2310,7 +2311,7 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col
 
                const HashMap *pMapHeader = dynamic_cast<const HashMap *>(pHeader);
                SysTryCatch(NID_MEDIA, pMapHeader != null, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred.");
-               pMapHeader->ContainsKey(String("Cookie"), containsCookie);
+               r = pMapHeader->ContainsKey(String("Cookie"), containsCookie);
                if (r != E_SUCCESS)
                {
                        SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::ContainsKey operation", GetErrorMessage(r));
@@ -2324,6 +2325,8 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col
                                if (pCookieChars.get())
                                {
                                        err = player_set_streaming_cookie(__hPlayer, pCookieChars.get(),pCookieValue->GetLength());
+                                       r = MapExceptionToResult(err);
+                                       SysTryCatch(NID_MEDIA, r == E_SUCCESS, , r, "[%s] Failed to perform player_set_streaming_cookie with - 0x%x", GetErrorMessage(r), err);
                                }
                        }
                        else
@@ -2332,7 +2335,7 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col
                                SysLogException(NID_MEDIA, r, "[%s]Failed to perform HashMap::GetValue(Cookie) operation.", GetErrorMessage(r));
                        }
                }
-               pMapHeader->ContainsKey(String("User-Agent"), containsUserAgent);
+               r = pMapHeader->ContainsKey(String("User-Agent"), containsUserAgent);
                if (r != E_SUCCESS)
                {
                        SysLogException(NID_MEDIA, r, "[%s]Failed to perform HashMap::ContainsKey operation.", GetErrorMessage(r));
@@ -2343,7 +2346,12 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col
                        if (pUserAgentValue.get())
                        {
                                pUsetAgentChars.reset(_StringConverter::CopyToCharArrayN(*(pUserAgentValue.get())));
-                               err = player_set_streaming_cookie(__hPlayer, pUsetAgentChars.get(),pUserAgentValue->GetLength());
+                               if (pUsetAgentChars.get())
+                               {
+                                       err = player_set_streaming_user_agent(__hPlayer, pUsetAgentChars.get(),pUserAgentValue->GetLength());
+                                       r = MapExceptionToResult(err);
+                                       SysTryCatch(NID_MEDIA, r == E_SUCCESS, , r, "[%s] Failed to perform player_set_streaming_user_agent with - 0x%x", GetErrorMessage(r), err);
+                               }
                        }
                        else
                        {
@@ -2545,7 +2553,7 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur
        {
                const HashMap *pMapHeader = dynamic_cast<const HashMap *>(pHeader);
                SysTryCatch(NID_MEDIA, pMapHeader != null, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred.");
-               pMapHeader->ContainsKey(String("Cookie"), containsCookie);
+               r = pMapHeader->ContainsKey(String("Cookie"), containsCookie);
                if (r != E_SUCCESS)
                {
                        SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::ContainsKey operation.", GetErrorMessage(r));
@@ -2559,6 +2567,8 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur
                                if (pCookieChars.get())
                                {
                                        err = player_set_streaming_cookie(__hPlayer, pCookieChars.get(),pCookieValue->GetLength());
+                                       r = MapExceptionToResult(err);
+                                       SysTryCatch(NID_MEDIA, r == E_SUCCESS, , r, "[%s] Failed to perform player_set_streaming_cookie with - 0x%x", GetErrorMessage(r), err);
                                }
                        }
                        else
@@ -2567,7 +2577,7 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur
                                SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::GetValue(Cookie) operation.", GetErrorMessage(r));
                        }
                }
-               pMapHeader->ContainsKey(String("User-Agent"), containsUserAgent);
+               r = pMapHeader->ContainsKey(String("User-Agent"), containsUserAgent);
                if (r != E_SUCCESS)
                {
                        SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::ContainsKey operation.", GetErrorMessage(r));
@@ -2578,7 +2588,12 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur
                        if (pUserAgentValue.get())
                        {
                                pUsetAgentChars.reset(_StringConverter::CopyToCharArrayN(*(pUserAgentValue.get())));
-                               err = player_set_streaming_user_agent(__hPlayer, pUsetAgentChars.get(),pUserAgentValue->GetLength());
+                               if (pUsetAgentChars.get())
+                               {
+                                       err = player_set_streaming_user_agent(__hPlayer, pUsetAgentChars.get(),pUserAgentValue->GetLength());
+                                       r = MapExceptionToResult(err);
+                                       SysTryCatch(NID_MEDIA, r == E_SUCCESS, , r, "[%s] Failed to perform player_set_streaming_user_agent with - 0x%x", GetErrorMessage(r), err);
+                               }
                        }
                        else
                        {