generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Cherry pick libyuv VS fix"

Browse Source
This commit is contained in:
Johann 2015-03-06 16:04:59 -08:00 committed by Gerrit Code Review
commit b12f531cc5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/libyuv/README.libvpx vendored
View File

@ -13,4 +13,4 @@ which down-samples the original input video (f.g. 1280x720) a number of times
in order to encode multiple resolution bit streams. in order to encode multiple resolution bit streams.
Local Modifications: Local Modifications:
None. cherry pick r1311 'disable nv12 avx2 for vs9/10 that dont support avx2 instructions.'

4
third_party/libyuv/source/row_win.cc vendored
View File

@ -1687,6 +1687,7 @@ void I422ToARGBRow_AVX2(const uint8* y_buf,
} }
#endif // HAS_I422TOARGBROW_AVX2 #endif // HAS_I422TOARGBROW_AVX2
#ifdef HAS_NV12TOARGBROW_AVX2
// 16 pixels. // 16 pixels.
// 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes). // 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes).
__declspec(naked) __declspec(align(16)) __declspec(naked) __declspec(align(16))
@ -1714,7 +1715,9 @@ void NV12ToARGBRow_AVX2(const uint8* y_buf,
ret ret
} }
} }
#endif // HAS_NV12TOARGBROW_AVX2
#ifdef HAS_NV21TOARGBROW_AVX2
// 16 pixels. // 16 pixels.
// 8 VU values upsampled to 16 VU, mixed with 16 Y producing 16 ARGB (64 bytes). // 8 VU values upsampled to 16 VU, mixed with 16 Y producing 16 ARGB (64 bytes).
__declspec(naked) __declspec(align(16)) __declspec(naked) __declspec(align(16))
@ -1742,6 +1745,7 @@ void NV21ToARGBRow_AVX2(const uint8* y_buf,
ret ret
} }
} }
#endif // HAS_NV21TOARGBROW_AVX2
#ifdef HAS_I422TOBGRAROW_AVX2 #ifdef HAS_I422TOBGRAROW_AVX2
// 16 pixels // 16 pixels