aboutsummaryrefslogtreecommitdiff
path: root/files/util/yuvconvert.cc
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2022-08-02 13:26:21 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2022-08-25 13:27:22 -0700
commit51738d52b6c91d4573b75f6483dd045d0affc00b (patch)
treee8cf5f7cdc94a5abfe84a758a4245d7269b65f8f /files/util/yuvconvert.cc
parentfe33d276d689446c03db3f1f761797b01aa06e1f (diff)
downloadlibyuv-51738d52b6c91d4573b75f6483dd045d0affc00b.tar.gz
Update external/libyuv to r1837
Update external/libyuv to version r1837 (d53f1bee) from upstream. This brings in some new functions that will be used by libavif. Also update README.version with local modifications. The files/ subdirectory is a pristine copy of the upstream checkout except for the local modifications that are listed in README.version. Bug: b/241008246 Bug: b/228492909 Test: Builds. Media and Camera CTS tests pass. Merged-In: I1bd041e475666e13fafd8c3792d7142a022d435a Change-Id: I85df21181e582ff835aab1e9ef13ad3ac8421d30
Diffstat (limited to 'files/util/yuvconvert.cc')
-rw-r--r--files/util/yuvconvert.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/files/util/yuvconvert.cc b/files/util/yuvconvert.cc
index 27cdfe9e..332699e3 100644
--- a/files/util/yuvconvert.cc
+++ b/files/util/yuvconvert.cc
@@ -165,23 +165,23 @@ static int TileARGBScale(const uint8_t* src_argb,
int src_height,
uint8_t* dst_argb,
int dst_stride_argb,
- int dst_width,
- int dst_height,
+ int destination_width,
+ int destination_height,
libyuv::FilterMode filtering) {
- for (int y = 0; y < dst_height; y += kTileY) {
- for (int x = 0; x < dst_width; x += kTileX) {
+ for (int y = 0; y < destination_height; y += kTileY) {
+ for (int x = 0; x < destination_width; x += kTileX) {
int clip_width = kTileX;
- if (x + clip_width > dst_width) {
- clip_width = dst_width - x;
+ if (x + clip_width > destination_width) {
+ clip_width = destination_width - x;
}
int clip_height = kTileY;
- if (y + clip_height > dst_height) {
- clip_height = dst_height - y;
+ if (y + clip_height > destination_height) {
+ clip_height = destination_height - y;
}
int r = libyuv::ARGBScaleClip(src_argb, src_stride_argb, src_width,
src_height, dst_argb, dst_stride_argb,
- dst_width, dst_height, x, y, clip_width,
- clip_height, filtering);
+ destination_width, destination_height, x, y,
+ clip_width, clip_height, filtering);
if (r) {
return r;
}