Merge "replace vp8_ with vpx_ in vpx_scale"
This commit is contained in:
Yaowu Xu
Gerrit Code Review
Коммит
b739d3aebf
|
|
@ -33,7 +33,7 @@
|
|||
* SPECIAL NOTES : None.
|
||||
*
|
||||
****************************************************************************/
|
||||
void vp8_horizontal_line_5_4_scale_c(const unsigned char *source,
|
||||
void vpx_horizontal_line_5_4_scale_c(const unsigned char *source,
|
||||
unsigned int source_width,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_width) {
|
||||
|
|
@ -64,7 +64,7 @@ void vp8_horizontal_line_5_4_scale_c(const unsigned char *source,
|
|||
|
||||
|
||||
|
||||
void vp8_vertical_band_5_4_scale_c(unsigned char *source,
|
||||
void vpx_vertical_band_5_4_scale_c(unsigned char *source,
|
||||
unsigned int src_pitch,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_pitch,
|
||||
|
|
@ -96,7 +96,7 @@ void vp8_vertical_band_5_4_scale_c(unsigned char *source,
|
|||
|
||||
/*7***************************************************************************
|
||||
*
|
||||
* ROUTINE : vp8_horizontal_line_3_5_scale_c
|
||||
* ROUTINE : vpx_horizontal_line_3_5_scale_c
|
||||
*
|
||||
* INPUTS : const unsigned char *source : Pointer to source data.
|
||||
* unsigned int source_width : Stride of source.
|
||||
|
|
@ -114,7 +114,7 @@ void vp8_vertical_band_5_4_scale_c(unsigned char *source,
|
|||
*
|
||||
*
|
||||
****************************************************************************/
|
||||
void vp8_horizontal_line_5_3_scale_c(const unsigned char *source,
|
||||
void vpx_horizontal_line_5_3_scale_c(const unsigned char *source,
|
||||
unsigned int source_width,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_width) {
|
||||
|
|
@ -142,7 +142,7 @@ void vp8_horizontal_line_5_3_scale_c(const unsigned char *source,
|
|||
|
||||
}
|
||||
|
||||
void vp8_vertical_band_5_3_scale_c(unsigned char *source,
|
||||
void vpx_vertical_band_5_3_scale_c(unsigned char *source,
|
||||
unsigned int src_pitch,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_pitch,
|
||||
|
|
@ -172,7 +172,7 @@ void vp8_vertical_band_5_3_scale_c(unsigned char *source,
|
|||
|
||||
/****************************************************************************
|
||||
*
|
||||
* ROUTINE : vp8_horizontal_line_1_2_scale_c
|
||||
* ROUTINE : vpx_horizontal_line_1_2_scale_c
|
||||
*
|
||||
* INPUTS : const unsigned char *source : Pointer to source data.
|
||||
* unsigned int source_width : Stride of source.
|
||||
|
|
@ -189,7 +189,7 @@ void vp8_vertical_band_5_3_scale_c(unsigned char *source,
|
|||
* SPECIAL NOTES : None.
|
||||
*
|
||||
****************************************************************************/
|
||||
void vp8_horizontal_line_2_1_scale_c(const unsigned char *source,
|
||||
void vpx_horizontal_line_2_1_scale_c(const unsigned char *source,
|
||||
unsigned int source_width,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_width) {
|
||||
|
|
@ -208,7 +208,7 @@ void vp8_horizontal_line_2_1_scale_c(const unsigned char *source,
|
|||
}
|
||||
}
|
||||
|
||||
void vp8_vertical_band_2_1_scale_c(unsigned char *source,
|
||||
void vpx_vertical_band_2_1_scale_c(unsigned char *source,
|
||||
unsigned int src_pitch,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_pitch,
|
||||
|
|
@ -218,7 +218,7 @@ void vp8_vertical_band_2_1_scale_c(unsigned char *source,
|
|||
memcpy(dest, source, dest_width);
|
||||
}
|
||||
|
||||
void vp8_vertical_band_2_1_scale_i_c(unsigned char *source,
|
||||
void vpx_vertical_band_2_1_scale_i_c(unsigned char *source,
|
||||
unsigned int src_pitch,
|
||||
unsigned char *dest,
|
||||
unsigned int dest_pitch,
|
||||
|
|
|
|||
|
|
@ -289,15 +289,15 @@ void Scale2D
|
|||
switch (hratio * 10 / hscale) {
|
||||
case 8:
|
||||
/* 4-5 Scale in Width direction */
|
||||
horiz_line_scale = vp8_horizontal_line_5_4_scale;
|
||||
horiz_line_scale = vpx_horizontal_line_5_4_scale;
|
||||
break;
|
||||
case 6:
|
||||
/* 3-5 Scale in Width direction */
|
||||
horiz_line_scale = vp8_horizontal_line_5_3_scale;
|
||||
horiz_line_scale = vpx_horizontal_line_5_3_scale;
|
||||
break;
|
||||
case 5:
|
||||
/* 1-2 Scale in Width direction */
|
||||
horiz_line_scale = vp8_horizontal_line_2_1_scale;
|
||||
horiz_line_scale = vpx_horizontal_line_2_1_scale;
|
||||
break;
|
||||
default:
|
||||
/* The ratio is not acceptable now */
|
||||
|
|
@ -309,13 +309,13 @@ void Scale2D
|
|||
switch (vratio * 10 / vscale) {
|
||||
case 8:
|
||||
/* 4-5 Scale in vertical direction */
|
||||
vert_band_scale = vp8_vertical_band_5_4_scale;
|
||||
vert_band_scale = vpx_vertical_band_5_4_scale;
|
||||
source_band_height = 5;
|
||||
dest_band_height = 4;
|
||||
break;
|
||||
case 6:
|
||||
/* 3-5 Scale in vertical direction */
|
||||
vert_band_scale = vp8_vertical_band_5_3_scale;
|
||||
vert_band_scale = vpx_vertical_band_5_3_scale;
|
||||
source_band_height = 5;
|
||||
dest_band_height = 3;
|
||||
break;
|
||||
|
|
@ -324,12 +324,12 @@ void Scale2D
|
|||
|
||||
if (interlaced) {
|
||||
/* if the content is interlaced, point sampling is used */
|
||||
vert_band_scale = vp8_vertical_band_2_1_scale;
|
||||
vert_band_scale = vpx_vertical_band_2_1_scale;
|
||||
} else {
|
||||
|
||||
interpolation = 1;
|
||||
/* if the content is progressive, interplo */
|
||||
vert_band_scale = vp8_vertical_band_2_1_scale_i;
|
||||
vert_band_scale = vpx_vertical_band_2_1_scale_i;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ forward_decls qw/vpx_scale_forward_decls/;
|
|||
|
||||
# Scaler functions
|
||||
if (vpx_config("CONFIG_SPATIAL_RESAMPLING") eq "yes") {
|
||||
add_proto qw/void vp8_horizontal_line_5_4_scale/, "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width";
|
||||
add_proto qw/void vp8_vertical_band_5_4_scale/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vp8_horizontal_line_5_3_scale/, "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width";
|
||||
add_proto qw/void vp8_vertical_band_5_3_scale/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vp8_horizontal_line_2_1_scale/, "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width";
|
||||
add_proto qw/void vp8_vertical_band_2_1_scale/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vp8_vertical_band_2_1_scale_i/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vpx_horizontal_line_5_4_scale/, "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width";
|
||||
add_proto qw/void vpx_vertical_band_5_4_scale/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vpx_horizontal_line_5_3_scale/, "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width";
|
||||
add_proto qw/void vpx_vertical_band_5_3_scale/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vpx_horizontal_line_2_1_scale/, "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width";
|
||||
add_proto qw/void vpx_vertical_band_2_1_scale/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
add_proto qw/void vpx_vertical_band_2_1_scale_i/, "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width";
|
||||
}
|
||||
|
||||
add_proto qw/void vpx_yv12_extend_frame_borders/, "struct yv12_buffer_config *ybf";
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче