release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4352002 snap-temp-L88700000105039240

Change-Id: Ic34f6e347a0a7ffd0d77bcab7dbcf345e434367c

6 files changed, 96 insertions, 93 deletions

diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index cb31953..bfeb46a 100644
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -1974,6 +1974,8 @@ void QCamera3RawChannel::convertMipiToRaw16(mm_camera_buf_def_t *frame)
 
         uint32_t raw16_stride = ((uint32_t)dim.width + 15U) & ~15U;
         uint16_t* raw16_buffer = (uint16_t *)frame->buffer;
+        uint8_t first_quintuple[5];
+        memcpy(first_quintuple, raw16_buffer, sizeof(first_quintuple));
 
         // Some raw processing may be needed prior to conversion.
         static bool raw_proc_lib_load_attempted = false;
@@ -2007,13 +2009,19 @@ void QCamera3RawChannel::convertMipiToRaw16(mm_camera_buf_def_t *frame)
             for (int32_t xs = dim.width - 1; xs >= 0; xs--) {
                 uint32_t x = (uint32_t)xs;
                 uint8_t upper_8bit = row_start[5*(x/4)+x%4];
-                uint8_t lower_2bit = ((row_start[5*(x/4)+4] >> (x%4)) & 0x3);
+                uint8_t lower_2bit = ((row_start[5*(x/4)+4] >> ((x%4) << 1)) & 0x3);
                 uint16_t raw16_pixel =
                         (uint16_t)(((uint16_t)upper_8bit)<<2 |
                         (uint16_t)lower_2bit);
                 raw16_buffer[y*raw16_stride+x] = raw16_pixel;
             }
         }
+
+        // Re-convert the first 2 pixels of the buffer because the loop above messes
+        // them up by reading the first quintuple while modifying it.
+        raw16_buffer[0] = ((uint16_t)first_quintuple[0]<<2) | (first_quintuple[4] & 0x3);
+        raw16_buffer[1] = ((uint16_t)first_quintuple[1]<<2) | ((first_quintuple[4] >> 2) & 0x3);
+
     } else {
         ALOGE("%s: Could not find stream", __func__);
     }
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index da4a689..dc2a042 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -14,139 +14,138 @@
      limitations under the License.
 -->
 
-<!-- Generated file for angler using measurements between OPR1.170623.008 and OPM1.170904.001 -->
+<!-- Generated file for angler using measurements between OPM1.170720.001 and OPM1.170912.002 -->
 <MediaCodecs>
