Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1173396 - Restore libvpx alignment patch. r=kinetik

Browse Source 
The crash in vp8_diamond_search_sadx4 is reproducing again
so it looks like switching off unified build didn't fix
this.

--HG--
extra : rebase_source : 60517f781a17b3b26eec38d11bcc6a355ac09369
This commit is contained in:
Ralph Giles 2015-06-10 09:31:00 -07:00
parent ba2b70542e
commit fce6dd199a
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
media/libvpx/bug1137614.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/media/libvpx/vp8/encoder/block.h b/media/libvpx/vp8/encoder/block.h
--- a/media/libvpx/vp8/encoder/block.h
+++ b/media/libvpx/vp8/encoder/block.h
@@ -93,17 +93,18 @@ typedef struct macroblock
int rddiv;
int rdmult;
unsigned int * mb_activity_ptr;
int * mb_norm_activity_ptr;
signed int act_zbin_adj;
signed int last_act_zbin_adj;
int *mvcost[2];
- int *mvsadcost[2];
+ /* MSVC generates code that thinks this is 16-byte aligned */
+ DECLARE_ALIGNED(16, int*, mvsadcost[2]);
int (*mbmode_cost)[MB_MODE_COUNT];
int (*intra_uv_mode_cost)[MB_MODE_COUNT];
int (*bmode_costs)[10][10];
int *inter_bmode_costs;
int (*token_costs)[COEF_BANDS][PREV_COEF_CONTEXTS]
[MAX_ENTROPY_TOKENS];
/* These define limits to motion vector components to prevent

2
media/libvpx/update.py
View File

@ -524,6 +524,8 @@ def apply_patches():
os.system("patch -p3 < apple-clang.patch")
# Patch to allow MSVC 2015 to compile libvpx
os.system("patch -p3 < msvc2015.patch")
# Patch to fix a crash caused by MSVC 2013
os.system("patch -p3 < bug1137614.patch")
def update_readme(commit):
with open('README_MOZILLA') as f:

3
media/libvpx/vp8/encoder/block.h
View File

@ -98,7 +98,8 @@ typedef struct macroblock
signed int last_act_zbin_adj;
int *mvcost[2];
int *mvsadcost[2];
/* MSVC generates code that thinks this is 16-byte aligned */
DECLARE_ALIGNED(16, int*, mvsadcost[2]);
int (*mbmode_cost)[MB_MODE_COUNT];
int (*intra_uv_mode_cost)[MB_MODE_COUNT];
int (*bmode_costs)[10][10];