diff options
| -rw-r--r-- | vpx_scale/generic/yv12extend.c | 15 | ||||
| -rw-r--r-- | vpxdec.c | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index f2aec2b7a..7896dfee6 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -84,14 +84,13 @@ void vp8_yv12_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) { static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int subsampling_x, int subsampling_y, int ext_size) { - const int c_w = (ybf->y_crop_width + subsampling_x) >> subsampling_x; - const int c_h = (ybf->y_crop_height + subsampling_y) >> subsampling_y; - const int c_et = ext_size >> subsampling_y; - const int c_el = ext_size >> subsampling_x; - const int c_eb = (ext_size + ybf->y_height - ybf->y_crop_height + - subsampling_y) >> subsampling_y; - const int c_er = (ext_size + ybf->y_width - ybf->y_crop_width + - subsampling_x) >> subsampling_x; + const int c_w = ybf->uv_crop_width; + const int c_h = ybf->uv_crop_height; + const int c_ext_size = ext_size >> 1; + const int c_et = c_ext_size; + const int c_el = c_ext_size; + const int c_eb = c_ext_size + ybf->uv_height - ybf->uv_crop_height; + const int c_er = c_ext_size + ybf->uv_width - ybf->uv_crop_width; assert(ybf->y_height - ybf->y_crop_height < 16); assert(ybf->y_width - ybf->y_crop_width < 16); @@ -857,7 +857,8 @@ int main_loop(int argc, const char **argv_) { fail: if (vpx_codec_destroy(&decoder)) { - fprintf(stderr, "Failed to destroy decoder: %s\n", vpx_codec_error(&decoder)); + fprintf(stderr, "Failed to destroy decoder: %s\n", + vpx_codec_error(&decoder)); return EXIT_FAILURE; } @@ -869,6 +870,8 @@ fail: else free(buf); + if (scaled_img) vpx_img_free(scaled_img); + fclose(infile); free(argv); |