commit fb0aa18ee8e67ecbfe3e223218493da1899ae47b
author Li Zeng <li.zeng@intel.com> Sat Nov 02 05:28:55 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:44 2014 -0700
tree ee5742b271b51a6bf0608c7d3cc41aab38fe0883
parent b6e058961dd963f35d7a949fe23762f0fe8e8dc2

libmix: revist error reporting code

BZ: 147912

revist error reporting code

Change-Id: Ibdbab27f31d9cbc19a3db8e75a7f2b9d19e05504
Signed-off-by: Li Zeng <li.zeng@intel.com>

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index b6874da..cf20c24 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -233,9 +233,8 @@
         }
         vaStatus = vaSetTimestampForSurface(mVADisplay, outputByPos->renderBuffer.surface, outputByPos->renderBuffer.timeStamp);
         if (useGraphicBuffer) {
-            if (vaSyncSurface(mVADisplay, outputByPos->renderBuffer.surface) == VA_STATUS_ERROR_DECODING_ERROR) {
-                fillDecodingErrors(&(outputByPos->renderBuffer));
-            }
+            vaSyncSurface(mVADisplay, outputByPos->renderBuffer.surface);
+            fillDecodingErrors(&(outputByPos->renderBuffer));
         }
         if (draining && mOutputTail == NULL) {
             outputByPos->renderBuffer.flag |= IS_EOS;
@@ -290,9 +289,8 @@
     vaStatus = vaSetTimestampForSurface(mVADisplay, output->renderBuffer.surface, output->renderBuffer.timeStamp);
 
     if (useGraphicBuffer) {
-        if (vaSyncSurface(mVADisplay, output->renderBuffer.surface) == VA_STATUS_ERROR_DECODING_ERROR) {
-            fillDecodingErrors(&(output->renderBuffer));
-        }
+        vaSyncSurface(mVADisplay, output->renderBuffer.surface);
+        fillDecodingErrors(&(output->renderBuffer));
     }
 
     if (draining && mOutputTail == NULL) {
@@ -1361,8 +1359,10 @@
     if (mErrReportEnabled) {
         CurrentSurface->errBuf.timeStamp = CurrentSurface->timeStamp;
         // TODO: is 10 a suitable number?
-        VASurfaceDecodeMBErrors err_drv_output[MAX_ERR_NUM - 1];
+        VASurfaceDecodeMBErrors *err_drv_output;
         ret = vaQuerySurfaceError(mVADisplay, CurrentSurface->surface, VA_STATUS_ERROR_DECODING_ERROR, (void **)&err_drv_output);
+        if (ret)
+            return;
         for (int i = CurrentSurface->errBuf.errorNumber; i < MAX_ERR_NUM - 1; i++) {
             if (err_drv_output[i].status != -1) {
                 CurrentSurface->errBuf.errorNumber++;