+    <!-- Measurements between OPR1.170623.010 and OPM1.170906.002 -->
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <!-- measured 98%:120-525 med:177/177 variance:2.1 -->
-            <Limit name="measured-frame-rate-176x144" range="177-325" /> <!-- N=126 -->
-            <Limit name="measured-frame-rate-352x288" range="283-283" /> <!-- N=116 v98%=1.6 -->
+            <!-- measured 98%:120-525 med:183/183 variance:2.1 -->
+            <Limit name="measured-frame-rate-176x144" range="179-321" /> <!-- N=128 -->
+            <Limit name="measured-frame-rate-352x288" range="284-284" /> <!-- N=118 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <!-- measured 98%:129-525 med:288/285 FLAKY(mn=122.1 < 128 - 572) variance:2.0 -->
-            <Limit name="measured-frame-rate-320x240" range="256-286" /> <!-- N=116 -->
-            <!-- measured 98%:82-203 med:163/163 FLAKY(mn=81.2 < 82 - 326) -->
-            <Limit name="measured-frame-rate-720x480" range="163-163" /> <!-- N=116 v98%=1.6 -->
-            <Limit name="measured-frame-rate-1280x720" range="67-68" /> <!-- N=116 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=116 v98%=1.4 -->
+            <!-- measured 98%:129-525 med:288/285 FLAKY(mn=122.1 < 129 - 570) variance:2.0 -->
+            <Limit name="measured-frame-rate-320x240" range="257-285" /> <!-- N=118 -->
+            <!-- measured 98%:76-203 med:163/163 FLAKY(mn=59.4 < 76 - 326) -->
+            <Limit name="measured-frame-rate-720x480" range="118-163" /> <!-- TWEAKED N=118 v98%=1.6 -->
+            <Limit name="measured-frame-rate-1280x720" range="67-68" /> <!-- N=118 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=118 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="284-311" /> <!-- N=116 v98%=1.6 -->
-            <Limit name="measured-frame-rate-720x480" range="156-156" /> <!-- N=116 v98%=1.5 -->
-            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=116 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=116 v98%=1.2 -->
-            <!-- measured 98%:7-34 med:14/15 variance:2.2 -->
-            <Limit name="measured-frame-rate-3840x2160" range="12-20" /> <!-- N=118 -->
+            <Limit name="measured-frame-rate-320x240" range="285-309" /> <!-- N=118 v98%=1.6 -->
+            <Limit name="measured-frame-rate-720x480" range="157-157" /> <!-- N=118 v98%=1.5 -->
+            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=118 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=118 v98%=1.3 -->
+            <!-- measured 98%:7-33 med:14/14 variance:2.2 -->
+            <Limit name="measured-frame-rate-3840x2160" range="11-20" /> <!-- N=120 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <!-- measured 98%:111-400 med:174/172 FLAKY(86 - 400 < mx=406.2) -->
-            <Limit name="measured-frame-rate-176x144" range="172-200" /> <!-- N=130 v98%=1.9 -->
-            <Limit name="measured-frame-rate-352x288" range="222-222" /> <!-- N=116 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x480" range="85-85" /> <!-- N=116 v98%=1.0 -->
+            <!-- measured 98%:111-406 med:175/173 FLAKY(87 - 406 < mx=406.2) -->
+            <Limit name="measured-frame-rate-176x144" range="173-203" /> <!-- N=132 v98%=1.9 -->
+            <Limit name="measured-frame-rate-352x288" range="222-222" /> <!-- N=118 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x480" range="85-85" /> <!-- N=118 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="122-122" /> <!-- N=116 v98%=1.0 -->
-            <Limit name="measured-frame-rate-640x360" range="113-113" /> <!-- N=110 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="39-39" /> <!-- N=116 v98%=1.0 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=116 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="122-122" /> <!-- N=118 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="113-113" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="39-39" /> <!-- N=116 v98%=1.0 (OPR1.170623.009-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=118 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="235-235" /> <!-- N=116 v98%=1.3 -->
+            <Limit name="measured-frame-rate-176x144" range="234-234" /> <!-- N=118 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <!-- measured 98%:129-364 med:228/233 FLAKY(mn=113.4 < 114 - 466) -->
-            <Limit name="measured-frame-rate-320x240" range="228-233" /> <!-- N=116 v98%=1.7 -->
-            <!-- measured 98%:53-124 med:86/87 FLAKY(mn=35.7 < 43 - 180) -->
-            <Limit name="measured-frame-rate-720x480" range="71-90" /> <!-- TWEAKED N=116 v98%=1.5 -->
-            <Limit name="measured-frame-rate-1280x720" range="41-48" /> <!-- N=116 v98%=1.7 -->
-            <Limit name="measured-frame-rate-1920x1080" range="17-22" /> <!-- N=120 v98%=1.7 -->
+            <!-- measured 98%:113-364 med:227/232 FLAKY(mn=90.3 < 113 - 464) -->
+            <Limit name="measured-frame-rate-320x240" range="180-232" /> <!-- TWEAKED N=118 v98%=1.8 -->
+            <!-- measured 97%:48-124 med:85/86 FLAKY(mn=29.1 < 43 - 178) -->
+            <Limit name="measured-frame-rate-720x480" range="58-89" /> <!-- TWEAKED N=118 v97%=1.6 -->
+            <Limit name="measured-frame-rate-1280x720" range="41-46" /> <!-- N=118 v98%=1.7 -->
+            <Limit name="measured-frame-rate-1920x1080" range="17-22" /> <!-- N=122 v98%=1.7 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="268-269" /> <!-- N=116 v98%=1.3 -->
+            <Limit name="measured-frame-rate-176x144" range="268-269" /> <!-- N=118 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="96-96" /> <!-- N=116 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="37-37" /> <!-- N=116 v98%=1.0 -->
-            <Limit name="measured-frame-rate-1280x720" range="29-31" /> <!-- N=116 v98%=1.3 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1920x1080" range="13-14" /> <!-- N=116 v98%=1.5 -->
+            <Limit name="measured-frame-rate-320x180" range="96-96" /> <!-- N=118 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="37-37" /> <!-- N=118 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="27-30" /> <!-- N=116 v98%=1.3 (OPR1.170623.009-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="13-13" /> <!-- N=118 v98%=1.5 -->
         </MediaCodec>
+        <!-- Measurements between OPR1.170207.001 and OPM1.170906.002 -->
         <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 98%:48-128 med:107/106 N=90 -->
-            <Limit name="measured-frame-rate-320x180" range="96-106" /> <!-- v98%=1.6 (OPR1.170207.001-) -->
-            <!-- measured 98%:23-46 med:39/39 N=88 -->
-            <Limit name="measured-frame-rate-640x360" range="39-39" /> <!-- v98%=1.4 (OPR1.170207.001-) -->
-            <!-- measured 98%:4-11 med:10/10 N=90 -->
-            <Limit name="measured-frame-rate-1280x720" range="7-10" /> <!-- v98%=1.7 (OPR1.170207.001-) -->
-            <!-- measured 97%:3-6 med:5/5 N=56 -->
-            <Limit name="measured-frame-rate-1920x1080" range="5-5" /> <!-- v97%=1.2 (OPR1.170207.001-OPM1.170810.004) -->
+            <!-- measured 98%:48-128 med:106/106 N=96 -->
+            <Limit name="measured-frame-rate-320x180" range="96-106" /> <!-- v98%=1.6 -->
+            <!-- measured 98%:23-46 med:39/39 N=94 -->
+            <Limit name="measured-frame-rate-640x360" range="39-39" /> <!-- v98%=1.4 -->
+            <!-- measured 98%:4-11 med:9/9 N=96 -->
+            <Limit name="measured-frame-rate-1280x720" range="7-9" /> <!-- v98%=1.7 -->
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="728-728" /> <!-- N=114 v98%=1.3 -->
-            <Limit name="measured-frame-rate-352x288" range="693-695" /> <!-- N=114 v98%=1.4 -->
+            <Limit name="measured-frame-rate-176x144" range="721-721" /> <!-- N=112 v98%=1.3 -->
+            <Limit name="measured-frame-rate-352x288" range="685-687" /> <!-- N=112 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="409-409" /> <!-- N=112 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="238-238" /> <!-- N=114 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="289-289" /> <!-- N=114 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="144-144" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x240" range="407-407" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="239-239" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="290-290" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="145-145" /> <!-- N=110 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="463-463" /> <!-- N=114 v98%=1.3 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-640x360" range="413-413" /> <!-- N=112 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="366-366" /> <!-- N=112 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="435-435" /> <!-- N=114 v98%=1.3 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1920x1080" range="250-250" /> <!-- N=114 v98%=1.1 -->
-            <Limit name="measured-frame-rate-3840x2160" range="43-43" /> <!-- N=112 v98%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="450-451" /> <!-- N=114 v98%=1.4 (OPR1.170623.019-) -->
+            <Limit name="measured-frame-rate-640x360" range="407-408" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="364-364" /> <!-- N=110 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="430-430" /> <!-- N=114 v98%=1.3 (OPR1.170623.019-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="250-250" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-3840x2160" range="43-43" /> <!-- N=110 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <!-- measured 98%:467-742 med:700/699 FLAKY(mn=326.9 < 350 - 1398) -->
-            <Limit name="measured-frame-rate-176x144" range="699-699" /> <!-- N=114 v98%=1.3 -->
-            <Limit name="measured-frame-rate-480x360" range="619-619" /> <!-- N=114 v98%=1.3 -->
+            <!-- measured 98%:467-742 med:690/690 FLAKY(mn=326.9 < 345 - 1380) -->
+            <Limit name="measured-frame-rate-176x144" range="690-690" /> <!-- N=112 v98%=1.3 -->
+            <Limit name="measured-frame-rate-480x360" range="613-613" /> <!-- N=112 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="412-412" /> <!-- N=114 v98%=1.1 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-640x360" range="393-393" /> <!-- N=114 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="446-446" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="248-248" /> <!-- N=112 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="411-411" /> <!-- N=114 v98%=1.1 (OPR1.170623.019-) -->
+            <Limit name="measured-frame-rate-640x360" range="391-391" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="442-442" /> <!-- N=112 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="248-248" /> <!-- N=110 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <!-- measured 98%:99-335 med:116/118 FLAKY(58 - 336 < mx=345.2) -->
-            <Limit name="measured-frame-rate-176x144" range="116-173" /> <!-- TWEAKED N=112 v98%=1.8 -->
+            <Limit name="measured-frame-rate-176x144" range="124-181" /> <!-- N=112 v98%=1.9 -->
         </MediaCodec>
+        <!-- Measurements between OPR1.170623.019 and OPM1.170912.002 -->
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="349-349" /> <!-- N=114 v98%=1.2 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-720x480" range="117-117" /> <!-- N=114 v98%=1.2 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1280x720" range="46-46" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=114 v98%=1.3 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-320x240" range="345-345" /> <!-- N=114 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="117-117" /> <!-- N=114 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="45-45" /> <!-- N=112 v98%=1.3 (OPM1.170720.001-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="18-18" /> <!-- N=114 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="281-282" /> <!-- N=112 v98%=1.7 -->
-            <!-- measured 98%:90-218 med:175/174 FLAKY(mn=70.0 < 87 - 348) -->
-            <Limit name="measured-frame-rate-640x360" range="140-174" /> <!-- TWEAKED N=112 v98%=1.6 -->
-            <Limit name="measured-frame-rate-720x480" range="150-155" /> <!-- N=118 v98%=1.7 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1280x720" range="62-63" /> <!-- N=118 v98%=1.7 -->
-            <Limit name="measured-frame-rate-1920x1080" range="35-35" /> <!-- N=116 v98%=1.6 -->
+            <Limit name="measured-frame-rate-352x288" range="279-280" /> <!-- N=110 v98%=1.6 -->
+            <!-- measured 98%:90-204 med:162/162 FLAKY(mn=70.0 < 81 - 324) -->
+            <Limit name="measured-frame-rate-640x360" range="140-162" /> <!-- TWEAKED N=110 v98%=1.5 -->
+            <Limit name="measured-frame-rate-720x480" range="142-142" /> <!-- N=120 v98%=1.6 (OPR1.170623.019-) -->
+            <!-- measured 98%:32-74 med:58/58 FLAKY(mn=22.7 < 29 - 116) -->
+            <Limit name="measured-frame-rate-1280x720" range="45-58" /> <!-- TWEAKED N=116 v98%=1.5 -->
+            <Limit name="measured-frame-rate-1920x1080" range="33-33" /> <!-- N=114 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <!-- measured 98%:111-416 med:147/152 FLAKY(74 - 416 < mx=429.4) -->
-            <Limit name="measured-frame-rate-176x144" range="147-215" /> <!-- TWEAKED N=114 v98%=1.9 -->
+            <Limit name="measured-frame-rate-176x144" range="156-231" /> <!-- N=116 v98%=2.0 -->
         </MediaCodec>
+        <!-- Measurements between OPR1.170623.019 and OPM1.170912.002 -->
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 98%:303-975 med:358/359 FLAKY(179 - 976 < mx=1000.0) -->
-            <Limit name="measured-frame-rate-320x180" range="358-488" /> <!-- N=114 v98%=1.8 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-640x360" range="219-239" /> <!-- N=116 v98%=1.6 -->
-            <Limit name="measured-frame-rate-1280x720" range="52-52" /> <!-- N=116 v98%=1.6 (OPR1.170618.001-) -->
-            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=114 v98%=1.5 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-320x180" range="358-462" /> <!-- N=114 v98%=1.7 -->
+            <!-- measured 98%:105-287 med:231/230 FLAKY(mn=101.0 < 105 - 460) -->
+            <Limit name="measured-frame-rate-640x360" range="202-230" /> <!-- TWEAKED N=114 v98%=1.7 (OPM1.170720.001-) -->
+            <Limit name="measured-frame-rate-1280x720" range="48-48" /> <!-- N=118 v98%=1.6 (OPR1.170623.010-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=114 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 98%:225-614 med:290/288 FLAKY(144 - 614 < mx=662.7) -->
-            <Limit name="measured-frame-rate-320x180" range="288-307" /> <!-- N=114 v98%=1.7 -->
-            <!-- measured 98%:102-279 med:138/138 FLAKY(69 - 280 < mx=285.8) -->
-            <Limit name="measured-frame-rate-640x360" range="138-140" /> <!-- N=114 v98%=1.7 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1280x720" range="58-58" /> <!-- N=114 v98%=1.4 (OPR1.170623.006-) -->
-            <Limit name="measured-frame-rate-1920x1080" range="35-35" /> <!-- N=114 v98%=1.4 -->
+            <Limit name="measured-frame-rate-320x180" range="279-305" /> <!-- N=112 v98%=1.5 -->
+            <Limit name="measured-frame-rate-640x360" range="138-138" /> <!-- N=114 v98%=1.5 (OPR1.170623.019-) -->
+            <Limit name="measured-frame-rate-1280x720" range="54-54" /> <!-- N=114 v98%=1.4 (OPR1.170623.019-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="34-34" /> <!-- N=112 v98%=1.4 -->
         </MediaCodec>
     </Decoders>
 </MediaCodecs>
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index fe9a7ae..0599c51 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -15,7 +15,6 @@
 # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT
 
 /system/bin/diag_qshrink4_daemon
-/system/bin/halutil
 /system/bin/mm-audio-alsa-test
 /system/bin/PktRspTest
 /system/bin/qmi-framework-tests/check_system_health
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 6730310..72ca564 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -6,7 +6,6 @@
   qcom)
     TO_EXTRACT="\
             system/bin/diag_qshrink4_daemon \
-            system/bin/halutil \
             system/bin/mm-audio-alsa-test \
             system/bin/PktRspTest \
             system/bin/qmi-framework-tests/check_system_health \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 4b5ba4e..49a0719 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -15,7 +15,6 @@
 # Qualcomm blob(s) necessary for Shamu hardware
 PRODUCT_COPY_FILES := \
     vendor/qcom/angler/proprietary/diag_qshrink4_daemon:system/bin/diag_qshrink4_daemon:qcom \
-    vendor/qcom/angler/proprietary/halutil:system/bin/halutil:qcom \
     vendor/qcom/angler/proprietary/mm-audio-alsa-test:system/bin/mm-audio-alsa-test:qcom \
     vendor/qcom/angler/proprietary/PktRspTest:system/bin/PktRspTest:qcom \
     vendor/qcom/angler/proprietary/check_system_health:system/bin/qmi-framework-tests/check_system_health:qcom \
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index e1c783a..e401d89 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -1,5 +1,4 @@
 system/bin/diag_qshrink4_daemon:qcom
-system/bin/halutil:qcom
 system/bin/mm-audio-alsa-test:qcom
 system/bin/PktRspTest:qcom
 system/bin/qmi-framework-tests/check_system_health:qcom