diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-11 20:10:43 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-11 20:10:43 +0200 |
| commit | 2713347f0e0ec3014501c35cd53900732fd27176 (patch) | |
| tree | 23d1c8f675ea7582fe3609039f86195764b8bd97 /media | |
| parent | 1bf4a513c8e7fd85642827ce0938b7e1441e5e03 (diff) | |
| parent | d086e918b45bbc7a841b46c3d444b2e9d7d7e4c3 (diff) | |
| download | UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar.gz UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar.lz UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar.xz UXP-2713347f0e0ec3014501c35cd53900732fd27176.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'media')
| -rw-r--r-- | media/libvpx/bug1480092.patch | 36 | ||||
| -rwxr-xr-x | media/libvpx/update.py | 2 | ||||
| -rw-r--r-- | media/libvpx/vp8/common/postproc.c | 2 |
3 files changed, 39 insertions, 1 deletions
diff --git a/media/libvpx/bug1480092.patch b/media/libvpx/bug1480092.patch new file mode 100644 index 000000000..ae774bb20 --- /dev/null +++ b/media/libvpx/bug1480092.patch @@ -0,0 +1,36 @@ +From f00fe25d7eb13ceafbea6a6987d45fdef64cffb3 Mon Sep 17 00:00:00 2001 +From: Pale Moon <git-repo@palemoon.org> +Date: Tue, 11 Sep 2018 08:58:16 +0200 +Subject: [PATCH] Cherry-pick libvpx upstream + 52add5896661d186dec284ed646a4b33b607d2c7. + +--- + media/libvpx/vp8/common/postproc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c +index a4e6ae170..3b05bc63e 100644 +--- a/media/libvpx/vp8/common/postproc.c ++++ b/media/libvpx/vp8/common/postproc.c +@@ -325,17 +325,17 @@ void vp8_deblock(VP8_COMMON *cm, + 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; +-- +2.16.1.windows.4 + diff --git a/media/libvpx/update.py b/media/libvpx/update.py index 85eed5872..1e9d9b478 100755 --- a/media/libvpx/update.py +++ b/media/libvpx/update.py @@ -608,6 +608,8 @@ def apply_patches(): 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: diff --git a/media/libvpx/vp8/common/postproc.c b/media/libvpx/vp8/common/postproc.c index a4e6ae170..3b05bc63e 100644 --- a/media/libvpx/vp8/common/postproc.c +++ b/media/libvpx/vp8/common/postproc.c @@ -330,7 +330,7 @@ void vp8_deblock(VP8_COMMON *cm, 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 |