diff options
author | trav90 <travawine@palemoon.org> | 2018-10-19 21:52:15 -0500 |
---|---|---|
committer | trav90 <travawine@palemoon.org> | 2018-10-19 21:52:20 -0500 |
commit | bbcc64772580c8a979288791afa02d30bc476d2e (patch) | |
tree | 437ce94c3fdd7497508e5b55de06c6d011678597 /third_party/aom/aom_scale/generic/aom_scale.c | |
parent | 14805f6ddbfb173c327768fff9f81f40ce5e81b0 (diff) | |
download | UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.gz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.lz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.xz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.zip |
Update aom to v1.0.0
Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0.
Diffstat (limited to 'third_party/aom/aom_scale/generic/aom_scale.c')
-rw-r--r-- | third_party/aom/aom_scale/generic/aom_scale.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/third_party/aom/aom_scale/generic/aom_scale.c b/third_party/aom/aom_scale/generic/aom_scale.c index d124832b7..206c42c9f 100644 --- a/third_party/aom/aom_scale/generic/aom_scale.c +++ b/third_party/aom/aom_scale/generic/aom_scale.c @@ -18,9 +18,10 @@ ***************************************************************************/ /**************************************************************************** -* Header Files -****************************************************************************/ -#include "./aom_scale_rtcd.h" + * Header Files + ****************************************************************************/ +#include "config/aom_scale_rtcd.h" + #include "aom_mem/aom_mem.h" #include "aom_scale/aom_scale.h" #include "aom_scale/yv12config.h" @@ -475,11 +476,11 @@ void aom_scale_frame(YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, unsigned char *temp_area, unsigned char temp_height, unsigned int hscale, unsigned int hratio, unsigned int vscale, unsigned int vratio, - unsigned int interlaced) { + unsigned int interlaced, const int num_planes) { const int dw = (hscale - 1 + src->y_width * hratio) / hscale; const int dh = (vscale - 1 + src->y_height * vratio) / vscale; - for (int plane = 0; plane < 3; ++plane) { + for (int plane = 0; plane < num_planes; ++plane) { const int is_uv = plane > 0; const int plane_dw = dw >> is_uv; const int plane_dh = dh >> is_uv; |