Bug 1480092 - Cherrypick rev 52add5896661d186dec284ed646a4b33b607d2c7. r=drno a=IanN CLOSED TREE DONTBUILD SEAMONKEY_2_49_ESR_RELBRANCH
authorDan Minor <dminor@mozilla.com>
Mon, 13 Aug 2018 11:32:47 -0400
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 357538 d6e809ebaef8c685c157fe89a3babea9a7e3c229
parent 357537 eb92d7b3043c75933192cca237f7a9fe32c69ebb
child 357539 30a49fef33b4374b5e19998cdab9e9e0f4988eb9
push id7834
push userfrgrahl@gmx.net
push dateSun, 13 Jan 2019 12:17:02 +0000
treeherdermozilla-esr52@6e4ad8a8f2e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdrno, IanN
bugs1480092
milestone52.9.1
Bug 1480092 - Cherrypick rev 52add5896661d186dec284ed646a4b33b607d2c7. r=drno a=IanN CLOSED TREE DONTBUILD mozilla-esr52 SEAMONKEY_2_49_ESR_RELBRANCH
media/libvpx/bug1480092.patch
media/libvpx/update.py
media/libvpx/vp8/common/postproc.c
new file mode 100644
--- /dev/null
+++ b/media/libvpx/bug1480092.patch
@@ -0,0 +1,22 @@
+diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c
+--- a/media/libvpx/vp8/common/postproc.c
++++ b/media/libvpx/vp8/common/postproc.c
+@@ -325,17 +325,17 @@ void vp8_deblock(VP8_COMMON             
+                  YV12_BUFFER_CONFIG         *post,
+                  int                         q,
+                  int                         low_var_thresh,
+                  int                         flag)
+ {
+     double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
+     int ppl = (int)(level + .5);
+ 
+-    const MODE_INFO *mode_info_context = cm->show_frame_mi;
++    const MODE_INFO *mode_info_context = cm->mi;
+     int mbr, mbc;
+ 
+     /* The pixel thresholds are adjusted according to if or not the macroblock
+      * is a skipped block.  */
+     unsigned char *ylimits = cm->pp_limits_buffer;
+     unsigned char *uvlimits = cm->pp_limits_buffer + 16 * cm->mb_cols;
+     (void) low_var_thresh;
+     (void) flag;
--- a/media/libvpx/update.py
+++ b/media/libvpx/update.py
@@ -603,16 +603,18 @@ def apply_patches():
     # Bug 1224371 - Cast uint8_t to uint32_t before shift
     os.system("patch -p3 < cast-char-to-uint-before-shift.patch")
     # Bug 1237848 - Check lookahead ctx
     os.system("patch -p3 < 1237848-check-lookahead-ctx.patch")
     # Bug 1263384 - Check input frame resolution
     os.system("patch -p3 < input_frame_validation.patch")
     # Bug 1315288 - Check input frame resolution for vp9
     os.system("patch -p3 < input_frame_validation_vp9.patch")
+    # Cherrypick fix from upstream
+    os.system("patch -p3 < bug1480092.patch")
 
 def update_readme(commit):
     with open('README_MOZILLA') as f:
         readme = f.read()
 
     if 'The git commit ID used was' in readme:
         new_readme = re.sub('The git commit ID used was [a-f0-9]+',
             'The git commit ID used was %s' % commit, readme)
--- a/media/libvpx/vp8/common/postproc.c
+++ b/media/libvpx/vp8/common/postproc.c
@@ -325,17 +325,17 @@ void vp8_deblock(VP8_COMMON             
                  YV12_BUFFER_CONFIG         *post,
                  int                         q,
                  int                         low_var_thresh,
                  int                         flag)
 {
     double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
     int ppl = (int)(level + .5);
 
-    const MODE_INFO *mode_info_context = cm->show_frame_mi;
+    const MODE_INFO *mode_info_context = cm->mi;
     int mbr, mbc;
 
     /* The pixel thresholds are adjusted according to if or not the macroblock
      * is a skipped block.  */
     unsigned char *ylimits = cm->pp_limits_buffer;
     unsigned char *uvlimits = cm->pp_limits_buffer + 16 * cm->mb_cols;
     (void) low_var_thresh;
     (void) flag;