Merge changes I341bd674,Ia9a0d71d,I71c1f906,I2e36e07c,I94ee2e85, ...
* changes:
Refactor check_initial_width
Move noise_sensitivity to set_encoder_config
Remove extra function calls in check_initial_width
Move init_ref_frame_bufs to vp9_create_compressor
Remove bits_left update in encoder_encode()
Add vp9_get_encoder_config / vp9_get_frame_info
vp9_get_coding_frame_num()
Make [min/max]_gf_interval static under rate_ctrl
Add rate_ctrl flag
diff --git a/README b/README
index eae9783..17271e3 100644
--- a/README
+++ b/README
@@ -100,6 +100,7 @@
x86-win32-gcc
x86-win32-vs14
x86-win32-vs15
+ x86-win32-vs16
x86_64-android-gcc
x86_64-darwin9-gcc
x86_64-darwin10-gcc
@@ -118,6 +119,7 @@
x86_64-win64-gcc
x86_64-win64-vs14
x86_64-win64-vs15
+ x86_64-win64-vs16
generic-gnu
The generic-gnu target, in conjunction with the CROSS environment variable,
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 0e25f65..fc00a32 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1081,60 +1081,62 @@
;;
darwin*)
- XCRUN_FIND="xcrun --sdk iphoneos --find"
- CXX="$(${XCRUN_FIND} clang++)"
- CC="$(${XCRUN_FIND} clang)"
- AR="$(${XCRUN_FIND} ar)"
- AS="$(${XCRUN_FIND} as)"
- STRIP="$(${XCRUN_FIND} strip)"
- NM="$(${XCRUN_FIND} nm)"
- RANLIB="$(${XCRUN_FIND} ranlib)"
- AS_SFX=.S
- LD="${CXX:-$(${XCRUN_FIND} ld)}"
+ if ! enabled external_build; then
+ XCRUN_FIND="xcrun --sdk iphoneos --find"
+ CXX="$(${XCRUN_FIND} clang++)"
+ CC="$(${XCRUN_FIND} clang)"
+ AR="$(${XCRUN_FIND} ar)"
+ AS="$(${XCRUN_FIND} as)"
+ STRIP="$(${XCRUN_FIND} strip)"
+ NM="$(${XCRUN_FIND} nm)"
+ RANLIB="$(${XCRUN_FIND} ranlib)"
+ AS_SFX=.S
+ LD="${CXX:-$(${XCRUN_FIND} ld)}"
- # ASFLAGS is written here instead of using check_add_asflags
- # because we need to overwrite all of ASFLAGS and purge the
- # options that were put in above
- ASFLAGS="-arch ${tgt_isa} -g"
+ # ASFLAGS is written here instead of using check_add_asflags
+ # because we need to overwrite all of ASFLAGS and purge the
+ # options that were put in above
+ ASFLAGS="-arch ${tgt_isa} -g"
- add_cflags -arch ${tgt_isa}
- add_ldflags -arch ${tgt_isa}
+ add_cflags -arch ${tgt_isa}
+ add_ldflags -arch ${tgt_isa}
- alt_libc="$(show_darwin_sdk_path iphoneos)"
- if [ -d "${alt_libc}" ]; then
- add_cflags -isysroot ${alt_libc}
- fi
+ alt_libc="$(show_darwin_sdk_path iphoneos)"
+ if [ -d "${alt_libc}" ]; then
+ add_cflags -isysroot ${alt_libc}
+ fi
- if [ "${LD}" = "${CXX}" ]; then
- add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"
- else
- add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
- fi
+ if [ "${LD}" = "${CXX}" ]; then
+ add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"
+ else
+ add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
+ fi
- for d in lib usr/lib usr/lib/system; do
- try_dir="${alt_libc}/${d}"
- [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
- done
+ for d in lib usr/lib usr/lib/system; do
+ try_dir="${alt_libc}/${d}"
+ [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
+ done
- case ${tgt_isa} in
- armv7|armv7s|armv8|arm64)
- if enabled neon && ! check_xcode_minimum_version; then
- soft_disable neon
- log_echo " neon disabled: upgrade Xcode (need v6.3+)."
- if enabled neon_asm; then
- soft_disable neon_asm
- log_echo " neon_asm disabled: upgrade Xcode (need v6.3+)."
+ case ${tgt_isa} in
+ armv7|armv7s|armv8|arm64)
+ if enabled neon && ! check_xcode_minimum_version; then
+ soft_disable neon
+ log_echo " neon disabled: upgrade Xcode (need v6.3+)."
+ if enabled neon_asm; then
+ soft_disable neon_asm
+ log_echo " neon_asm disabled: upgrade Xcode (need v6.3+)."
+ fi
fi
- fi
- ;;
- esac
+ ;;
+ esac
- asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
+ asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
- if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then
- check_add_cflags -fembed-bitcode
- check_add_asflags -fembed-bitcode
- check_add_ldflags -fembed-bitcode
+ if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then
+ check_add_cflags -fembed-bitcode
+ check_add_asflags -fembed-bitcode
+ check_add_ldflags -fembed-bitcode
+ fi
fi
;;
diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh
index 401223a..d1adfd7 100755
--- a/build/make/gen_msvs_sln.sh
+++ b/build/make/gen_msvs_sln.sh
@@ -25,7 +25,7 @@
Options:
--help Print this message
--out=outfile Redirect output to a file
- --ver=version Version (7,8,9,10,11,12,14,15) of visual studio to generate for
+ --ver=version Version (14-16) of visual studio to generate for
--target=isa-os-cc Target specifier
EOF
exit 1
@@ -213,13 +213,14 @@
;;
--dep=*) eval "${optval%%:*}_deps=\"\${${optval%%:*}_deps} ${optval##*:}\""
;;
- --ver=*) vs_ver="$optval"
- case $optval in
- 10|11|12|14|15)
- ;;
- *) die Unrecognized Visual Studio Version in $opt
- ;;
- esac
+ --ver=*)
+ vs_ver="$optval"
+ case $optval in
+ 14) vs_year=2015 ;;
+ 15) vs_year=2017 ;;
+ 16) vs_year=2019 ;;
+ *) die Unrecognized Visual Studio Version in $opt ;;
+ esac
;;
--target=*) target="${optval}"
;;
@@ -230,21 +231,11 @@
done
outfile=${outfile:-/dev/stdout}
mkoutfile=${mkoutfile:-/dev/stdout}
-case "${vs_ver:-10}" in
- 10) sln_vers="11.00"
- sln_vers_str="Visual Studio 2010"
- ;;
- 11) sln_vers="12.00"
- sln_vers_str="Visual Studio 2012"
- ;;
- 12) sln_vers="12.00"
- sln_vers_str="Visual Studio 2013"
- ;;
- 14) sln_vers="12.00"
- sln_vers_str="Visual Studio 2015"
- ;;
- 15) sln_vers="12.00"
- sln_vers_str="Visual Studio 2017"
+case "${vs_ver}" in
+ 1[4-6])
+ # VS has used Format Version 12.00 continuously since vs11.
+ sln_vers="12.00"
+ sln_vers_str="Visual Studio ${vs_year}"
;;
esac
sfx=vcxproj
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index 84515ec..bb1c31d 100755
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -34,7 +34,7 @@
--name=project_name Name of the project (required)
--proj-guid=GUID GUID to use for the project
--module-def=filename File containing export definitions (for DLLs)
- --ver=version Version (10,11,12,14,15) of visual studio to generate for
+ --ver=version Version (14-16) of visual studio to generate for
--src-path-bare=dir Path to root of source tree
-Ipath/to/include Additional include directories
-DFLAG[=value] Preprocessor macros to define
@@ -82,7 +82,7 @@
| sed -e "s,$src_path_bare,," \
-e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
- if ([ "$pat" == "asm" ] || [ "$pat" == "s" ] || [ "$pat" == "S" ]) && $asm_use_custom_step; then
+ if ([ "$pat" == "asm" ] || [ "$pat" == "s" ] || [ "$pat" == "S" ]) && $uses_asm; then
# Avoid object file name collisions, i.e. vpx_config.c and
# vpx_config.asm produce the same object file without
# this additional suffix.
@@ -168,7 +168,7 @@
--ver=*)
vs_ver="$optval"
case "$optval" in
- 10|11|12|14|15)
+ 1[4-6])
;;
*) die Unrecognized Visual Studio Version in $opt
;;
@@ -215,13 +215,7 @@
outfile=${outfile:-/dev/stdout}
guid=${guid:-`generate_uuid`}
-asm_use_custom_step=false
uses_asm=${uses_asm:-false}
-case "${vs_ver:-11}" in
- 10|11|12|14|15)
- asm_use_custom_step=$uses_asm
- ;;
-esac
[ -n "$name" ] || die "Project name (--name) must be specified!"
[ -n "$target" ] || die "Target (--target) must be specified!"
@@ -339,32 +333,15 @@
else
tag_content ConfigurationType StaticLibrary
fi
- if [ "$vs_ver" = "11" ]; then
- if [ "$plat" = "ARM" ]; then
- # Setting the wp80 toolchain automatically sets the
- # WINAPI_FAMILY define, which is required for building
- # code for arm with the windows headers. Alternatively,
- # one could add AppContainerApplication=true in the Globals
- # section and add PrecompiledHeader=NotUsing and
- # CompileAsWinRT=false in ClCompile and SubSystem=Console
- # in Link.
- tag_content PlatformToolset v110_wp80
- else
- tag_content PlatformToolset v110
- fi
- fi
- if [ "$vs_ver" = "12" ]; then
- # Setting a PlatformToolset indicating windows phone isn't
- # enough to build code for arm with MSVC 2013, one strictly
- # has to enable AppContainerApplication as well.
- tag_content PlatformToolset v120
- fi
if [ "$vs_ver" = "14" ]; then
tag_content PlatformToolset v140
fi
if [ "$vs_ver" = "15" ]; then
tag_content PlatformToolset v141
fi
+ if [ "$vs_ver" = "16" ]; then
+ tag_content PlatformToolset v142
+ fi
tag_content CharacterSet Unicode
if [ "$config" = "Release" ]; then
tag_content WholeProgramOptimization true
diff --git a/configure b/configure
index 79a1b33..181e27b 100755
--- a/configure
+++ b/configure
@@ -137,6 +137,7 @@
all_platforms="${all_platforms} x86-win32-gcc"
all_platforms="${all_platforms} x86-win32-vs14"
all_platforms="${all_platforms} x86-win32-vs15"
+all_platforms="${all_platforms} x86-win32-vs16"
all_platforms="${all_platforms} x86_64-android-gcc"
all_platforms="${all_platforms} x86_64-darwin9-gcc"
all_platforms="${all_platforms} x86_64-darwin10-gcc"
@@ -155,6 +156,7 @@
all_platforms="${all_platforms} x86_64-win64-gcc"
all_platforms="${all_platforms} x86_64-win64-vs14"
all_platforms="${all_platforms} x86_64-win64-vs15"
+all_platforms="${all_platforms} x86_64-win64-vs16"
all_platforms="${all_platforms} generic-gnu"
# all_targets is a list of all targets that can be configured
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c
index 76c34d1..75ce7ef 100644
--- a/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@ -88,8 +88,6 @@
void vp8_machine_specific_config(VP8_COMMON *ctx) {
#if CONFIG_MULTITHREAD
ctx->processor_core_count = get_cpu_count();
-#else
- (void)ctx;
#endif /* CONFIG_MULTITHREAD */
#if VPX_ARCH_ARM
@@ -98,5 +96,8 @@
ctx->cpu_caps = x86_simd_caps();
#elif VPX_ARCH_PPC
ctx->cpu_caps = ppc_simd_caps();
+#else
+ // generic-gnu targets.
+ ctx->cpu_caps = 0;
#endif
}
diff --git a/vp8/common/loopfilter.h b/vp8/common/loopfilter.h
index 03b23af..909e8df 100644
--- a/vp8/common/loopfilter.h
+++ b/vp8/common/loopfilter.h
@@ -93,9 +93,7 @@
void vp8_loop_filter_row_simple(struct VP8Common *cm,
struct modeinfo *mode_info_context, int mb_row,
- int post_ystride, int post_uvstride,
- unsigned char *y_ptr, unsigned char *u_ptr,
- unsigned char *v_ptr);
+ int post_ystride, unsigned char *y_ptr);
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/vp8/common/onyxd.h b/vp8/common/onyxd.h
index 801ef87..e4e81aa 100644
--- a/vp8/common/onyxd.h
+++ b/vp8/common/onyxd.h
@@ -41,8 +41,7 @@
int vp8dx_get_setting(struct VP8D_COMP *comp, VP8D_SETTING oxst);
-int vp8dx_receive_compressed_data(struct VP8D_COMP *pbi, size_t size,
- const uint8_t *source, int64_t time_stamp);
+int vp8dx_receive_compressed_data(struct VP8D_COMP *pbi, int64_t time_stamp);
int vp8dx_get_raw_frame(struct VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd,
int64_t *time_stamp, int64_t *time_end_stamp,
vp8_ppflags_t *flags);
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index 2ed19c4..c03b16b 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -60,8 +60,7 @@
}
void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh,
- int flag) {
+ YV12_BUFFER_CONFIG *post, int q) {
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5);
@@ -72,8 +71,6 @@
* is a skipped block. */
unsigned char *ylimits = cm->pp_limits_buffer;
unsigned char *uvlimits = cm->pp_limits_buffer + 16 * cm->mb_cols;
- (void)low_var_thresh;
- (void)flag;
if (ppl > 0) {
for (mbr = 0; mbr < cm->mb_rows; ++mbr) {
@@ -116,8 +113,7 @@
}
}
-void vp8_de_noise(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh, int flag,
+void vp8_de_noise(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, int q,
int uvfilter) {
int mbr;
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
@@ -125,9 +121,6 @@
int mb_rows = cm->mb_rows;
int mb_cols = cm->mb_cols;
unsigned char *limits = cm->pp_limits_buffer;
- (void)post;
- (void)low_var_thresh;
- (void)flag;
memset(limits, (unsigned char)ppl, 16 * mb_cols);
@@ -216,11 +209,10 @@
vp8_yv12_copy_frame(&oci->post_proc_buffer, &oci->post_proc_buffer_int);
if (flags & VP8D_DEMACROBLOCK) {
vp8_deblock(oci, &oci->post_proc_buffer_int, &oci->post_proc_buffer,
- q + (deblock_level - 5) * 10, 1, 0);
+ q + (deblock_level - 5) * 10);
vp8_de_mblock(&oci->post_proc_buffer, q + (deblock_level - 5) * 10);
} else if (flags & VP8D_DEBLOCK) {
- vp8_deblock(oci, &oci->post_proc_buffer_int, &oci->post_proc_buffer, q,
- 1, 0);
+ vp8_deblock(oci, &oci->post_proc_buffer_int, &oci->post_proc_buffer, q);
}
}
/* Move partially towards the base q of the previous frame */
@@ -228,12 +220,12 @@
(3 * oci->postproc_state.last_base_qindex + oci->base_qindex) >> 2;
} else if (flags & VP8D_DEMACROBLOCK) {
vp8_deblock(oci, oci->frame_to_show, &oci->post_proc_buffer,
- q + (deblock_level - 5) * 10, 1, 0);
+ q + (deblock_level - 5) * 10);
vp8_de_mblock(&oci->post_proc_buffer, q + (deblock_level - 5) * 10);
oci->postproc_state.last_base_qindex = oci->base_qindex;
} else if (flags & VP8D_DEBLOCK) {
- vp8_deblock(oci, oci->frame_to_show, &oci->post_proc_buffer, q, 1, 0);
+ vp8_deblock(oci, oci->frame_to_show, &oci->post_proc_buffer, q);
oci->postproc_state.last_base_qindex = oci->base_qindex;
} else {
vp8_yv12_copy_frame(oci->frame_to_show, &oci->post_proc_buffer);
diff --git a/vp8/common/postproc.h b/vp8/common/postproc.h
index a14f5f1..492c52a 100644
--- a/vp8/common/postproc.h
+++ b/vp8/common/postproc.h
@@ -29,12 +29,11 @@
int vp8_post_proc_frame(struct VP8Common *oci, YV12_BUFFER_CONFIG *dest,
vp8_ppflags_t *ppflags);
-void vp8_de_noise(struct VP8Common *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh, int flag,
+void vp8_de_noise(struct VP8Common *cm, YV12_BUFFER_CONFIG *source, int q,
int uvfilter);
void vp8_deblock(struct VP8Common *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh, int flag);
+ YV12_BUFFER_CONFIG *post, int q);
#define MFQE_PRECISION 4
diff --git a/vp8/common/vp8_loopfilter.c b/vp8/common/vp8_loopfilter.c
index 9fb1250..9c9e5f3 100644
--- a/vp8/common/vp8_loopfilter.c
+++ b/vp8/common/vp8_loopfilter.c
@@ -219,13 +219,11 @@
}
void vp8_loop_filter_row_simple(VP8_COMMON *cm, MODE_INFO *mode_info_context,
- int mb_row, int post_ystride, int post_uvstride,
- unsigned char *y_ptr, unsigned char *u_ptr,
- unsigned char *v_ptr) {
+ int mb_row, int post_ystride,
+ unsigned char *y_ptr) {
int mb_col;
int filter_level;
loop_filter_info_n *lfi_n = &cm->lf_info;
- (void)post_uvstride;
for (mb_col = 0; mb_col < cm->mb_cols; ++mb_col) {
int skip_lf = (mode_info_context->mbmi.mode != B_PRED &&
@@ -258,8 +256,6 @@
}
y_ptr += 16;
- u_ptr += 8;
- v_ptr += 8;
mode_info_context++; /* step to next MB */
}
diff --git a/vp8/decoder/decodeframe.c b/vp8/decoder/decodeframe.c
index b26b1ae..67c254f 100644
--- a/vp8/decoder/decodeframe.c
+++ b/vp8/decoder/decodeframe.c
@@ -610,8 +610,7 @@
lf_dst[2]);
} else {
vp8_loop_filter_row_simple(pc, lf_mic, mb_row - 1, recon_y_stride,
- recon_uv_stride, lf_dst[0], lf_dst[1],
- lf_dst[2]);
+ lf_dst[0]);
}
if (mb_row > 1) {
yv12_extend_frame_left_right_c(yv12_fb_new, eb_dst[0], eb_dst[1],
@@ -647,8 +646,7 @@
lf_dst[2]);
} else {
vp8_loop_filter_row_simple(pc, lf_mic, mb_row - 1, recon_y_stride,
- recon_uv_stride, lf_dst[0], lf_dst[1],
- lf_dst[2]);
+ lf_dst[0]);
}
yv12_extend_frame_left_right_c(yv12_fb_new, eb_dst[0], eb_dst[1],
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c
index 8e9600c..9437385 100644
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@ -485,10 +485,7 @@
}
}
-static void decode_mb_mode_mvs(VP8D_COMP *pbi, MODE_INFO *mi,
- MB_MODE_INFO *mbmi) {
- (void)mbmi;
-
+static void decode_mb_mode_mvs(VP8D_COMP *pbi, MODE_INFO *mi) {
/* Read the Macroblock segmentation map if it is being updated explicitly
* this frame (reset to 0 above by default)
* By default on a key frame reset all MBs to segment 0
@@ -537,7 +534,7 @@
int mb_num = mb_row * pbi->common.mb_cols + mb_col;
#endif
- decode_mb_mode_mvs(pbi, mi, &mi->mbmi);
+ decode_mb_mode_mvs(pbi, mi);
#if CONFIG_ERROR_CONCEALMENT
/* look for corruption. set mvs_corrupt_from_mb to the current
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c
index 2e52c93..765d2ec 100644
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -302,12 +302,9 @@
return 1;
}
-int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
- const uint8_t *source, int64_t time_stamp) {
+int vp8dx_receive_compressed_data(VP8D_COMP *pbi, int64_t time_stamp) {
VP8_COMMON *cm = &pbi->common;
int retcode = -1;
- (void)size;
- (void)source;
pbi->common.error.error_code = VPX_CODEC_OK;
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 8bd4f36..cd0c2e1 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -62,9 +62,6 @@
extern int vp8_update_coef_context(VP8_COMP *cpi);
#endif
-extern void vp8_deblock_frame(YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int filt_lvl,
- int low_var_thresh, int flag);
extern unsigned int vp8_get_processor_freq();
int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest);
@@ -3791,8 +3788,7 @@
// (temporal denoising) mode.
if (cpi->oxcf.noise_sensitivity >= 3) {
if (cpi->denoiser.denoise_pars.spatial_blur != 0) {
- vp8_de_noise(cm, cpi->Source, cpi->Source,
- cpi->denoiser.denoise_pars.spatial_blur, 1, 0, 0);
+ vp8_de_noise(cm, cpi->Source, cpi->denoiser.denoise_pars.spatial_blur, 1);
}
}
#endif
@@ -3813,9 +3809,9 @@
}
if (cm->frame_type == KEY_FRAME) {
- vp8_de_noise(cm, cpi->Source, cpi->Source, l, 1, 0, 1);
+ vp8_de_noise(cm, cpi->Source, l, 1);
} else {
- vp8_de_noise(cm, cpi->Source, cpi->Source, l, 1, 0, 1);
+ vp8_de_noise(cm, cpi->Source, l, 1);
src = cpi->Source->y_buffer;
@@ -5189,7 +5185,7 @@
double weight = 0;
vp8_deblock(cm, cm->frame_to_show, &cm->post_proc_buffer,
- cm->filter_level * 10 / 6, 1, 0);
+ cm->filter_level * 10 / 6);
vpx_clear_system_state();
ye = calc_plane_error(orig->y_buffer, orig->y_stride, pp->y_buffer,
diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c
index f441ed4..12e5781 100644
--- a/vp8/vp8_dx_iface.c
+++ b/vp8/vp8_dx_iface.c
@@ -485,7 +485,7 @@
pbi->restart_threads = 0;
#endif
ctx->user_priv = user_priv;
- if (vp8dx_receive_compressed_data(pbi, data_sz, data, deadline)) {
+ if (vp8dx_receive_compressed_data(pbi, deadline)) {
res = update_error_state(ctx, &pbi->common.error);
}
