coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 09:16:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

small count

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/460007

git-svn-id: http://libyuv.googlecode.com/svn/trunk@222 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2012-03-26 16:15:15 +00:00
parent 0ab5440693
commit e14b2abba4
4 changed files with 57 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 221 Version: 222
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,7 +11,7 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION 221 #define INCLUDE_LIBYUV_VERSION 222
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_

2
source/row_posix.cc
View File

@ -2049,7 +2049,7 @@ void ARGBBlendRow_SSE2(const uint8* src_argb, uint8* dst_argb, int width) {
// Do 1 to 3 pixels to get destination aligned. // Do 1 to 3 pixels to get destination aligned.
if ((uintptr_t)(dst_argb) & 15) { if ((uintptr_t)(dst_argb) & 15) {
int count = width; int count = width;
if (((intptr_t)(dst_argb) & 3) == 0) { if (count > 4 && ((intptr_t)(dst_argb) & 3) == 0) {
count = (-(intptr_t)(dst_argb) >> 2) & 3; count = (-(intptr_t)(dst_argb) >> 2) & 3;
} }
ARGBBlendRow1_SSE2(src_argb, dst_argb, count); ARGBBlendRow1_SSE2(src_argb, dst_argb, count);

8
source/row_win.cc
View File

@ -10,10 +10,6 @@
#include "source/row.h" #include "source/row.h"
#if defined(_M_IX86)
#include "emmintrin.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
namespace libyuv { namespace libyuv {
extern "C" { extern "C" {
@ -2079,7 +2075,7 @@ void ARGBBlendRow_SSE2(const uint8* src_argb, uint8* dst_argb, int width) {
// Do 1 to 3 pixels to get destination aligned. // Do 1 to 3 pixels to get destination aligned.
if ((uintptr_t)(dst_argb) & 15) { if ((uintptr_t)(dst_argb) & 15) {
int count = width; int count = width;
if (((intptr_t)(dst_argb) & 3) == 0) { if (count > 4 && ((intptr_t)(dst_argb) & 3) == 0) {
count = (-(intptr_t)(dst_argb) >> 2) & 3; count = (-(intptr_t)(dst_argb) >> 2) & 3;
} }
ARGBBlendRow1_SSE2(src_argb, dst_argb, count); ARGBBlendRow1_SSE2(src_argb, dst_argb, count);
@ -2186,7 +2182,7 @@ void ARGBBlendRow_SSSE3(const uint8* src_argb, uint8* dst_argb, int width) {
// Do 1 to 3 pixels to get destination aligned. // Do 1 to 3 pixels to get destination aligned.
if ((uintptr_t)(dst_argb) & 15) { if ((uintptr_t)(dst_argb) & 15) {
int count = width; int count = width;
if (((intptr_t)(dst_argb) & 3) == 0) { if (count > 4 && ((intptr_t)(dst_argb) & 3) == 0) {
count = (-(intptr_t)(dst_argb) >> 2) & 3; count = (-(intptr_t)(dst_argb) >> 2) & 3;
} }
ARGBBlendRow1_SSE2(src_argb, dst_argb, count); ARGBBlendRow1_SSE2(src_argb, dst_argb, count);