Commit 11a84b25 authored by Johann's avatar Johann
Browse files

Remove last duck_ functions

Change-Id: I5fbcd2006d05bfe841f3c7af9c1aeb2cb83b3149
parent 1009f765
...@@ -101,14 +101,7 @@ extern "C" { ...@@ -101,14 +101,7 @@ extern "C" {
/* some defines for backward compatibility */ /* some defines for backward compatibility */
#define DMEM_GENERAL 0 #define DMEM_GENERAL 0
#define duck_memalign(X,Y,Z) vpx_memalign(X,Y) // (*)<
#define duck_malloc(X,Y) vpx_malloc(X)
#define duck_calloc(X,Y,Z) vpx_calloc(X,Y)
#define duck_realloc vpx_realloc
#define duck_free vpx_free
#define duck_memcpy vpx_memcpy
#define duck_memmove vpx_memmove
#define duck_memset vpx_memset
#if REPLACE_BUILTIN_FUNCTIONS #if REPLACE_BUILTIN_FUNCTIONS
# ifndef __VPX_MEM_C__ # ifndef __VPX_MEM_C__
......
...@@ -432,7 +432,7 @@ void Scale2D ...@@ -432,7 +432,7 @@ void Scale2D
temp_area + i * dest_pitch, 1, hratio, dest_width); temp_area + i * dest_pitch, 1, hratio, dest_width);
} else { /* Duplicate the last row */ } else { /* Duplicate the last row */
/* copy temp_area row 0 over from last row in the past */ /* copy temp_area row 0 over from last row in the past */
duck_memcpy(temp_area + i * dest_pitch, temp_area + (i - 1)*dest_pitch, dest_pitch); vpx_memcpy(temp_area + i * dest_pitch, temp_area + (i - 1)*dest_pitch, dest_pitch);
} }
} }
...@@ -443,7 +443,7 @@ void Scale2D ...@@ -443,7 +443,7 @@ void Scale2D
} }
/* copy temp_area row 0 over from last row in the past */ /* copy temp_area row 0 over from last row in the past */
duck_memcpy(temp_area, temp_area + source_band_height * dest_pitch, dest_pitch); vpx_memcpy(temp_area, temp_area + source_band_height * dest_pitch, dest_pitch);
/* move to the next band */ /* move to the next band */
source += source_band_height * source_pitch; source += source_band_height * source_pitch;
...@@ -498,11 +498,11 @@ void vp8_scale_frame ...@@ -498,11 +498,11 @@ void vp8_scale_frame
if (dw < (int)dst->y_width) if (dw < (int)dst->y_width)
for (i = 0; i < dh; i++) for (i = 0; i < dh; i++)
duck_memset(dst->y_buffer + i * dst->y_stride + dw - 1, dst->y_buffer[i * dst->y_stride + dw - 2], dst->y_width - dw + 1); vpx_memset(dst->y_buffer + i * dst->y_stride + dw - 1, dst->y_buffer[i * dst->y_stride + dw - 2], dst->y_width - dw + 1);
if (dh < (int)dst->y_height) if (dh < (int)dst->y_height)
for (i = dh - 1; i < (int)dst->y_height; i++) for (i = dh - 1; i < (int)dst->y_height; i++)
duck_memcpy(dst->y_buffer + i * dst->y_stride, dst->y_buffer + (dh - 2) * dst->y_stride, dst->y_width + 1); vpx_memcpy(dst->y_buffer + i * dst->y_stride, dst->y_buffer + (dh - 2) * dst->y_stride, dst->y_width + 1);
Scale2D((unsigned char *) src->u_buffer, src->uv_stride, src->uv_width, src->uv_height, Scale2D((unsigned char *) src->u_buffer, src->uv_stride, src->uv_width, src->uv_height,
(unsigned char *) dst->u_buffer, dst->uv_stride, dw / 2, dh / 2, (unsigned char *) dst->u_buffer, dst->uv_stride, dw / 2, dh / 2,
...@@ -510,11 +510,11 @@ void vp8_scale_frame ...@@ -510,11 +510,11 @@ void vp8_scale_frame
if (dw / 2 < (int)dst->uv_width) if (dw / 2 < (int)dst->uv_width)
for (i = 0; i < dst->uv_height; i++) for (i = 0; i < dst->uv_height; i++)
duck_memset(dst->u_buffer + i * dst->uv_stride + dw / 2 - 1, dst->u_buffer[i * dst->uv_stride + dw / 2 - 2], dst->uv_width - dw / 2 + 1); vpx_memset(dst->u_buffer + i * dst->uv_stride + dw / 2 - 1, dst->u_buffer[i * dst->uv_stride + dw / 2 - 2], dst->uv_width - dw / 2 + 1);
if (dh / 2 < (int)dst->uv_height) if (dh / 2 < (int)dst->uv_height)
for (i = dh / 2 - 1; i < (int)dst->y_height / 2; i++) for (i = dh / 2 - 1; i < (int)dst->y_height / 2; i++)
duck_memcpy(dst->u_buffer + i * dst->uv_stride, dst->u_buffer + (dh / 2 - 2)*dst->uv_stride, dst->uv_width); vpx_memcpy(dst->u_buffer + i * dst->uv_stride, dst->u_buffer + (dh / 2 - 2)*dst->uv_stride, dst->uv_width);
Scale2D((unsigned char *) src->v_buffer, src->uv_stride, src->uv_width, src->uv_height, Scale2D((unsigned char *) src->v_buffer, src->uv_stride, src->uv_width, src->uv_height,
(unsigned char *) dst->v_buffer, dst->uv_stride, dw / 2, dh / 2, (unsigned char *) dst->v_buffer, dst->uv_stride, dw / 2, dh / 2,
...@@ -522,9 +522,9 @@ void vp8_scale_frame ...@@ -522,9 +522,9 @@ void vp8_scale_frame
if (dw / 2 < (int)dst->uv_width) if (dw / 2 < (int)dst->uv_width)
for (i = 0; i < dst->uv_height; i++) for (i = 0; i < dst->uv_height; i++)
duck_memset(dst->v_buffer + i * dst->uv_stride + dw / 2 - 1, dst->v_buffer[i * dst->uv_stride + dw / 2 - 2], dst->uv_width - dw / 2 + 1); vpx_memset(dst->v_buffer + i * dst->uv_stride + dw / 2 - 1, dst->v_buffer[i * dst->uv_stride + dw / 2 - 2], dst->uv_width - dw / 2 + 1);
if (dh / 2 < (int) dst->uv_height) if (dh / 2 < (int) dst->uv_height)
for (i = dh / 2 - 1; i < (int)dst->y_height / 2; i++) for (i = dh / 2 - 1; i < (int)dst->y_height / 2; i++)
duck_memcpy(dst->v_buffer + i * dst->uv_stride, dst->v_buffer + (dh / 2 - 2)*dst->uv_stride, dst->uv_width); vpx_memcpy(dst->v_buffer + i * dst->uv_stride, dst->v_buffer + (dh / 2 - 2)*dst->uv_stride, dst->uv_width);
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment