introduce a separate WebPRescalerDspInit to initialize pointers

so that we keep the details of WebPRescaler in utils/rescaler.c
when possible.

Change-Id: Ib6c1029a09b84cbc7a7d2f70dafa4d4d9132cecc
This commit is contained in:
Pascal Massimino
2015-01-10 06:46:00 -08:00
committed by James Zern
parent cbcdd5ffaf
commit ab66becaae
4 changed files with 77 additions and 54 deletions

View File

@ -13,8 +13,40 @@
#include <assert.h>
#include <stdlib.h>
#include "../dsp/dsp.h"
#include "./rescaler.h"
//------------------------------------------------------------------------------
void WebPRescalerInit(WebPRescaler* const wrk, int src_width, int src_height,
uint8_t* const dst, int dst_width, int dst_height,
int dst_stride, int num_channels, int x_add, int x_sub,
int y_add, int y_sub, int32_t* const work) {
wrk->x_expand = (src_width < dst_width);
wrk->src_width = src_width;
wrk->src_height = src_height;
wrk->dst_width = dst_width;
wrk->dst_height = dst_height;
wrk->dst = dst;
wrk->dst_stride = dst_stride;
wrk->num_channels = num_channels;
// for 'x_expand', we use bilinear interpolation
wrk->x_add = wrk->x_expand ? (x_sub - 1) : x_add - x_sub;
wrk->x_sub = wrk->x_expand ? (x_add - 1) : x_sub;
wrk->y_accum = y_add;
wrk->y_add = y_add;
wrk->y_sub = y_sub;
wrk->fx_scale = (1 << WEBP_RESCALER_RFIX) / x_sub;
wrk->fy_scale = (1 << WEBP_RESCALER_RFIX) / y_sub;
wrk->fxy_scale = wrk->x_expand ?
((int64_t)dst_height << WEBP_RESCALER_RFIX) / (x_sub * src_height) :
((int64_t)dst_height << WEBP_RESCALER_RFIX) / (x_add * src_height);
wrk->irow = work;
wrk->frow = work + num_channels * dst_width;
WebPRescalerDspInit();
}
//------------------------------------------------------------------------------
// all-in-one calls