Error handling during player initialization

Change-Id: I1f934298e93655991dd4a1ea32b0fe3e0b064f8c
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index f6dab5b..3bbdc6c 100644 (file)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -153,6 +153,8 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                rect.y = (clientRect.height - rect.height) / DIVIDE_BY_TWO;
                        }
 
+                       AppLogDebug("SCREEN_MODE_NORMAL : [%d][%d][%d][%d]", rect.x, rect.y, rect.width, rect.height);
+
                        if (destroyOverlay == true)
                        {
                                if (__pOverlayPanel != null)
@@ -185,7 +187,8 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
        case SCREEN_MODE_FULL:
                {
                        Rectangle rect = Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height);
-                       AppLogDebug("SetScreenMode [%d] [%d]", rect.height, rect.width);
+
+                       AppLogDebug("SCREEN_MODE_FULL : [%d][%d][%d][%d]", rect.x, rect.y, rect.width, rect.height);
 
                        if (destroyOverlay == true)
                        {
@@ -239,6 +242,8 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                rect.y = (clientRect.height - rect.height) / DIVIDE_BY_TWO;
                        }
 
+                       AppLogDebug("SCREEN_MODE_FIT : [%d][%d][%d][%d]", rect.x, rect.y, rect.width, rect.height);
+
                        if (destroyOverlay == true)
                        {
                                if (__pOverlayPanel != null)
@@ -302,7 +307,9 @@ VideoPlayerForm::OnInitializing(void)
        TryCatch(__pVideoPlayerPresentationModel != null, r = E_SYSTEM, "__pVideoPlayerPresentationModel is null");
 
        __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
+
        __pVideoPlayerPresentationModel->InitializePlayer();
+       TryCatch(r == E_SUCCESS, , "InitializePlayer() failed : %s", GetErrorMessage(r));
 
        __pVideoPlayerPresentationModel->SetVideoPlayerEventListener(this);
 

diff --git a/src/VpVideoPlayerPresentationModel.cpp b/src/VpVideoPlayerPresentationModel.cpp
index 8414f0f..2e68a2b 100644 (file)
--- a/src/VpVideoPlayerPresentationModel.cpp
+++ b/src/VpVideoPlayerPresentationModel.cpp
@@ -214,10 +214,11 @@ VideoPlayerPresentationModel::ConstructPlayerInstanceWithBufferInfo(void)
 
        __pPlayer = new (std::nothrow) Player();
 
-       __pPlayer->Construct(*this, &bufferInfo);
-
        AppLogDebug("__pPlayer [%x]", __pPlayer);
 
+       __pPlayer->Construct(*this, &bufferInfo);
+       TryCatch(r == E_SUCCESS, , "__pPlayer->Construct failed:%s", GetErrorMessage(r));
+
        return r;
 
 CATCH:
@@ -394,7 +395,8 @@ VideoPlayerPresentationModel::StartPlay(void)
 
                                if (GetRepeatMode() != REPEAT_TYPE_ONE)
                                {
-                                       InitializePlayer();
+                                       r = InitializePlayer();
+                                       TryCatch(r == E_SUCCESS, , "InitializePlayer() failed : %s", GetErrorMessage(r));
 
                                        r = __pPlayer->OpenFile(mediaPath);
                                        TryCatch(r == E_SUCCESS, , "__pPlayer->OpenFile() failed:%s", GetErrorMessage(r));
@@ -1061,18 +1063,21 @@ VideoPlayerPresentationModel::InitializePlayer(void)
        result r = E_SUCCESS;
 
        AppLogDebug("InitializePlayer");
+
        delete __pPlayer;
 
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferInfo);
+       TryCatch(r == E_SUCCESS, , "__pOverlayPanel->GetBackgroundBufferInfo failed:%s", GetErrorMessage(r));
 
        __pPlayer = new (std::nothrow) Player();
-       if (r == E_SUCCESS)
-       {
-               r = __pPlayer->Construct(*this, &bufferInfo);
-       }
-
        AppLogDebug("__pPlayer [%x]", __pPlayer);
 
+       r = __pPlayer->Construct(*this, &bufferInfo);
+       TryCatch(r == E_SUCCESS, , "__pPlayer->Construct failed:%s", GetErrorMessage(r));
+
+       return r;
+
+CATCH:
        return r;
 }