diff options
Diffstat (limited to 'vpx_scale')
44 files changed, 385 insertions, 329 deletions
diff --git a/vpx_scale/arm/armv4/gen_scalers_armv4.asm b/vpx_scale/arm/armv4/gen_scalers_armv4.asm index 1c904edae..e495184e7 100644 --- a/vpx_scale/arm/armv4/gen_scalers_armv4.asm +++ b/vpx_scale/arm/armv4/gen_scalers_armv4.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/arm/nds/yv12extend.c b/vpx_scale/arm/nds/yv12extend.c index 56959cb18..48c0dfb33 100644 --- a/vpx_scale/arm/nds/yv12extend.c +++ b/vpx_scale/arm/nds/yv12extend.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm index 26384c42c..24d46cbe5 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm index a50ae60d7..6534827d8 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm index c8923d5a5..dfc8db55c 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm index 8c9ce1962..e475b929b 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/arm/scalesystemdependant.c b/vpx_scale/arm/scalesystemdependant.c index b270a5f06..fee76fff7 100644 --- a/vpx_scale/arm/scalesystemdependant.c +++ b/vpx_scale/arm/scalesystemdependant.c @@ -1,14 +1,16 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ #include "vpx_ports/config.h" +#include "vpx_ports/arm.h" #include "vpx_scale/vpxscale.h" @@ -46,6 +48,9 @@ extern void vp8_yv12_copy_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CO ****************************************************************************/ void vp8_scale_machine_specific_config() { +#if HAVE_ARMV7 && CONFIG_RUNTIME_CPU_DETECT + int flags; +#endif /* vp8_horizontal_line_1_2_scale = horizontal_line_1_2_scale_armv4; vp8_vertical_band_1_2_scale = vertical_band_1_2_scale_armv4; @@ -72,14 +77,20 @@ void vp8_scale_machine_specific_config() vp8_horizontal_line_5_4_scale = vp8cx_horizontal_line_5_4_scale_c; */ -#if HAVE_ARMV7 - vp8_yv12_extend_frame_borders_ptr = vp8_yv12_extend_frame_borders_neon; - vp8_yv12_copy_frame_yonly_ptr = vp8_yv12_copy_frame_yonly_neon; - vp8_yv12_copy_frame_ptr = vp8_yv12_copy_frame_neon; -#else +#if !HAVE_ARMV7 || CONFIG_RUNTIME_CPU_DETECT vp8_yv12_extend_frame_borders_ptr = vp8_yv12_extend_frame_borders; vp8_yv12_copy_frame_yonly_ptr = vp8_yv12_copy_frame_yonly; vp8_yv12_copy_frame_ptr = vp8_yv12_copy_frame; #endif - +#if HAVE_ARMV7 +#if CONFIG_RUNTIME_CPU_DETECT + flags = arm_cpu_caps(); + if (flags & HAS_NEON) +#endif + { + vp8_yv12_extend_frame_borders_ptr = vp8_yv12_extend_frame_borders_neon; + vp8_yv12_copy_frame_yonly_ptr = vp8_yv12_copy_frame_yonly_neon; + vp8_yv12_copy_frame_ptr = vp8_yv12_copy_frame_neon; + } +#endif } diff --git a/vpx_scale/arm/yv12extend_arm.c b/vpx_scale/arm/yv12extend_arm.c index 7c3f7cd07..d7a8289a9 100644 --- a/vpx_scale/arm/yv12extend_arm.c +++ b/vpx_scale/arm/yv12extend_arm.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/blackfin/yv12config.c b/vpx_scale/blackfin/yv12config.c index 7cb083fb9..42538af58 100644 --- a/vpx_scale/blackfin/yv12config.c +++ b/vpx_scale/blackfin/yv12config.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/blackfin/yv12extend.c b/vpx_scale/blackfin/yv12extend.c index d5be4950d..cfd3de050 100644 --- a/vpx_scale/blackfin/yv12extend.c +++ b/vpx_scale/blackfin/yv12extend.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/dm642/bicubic_scaler_c64.c b/vpx_scale/dm642/bicubic_scaler_c64.c index 9bd379725..5166ace85 100644 --- a/vpx_scale/dm642/bicubic_scaler_c64.c +++ b/vpx_scale/dm642/bicubic_scaler_c64.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/dm642/gen_scalers_c64.c b/vpx_scale/dm642/gen_scalers_c64.c index 2126a7534..87ff998d3 100644 --- a/vpx_scale/dm642/gen_scalers_c64.c +++ b/vpx_scale/dm642/gen_scalers_c64.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/dm642/yv12extend.c b/vpx_scale/dm642/yv12extend.c index ca25a5fce..646e69a7f 100644 --- a/vpx_scale/dm642/yv12extend.c +++ b/vpx_scale/dm642/yv12extend.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/generic/bicubic_scaler.c b/vpx_scale/generic/bicubic_scaler.c index e3c2b4a80..420f719ce 100644 --- a/vpx_scale/generic/bicubic_scaler.c +++ b/vpx_scale/generic/bicubic_scaler.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -45,7 +46,7 @@ static float a = -0.6; // 3 2 // C0 = a*t - a*t // -static INLINE short c0_fixed(unsigned int t) +static short c0_fixed(unsigned int t) { // put t in Q16 notation unsigned short v1, v2; @@ -66,7 +67,7 @@ static INLINE short c0_fixed(unsigned int t) // 2 3 // C1 = a*t + (3-2*a)*t - (2-a)*t // -static INLINE short c1_fixed(unsigned int t) +static short c1_fixed(unsigned int t) { unsigned short v1, v2, v3; unsigned short two, three; @@ -95,7 +96,7 @@ static INLINE short c1_fixed(unsigned int t) // 2 3 // C2 = 1 - (3-a)*t + (2-a)*t // -static INLINE short c2_fixed(unsigned int t) +static short c2_fixed(unsigned int t) { unsigned short v1, v2, v3; unsigned short two, three; @@ -123,7 +124,7 @@ static INLINE short c2_fixed(unsigned int t) // 2 3 // C3 = a*t - 2*a*t + a*t // -static INLINE short c3_fixed(unsigned int t) +static short c3_fixed(unsigned int t) { int v1, v2, v3; diff --git a/vpx_scale/generic/gen_scalers.c b/vpx_scale/generic/gen_scalers.c index a5e545f70..b54e334cb 100644 --- a/vpx_scale/generic/gen_scalers.c +++ b/vpx_scale/generic/gen_scalers.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -115,7 +116,7 @@ void vp8cx_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitc des [dest_pitch*2] = (unsigned char)((b * 102 + c + 128) >> 8); des [dest_pitch*3] = (unsigned char)((c + 102 * d + 128) >> 8); - // First line in next band + /* First line in next band */ a = des [dest_pitch * 5]; des [dest_pitch * 4] = (unsigned char)((d * 205 + 51 * a + 128) >> 8); @@ -162,7 +163,7 @@ void vp8cx_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest des [dest_pitch*2] = (unsigned char)((b * 102 + c + 128) >> 8); des [dest_pitch*3] = (unsigned char)((c + 102 * d + 128) >> 8); - // No other line for interplation of this line, so .. + /* No other line for interplation of this line, so .. */ des[dest_pitch*4] = (unsigned char) d; des++; @@ -400,7 +401,7 @@ void vp8cx_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitc des [dest_pitch*2] = (unsigned char)((b * 205 + c * 51 + 128) >> 8); des [dest_pitch*3] = (unsigned char)((b * 51 + c * 205 + 128) >> 8); - // First line in next band... + /* First line in next band... */ a = des [dest_pitch * 5]; des [dest_pitch * 4] = (unsigned char)((c * 154 + a * 102 + 128) >> 8); @@ -445,7 +446,7 @@ void vp8cx_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest des [dest_pitch*2] = (unsigned char)((b * 205 + c * 51 + 128) >> 8); des [dest_pitch*3] = (unsigned char)((b * 51 + c * 205 + 128) >> 8); - // No other line for interplation of this line, so .. + /* No other line for interplation of this line, so .. */ des [ dest_pitch * 4 ] = (unsigned char)(c) ; des++; @@ -548,7 +549,7 @@ void vp8cx_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitc c = des[dest_pitch*2]; des [dest_pitch*2] = (unsigned char)((b + c + 1) >> 1); - // First line in next band... + /* First line in next band... */ a = des [dest_pitch*4]; des [dest_pitch*3] = (unsigned char)((c * 192 + a * 64 + 128) >> 8); @@ -592,7 +593,7 @@ void vp8cx_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest c = des[dest_pitch*2]; des [dest_pitch*2] = (unsigned char)((b + c + 1) >> 1); - // No other line for interplation of this line, so .. + /* No other line for interplation of this line, so .. */ des [dest_pitch*3] = (unsigned char)(c); des++; @@ -936,12 +937,13 @@ void vp8cx_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pit void vp8cx_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width) { - unsigned int i; + int i; int temp; + int width = dest_width; (void) dest_pitch; - for (i = 0; i < dest_width; i++) + for (i = 0; i < width; i++) { temp = 8; temp += source[i-(int)src_pitch] * 3; diff --git a/vpx_scale/generic/scalesystemdependant.c b/vpx_scale/generic/scalesystemdependant.c index 542e5daa9..926feb7cd 100644 --- a/vpx_scale/generic/scalesystemdependant.c +++ b/vpx_scale/generic/scalesystemdependant.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/generic/vpxscale.c b/vpx_scale/generic/vpxscale.c index 206cd5512..13c9122f0 100644 --- a/vpx_scale/generic/vpxscale.c +++ b/vpx_scale/generic/vpxscale.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -278,9 +279,9 @@ void scale1d_c (void) source_length; - // These asserts are needed if there are boundary issues... - //assert ( dest_scale > source_scale ); - //assert ( (source_length-1) * dest_scale >= (dest_length-1) * source_scale ); + /* These asserts are needed if there are boundary issues... */ + /*assert ( dest_scale > source_scale );*/ + /*assert ( (source_length-1) * dest_scale >= (dest_length-1) * source_scale );*/ for (i = 0; i < dest_length * dest_step; i += dest_step) { @@ -333,7 +334,7 @@ void scale1d_c static void Scale2D ( - //const + /*const*/ unsigned char *source, int source_pitch, unsigned int source_width, @@ -351,7 +352,7 @@ void Scale2D unsigned int interlaced ) { - //unsigned + /*unsigned*/ int i, j, k; int bands; int dest_band_height; @@ -369,7 +370,7 @@ void Scale2D int ratio_scalable = 1; int interpolation = 0; - unsigned char *source_base; // = (unsigned char *) ((source_pitch >= 0) ? source : (source + ((source_height-1) * source_pitch))); + unsigned char *source_base; /* = (unsigned char *) ((source_pitch >= 0) ? source : (source + ((source_height-1) * source_pitch))); */ unsigned char *line_src; @@ -385,24 +386,24 @@ void Scale2D source_base += offset; } - // find out the ratio for each direction + /* find out the ratio for each direction */ switch (hratio * 10 / hscale) { case 8: - // 4-5 Scale in Width direction + /* 4-5 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_5_4_scale; break; case 6: - // 3-5 Scale in Width direction + /* 3-5 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_5_3_scale; break; case 5: - // 1-2 Scale in Width direction + /* 1-2 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_2_1_scale; break; default: - // The ratio is not acceptable now - // throw("The ratio is not acceptable for now!"); + /* The ratio is not acceptable now */ + /* throw("The ratio is not acceptable for now!"); */ ratio_scalable = 0; break; } @@ -410,30 +411,30 @@ void Scale2D switch (vratio * 10 / vscale) { case 8: - // 4-5 Scale in vertical direction + /* 4-5 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_5_4_scale; source_band_height = 5; dest_band_height = 4; break; case 6: - // 3-5 Scale in vertical direction + /* 3-5 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_5_3_scale; source_band_height = 5; dest_band_height = 3; break; case 5: - // 1-2 Scale in vertical direction + /* 1-2 Scale in vertical direction */ if (interlaced) { - //if the content is interlaced, point sampling is used + /* if the content is interlaced, point sampling is used */ vert_band_scale = vp8_vertical_band_2_1_scale; } else { interpolation = 1; - //if the content is progressive, interplo + /* if the content is progressive, interplo */ vert_band_scale = vp8_vertical_band_2_1_scale_i; } @@ -442,8 +443,8 @@ void Scale2D dest_band_height = 1; break; default: - // The ratio is not acceptable now - // throw("The ratio is not acceptable for now!"); + /* The ratio is not acceptable now */ + /* throw("The ratio is not acceptable for now!"); */ ratio_scalable = 0; break; } @@ -452,7 +453,7 @@ void Scale2D { if (source_height == dest_height) { - // for each band of the image + /* for each band of the image */ for (k = 0; k < (int)dest_height; k++) { horiz_line_scale(source, source_width, dest, dest_width); @@ -473,10 +474,10 @@ void Scale2D for (k = 0; k < (int)(dest_height + dest_band_height - 1) / dest_band_height; k++) { - // scale one band horizontally + /* scale one band horizontally */ for (i = 0; i < source_band_height; i++) { - // Trap case where we could read off the base of the source buffer + /* Trap case where we could read off the base of the source buffer */ line_src = (unsigned char *)source + i * source_pitch; @@ -487,13 +488,13 @@ void Scale2D temp_area + (i + 1)*dest_pitch, dest_width); } - // Vertical scaling is in place + /* Vertical scaling is in place */ vert_band_scale(temp_area + dest_pitch, dest_pitch, dest, dest_pitch, dest_width); if (interpolation) vpx_memcpy(temp_area, temp_area + source_band_height * dest_pitch, dest_width); - // Next band... + /* Next band... */ source += (unsigned long) source_band_height * source_pitch; dest += (unsigned long) dest_band_height * dest_pitch; } @@ -514,7 +515,7 @@ void Scale2D if (source_height == dest_height) { - // for each band of the image + /* for each band of the image */ for (k = 0; k < (int)dest_height; k++) { Scale1Dh(source, 1, hscale, source_width + 1, dest, 1, hratio, dest_width); @@ -536,15 +537,15 @@ void Scale2D dest_band_height = source_band_height * vratio / vscale; } - // first row needs to be done so that we can stay one row ahead for vertical zoom + /* first row needs to be done so that we can stay one row ahead for vertical zoom */ Scale1Dh(source, 1, hscale, source_width + 1, temp_area, 1, hratio, dest_width); - // for each band of the image + /* for each band of the image */ bands = (dest_height + dest_band_height - 1) / dest_band_height; for (k = 0; k < bands; k++) { - // scale one band horizontally + /* scale one band horizontally */ for (i = 1; i < source_band_height + 1; i++) { if (k * source_band_height + i < (int) source_height) @@ -552,24 +553,24 @@ void Scale2D Scale1Dh(source + i * source_pitch, 1, hscale, source_width + 1, 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); } } - // scale one band vertically + /* scale one band vertically */ for (j = 0; j < (int)dest_width; j++) { Scale1Dv(&temp_area[j], dest_pitch, vscale, source_band_height + 1, &dest[j], dest_pitch, vratio, dest_band_height); } - // 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); - // move to the next band + /* move to the next band */ source += source_band_height * source_pitch; dest += dest_band_height * dest_pitch; } @@ -616,7 +617,7 @@ void vp8_scale_frame int dw = (hscale - 1 + src->y_width * hratio) / hscale; int dh = (vscale - 1 + src->y_height * vratio) / vscale; - // call our internal scaling routines!! + /* call our internal scaling routines!! */ Scale2D((unsigned char *) src->y_buffer, src->y_stride, src->y_width, src->y_height, (unsigned char *) dst->y_buffer, dst->y_stride, dw, dh, temp_area, temp_height, hscale, hratio, vscale, vratio, interlaced); @@ -695,13 +696,13 @@ int any_ratio_2d_scale unsigned int src_band_height = 0; unsigned int dest_band_height = 0; - // suggested scale factors + /* suggested scale factors */ int hs = si->HScale; int hr = si->HRatio; int vs = si->VScale; int vr = si->VRatio; - // assume the ratios are scalable instead of should be centered + /* assume the ratios are scalable instead of should be centered */ int ratio_scalable = 1; const unsigned char *source_base = ((source_pitch >= 0) ? source : (source + ((source_height - 1) * source_pitch))); @@ -713,37 +714,37 @@ int any_ratio_2d_scale (void) si; - // find out the ratio for each direction + /* find out the ratio for each direction */ switch (hr * 30 / hs) { case 24: - // 4-5 Scale in Width direction + /* 4-5 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_4_5_scale; break; case 22: - // 3-4 Scale in Width direction + /* 3-4 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_3_4_scale; break; case 20: - // 4-5 Scale in Width direction + /* 4-5 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_2_3_scale; break; case 18: - // 3-5 Scale in Width direction + /* 3-5 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_3_5_scale; break; case 15: - // 1-2 Scale in Width direction + /* 1-2 Scale in Width direction */ horiz_line_scale = vp8_horizontal_line_1_2_scale; break; case 30: - // no scale in Width direction + /* no scale in Width direction */ horiz_line_scale = horizontal_line_copy; break; default: - // The ratio is not acceptable now - // throw("The ratio is not acceptable for now!"); + /* The ratio is not acceptable now */ + /* throw("The ratio is not acceptable for now!"); */ ratio_scalable = 0; break; } @@ -751,50 +752,50 @@ int any_ratio_2d_scale switch (vr * 30 / vs) { case 24: - // 4-5 Scale in vertical direction + /* 4-5 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_4_5_scale; last_vert_band_scale = vp8_last_vertical_band_4_5_scale; src_band_height = 4; dest_band_height = 5; break; case 22: - // 3-4 Scale in vertical direction + /* 3-4 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_3_4_scale; last_vert_band_scale = vp8_last_vertical_band_3_4_scale; src_band_height = 3; dest_band_height = 4; break; case 20: - // 2-3 Scale in vertical direction + /* 2-3 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_2_3_scale; last_vert_band_scale = vp8_last_vertical_band_2_3_scale; src_band_height = 2; dest_band_height = 3; break; case 18: - // 3-5 Scale in vertical direction + /* 3-5 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_3_5_scale; last_vert_band_scale = vp8_last_vertical_band_3_5_scale; src_band_height = 3; dest_band_height = 5; break; case 15: - // 1-2 Scale in vertical direction + /* 1-2 Scale in vertical direction */ vert_band_scale = vp8_vertical_band_1_2_scale; last_vert_band_scale = vp8_last_vertical_band_1_2_scale; src_band_height = 1; dest_band_height = 2; break; case 30: - // no scale in Width direction + /* no scale in Width direction */ vert_band_scale = null_scale; last_vert_band_scale = null_scale; src_band_height = 4; dest_band_height = 4; break; default: - // The ratio is not acceptable now - // throw("The ratio is not acceptable for now!"); + /* The ratio is not acceptable now */ + /* throw("The ratio is not acceptable for now!"); */ ratio_scalable = 0; break; } @@ -804,13 +805,13 @@ int any_ratio_2d_scale horiz_line_scale(source, source_width, dest, dest_width); - // except last band + /* except last band */ for (k = 0; k < (dest_height + dest_band_height - 1) / dest_band_height - 1; k++) { - // scale one band horizontally + /* scale one band horizontally */ for (i = 1; i < src_band_height; i++) { - // Trap case where we could read off the base of the source buffer + /* Trap case where we could read off the base of the source buffer */ line_src = source + i * source_pitch; if (line_src < source_base) @@ -820,8 +821,8 @@ int any_ratio_2d_scale dest + i * dest_pitch, dest_width); } - // first line of next band - // Trap case where we could read off the base of the source buffer + /* first line of next band */ + /* Trap case where we could read off the base of the source buffer */ line_src = source + src_band_height * source_pitch; if (line_src < source_base) @@ -831,18 +832,18 @@ int any_ratio_2d_scale dest + dest_band_height * dest_pitch, dest_width); - // Vertical scaling is in place + /* Vertical scaling is in place */ vert_band_scale(dest, dest_pitch, dest_width); - // Next band... + /* Next band... */ source += src_band_height * source_pitch; dest += dest_band_height * dest_pitch; } - // scale one band horizontally + /* scale one band horizontally */ for (i = 1; i < src_band_height; i++) { - // Trap case where we could read off the base of the source buffer + /* Trap case where we could read off the base of the source buffer */ line_src = source + i * source_pitch; if (line_src < source_base) @@ -853,7 +854,7 @@ int any_ratio_2d_scale dest_width); } - // Vertical scaling is in place + /* Vertical scaling is in place */ last_vert_band_scale(dest, dest_pitch, dest_width); return ratio_scalable; @@ -884,7 +885,7 @@ int any_ratio_frame_scale(SCALE_VARS *scale_vars, int YOffset, int UVOffset) int ew; int eh; - // suggested scale factors + /* suggested scale factors */ int hs = scale_vars->HScale; int hr = scale_vars->HRatio; int vs = scale_vars->VScale; @@ -967,11 +968,11 @@ center_image(YV12_BUFFER_CONFIG *src_yuv_config, YV12_BUFFER_CONFIG *dst_yuv_con unsigned char *src_data_pointer; unsigned char *dst_data_pointer; - // center values + /* center values */ row_offset = (dst_yuv_config->y_height - src_yuv_config->y_height) / 2; col_offset = (dst_yuv_config->y_width - src_yuv_config->y_width) / 2; - // Y's + /* Y's */ src_data_pointer = src_yuv_config->y_buffer; dst_data_pointer = (unsigned char *)dst_yuv_config->y_buffer + (row_offset * dst_yuv_config->y_stride) + col_offset; @@ -985,7 +986,7 @@ center_image(YV12_BUFFER_CONFIG *src_yuv_config, YV12_BUFFER_CONFIG *dst_yuv_con row_offset /= 2; col_offset /= 2; - // U's + /* U's */ src_data_pointer = src_yuv_config->u_buffer; dst_data_pointer = (unsigned char *)dst_yuv_config->u_buffer + (row_offset * dst_yuv_config->uv_stride) + col_offset; @@ -996,7 +997,7 @@ center_image(YV12_BUFFER_CONFIG *src_yuv_config, YV12_BUFFER_CONFIG *dst_yuv_con src_data_pointer += src_yuv_config->uv_stride; } - // V's + /* V's */ src_data_pointer = src_yuv_config->v_buffer; dst_data_pointer = (unsigned char *)dst_yuv_config->v_buffer + (row_offset * dst_yuv_config->uv_stride) + col_offset; @@ -1039,8 +1040,8 @@ vp8_yv12_scale_or_center int VRatio ) { -// if ( ppi->post_processing_level ) - // update_umvborder ( ppi, frame_buffer ); + /*if ( ppi->post_processing_level ) + update_umvborder ( ppi, frame_buffer );*/ switch (scaling_mode) @@ -1049,12 +1050,12 @@ vp8_yv12_scale_or_center case MAINTAIN_ASPECT_RATIO: { SCALE_VARS scale_vars; - // center values + /* center values */ #if 1 int row = (dst_yuv_config->y_height - expanded_frame_height) / 2; int col = (dst_yuv_config->y_width - expanded_frame_width) / 2; -// int YOffset = row * dst_yuv_config->y_width + col; -// int UVOffset = (row>>1) * dst_yuv_config->uv_width + (col>>1); + /*int YOffset = row * dst_yuv_config->y_width + col; + int UVOffset = (row>>1) * dst_yuv_config->uv_width + (col>>1);*/ int YOffset = row * dst_yuv_config->y_stride + col; int UVOffset = (row >> 1) * dst_yuv_config->uv_stride + (col >> 1); #else @@ -1073,7 +1074,7 @@ vp8_yv12_scale_or_center scale_vars.expanded_frame_width = expanded_frame_width; scale_vars.expanded_frame_height = expanded_frame_height; - // perform center and scale + /* perform center and scale */ any_ratio_frame_scale(&scale_vars, YOffset, UVOffset); break; diff --git a/vpx_scale/generic/yv12config.c b/vpx_scale/generic/yv12config.c index 04617be51..d9d228551 100644 --- a/vpx_scale/generic/yv12config.c +++ b/vpx_scale/generic/yv12config.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -44,7 +45,7 @@ vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf) int vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, int border) { -//NOTE: +/*NOTE:*/ int yplane_size = (height + 2 * border) * (width + 2 * border); int uvplane_size = ((1 + height) / 2 + border) * ((1 + width) / 2 + border); @@ -64,9 +65,10 @@ vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, int ybf->border = border; ybf->frame_size = yplane_size + 2 * uvplane_size; - // Added 2 extra lines to framebuffer so that copy12x12 doesn't fail - // when we have a large motion vector in V on the last v block. - // Note : We never use these pixels anyway so this doesn't hurt. + /* Added 2 extra lines to framebuffer so that copy12x12 doesn't fail + * when we have a large motion vector in V on the last v block. + * Note : We never use these pixels anyway so this doesn't hurt. + */ ybf->buffer_alloc = (unsigned char *) duck_memalign(32, ybf->frame_size + (ybf->y_stride * 2) + 32, 0); if (ybf->buffer_alloc == NULL) diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 4906625c8..e58aa1fb2 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -39,7 +40,7 @@ vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) plane_height = ybf->y_height; plane_width = ybf->y_width; - // copy the left and right most columns out + /* copy the left and right most columns out */ src_ptr1 = ybf->y_buffer; src_ptr2 = src_ptr1 + plane_width - 1; dest_ptr1 = src_ptr1 - Border; @@ -55,7 +56,7 @@ vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) dest_ptr2 += plane_stride; } - // Now copy the top and bottom source lines into each line of the respective borders + /* Now copy the top and bottom source lines into each line of the respective borders */ src_ptr1 = ybf->y_buffer - Border; src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; dest_ptr1 = src_ptr1 - (Border * plane_stride); @@ -78,7 +79,7 @@ vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) plane_width = ybf->uv_width; Border /= 2; - // copy the left and right most columns out + /* copy the left and right most columns out */ src_ptr1 = ybf->u_buffer; src_ptr2 = src_ptr1 + plane_width - 1; dest_ptr1 = src_ptr1 - Border; @@ -94,7 +95,7 @@ vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) dest_ptr2 += plane_stride; } - // Now copy the top and bottom source lines into each line of the respective borders + /* Now copy the top and bottom source lines into each line of the respective borders */ src_ptr1 = ybf->u_buffer - Border; src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; dest_ptr1 = src_ptr1 - (Border * plane_stride); @@ -112,7 +113,7 @@ vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) /* V Plane */ /***********/ - // copy the left and right most columns out + /* copy the left and right most columns out */ src_ptr1 = ybf->v_buffer; src_ptr2 = src_ptr1 + plane_width - 1; dest_ptr1 = src_ptr1 - Border; @@ -128,7 +129,7 @@ vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) dest_ptr2 += plane_stride; } - // Now copy the top and bottom source lines into each line of the respective borders + /* Now copy the top and bottom source lines into each line of the respective borders */ src_ptr1 = ybf->v_buffer - Border; src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; dest_ptr1 = src_ptr1 - (Border * plane_stride); @@ -164,7 +165,7 @@ vp8_yv12_extend_frame_borders_yonly(YV12_BUFFER_CONFIG *ybf) plane_height = ybf->y_height; plane_width = ybf->y_width; - // copy the left and right most columns out + /* copy the left and right most columns out */ src_ptr1 = ybf->y_buffer; src_ptr2 = src_ptr1 + plane_width - 1; dest_ptr1 = src_ptr1 - Border; @@ -180,7 +181,7 @@ vp8_yv12_extend_frame_borders_yonly(YV12_BUFFER_CONFIG *ybf) dest_ptr2 += plane_stride; } - // Now copy the top and bottom source lines into each line of the respective borders + /* Now copy the top and bottom source lines into each line of the respective borders */ src_ptr1 = ybf->y_buffer - Border; src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; dest_ptr1 = src_ptr1 - (Border * plane_stride); diff --git a/vpx_scale/include/arm/vpxscale_nofp.h b/vpx_scale/include/arm/vpxscale_nofp.h index d6181d207..3e1a9fa83 100644 --- a/vpx_scale/include/arm/vpxscale_nofp.h +++ b/vpx_scale/include/arm/vpxscale_nofp.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/include/generic/vpxscale_arbitrary.h b/vpx_scale/include/generic/vpxscale_arbitrary.h index 2b50f24cf..39de1816b 100644 --- a/vpx_scale/include/generic/vpxscale_arbitrary.h +++ b/vpx_scale/include/generic/vpxscale_arbitrary.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/include/generic/vpxscale_depricated.h b/vpx_scale/include/generic/vpxscale_depricated.h index 015eed0fc..3f7fe0f04 100644 --- a/vpx_scale/include/generic/vpxscale_depricated.h +++ b/vpx_scale/include/generic/vpxscale_depricated.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/include/generic/vpxscale_nofp.h b/vpx_scale/include/generic/vpxscale_nofp.h index c4d5f4c6f..7b8205a1b 100644 --- a/vpx_scale/include/generic/vpxscale_nofp.h +++ b/vpx_scale/include/generic/vpxscale_nofp.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/include/leapster/vpxscale.h b/vpx_scale/include/leapster/vpxscale.h index f70029cae..50218497d 100644 --- a/vpx_scale/include/leapster/vpxscale.h +++ b/vpx_scale/include/leapster/vpxscale.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/include/symbian/vpxscale_nofp.h b/vpx_scale/include/symbian/vpxscale_nofp.h index d6181d207..3e1a9fa83 100644 --- a/vpx_scale/include/symbian/vpxscale_nofp.h +++ b/vpx_scale/include/symbian/vpxscale_nofp.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/include/vpxscale_nofp.h b/vpx_scale/include/vpxscale_nofp.h index f6482f944..a704bd92c 100644 --- a/vpx_scale/include/vpxscale_nofp.h +++ b/vpx_scale/include/vpxscale_nofp.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/intel_linux/scaleopt.c b/vpx_scale/intel_linux/scaleopt.c index 6555600e9..499f0ed61 100644 --- a/vpx_scale/intel_linux/scaleopt.c +++ b/vpx_scale/intel_linux/scaleopt.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/intel_linux/scalesystemdependant.c b/vpx_scale/intel_linux/scalesystemdependant.c index 9ed48bfc6..eab741f83 100644 --- a/vpx_scale/intel_linux/scalesystemdependant.c +++ b/vpx_scale/intel_linux/scalesystemdependant.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/leapster/doptsystemdependant_lf.c b/vpx_scale/leapster/doptsystemdependant_lf.c index ca1316730..7cbb1c555 100644 --- a/vpx_scale/leapster/doptsystemdependant_lf.c +++ b/vpx_scale/leapster/doptsystemdependant_lf.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/leapster/gen_scalers_lf.c b/vpx_scale/leapster/gen_scalers_lf.c index 1b9c7c745..f1ee056ea 100644 --- a/vpx_scale/leapster/gen_scalers_lf.c +++ b/vpx_scale/leapster/gen_scalers_lf.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/leapster/vpxscale_lf.c b/vpx_scale/leapster/vpxscale_lf.c index 5f05e5de0..616ddf559 100644 --- a/vpx_scale/leapster/vpxscale_lf.c +++ b/vpx_scale/leapster/vpxscale_lf.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/leapster/yv12extend.c b/vpx_scale/leapster/yv12extend.c index 480d971b4..1cddd9540 100644 --- a/vpx_scale/leapster/yv12extend.c +++ b/vpx_scale/leapster/yv12extend.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/scale_mode.h b/vpx_scale/scale_mode.h index 2a9ab7612..1476e641b 100644 --- a/vpx_scale/scale_mode.h +++ b/vpx_scale/scale_mode.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/symbian/gen_scalers_armv4.asm b/vpx_scale/symbian/gen_scalers_armv4.asm index 1c904edae..e495184e7 100644 --- a/vpx_scale/symbian/gen_scalers_armv4.asm +++ b/vpx_scale/symbian/gen_scalers_armv4.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/symbian/scalesystemdependant.c b/vpx_scale/symbian/scalesystemdependant.c index a2acc3e9d..b0bffddb7 100644 --- a/vpx_scale/symbian/scalesystemdependant.c +++ b/vpx_scale/symbian/scalesystemdependant.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/vpxscale.h b/vpx_scale/vpxscale.h index 9a86b75de..86fc128da 100644 --- a/vpx_scale/vpxscale.h +++ b/vpx_scale/vpxscale.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/wce/gen_scalers_armv4.asm b/vpx_scale/wce/gen_scalers_armv4.asm index 1c904edae..e495184e7 100644 --- a/vpx_scale/wce/gen_scalers_armv4.asm +++ b/vpx_scale/wce/gen_scalers_armv4.asm @@ -1,10 +1,11 @@ ; -; Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +; Copyright (c) 2010 The WebM project authors. All Rights Reserved. ; -; Use of this source code is governed by a BSD-style license and patent -; grant that can be found in the LICENSE file in the root of the source -; tree. All contributing project authors may be found in the AUTHORS -; file in the root of the source tree. +; Use of this source code is governed by a BSD-style license +; that can be found in the LICENSE file in the root of the source +; tree. An additional intellectual property rights grant can be found +; in the file PATENTS. All contributing project authors may +; be found in the AUTHORS file in the root of the source tree. ; diff --git a/vpx_scale/wce/scalesystemdependant.c b/vpx_scale/wce/scalesystemdependant.c index a5a6a5275..e9f2c26a9 100644 --- a/vpx_scale/wce/scalesystemdependant.c +++ b/vpx_scale/wce/scalesystemdependant.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/win32/scaleopt.c b/vpx_scale/win32/scaleopt.c index da0533e6b..3711fe5eb 100644 --- a/vpx_scale/win32/scaleopt.c +++ b/vpx_scale/win32/scaleopt.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/win32/scalesystemdependant.c b/vpx_scale/win32/scalesystemdependant.c index 9ed48bfc6..eab741f83 100644 --- a/vpx_scale/win32/scalesystemdependant.c +++ b/vpx_scale/win32/scalesystemdependant.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/x86_64/scaleopt.c b/vpx_scale/x86_64/scaleopt.c index 3d2d5f237..101f5ff60 100644 --- a/vpx_scale/x86_64/scaleopt.c +++ b/vpx_scale/x86_64/scaleopt.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/x86_64/scalesystemdependant.c b/vpx_scale/x86_64/scalesystemdependant.c index 43f05a68c..89ae86e00 100644 --- a/vpx_scale/x86_64/scalesystemdependant.c +++ b/vpx_scale/x86_64/scalesystemdependant.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index a8d0ce45b..5dcee818a 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -31,8 +32,8 @@ extern "C" ************************************/ typedef enum { - REG_YUV = 0, // Regular yuv - INT_YUV = 1 // The type of yuv that can be tranfer to and from RGB through integer transform + REG_YUV = 0, /* Regular yuv */ + INT_YUV = 1 /* The type of yuv that can be tranfer to and from RGB through integer transform */ } YUV_TYPE; @@ -41,12 +42,12 @@ extern "C" int y_width; int y_height; int y_stride; -// int yinternal_width; +/* int yinternal_width; */ int uv_width; int uv_height; int uv_stride; -// int uvinternal_width; +/* int uvinternal_width; */ unsigned char *y_buffer; unsigned char *u_buffer; @@ -67,4 +68,4 @@ extern "C" #endif -#endif //YV12_CONFIG_H +#endif /*YV12_CONFIG_H*/ diff --git a/vpx_scale/yv12extend.h b/vpx_scale/yv12extend.h index 9968feae8..0c239b9d1 100644 --- a/vpx_scale/yv12extend.h +++ b/vpx_scale/yv12extend.h @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ |