提交: 896316a21f72c9599f2bc4cd504b9256cb6649fb - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• 修订版: 896316a21f72c9599f2bc4cd504b9256cb6649fb (tree)
• 时间: 2015-03-24 13:05:25
• 作者: Olivier Crete <olivier.crete@coll...>
• Commiter: Xiang, Haihao

Log Message

gen7_mfd: Optimise start code search

Code inspired from GStreamer

See https://bugs.freedesktop.org/show_bug.cgi?id=89507

Signed-off-by: Olivier Crete <[e-mail]>

更改概述

• modified: src/gen7_mfd.c

差异

--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -1043,21 +1043,29 @@ uint32_t mpeg2_get_slice_data_length(dri_bo *slice_data_bo, VASliceParameterBuff
     uint8_t *buf;
     uint32_t buf_offset = slice_param->slice_data_offset + (slice_param->macroblock_offset >> 3);
     uint32_t buf_size = slice_param->slice_data_size - (slice_param->macroblock_offset >> 3);
-    uint32_t i;
+    uint32_t i = 0;
 
     dri_bo_map(slice_data_bo, 0);
     buf = (uint8_t *)slice_data_bo->virtual + buf_offset;
 
-    for (i = 3; i < buf_size; i++) {
-        if (buf[i - 3] &&
-            !buf[i - 2] &&
-            !buf[i - 1] &&
-            !buf[i]) {
-            dri_bo_unmap(slice_data_bo);
-            return i - 3 + 1;
-        }
+    if (buf_size < 4)
+      return buf_size;
+
+    while (i <= (buf_size - 4)) {
+      if (buf[i + 2] > 1) {
+        i += 3;
+      } else if (buf[i + 1]) {
+        i += 2;
+      } else if (buf[i] || buf[i + 2] != 1) {
+        i++;
+      } else {
+        break;
+      }
     }
 
+    if (i <= (buf_size - 4))
+      buf_size = i;
+
     dri_bo_unmap(slice_data_bo);
     return buf_size;
 }