Commit bdb46b29 authored by Johann's avatar Johann

Cherry pick libyuv VS fix

Change-Id: I1f2e077af87d29b07eaf7acaec8d955e00da9333
parent a1ef75bb
......@@ -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.
Local Modifications:
None.
cherry pick r1311 'disable nv12 avx2 for vs9/10 that dont support avx2 instructions.'
......@@ -1687,6 +1687,7 @@ void I422ToARGBRow_AVX2(const uint8* y_buf,
}
#endif // HAS_I422TOARGBROW_AVX2
#ifdef HAS_NV12TOARGBROW_AVX2
// 16 pixels.
// 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes).
__declspec(naked) __declspec(align(16))
......@@ -1714,7 +1715,9 @@ void NV12ToARGBRow_AVX2(const uint8* y_buf,
ret
}
}
#endif // HAS_NV12TOARGBROW_AVX2
#ifdef HAS_NV21TOARGBROW_AVX2
// 16 pixels.
// 8 VU values upsampled to 16 VU, mixed with 16 Y producing 16 ARGB (64 bytes).
__declspec(naked) __declspec(align(16))
......@@ -1742,6 +1745,7 @@ void NV21ToARGBRow_AVX2(const uint8* y_buf,
ret
}
}
#endif // HAS_NV21TOARGBROW_AVX2
#ifdef HAS_I422TOBGRAROW_AVX2
// 16 pixels
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment