E_STORAGE_FULL conditioned handled in videoencoder:N_SE-41729

Signed-off-by: rahul varna <rahul.varna@samsung.com>

diff --git a/project/src/Codec/AudioEncoderForm.cpp b/project/src/Codec/AudioEncoderForm.cpp
index 7a586e4..2b922ac 100644 (file)
--- a/project/src/Codec/AudioEncoderForm.cpp
+++ b/project/src/Codec/AudioEncoderForm.cpp
@@ -606,6 +606,7 @@ AudioEncoderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
        break;
        case ID_ERROR_POPUP:
                ClearErrorPopup();
+               Deactivate();
                break;
        default:
                break;
@@ -822,10 +823,13 @@ AudioEncoderForm::ContinueAudioEncoding(void)
                                {
                                        byte adtsHeader[ADTS_HEADER_SIZE];
                                        FillAdtsHeader(adtsHeader, __channelCount, __sampleRate, __pDstBuf->GetLimit());
-                                       __pDestFile->Write(adtsHeader, sizeof(adtsHeader));
+                                       r = __pDestFile->Write(adtsHeader, sizeof(adtsHeader));
+                                       TryCatch( r == E_SUCCESS, __curState = STATE_ERROR, "Error Occurred" );
                                }
-                               __pDestFile->Write(*__pDstBuf);
-                               __pDestFile->Flush();
+                               r = __pDestFile->Write(*__pDstBuf);
+                               TryCatch( r == E_SUCCESS, __curState = STATE_ERROR, "Error Occurred" );
+                               r = __pDestFile->Flush();
+                               TryCatch( r == E_SUCCESS, __curState = STATE_ERROR, "Error Occurred" );
                        }
                }
                return;
@@ -847,7 +851,7 @@ CATCH:
        {
                __pProgressBar->SetValue(0);
        }
-
+       __encodeFailReason = r;
        SendUserEvent(ENCODE_FAIL, null);
 
        return;
@@ -1198,7 +1202,7 @@ AudioEncoderForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collect
                SAFE_DELETE(__pEnc);
                SAFE_DELETE(__pSrcBuf);
                SAFE_DELETE(__pDstBuf);
-               ShowError(E_SYSTEM, METHOD_FILE_LINENO);
+               ShowError(__encodeFailReason, METHOD_FILE_LINENO);
 
        }
        break;

diff --git a/project/src/Codec/AudioEncoderForm.h b/project/src/Codec/AudioEncoderForm.h
index ecdd38a..3cc04a5 100644 (file)
--- a/project/src/Codec/AudioEncoderForm.h
+++ b/project/src/Codec/AudioEncoderForm.h
@@ -177,6 +177,7 @@ private:
        int __totalEncodingTime;
        int __totalDecodingTime;
        bool __codecToggle;
+       result __encodeFailReason;
        PcmPitchControl* __pPcmPitchCtrl;
 };
 

diff --git a/project/src/Codec/VideoEncoderForm.cpp b/project/src/Codec/VideoEncoderForm.cpp
index 0a5c6ee..e2df072 100644 (file)
--- a/project/src/Codec/VideoEncoderForm.cpp
+++ b/project/src/Codec/VideoEncoderForm.cpp
@@ -665,6 +665,7 @@ VideoEncoderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
        break;
        case ID_ERROR_POPUP:
                ClearErrorPopup();
+               Deactivate();
        break;
        default:
                break;
@@ -985,16 +986,11 @@ VideoEncoderForm::ContinueEncoding(void)
                        SystemTime::GetTicks(ticks1);
 
                        r = __pEnc->Encode(*__pSrcBuf, *__pDstBuf);
+                       TryCatch( r == E_SUCCESS, __curState = STATE_ERROR, "Error Occurred" );
 
                        SystemTime::GetTicks(ticks2);
                        __totalEncodingTime = __totalEncodingTime +(ticks2-ticks1);
 
-                       if (r != E_SUCCESS)
-                       {
-                               __curState = STATE_ERROR;
-                               goto FAIL;
-                       }
-
                        __consumedByte += __pSrcBuf->GetPosition();
 
                        __pDstBuf->Flip();
@@ -1006,9 +1002,9 @@ VideoEncoderForm::ContinueEncoding(void)
                                AppLog("Video Encoded Data Size = %d", encodedDataSize);
                                if (__dumpFlag == true)
                                {
-                                       __pEncOutputFile->Write(*__pDstBuf);
+                                       r = __pEncOutputFile->Write(*__pDstBuf);
+                                       TryCatch( r == E_SUCCESS, __curState = STATE_ERROR, "Error Occurred" );
                                }
-
                                DisplayFrame(true, __pSrcBuf);
                        }
 
@@ -1034,7 +1030,7 @@ VideoEncoderForm::ContinueEncoding(void)
 
        return E_SUCCESS;
 
-FAIL:
+CATCH:
        AppLogException("Video Encoding  Failed");
        if (__pProgressBar != null && __appTerminating == false)
        {
@@ -1044,6 +1040,7 @@ FAIL:
        {
                return E_FAILURE;
        }
+       __encodeFailReason = r;
        SendUserEvent(ENCODE_FAIL, null);
 
        return r;
@@ -1427,7 +1424,7 @@ VideoEncoderForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collect
                SAFE_DELETE(__pSrcFile);
                SAFE_DELETE(__pSrcBuf);
                SAFE_DELETE(__pDstBuf);
-
+               ShowError(__encodeFailReason, METHOD_FILE_LINENO);
                AppLog(" Completed ENCODE_DONE: ");
        }
        break;

diff --git a/project/src/Codec/VideoEncoderForm.h b/project/src/Codec/VideoEncoderForm.h
index 12983e1..ed8ff13 100644 (file)
--- a/project/src/Codec/VideoEncoderForm.h
+++ b/project/src/Codec/VideoEncoderForm.h
@@ -185,6 +185,7 @@ private:
        int __totalEncodingTime;
        int __totalDecodingTime;
        bool __codecToggle;
+       result __encodeFailReason;
 };
 
 #endif  //_VIDEO_ENCODER_FORM_H_