commit 3813ec750c8bf95aedf95ade20ef9543c79f0338
author Zhao Liang <leo.zhao@intel.com> Tue Sep 10 14:01:14 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:42 2014 -0700
tree 9bf478df4bce4e6c9f186650d5e8c6c57ed87a43
parent 014d73906cd874387e9e05dbdb608e95d51df8ac

[port from R42TW] Fix race condition for frame type judging

BZ: 137717

When start encoding frame, if at this time, user send IDR request,
it is possible to have race condition for frame type, so re-calculate
in sendEncodeCommand

Change-Id: Iddf6b6569bc9f85efda8cc3372d2e65c699e3021
Signed-off-by: Zhao Liang <leo.zhao@intel.com>
Reviewed-on: http://android.intel.com:8080/130948
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>
Reviewed-on: http://android.intel.com:8080/140121
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>

videoencoder/VideoEncoderAVC.cpp

diff --git a/videoencoder/VideoEncoderAVC.cpp b/videoencoder/VideoEncoderAVC.cpp
index 6deeac6..0c021dc 100644
--- a/videoencoder/VideoEncoderAVC.cpp
+++ b/videoencoder/VideoEncoderAVC.cpp
@@ -656,7 +656,11 @@
         mFrameNum = 0;
         ret = renderSequenceParams(task);
         CHECK_ENCODE_STATUS_RETURN("renderSequenceParams");
-        mNewHeader = false; //Set to require new header filed to false
+        if (mNewHeader) {
+            mNewHeader = false; //Set to require new header filed to false
+            mFrameNum = 0; //reset mFrameNum to 0
+            updateFrameInfo(task); //recalculate frame info if mNewHeader is set true after PrepareFrameInfo in encode()
+        }
     }
 
     if (mRenderMaxSliceSize && mVideoParamsAVC.maxSliceSize != 0) {