generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master branch into experimental

Browse Source 
Picks up some build system changes, compiler warning fixes, etc.

Change-Id: I2712f99e653502818a101a72696ad54018152d4e
This commit is contained in:
John Koleszar 2013-02-28 16:25:38 -08:00
commit 69c67c9531
59 changed files with 691 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/make/Makefile
View File

@ -74,7 +74,7 @@ HOSTCC?=gcc
TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN))) TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN)))
TGT_OS:=$(word 2, $(subst -, ,$(TOOLCHAIN))) TGT_OS:=$(word 2, $(subst -, ,$(TOOLCHAIN)))
TGT_CC:=$(word 3, $(subst -, ,$(TOOLCHAIN))) TGT_CC:=$(word 3, $(subst -, ,$(TOOLCHAIN)))
quiet:=$(if $(verbose),,yes) quiet:=$(if $(or $(verbose), $(V)),, yes)
qexec=$(if $(quiet),@) qexec=$(if $(quiet),@)
# Cancel built-in implicit rules # Cancel built-in implicit rules
@ -380,6 +380,7 @@ ifneq ($(call enabled,DIST-SRCS),)
# Include obj_int_extract if we use offsets from asm_*_offsets # Include obj_int_extract if we use offsets from asm_*_offsets
DIST-SRCS-$(ARCH_ARM)$(ARCH_X86)$(ARCH_X86_64) += build/make/obj_int_extract.c DIST-SRCS-$(ARCH_ARM)$(ARCH_X86)$(ARCH_X86_64) += build/make/obj_int_extract.c
DIST-SRCS-$(ARCH_ARM) += build/make/ads2gas.pl DIST-SRCS-$(ARCH_ARM) += build/make/ads2gas.pl
DIST-SRCS-$(ARCH_ARM) += build/make/ads2gas_apple.pl
DIST-SRCS-yes += $(target:-$(TOOLCHAIN)=).mk DIST-SRCS-yes += $(target:-$(TOOLCHAIN)=).mk
endif endif
INSTALL-SRCS := $(call cond_enabled,CONFIG_INSTALL_SRCS,INSTALL-SRCS) INSTALL-SRCS := $(call cond_enabled,CONFIG_INSTALL_SRCS,INSTALL-SRCS)

4
build/make/ads2gas_apple.pl
View File

@ -10,12 +10,12 @@
## ##
# ads2gas.pl # ads2gas_apple.pl
# Author: Eric Fung (efung (at) acm.org) # Author: Eric Fung (efung (at) acm.org)
# #
# Convert ARM Developer Suite 1.0.1 syntax assembly source to GNU as format # Convert ARM Developer Suite 1.0.1 syntax assembly source to GNU as format
# #
# Usage: cat inputfile | perl ads2gas.pl > outputfile # Usage: cat inputfile | perl ads2gas_apple.pl > outputfile
# #
print "@ This file was created from a .asm file\n"; print "@ This file was created from a .asm file\n";
print "@ using the ads2gas_apple.pl script.\n\n"; print "@ using the ads2gas_apple.pl script.\n\n";

19
build/make/configure.sh
View File

@ -598,8 +598,13 @@ process_common_toolchain() {
armv6*) armv6*)
tgt_isa=armv6 tgt_isa=armv6
;; ;;
armv7*-hardfloat*)
tgt_isa=armv7
float_abi=hard
;;
armv7*) armv7*)
tgt_isa=armv7 tgt_isa=armv7
float_abi=softfp
;; ;;
armv5te*) armv5te*)
tgt_isa=armv5te tgt_isa=armv5te
@ -643,6 +648,9 @@ process_common_toolchain() {
tgt_isa=x86_64 tgt_isa=x86_64
tgt_os=darwin12 tgt_os=darwin12
;; ;;
x86_64*mingw32*)
tgt_os=win64
;;
*mingw32*|*cygwin*) *mingw32*|*cygwin*)
[ -z "$tgt_isa" ] && tgt_isa=x86 [ -z "$tgt_isa" ] && tgt_isa=x86
tgt_os=win32 tgt_os=win32
@ -785,8 +793,9 @@ process_common_toolchain() {
check_add_asflags --defsym ARCHITECTURE=${arch_int} check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune=" tune_cflags="-mtune="
if [ ${tgt_isa} == "armv7" ]; then if [ ${tgt_isa} == "armv7" ]; then
check_add_cflags -march=armv7-a -mfloat-abi=softfp [ -z "${float_abi}" ] && float_abi=softfp
check_add_asflags -march=armv7-a -mfloat-abi=softfp check_add_cflags -march=armv7-a -mfloat-abi=${float_abi}
check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
if enabled neon if enabled neon
then then
@ -1038,7 +1047,7 @@ EOF
add_ldflags -m${bits} add_ldflags -m${bits}
link_with_cc=gcc link_with_cc=gcc
tune_cflags="-march=" tune_cflags="-march="
setup_gnu_toolchain setup_gnu_toolchain
#for 32 bit x86 builds, -O3 did not turn on this flag #for 32 bit x86 builds, -O3 did not turn on this flag
enabled optimizations && check_add_cflags -fomit-frame-pointer enabled optimizations && check_add_cflags -fomit-frame-pointer
;; ;;
@ -1056,6 +1065,8 @@ EOF
soft_enable sse2 soft_enable sse2
soft_enable sse3 soft_enable sse3
soft_enable ssse3 soft_enable ssse3
# We can't use 'check_cflags' until the compiler is configured and CC is
# populated.
if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 " RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
else else
@ -1082,7 +1093,7 @@ EOF
add_asflags -f x64 add_asflags -f x64
enabled debug && add_asflags -g cv8 enabled debug && add_asflags -g cv8
;; ;;
linux*|solaris*) linux*|solaris*|android*)
add_asflags -f elf${bits} add_asflags -f elf${bits}
enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
enabled debug && [ "${AS}" = nasm ] && add_asflags -g enabled debug && [ "${AS}" = nasm ] && add_asflags -g

59
build/make/rtcd.sh
View File

@ -59,13 +59,13 @@ for f in $defs_file; do [ -f "$f" ] || usage; done
# Routines for the RTCD DSL to call # Routines for the RTCD DSL to call
# #
prototype() { prototype() {
local rtyp rtyp=""
case "$1" in case "$1" in
unsigned) rtyp="$1 "; shift;; unsigned) rtyp="$1 "; shift;;
esac esac
rtyp="${rtyp}$1" rtyp="${rtyp}$1"
local fn="$2" fn="$2"
local args="$3" args="$3"
eval "${2}_rtyp='$rtyp'" eval "${2}_rtyp='$rtyp'"
eval "${2}_args='$3'" eval "${2}_args='$3'"
@ -74,7 +74,7 @@ prototype() {
} }
specialize() { specialize() {
local fn="$1" fn="$1"
shift shift
for opt in "$@"; do for opt in "$@"; do
eval "${fn}_${opt}=${fn}_${opt}" eval "${fn}_${opt}=${fn}_${opt}"
@ -84,13 +84,13 @@ specialize() {
require() { require() {
for fn in $ALL_FUNCS; do for fn in $ALL_FUNCS; do
for opt in "$@"; do for opt in "$@"; do
local ofn=$(eval "echo \$${fn}_${opt}") ofn=$(eval "echo \$${fn}_${opt}")
[ -z "$ofn" ] && continue [ -z "$ofn" ] && continue
# if we already have a default, then we can disable it, as we know # if we already have a default, then we can disable it, as we know
# we can do better. # we can do better.
local best=$(eval "echo \$${fn}_default") best=$(eval "echo \$${fn}_default")
local best_ofn=$(eval "echo \$${best}") best_ofn=$(eval "echo \$${best}")
[ -n "$best" ] && [ "$best_ofn" != "$ofn" ] && eval "${best}_link=false" [ -n "$best" ] && [ "$best_ofn" != "$ofn" ] && eval "${best}_link=false"
eval "${fn}_default=${fn}_${opt}" eval "${fn}_default=${fn}_${opt}"
eval "${fn}_${opt}_link=true" eval "${fn}_${opt}_link=true"
@ -121,15 +121,15 @@ process_forward_decls() {
determine_indirection() { determine_indirection() {
[ "$CONFIG_RUNTIME_CPU_DETECT" = "yes" ] || require $ALL_ARCHS [ "$CONFIG_RUNTIME_CPU_DETECT" = "yes" ] || require $ALL_ARCHS
for fn in $ALL_FUNCS; do for fn in $ALL_FUNCS; do
local n="" n=""
local rtyp="$(eval "echo \$${fn}_rtyp")" rtyp="$(eval "echo \$${fn}_rtyp")"
local args="$(eval "echo \"\$${fn}_args\"")" args="$(eval "echo \"\$${fn}_args\"")"
local dfn="$(eval "echo \$${fn}_default")" dfn="$(eval "echo \$${fn}_default")"
dfn=$(eval "echo \$${dfn}") dfn=$(eval "echo \$${dfn}")
for opt in "$@"; do for opt in "$@"; do
local ofn=$(eval "echo \$${fn}_${opt}") ofn=$(eval "echo \$${fn}_${opt}")
[ -z "$ofn" ] && continue [ -z "$ofn" ] && continue
local link=$(eval "echo \$${fn}_${opt}_link") link=$(eval "echo \$${fn}_${opt}_link")
[ "$link" = "false" ] && continue [ "$link" = "false" ] && continue
n="${n}x" n="${n}x"
done done
@ -143,12 +143,12 @@ determine_indirection() {
declare_function_pointers() { declare_function_pointers() {
for fn in $ALL_FUNCS; do for fn in $ALL_FUNCS; do
local rtyp="$(eval "echo \$${fn}_rtyp")" rtyp="$(eval "echo \$${fn}_rtyp")"
local args="$(eval "echo \"\$${fn}_args\"")" args="$(eval "echo \"\$${fn}_args\"")"
local dfn="$(eval "echo \$${fn}_default")" dfn="$(eval "echo \$${fn}_default")"
dfn=$(eval "echo \$${dfn}") dfn=$(eval "echo \$${dfn}")
for opt in "$@"; do for opt in "$@"; do
local ofn=$(eval "echo \$${fn}_${opt}") ofn=$(eval "echo \$${fn}_${opt}")
[ -z "$ofn" ] && continue [ -z "$ofn" ] && continue
echo "$rtyp ${ofn}($args);" echo "$rtyp ${ofn}($args);"
done done
@ -163,20 +163,20 @@ declare_function_pointers() {
set_function_pointers() { set_function_pointers() {
for fn in $ALL_FUNCS; do for fn in $ALL_FUNCS; do
local n="" n=""
local rtyp="$(eval "echo \$${fn}_rtyp")" rtyp="$(eval "echo \$${fn}_rtyp")"
local args="$(eval "echo \"\$${fn}_args\"")" args="$(eval "echo \"\$${fn}_args\"")"
local dfn="$(eval "echo \$${fn}_default")" dfn="$(eval "echo \$${fn}_default")"
dfn=$(eval "echo \$${dfn}") dfn=$(eval "echo \$${dfn}")
if $(eval "echo \$${fn}_indirect"); then if $(eval "echo \$${fn}_indirect"); then
echo " $fn = $dfn;" echo " $fn = $dfn;"
for opt in "$@"; do for opt in "$@"; do
local ofn=$(eval "echo \$${fn}_${opt}") ofn=$(eval "echo \$${fn}_${opt}")
[ -z "$ofn" ] && continue [ -z "$ofn" ] && continue
[ "$ofn" = "$dfn" ] && continue; [ "$ofn" = "$dfn" ] && continue;
local link=$(eval "echo \$${fn}_${opt}_link") link=$(eval "echo \$${fn}_${opt}_link")
[ "$link" = "false" ] && continue [ "$link" = "false" ] && continue
local cond="$(eval "echo \$have_${opt}")" cond="$(eval "echo \$have_${opt}")"
echo " if (${cond}) $fn = $ofn;" echo " if (${cond}) $fn = $ofn;"
done done
fi fi
@ -185,7 +185,7 @@ set_function_pointers() {
} }
filter() { filter() {
local filtered filtered=""
for opt in "$@"; do for opt in "$@"; do
[ -z $(eval "echo \$disable_${opt}") ] && filtered="$filtered $opt" [ -z $(eval "echo \$disable_${opt}") ] && filtered="$filtered $opt"
done done
@ -196,8 +196,9 @@ filter() {
# Helper functions for generating the arch specific RTCD files # Helper functions for generating the arch specific RTCD files
# #
common_top() { common_top() {
local outfile_basename=$(basename ${symbol:-rtcd.h}) outfile_basename=$(basename ${symbol:-rtcd})
local include_guard=$(echo $outfile_basename | tr '[a-z]' '[A-Z]' | tr -c '[A-Z]' _) include_guard=$(echo $outfile_basename | tr '[a-z]' '[A-Z]' | \
tr -c '[A-Z0-9]' _)H_
cat <<EOF cat <<EOF
#ifndef ${include_guard} #ifndef ${include_guard}
#define ${include_guard} #define ${include_guard}
@ -227,7 +228,7 @@ x86() {
# Assign the helper variable for each enabled extension # Assign the helper variable for each enabled extension
for opt in $ALL_ARCHS; do for opt in $ALL_ARCHS; do
local uc=$(echo $opt | tr '[a-z]' '[A-Z]') uc=$(echo $opt | tr '[a-z]' '[A-Z]')
eval "have_${opt}=\"flags & HAS_${uc}\"" eval "have_${opt}=\"flags & HAS_${uc}\""
done done
@ -254,7 +255,7 @@ arm() {
# Assign the helper variable for each enabled extension # Assign the helper variable for each enabled extension
for opt in $ALL_ARCHS; do for opt in $ALL_ARCHS; do
local uc=$(echo $opt | tr '[a-z]' '[A-Z]') uc=$(echo $opt | tr '[a-z]' '[A-Z]')
eval "have_${opt}=\"flags & HAS_${uc}\"" eval "have_${opt}=\"flags & HAS_${uc}\""
done done

5
configure vendored
View File

@ -106,6 +106,7 @@ all_platforms="${all_platforms} ppc64-darwin8-gcc"
all_platforms="${all_platforms} ppc64-darwin9-gcc" all_platforms="${all_platforms} ppc64-darwin9-gcc"
all_platforms="${all_platforms} ppc64-linux-gcc" all_platforms="${all_platforms} ppc64-linux-gcc"
all_platforms="${all_platforms} sparc-solaris-gcc" all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-android-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc" all_platforms="${all_platforms} x86-darwin8-gcc"
all_platforms="${all_platforms} x86-darwin8-icc" all_platforms="${all_platforms} x86-darwin8-icc"
all_platforms="${all_platforms} x86-darwin9-gcc" all_platforms="${all_platforms} x86-darwin9-gcc"
@ -650,7 +651,7 @@ process_toolchain() {
enabled postproc || die "postproc_visualizer requires postproc to be enabled" enabled postproc || die "postproc_visualizer requires postproc to be enabled"
fi fi
# Enable unit tests if we have a working C++ compiler # Enable unit tests by default if we have a working C++ compiler.
case "$toolchain" in case "$toolchain" in
*-vs*) *-vs*)
soft_enable unit_tests soft_enable unit_tests
@ -663,7 +664,7 @@ process_toolchain() {
# x86 targets. # x86 targets.
;; ;;
*) *)
check_cxx "$@" <<EOF && soft_enable unit_tests enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests
int z; int z;
EOF EOF
;; ;;

10
libs.mk
View File

@ -17,7 +17,6 @@ else
ASM:=.asm ASM:=.asm
endif endif
# #
# Calculate platform- and compiler-specific offsets for hand coded assembly # Calculate platform- and compiler-specific offsets for hand coded assembly
# #
@ -167,7 +166,9 @@ CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/emmintrin_compat.h
CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_once.h CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_once.h
CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c
INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c
ifeq ($(ARCH_X86)$(ARCH_X86_64),yes)
CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm
endif
CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com
CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc
CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec
@ -221,7 +222,6 @@ obj_int_extract.vcproj: $(SRC_PATH_BARE)/build/make/obj_int_extract.c
-I"$(SRC_PATH_BARE)" \ -I"$(SRC_PATH_BARE)" \
PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.vcproj PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.vcproj
PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.bat
vpx.def: $(call enabled,CODEC_EXPORTS) vpx.def: $(call enabled,CODEC_EXPORTS)
@echo " [CREATE] $@" @echo " [CREATE] $@"
@ -325,7 +325,11 @@ vpx.pc: config.mk libs.mk
$(qexec)echo 'Requires:' >> $@ $(qexec)echo 'Requires:' >> $@
$(qexec)echo 'Conflicts:' >> $@ $(qexec)echo 'Conflicts:' >> $@
$(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
ifeq ($(HAVE_PTHREAD_H),yes)
$(qexec)echo 'Libs.private: -lm -lpthread' >> $@ $(qexec)echo 'Libs.private: -lm -lpthread' >> $@
else
$(qexec)echo 'Libs.private: -lm' >> $@
endif
$(qexec)echo 'Cflags: -I$${includedir}' >> $@ $(qexec)echo 'Cflags: -I$${includedir}' >> $@
INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
@ -373,7 +377,7 @@ LIBVPX_TEST_DATA_PATH ?= .
include $(SRC_PATH_BARE)/test/test.mk include $(SRC_PATH_BARE)/test/test.mk
LIBVPX_TEST_SRCS=$(addprefix test/,$(call enabled,LIBVPX_TEST_SRCS)) LIBVPX_TEST_SRCS=$(addprefix test/,$(call enabled,LIBVPX_TEST_SRCS))
LIBVPX_TEST_BINS=./test_libvpx LIBVPX_TEST_BINS=./test_libvpx$(EXE_SFX)
LIBVPX_TEST_DATA=$(addprefix $(LIBVPX_TEST_DATA_PATH)/,\ LIBVPX_TEST_DATA=$(addprefix $(LIBVPX_TEST_DATA_PATH)/,\
$(call enabled,LIBVPX_TEST_DATA)) $(call enabled,LIBVPX_TEST_DATA))
libvpx_test_data_url=http://downloads.webmproject.org/test_data/libvpx/$(1) libvpx_test_data_url=http://downloads.webmproject.org/test_data/libvpx/$(1)

6
test/sixtap_predict_test.cc
View File

@ -61,9 +61,9 @@ class SixtapPredictTest : public PARAMS(int, int, sixtap_predict_fn_t) {
width_ = GET_PARAM(0); width_ = GET_PARAM(0);
height_ = GET_PARAM(1); height_ = GET_PARAM(1);
sixtap_predict_ = GET_PARAM(2); sixtap_predict_ = GET_PARAM(2);
memset(src_, 0, sizeof(src_)); memset(src_, 0, kSrcSize);
memset(dst_, 0, sizeof(dst_)); memset(dst_, 0, kDstSize);
memset(dst_c_, 0, sizeof(dst_c_)); memset(dst_c_, 0, kDstSize);
} }
int width_; int width_;

1
test/test.mk
View File

@ -54,6 +54,7 @@ LIBVPX_TEST_SRCS-yes += sad_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += set_roi.cc LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += set_roi.cc
LIBVPX_TEST_SRCS-yes += sixtap_predict_test.cc LIBVPX_TEST_SRCS-yes += sixtap_predict_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += subtract_test.cc LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += subtract_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += variance_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += vp8_fdct4x4_test.cc LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += vp8_fdct4x4_test.cc
endif # VP8 endif # VP8

103
test/variance_test.cc
View File

@ -12,11 +12,17 @@
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx/vpx_integer.h"
#include "vpx_config.h" #include "vpx_config.h"
extern "C" { extern "C" {
#include "vp9/encoder/vp9_variance.h" #if CONFIG_VP8_ENCODER
#include "vpx/vpx_integer.h" # include "vp8/common/variance.h"
#include "vp9_rtcd.h" # include "vp8_rtcd.h"
#endif
#if CONFIG_VP9_ENCODER
# include "vp9/encoder/vp9_variance.h"
# include "vp9_rtcd.h"
#endif
} }
namespace { namespace {
@ -25,11 +31,12 @@ using ::std::tr1::get;
using ::std::tr1::make_tuple; using ::std::tr1::make_tuple;
using ::std::tr1::tuple; using ::std::tr1::tuple;
class VP9VarianceTest : template<typename VarianceFunctionType>
public ::testing::TestWithParam<tuple<int, int, vp9_variance_fn_t> > { class VarianceTest :
public ::testing::TestWithParam<tuple<int, int, VarianceFunctionType> > {
public: public:
virtual void SetUp() { virtual void SetUp() {
const tuple<int, int, vp9_variance_fn_t>& params = GetParam(); const tuple<int, int, VarianceFunctionType>& params = this->GetParam();
width_ = get<0>(params); width_ = get<0>(params);
height_ = get<1>(params); height_ = get<1>(params);
variance_ = get<2>(params); variance_ = get<2>(params);
@ -47,15 +54,20 @@ class VP9VarianceTest :
} }
protected: protected:
void ZeroTest();
void OneQuarterTest();
uint8_t* src_; uint8_t* src_;
uint8_t* ref_; uint8_t* ref_;
int width_; int width_;
int height_; int height_;
int block_size_; int block_size_;
vp9_variance_fn_t variance_; VarianceFunctionType variance_;
}; };
TEST_P(VP9VarianceTest, Zero) { template<typename VarianceFunctionType>
void VarianceTest<VarianceFunctionType>::ZeroTest() {
for (int i = 0; i <= 255; ++i) { for (int i = 0; i <= 255; ++i) {
memset(src_, i, block_size_); memset(src_, i, block_size_);
for (int j = 0; j <= 255; ++j) { for (int j = 0; j <= 255; ++j) {
@ -67,7 +79,8 @@ TEST_P(VP9VarianceTest, Zero) {
} }
} }
TEST_P(VP9VarianceTest, OneQuarter) { template<typename VarianceFunctionType>
void VarianceTest<VarianceFunctionType>::OneQuarterTest() {
memset(src_, 255, block_size_); memset(src_, 255, block_size_);
const int half = block_size_ / 2; const int half = block_size_ / 2;
memset(ref_, 255, half); memset(ref_, 255, half);
@ -78,6 +91,74 @@ TEST_P(VP9VarianceTest, OneQuarter) {
EXPECT_EQ(expected, var); EXPECT_EQ(expected, var);
} }
// -----------------------------------------------------------------------------
// VP8 test cases.
namespace vp8 {
#if CONFIG_VP8_ENCODER
typedef VarianceTest<vp8_variance_fn_t> VP8VarianceTest;
TEST_P(VP8VarianceTest, Zero) { ZeroTest(); }
TEST_P(VP8VarianceTest, OneQuarter) { OneQuarterTest(); }
const vp8_variance_fn_t variance4x4_c = vp8_variance4x4_c;
const vp8_variance_fn_t variance8x8_c = vp8_variance8x8_c;
const vp8_variance_fn_t variance8x16_c = vp8_variance8x16_c;
const vp8_variance_fn_t variance16x8_c = vp8_variance16x8_c;
const vp8_variance_fn_t variance16x16_c = vp8_variance16x16_c;
INSTANTIATE_TEST_CASE_P(
C, VP8VarianceTest,
::testing::Values(make_tuple(4, 4, variance4x4_c),
make_tuple(8, 8, variance8x8_c),
make_tuple(8, 16, variance8x16_c),
make_tuple(16, 8, variance16x8_c),
make_tuple(16, 16, variance16x16_c)));
#if HAVE_MMX
const vp8_variance_fn_t variance4x4_mmx = vp8_variance4x4_mmx;
const vp8_variance_fn_t variance8x8_mmx = vp8_variance8x8_mmx;
const vp8_variance_fn_t variance8x16_mmx = vp8_variance8x16_mmx;
const vp8_variance_fn_t variance16x8_mmx = vp8_variance16x8_mmx;
const vp8_variance_fn_t variance16x16_mmx = vp8_variance16x16_mmx;
INSTANTIATE_TEST_CASE_P(
MMX, VP8VarianceTest,
::testing::Values(make_tuple(4, 4, variance4x4_mmx),
make_tuple(8, 8, variance8x8_mmx),
make_tuple(8, 16, variance8x16_mmx),
make_tuple(16, 8, variance16x8_mmx),
make_tuple(16, 16, variance16x16_mmx)));
#endif
#if HAVE_SSE2
const vp8_variance_fn_t variance4x4_wmt = vp8_variance4x4_wmt;
const vp8_variance_fn_t variance8x8_wmt = vp8_variance8x8_wmt;
const vp8_variance_fn_t variance8x16_wmt = vp8_variance8x16_wmt;
const vp8_variance_fn_t variance16x8_wmt = vp8_variance16x8_wmt;
const vp8_variance_fn_t variance16x16_wmt = vp8_variance16x16_wmt;
INSTANTIATE_TEST_CASE_P(
SSE2, VP8VarianceTest,
::testing::Values(make_tuple(4, 4, variance4x4_wmt),
make_tuple(8, 8, variance8x8_wmt),
make_tuple(8, 16, variance8x16_wmt),
make_tuple(16, 8, variance16x8_wmt),
make_tuple(16, 16, variance16x16_wmt)));
#endif
#endif // CONFIG_VP8_ENCODER
} // namespace vp8
// -----------------------------------------------------------------------------
// VP9 test cases.
namespace vp9 {
#if CONFIG_VP9_ENCODER
typedef VarianceTest<vp9_variance_fn_t> VP9VarianceTest;
TEST_P(VP9VarianceTest, Zero) { ZeroTest(); }
TEST_P(VP9VarianceTest, OneQuarter) { OneQuarterTest(); }
const vp9_variance_fn_t variance4x4_c = vp9_variance4x4_c; const vp9_variance_fn_t variance4x4_c = vp9_variance4x4_c;
const vp9_variance_fn_t variance8x8_c = vp9_variance8x8_c; const vp9_variance_fn_t variance8x8_c = vp9_variance8x8_c;
const vp9_variance_fn_t variance8x16_c = vp9_variance8x16_c; const vp9_variance_fn_t variance8x16_c = vp9_variance8x16_c;
@ -120,4 +201,8 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(16, 8, variance16x8_wmt), make_tuple(16, 8, variance16x8_wmt),
make_tuple(16, 16, variance16x16_wmt))); make_tuple(16, 16, variance16x16_wmt)));
#endif #endif
#endif // CONFIG_VP9_ENCODER
} // namespace vp9
} // namespace } // namespace

7
third_party/x86inc/x86inc.asm vendored
View File

@ -61,6 +61,8 @@
%define mangle(x) x %define mangle(x) x
%elifidn __OUTPUT_FORMAT__,x64 %elifidn __OUTPUT_FORMAT__,x64
%define mangle(x) x %define mangle(x) x
%elifidn __OUTPUT_FORMAT__,win64
%define mangle(x) x
%else %else
%define mangle(x) _ %+ x %define mangle(x) _ %+ x
%endif %endif
@ -112,7 +114,12 @@
%endif %endif
; Always use long nops (reduces 0x90 spam in disassembly on x86_32) ; Always use long nops (reduces 0x90 spam in disassembly on x86_32)
%ifndef __NASM_VER__
CPU amdnop CPU amdnop
%else
%use smartalign
ALIGNMODE k7
%endif
; Macros to eliminate most code duplication between x86_32 and x86_64: ; Macros to eliminate most code duplication between x86_32 and x86_64:
; Currently this works only for leaf functions which load all their arguments ; Currently this works only for leaf functions which load all their arguments

2
vp8/common/mfqe.c
View File

@ -280,7 +280,7 @@ void vp8_multiframe_quality_enhance
FRAME_TYPE frame_type = cm->frame_type; FRAME_TYPE frame_type = cm->frame_type;
/* Point at base of Mb MODE_INFO list has motion vectors etc */ /* Point at base of Mb MODE_INFO list has motion vectors etc */
const MODE_INFO *mode_info_context = cm->mi; const MODE_INFO *mode_info_context = cm->show_frame_mi;
int mb_row; int mb_row;
int mb_col; int mb_col;
int totmap, map[4]; int totmap, map[4];

3
vp8/common/onyxc_int.h
View File

@ -127,7 +127,8 @@ typedef struct VP8Common
MODE_INFO *prev_mip; /* MODE_INFO array 'mip' from last decoded frame */ MODE_INFO *prev_mip; /* MODE_INFO array 'mip' from last decoded frame */
MODE_INFO *prev_mi; /* 'mi' from last frame (points into prev_mip) */ MODE_INFO *prev_mi; /* 'mi' from last frame (points into prev_mip) */
#endif #endif
MODE_INFO *show_frame_mi; /* MODE_INFO for the last decoded frame
to show */
LOOPFILTERTYPE filter_type; LOOPFILTERTYPE filter_type;
loop_filter_info_n lf_info; loop_filter_info_n lf_info;

5
vp8/common/onyxd.h
View File

@ -34,7 +34,6 @@ extern "C"
int postprocess; int postprocess;
int max_threads; int max_threads;
int error_concealment; int error_concealment;
int input_fragments;
} VP8D_CONFIG; } VP8D_CONFIG;
typedef enum typedef enum
@ -56,10 +55,6 @@ extern "C"
vpx_codec_err_t vp8dx_get_reference(struct VP8D_COMP* comp, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd); vpx_codec_err_t vp8dx_get_reference(struct VP8D_COMP* comp, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd);
vpx_codec_err_t vp8dx_set_reference(struct VP8D_COMP* comp, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd); vpx_codec_err_t vp8dx_set_reference(struct VP8D_COMP* comp, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd);
struct VP8D_COMP* vp8dx_create_decompressor(VP8D_CONFIG *oxcf);
void vp8dx_remove_decompressor(struct VP8D_COMP* comp);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
vp8/common/postproc.c
View File

@ -334,7 +334,7 @@ void vp8_deblock(VP8_COMMON *cm,
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5); int ppl = (int)(level + .5);
const MODE_INFO *mode_info_context = cm->mi; const MODE_INFO *mode_info_context = cm->show_frame_mi;
int mbr, mbc; int mbr, mbc;
/* The pixel thresholds are adjusted according to if or not the macroblock /* The pixel thresholds are adjusted according to if or not the macroblock

10
vp8/common/variance_c.c
View File

@ -75,7 +75,7 @@ unsigned int vp8_variance16x16_c(
variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16, &var, &avg); variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16, &var, &avg);
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 8)); return (var - (((unsigned int)avg * avg) >> 8));
} }
unsigned int vp8_variance8x16_c( unsigned int vp8_variance8x16_c(
@ -91,7 +91,7 @@ unsigned int vp8_variance8x16_c(
variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 16, &var, &avg); variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 16, &var, &avg);
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 7)); return (var - (((unsigned int)avg * avg) >> 7));
} }
unsigned int vp8_variance16x8_c( unsigned int vp8_variance16x8_c(
@ -107,7 +107,7 @@ unsigned int vp8_variance16x8_c(
variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 8, &var, &avg); variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 8, &var, &avg);
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 7)); return (var - (((unsigned int)avg * avg) >> 7));
} }
@ -124,7 +124,7 @@ unsigned int vp8_variance8x8_c(
variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 8, &var, &avg); variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 8, &var, &avg);
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 6)); return (var - (((unsigned int)avg * avg) >> 6));
} }
unsigned int vp8_variance4x4_c( unsigned int vp8_variance4x4_c(
@ -140,7 +140,7 @@ unsigned int vp8_variance4x4_c(
variance(src_ptr, source_stride, ref_ptr, recon_stride, 4, 4, &var, &avg); variance(src_ptr, source_stride, ref_ptr, recon_stride, 4, 4, &var, &avg);
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 4)); return (var - (((unsigned int)avg * avg) >> 4));
} }

2
vp8/common/x86/iwalsh_mmx.asm
View File

@ -24,7 +24,7 @@ sym(vp8_short_inv_walsh4x4_mmx):
movq mm0, [rdx + 0] ;ip[0] movq mm0, [rdx + 0] ;ip[0]
movq mm1, [rdx + 8] ;ip[4] movq mm1, [rdx + 8] ;ip[4]
movd mm7, rax movq mm7, rax
movq mm2, [rdx + 16] ;ip[8] movq mm2, [rdx + 16] ;ip[8]
movq mm3, [rdx + 24] ;ip[12] movq mm3, [rdx + 24] ;ip[12]

8
vp8/common/x86/loopfilter_block_sse2.asm
View File

@ -136,7 +136,7 @@
global sym(vp8_loop_filter_bh_y_sse2) PRIVATE global sym(vp8_loop_filter_bh_y_sse2) PRIVATE
sym(vp8_loop_filter_bh_y_sse2): sym(vp8_loop_filter_bh_y_sse2):
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%define src rcx ; src_ptr %define src rcx ; src_ptr
%define stride rdx ; src_pixel_step %define stride rdx ; src_pixel_step
%define blimit r8 %define blimit r8
@ -256,7 +256,7 @@ LF_FILTER xmm0, xmm1, xmm3, xmm8, xmm4, xmm2
movdqa i12, xmm3 movdqa i12, xmm3
movdqa i13, xmm8 movdqa i13, xmm8
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop r13 pop r13
pop r12 pop r12
RESTORE_XMM RESTORE_XMM
@ -278,7 +278,7 @@ LF_FILTER xmm0, xmm1, xmm3, xmm8, xmm4, xmm2
global sym(vp8_loop_filter_bv_y_sse2) PRIVATE global sym(vp8_loop_filter_bv_y_sse2) PRIVATE
sym(vp8_loop_filter_bv_y_sse2): sym(vp8_loop_filter_bv_y_sse2):
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%define src rcx ; src_ptr %define src rcx ; src_ptr
%define stride rdx ; src_pixel_step %define stride rdx ; src_pixel_step
%define blimit r8 %define blimit r8
@ -779,7 +779,7 @@ LF_FILTER xmm0, xmm1, xmm4, xmm8, xmm3, xmm2
; un-ALIGN_STACK ; un-ALIGN_STACK
pop rsp pop rsp
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop r13 pop r13
pop r12 pop r12
RESTORE_XMM RESTORE_XMM

6
vp8/common/x86/mfqe_sse2.asm
View File

@ -271,7 +271,13 @@ sym(vp8_variance_and_sad_16x16_sse2):
SECTION_RODATA SECTION_RODATA
align 16 align 16
t128: t128:
%ifndef __NASM_VER__
ddq 128 ddq 128
%elif CONFIG_BIG_ENDIAN
dq 0, 128
%else
dq 128, 0
%endif
align 16 align 16
tMFQE: ; 1 << MFQE_PRECISION tMFQE: ; 1 << MFQE_PRECISION
times 8 dw 0x10 times 8 dw 0x10

8
vp8/common/x86/sad_sse3.asm
View File

@ -33,7 +33,7 @@
movsxd rax, dword ptr arg(1) ; src_stride movsxd rax, dword ptr arg(1) ; src_stride
movsxd rdx, dword ptr arg(3) ; ref_stride movsxd rdx, dword ptr arg(3) ; ref_stride
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
SAVE_XMM 7, u SAVE_XMM 7, u
%define src_ptr rcx %define src_ptr rcx
%define src_stride rdx %define src_stride rdx
@ -76,7 +76,7 @@
pop rsi pop rsi
pop rbp pop rbp
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
RESTORE_XMM RESTORE_XMM
%endif %endif
%endif %endif
@ -111,7 +111,7 @@
xchg rbx, rax xchg rbx, rax
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
SAVE_XMM 7, u SAVE_XMM 7, u
%define src_ptr rcx %define src_ptr rcx
%define src_stride rdx %define src_stride rdx
@ -156,7 +156,7 @@
pop rsi pop rsi
pop rbp pop rbp
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
RESTORE_XMM RESTORE_XMM
%endif %endif

20
vp8/common/x86/variance_mmx.c
View File

@ -91,7 +91,7 @@ unsigned int vp8_variance4x4_mmx(
vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 4)); return (var - (((unsigned int)avg * avg) >> 4));
} }
@ -108,7 +108,7 @@ unsigned int vp8_variance8x8_mmx(
vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 6)); return (var - (((unsigned int)avg * avg) >> 6));
} }
@ -153,7 +153,7 @@ unsigned int vp8_variance16x16_mmx(
var = sse0 + sse1 + sse2 + sse3; var = sse0 + sse1 + sse2 + sse3;
avg = sum0 + sum1 + sum2 + sum3; avg = sum0 + sum1 + sum2 + sum3;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 8)); return (var - (((unsigned int)avg * avg) >> 8));
} }
unsigned int vp8_variance16x8_mmx( unsigned int vp8_variance16x8_mmx(
@ -172,7 +172,7 @@ unsigned int vp8_variance16x8_mmx(
var = sse0 + sse1; var = sse0 + sse1;
avg = sum0 + sum1; avg = sum0 + sum1;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 7)); return (var - (((unsigned int)avg * avg) >> 7));
} }
@ -194,7 +194,7 @@ unsigned int vp8_variance8x16_mmx(
avg = sum0 + sum1; avg = sum0 + sum1;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 7)); return (var - (((unsigned int)avg * avg) >> 7));
} }
@ -219,7 +219,7 @@ unsigned int vp8_sub_pixel_variance4x4_mmx
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((unsigned int)(xsum * xsum) >> 4)); return (xxsum - (((unsigned int)xsum * xsum) >> 4));
} }
@ -244,7 +244,7 @@ unsigned int vp8_sub_pixel_variance8x8_mmx
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((unsigned int)(xsum * xsum) >> 6)); return (xxsum - (((unsigned int)xsum * xsum) >> 6));
} }
unsigned int vp8_sub_pixel_variance16x16_mmx unsigned int vp8_sub_pixel_variance16x16_mmx
@ -282,7 +282,7 @@ unsigned int vp8_sub_pixel_variance16x16_mmx
xxsum0 += xxsum1; xxsum0 += xxsum1;
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
} }
@ -335,7 +335,7 @@ unsigned int vp8_sub_pixel_variance16x8_mmx
xxsum0 += xxsum1; xxsum0 += xxsum1;
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7));
} }
unsigned int vp8_sub_pixel_variance8x16_mmx unsigned int vp8_sub_pixel_variance8x16_mmx
@ -358,7 +358,7 @@ unsigned int vp8_sub_pixel_variance8x16_mmx
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((unsigned int)(xsum * xsum) >> 7)); return (xxsum - (((unsigned int)xsum * xsum) >> 7));
} }

26
vp8/common/x86/variance_sse2.c
View File

@ -148,7 +148,7 @@ unsigned int vp8_variance4x4_wmt(
vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 4)); return (var - (((unsigned int)avg * avg) >> 4));
} }
@ -165,7 +165,7 @@ unsigned int vp8_variance8x8_wmt
vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 6)); return (var - (((unsigned int)avg * avg) >> 6));
} }
@ -184,7 +184,7 @@ unsigned int vp8_variance16x16_wmt
vp8_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ; vp8_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
*sse = sse0; *sse = sse0;
return (sse0 - ((unsigned int)(sum0 * sum0) >> 8)); return (sse0 - (((unsigned int)sum0 * sum0) >> 8));
} }
unsigned int vp8_mse16x16_wmt( unsigned int vp8_mse16x16_wmt(
const unsigned char *src_ptr, const unsigned char *src_ptr,
@ -220,7 +220,7 @@ unsigned int vp8_variance16x8_wmt
var = sse0 + sse1; var = sse0 + sse1;
avg = sum0 + sum1; avg = sum0 + sum1;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 7)); return (var - (((unsigned int)avg * avg) >> 7));
} }
@ -241,7 +241,7 @@ unsigned int vp8_variance8x16_wmt
var = sse0 + sse1; var = sse0 + sse1;
avg = sum0 + sum1; avg = sum0 + sum1;
*sse = var; *sse = var;
return (var - ((unsigned int)(avg * avg) >> 7)); return (var - (((unsigned int)avg * avg) >> 7));
} }
@ -265,7 +265,7 @@ unsigned int vp8_sub_pixel_variance4x4_wmt
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((unsigned int)(xsum * xsum) >> 4)); return (xxsum - (((unsigned int)xsum * xsum) >> 4));
} }
@ -314,7 +314,7 @@ unsigned int vp8_sub_pixel_variance8x8_wmt
} }
*sse = xxsum; *sse = xxsum;
return (xxsum - ((unsigned int)(xsum * xsum) >> 6)); return (xxsum - (((unsigned int)xsum * xsum) >> 6));
} }
unsigned int vp8_sub_pixel_variance16x16_wmt unsigned int vp8_sub_pixel_variance16x16_wmt
@ -376,7 +376,7 @@ unsigned int vp8_sub_pixel_variance16x16_wmt
} }
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
} }
unsigned int vp8_sub_pixel_mse16x16_wmt( unsigned int vp8_sub_pixel_mse16x16_wmt(
@ -447,7 +447,7 @@ unsigned int vp8_sub_pixel_variance16x8_wmt
} }
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7));
} }
unsigned int vp8_sub_pixel_variance8x16_wmt unsigned int vp8_sub_pixel_variance8x16_wmt
@ -495,7 +495,7 @@ unsigned int vp8_sub_pixel_variance8x16_wmt
} }
*sse = xxsum; *sse = xxsum;
return (xxsum - ((unsigned int)(xsum * xsum) >> 7)); return (xxsum - (((unsigned int)xsum * xsum) >> 7));
} }
@ -515,7 +515,7 @@ unsigned int vp8_variance_halfpixvar16x16_h_wmt(
&xsum0, &xxsum0); &xsum0, &xxsum0);
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
} }
@ -534,7 +534,7 @@ unsigned int vp8_variance_halfpixvar16x16_v_wmt(
&xsum0, &xxsum0); &xsum0, &xxsum0);
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
} }
@ -554,5 +554,5 @@ unsigned int vp8_variance_halfpixvar16x16_hv_wmt(
&xsum0, &xxsum0); &xsum0, &xxsum0);
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
} }

4
vp8/common/x86/variance_ssse3.c
View File

@ -113,7 +113,7 @@ unsigned int vp8_sub_pixel_variance16x16_ssse3
} }
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
} }
unsigned int vp8_sub_pixel_variance16x8_ssse3 unsigned int vp8_sub_pixel_variance16x8_ssse3
@ -162,5 +162,5 @@ unsigned int vp8_sub_pixel_variance16x8_ssse3
} }
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7)); return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7));
} }

38
vp8/decoder/decodframe.c
View File

@ -828,8 +828,8 @@ static void setup_token_decoder(VP8D_COMP *pbi,
unsigned int partition_idx; unsigned int partition_idx;
unsigned int fragment_idx; unsigned int fragment_idx;
unsigned int num_token_partitions; unsigned int num_token_partitions;
const unsigned char *first_fragment_end = pbi->fragments[0] + const unsigned char *first_fragment_end = pbi->fragments.ptrs[0] +
pbi->fragment_sizes[0]; pbi->fragments.sizes[0];
TOKEN_PARTITION multi_token_partition = TOKEN_PARTITION multi_token_partition =
(TOKEN_PARTITION)vp8_read_literal(&pbi->mbc[8], 2); (TOKEN_PARTITION)vp8_read_literal(&pbi->mbc[8], 2);
@ -839,10 +839,10 @@ static void setup_token_decoder(VP8D_COMP *pbi,
/* Check for partitions within the fragments and unpack the fragments /* Check for partitions within the fragments and unpack the fragments
* so that each fragment pointer points to its corresponding partition. */ * so that each fragment pointer points to its corresponding partition. */
for (fragment_idx = 0; fragment_idx < pbi->num_fragments; ++fragment_idx) for (fragment_idx = 0; fragment_idx < pbi->fragments.count; ++fragment_idx)
{ {
unsigned int fragment_size = pbi->fragment_sizes[fragment_idx]; unsigned int fragment_size = pbi->fragments.sizes[fragment_idx];
const unsigned char *fragment_end = pbi->fragments[fragment_idx] + const unsigned char *fragment_end = pbi->fragments.ptrs[fragment_idx] +
fragment_size; fragment_size;
/* Special case for handling the first partition since we have already /* Special case for handling the first partition since we have already
* read its size. */ * read its size. */
@ -850,16 +850,16 @@ static void setup_token_decoder(VP8D_COMP *pbi,
{ {
/* Size of first partition + token partition sizes element */ /* Size of first partition + token partition sizes element */
ptrdiff_t ext_first_part_size = token_part_sizes - ptrdiff_t ext_first_part_size = token_part_sizes -
pbi->fragments[0] + 3 * (num_token_partitions - 1); pbi->fragments.ptrs[0] + 3 * (num_token_partitions - 1);
fragment_size -= (unsigned int)ext_first_part_size; fragment_size -= (unsigned int)ext_first_part_size;
if (fragment_size > 0) if (fragment_size > 0)
{ {
pbi->fragment_sizes[0] = (unsigned int)ext_first_part_size; pbi->fragments.sizes[0] = (unsigned int)ext_first_part_size;
/* The fragment contains an additional partition. Move to /* The fragment contains an additional partition. Move to
* next. */ * next. */
fragment_idx++; fragment_idx++;
pbi->fragments[fragment_idx] = pbi->fragments[0] + pbi->fragments.ptrs[fragment_idx] = pbi->fragments.ptrs[0] +
pbi->fragment_sizes[0]; pbi->fragments.sizes[0];
} }
} }
/* Split the chunk into partitions read from the bitstream */ /* Split the chunk into partitions read from the bitstream */
@ -868,12 +868,12 @@ static void setup_token_decoder(VP8D_COMP *pbi,
ptrdiff_t partition_size = read_available_partition_size( ptrdiff_t partition_size = read_available_partition_size(
pbi, pbi,
token_part_sizes, token_part_sizes,
pbi->fragments[fragment_idx], pbi->fragments.ptrs[fragment_idx],
first_fragment_end, first_fragment_end,
fragment_end, fragment_end,
fragment_idx - 1, fragment_idx - 1,
num_token_partitions); num_token_partitions);
pbi->fragment_sizes[fragment_idx] = (unsigned int)partition_size; pbi->fragments.sizes[fragment_idx] = (unsigned int)partition_size;
fragment_size -= (unsigned int)partition_size; fragment_size -= (unsigned int)partition_size;
assert(fragment_idx <= num_token_partitions); assert(fragment_idx <= num_token_partitions);
if (fragment_size > 0) if (fragment_size > 0)
@ -881,19 +881,19 @@ static void setup_token_decoder(VP8D_COMP *pbi,
/* The fragment contains an additional partition. /* The fragment contains an additional partition.
* Move to next. */ * Move to next. */
fragment_idx++; fragment_idx++;
pbi->fragments[fragment_idx] = pbi->fragments.ptrs[fragment_idx] =
pbi->fragments[fragment_idx - 1] + partition_size; pbi->fragments.ptrs[fragment_idx - 1] + partition_size;
} }
} }
} }
pbi->num_fragments = num_token_partitions + 1; pbi->fragments.count = num_token_partitions + 1;
for (partition_idx = 1; partition_idx < pbi->num_fragments; ++partition_idx) for (partition_idx = 1; partition_idx < pbi->fragments.count; ++partition_idx)
{ {
if (vp8dx_start_decode(bool_decoder, if (vp8dx_start_decode(bool_decoder,
pbi->fragments[partition_idx], pbi->fragments.ptrs[partition_idx],
pbi->fragment_sizes[partition_idx])) pbi->fragments.sizes[partition_idx]))
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR, vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,
"Failed to allocate bool decoder %d", "Failed to allocate bool decoder %d",
partition_idx); partition_idx);
@ -983,8 +983,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vp8_reader *const bc = & pbi->mbc[8]; vp8_reader *const bc = & pbi->mbc[8];
VP8_COMMON *const pc = & pbi->common; VP8_COMMON *const pc = & pbi->common;
MACROBLOCKD *const xd = & pbi->mb; MACROBLOCKD *const xd = & pbi->mb;
const unsigned char *data = pbi->fragments[0]; const unsigned char *data = pbi->fragments.ptrs[0];
const unsigned char *data_end = data + pbi->fragment_sizes[0]; const unsigned char *data_end = data + pbi->fragments.sizes[0];
ptrdiff_t first_partition_length_in_bytes; ptrdiff_t first_partition_length_in_bytes;
int i, j, k, l; int i, j, k, l;

179
vp8/decoder/onyxd_if.c
View File

@ -42,7 +42,16 @@ extern void vp8cx_init_de_quantizer(VP8D_COMP *pbi);
static int get_free_fb (VP8_COMMON *cm); static int get_free_fb (VP8_COMMON *cm);
static void ref_cnt_fb (int *buf, int *idx, int new_idx); static void ref_cnt_fb (int *buf, int *idx, int new_idx);
struct VP8D_COMP * vp8dx_create_decompressor(VP8D_CONFIG *oxcf) static void remove_decompressor(VP8D_COMP *pbi)
{
#if CONFIG_ERROR_CONCEALMENT
vp8_de_alloc_overlap_lists(pbi);
#endif
vp8_remove_common(&pbi->common);
vpx_free(pbi);
}
static struct VP8D_COMP * create_decompressor(VP8D_CONFIG *oxcf)
{ {
VP8D_COMP *pbi = vpx_memalign(32, sizeof(VP8D_COMP)); VP8D_COMP *pbi = vpx_memalign(32, sizeof(VP8D_COMP));
@ -54,7 +63,7 @@ struct VP8D_COMP * vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
if (setjmp(pbi->common.error.jmp)) if (setjmp(pbi->common.error.jmp))
{ {
pbi->common.error.setjmp = 0; pbi->common.error.setjmp = 0;
vp8dx_remove_decompressor(pbi); remove_decompressor(pbi);
return 0; return 0;
} }
@ -65,11 +74,6 @@ struct VP8D_COMP * vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
pbi->common.current_video_frame = 0; pbi->common.current_video_frame = 0;
pbi->ready_for_new_data = 1; pbi->ready_for_new_data = 1;
#if CONFIG_MULTITHREAD
pbi->max_threads = oxcf->max_threads;
vp8_decoder_create_threads(pbi);
#endif
/* vp8cx_init_de_quantizer() is first called here. Add check in frame_init_dequantizer() to avoid /* vp8cx_init_de_quantizer() is first called here. Add check in frame_init_dequantizer() to avoid
* unnecessary calling of vp8cx_init_de_quantizer() for every frame. * unnecessary calling of vp8cx_init_de_quantizer() for every frame.
*/ */
@ -92,9 +96,6 @@ struct VP8D_COMP * vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
pbi->decoded_key_frame = 0; pbi->decoded_key_frame = 0;
pbi->input_fragments = oxcf->input_fragments;
pbi->num_fragments = 0;
/* Independent partitions is activated when a frame updates the /* Independent partitions is activated when a frame updates the
* token probability table to have equal probabilities over the * token probability table to have equal probabilities over the
* PREV_COEF context. * PREV_COEF context.
@ -106,25 +107,6 @@ struct VP8D_COMP * vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
return pbi; return pbi;
} }
void vp8dx_remove_decompressor(VP8D_COMP *pbi)
{
if (!pbi)
return;
#if CONFIG_MULTITHREAD
if (pbi->b_multithreaded_rd)
vp8mt_de_alloc_temp_buffers(pbi, pbi->common.mb_rows);
vp8_decoder_remove_threads(pbi);
#endif
#if CONFIG_ERROR_CONCEALMENT
vp8_de_alloc_overlap_lists(pbi);
#endif
vp8_remove_common(&pbi->common);
vpx_free(pbi);
}
vpx_codec_err_t vp8dx_get_reference(VP8D_COMP *pbi, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd) vpx_codec_err_t vp8dx_get_reference(VP8D_COMP *pbi, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd)
{ {
VP8_COMMON *cm = &pbi->common; VP8_COMMON *cm = &pbi->common;
@ -282,60 +264,13 @@ static int swap_frame_buffers (VP8_COMMON *cm)
return err; return err;
} }
int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, int check_fragments_for_errors(VP8D_COMP *pbi)
const uint8_t *source,
int64_t time_stamp)
{ {
#if HAVE_NEON
int64_t dx_store_reg[8];
#endif
VP8_COMMON *cm = &pbi->common;
int retcode = -1;
pbi->common.error.error_code = VPX_CODEC_OK;
if (pbi->num_fragments == 0)
{
/* New frame, reset fragment pointers and sizes */
vpx_memset((void*)pbi->fragments, 0, sizeof(pbi->fragments));
vpx_memset(pbi->fragment_sizes, 0, sizeof(pbi->fragment_sizes));
}
if (pbi->input_fragments && !(source == NULL && size == 0))
{
/* Store a pointer to this fragment and return. We haven't
* received the complete frame yet, so we will wait with decoding.
*/
assert(pbi->num_fragments < MAX_PARTITIONS);
pbi->fragments[pbi->num_fragments] = source;
pbi->fragment_sizes[pbi->num_fragments] = size;
pbi->num_fragments++;
if (pbi->num_fragments > (1 << EIGHT_PARTITION) + 1)
{
pbi->common.error.error_code = VPX_CODEC_UNSUP_BITSTREAM;
pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
return -1;
}
return 0;
}
if (!pbi->input_fragments)
{
pbi->fragments[0] = source;
pbi->fragment_sizes[0] = size;
pbi->num_fragments = 1;
}
assert(pbi->common.multi_token_partition <= EIGHT_PARTITION);
if (pbi->num_fragments == 0)
{
pbi->num_fragments = 1;
pbi->fragments[0] = NULL;
pbi->fragment_sizes[0] = 0;
}
if (!pbi->ec_active && if (!pbi->ec_active &&
pbi->num_fragments <= 1 && pbi->fragment_sizes[0] == 0) pbi->fragments.count <= 1 && pbi->fragments.sizes[0] == 0)
{ {
VP8_COMMON *cm = &pbi->common;
/* If error concealment is disabled we won't signal missing frames /* If error concealment is disabled we won't signal missing frames
* to the decoder. * to the decoder.
*/ */
@ -361,12 +296,29 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
/* Signal that we have no frame to show. */ /* Signal that we have no frame to show. */
cm->show_frame = 0; cm->show_frame = 0;
pbi->num_fragments = 0;
/* Nothing more to do. */ /* Nothing more to do. */
return 0; return 0;
} }
return 1;
}
int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
const uint8_t *source,
int64_t time_stamp)
{
#if HAVE_NEON
int64_t dx_store_reg[8];
#endif
VP8_COMMON *cm = &pbi->common;
int retcode = -1;
pbi->common.error.error_code = VPX_CODEC_OK;
retcode = check_fragments_for_errors(pbi);
if(retcode <= 0)
return retcode;
#if HAVE_NEON #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->cpu_caps & HAS_NEON) if (cm->cpu_caps & HAS_NEON)
@ -419,7 +371,13 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
vp8_clear_system_state(); vp8_clear_system_state();
#if CONFIG_ERROR_CONCEALMENT if (cm->show_frame)
{
cm->current_video_frame++;
cm->show_frame_mi = cm->mi;
}
#if CONFIG_ERROR_CONCEALMENT
/* swap the mode infos to storage for future error concealment */ /* swap the mode infos to storage for future error concealment */
if (pbi->ec_enabled && pbi->common.prev_mi) if (pbi->ec_enabled && pbi->common.prev_mi)
{ {
@ -441,9 +399,6 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
} }
#endif #endif
if (cm->show_frame)
cm->current_video_frame++;
pbi->ready_for_new_data = 0; pbi->ready_for_new_data = 0;
pbi->last_time_stamp = time_stamp; pbi->last_time_stamp = time_stamp;
@ -458,7 +413,6 @@ decode_exit:
#endif #endif
pbi->common.error.setjmp = 0; pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
return retcode; return retcode;
} }
int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags) int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags)
@ -521,3 +475,54 @@ int vp8dx_references_buffer( VP8_COMMON *oci, int ref_frame )
return 0; return 0;
} }
int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf)
{
if(!fb->use_frame_threads)
{
/* decoder instance for single thread mode */
fb->pbi[0] = create_decompressor(oxcf);
if(!fb->pbi[0])
return VPX_CODEC_ERROR;
#if CONFIG_MULTITHREAD
/* enable row-based threading only when use_frame_threads
* is disabled */
fb->pbi[0]->max_threads = oxcf->max_threads;
vp8_decoder_create_threads(fb->pbi[0]);
#endif
}
else
{
/* TODO : create frame threads and decoder instances for each
* thread here */
}
return VPX_CODEC_OK;
}
int vp8_remove_decoder_instances(struct frame_buffers *fb)
{
if(!fb->use_frame_threads)
{
VP8D_COMP *pbi = fb->pbi[0];
if (!pbi)
return VPX_CODEC_ERROR;
#if CONFIG_MULTITHREAD
if (pbi->b_multithreaded_rd)
vp8mt_de_alloc_temp_buffers(pbi, pbi->common.mb_rows);
vp8_decoder_remove_threads(pbi);
#endif
/* decoder instance for single thread mode */
remove_decompressor(pbi);
}
else
{
/* TODO : remove frame threads and decoder instances for each
* thread here */
}
return VPX_CODEC_OK;
}

34
vp8/decoder/onyxd_int.h
View File

@ -33,6 +33,31 @@ typedef struct
MACROBLOCKD mbd; MACROBLOCKD mbd;
} MB_ROW_DEC; } MB_ROW_DEC;
typedef struct
{
int enabled;
unsigned int count;
const unsigned char *ptrs[MAX_PARTITIONS];
unsigned int sizes[MAX_PARTITIONS];
} FRAGMENT_DATA;
#define MAX_FB_MT_DEC 32
struct frame_buffers
{
/*
* this struct will be populated with frame buffer management
* info in future commits. */
/* enable/disable frame-based threading */
int use_frame_threads;
/* decoder instances */
struct VP8D_COMP *pbi[MAX_FB_MT_DEC];
};
typedef struct VP8D_COMP typedef struct VP8D_COMP
{ {
DECLARE_ALIGNED(16, MACROBLOCKD, mb); DECLARE_ALIGNED(16, MACROBLOCKD, mb);
@ -46,10 +71,7 @@ typedef struct VP8D_COMP
VP8D_CONFIG oxcf; VP8D_CONFIG oxcf;
FRAGMENT_DATA fragments;
const unsigned char *fragments[MAX_PARTITIONS];
unsigned int fragment_sizes[MAX_PARTITIONS];
unsigned int num_fragments;
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD
/* variable for threading */ /* variable for threading */
@ -95,7 +117,6 @@ typedef struct VP8D_COMP
#endif #endif
int ec_enabled; int ec_enabled;
int ec_active; int ec_active;
int input_fragments;
int decoded_key_frame; int decoded_key_frame;
int independent_partitions; int independent_partitions;
int frame_corrupt_residual; int frame_corrupt_residual;
@ -104,6 +125,9 @@ typedef struct VP8D_COMP
int vp8_decode_frame(VP8D_COMP *cpi); int vp8_decode_frame(VP8D_COMP *cpi);
int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf);
int vp8_remove_decoder_instances(struct frame_buffers *fb);
#if CONFIG_DEBUG #if CONFIG_DEBUG
#define CHECK_MEM_ERROR(lval,expr) do {\ #define CHECK_MEM_ERROR(lval,expr) do {\
lval = (expr); \ lval = (expr); \

20
vp8/encoder/firstpass.c
View File

@ -858,7 +858,9 @@ skip_motion_search:
*/ */
if ((cm->current_video_frame > 0) && if ((cm->current_video_frame > 0) &&
(cpi->twopass.this_frame_stats.pcnt_inter > 0.20) && (cpi->twopass.this_frame_stats.pcnt_inter > 0.20) &&
((cpi->twopass.this_frame_stats.intra_error / cpi->twopass.this_frame_stats.coded_error) > 2.0)) ((cpi->twopass.this_frame_stats.intra_error /
DOUBLE_DIVIDE_CHECK(cpi->twopass.this_frame_stats.coded_error)) >
2.0))
{ {
vp8_yv12_copy_frame(lst_yv12, gld_yv12); vp8_yv12_copy_frame(lst_yv12, gld_yv12);
} }
@ -2116,23 +2118,25 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
(cpi->twopass.kf_group_error_left > 0)) (cpi->twopass.kf_group_error_left > 0))
{ {
cpi->twopass.gf_group_bits = cpi->twopass.gf_group_bits =
(int)((double)cpi->twopass.kf_group_bits * (int64_t)(cpi->twopass.kf_group_bits *
(gf_group_err / (double)cpi->twopass.kf_group_error_left)); (gf_group_err / cpi->twopass.kf_group_error_left));
} }
else else
cpi->twopass.gf_group_bits = 0; cpi->twopass.gf_group_bits = 0;
cpi->twopass.gf_group_bits = (int)( cpi->twopass.gf_group_bits =
(cpi->twopass.gf_group_bits < 0) (cpi->twopass.gf_group_bits < 0)
? 0 ? 0
: (cpi->twopass.gf_group_bits > cpi->twopass.kf_group_bits) : (cpi->twopass.gf_group_bits > cpi->twopass.kf_group_bits)
? cpi->twopass.kf_group_bits : cpi->twopass.gf_group_bits); ? cpi->twopass.kf_group_bits : cpi->twopass.gf_group_bits;
/* Clip cpi->twopass.gf_group_bits based on user supplied data rate /* Clip cpi->twopass.gf_group_bits based on user supplied data rate
* variability limit (cpi->oxcf.two_pass_vbrmax_section) * variability limit (cpi->oxcf.two_pass_vbrmax_section)
*/ */
if (cpi->twopass.gf_group_bits > max_bits * cpi->baseline_gf_interval) if (cpi->twopass.gf_group_bits >
cpi->twopass.gf_group_bits = max_bits * cpi->baseline_gf_interval; (int64_t)max_bits * cpi->baseline_gf_interval)
cpi->twopass.gf_group_bits =
(int64_t)max_bits * cpi->baseline_gf_interval;
/* Reset the file position */ /* Reset the file position */
reset_fpf_position(cpi, start_pos); reset_fpf_position(cpi, start_pos);
@ -2446,7 +2450,7 @@ void vp8_second_pass(VP8_COMP *cpi)
*/ */
if (cpi->oxcf.error_resilient_mode) if (cpi->oxcf.error_resilient_mode)
{ {
cpi->twopass.gf_group_bits = (int)cpi->twopass.kf_group_bits; cpi->twopass.gf_group_bits = cpi->twopass.kf_group_bits;
cpi->twopass.gf_group_error_left = cpi->twopass.gf_group_error_left =
(int)cpi->twopass.kf_group_error_left; (int)cpi->twopass.kf_group_error_left;
cpi->baseline_gf_interval = cpi->twopass.frames_to_key; cpi->baseline_gf_interval = cpi->twopass.frames_to_key;

3
vp8/encoder/mcomp.c
View File

@ -235,13 +235,12 @@ int vp8_find_best_sub_pixel_step_iteratively(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
MACROBLOCKD *xd = &x->e_mbd; MACROBLOCKD *xd = &x->e_mbd;
unsigned char *y0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col; unsigned char *y0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;
unsigned char *y; unsigned char *y;
int buf_r1, buf_r2, buf_c1, buf_c2; int buf_r1, buf_r2, buf_c1;
/* Clamping to avoid out-of-range data access */ /* Clamping to avoid out-of-range data access */
buf_r1 = ((bestmv->as_mv.row - 3) < x->mv_row_min)?(bestmv->as_mv.row - x->mv_row_min):3; buf_r1 = ((bestmv->as_mv.row - 3) < x->mv_row_min)?(bestmv->as_mv.row - x->mv_row_min):3;
buf_r2 = ((bestmv->as_mv.row + 3) > x->mv_row_max)?(x->mv_row_max - bestmv->as_mv.row):3; buf_r2 = ((bestmv->as_mv.row + 3) > x->mv_row_max)?(x->mv_row_max - bestmv->as_mv.row):3;
buf_c1 = ((bestmv->as_mv.col - 3) < x->mv_col_min)?(bestmv->as_mv.col - x->mv_col_min):3; buf_c1 = ((bestmv->as_mv.col - 3) < x->mv_col_min)?(bestmv->as_mv.col - x->mv_col_min):3;
buf_c2 = ((bestmv->as_mv.col + 3) > x->mv_col_max)?(x->mv_col_max - bestmv->as_mv.col):3;
y_stride = 32; y_stride = 32;
/* Copy to intermediate buffer before searching. */ /* Copy to intermediate buffer before searching. */

1
vp8/encoder/onyx_if.c
View File

@ -5362,6 +5362,7 @@ int vp8_get_preview_raw_frame(VP8_COMP *cpi, YV12_BUFFER_CONFIG *dest, vp8_ppfla
#endif #endif
#if CONFIG_POSTPROC #if CONFIG_POSTPROC
cpi->common.show_frame_mi = cpi->common.mi;
ret = vp8_post_proc_frame(&cpi->common, dest, flags); ret = vp8_post_proc_frame(&cpi->common, dest, flags);
#else #else

2
vp8/encoder/onyx_int.h
View File

@ -587,7 +587,7 @@ typedef struct VP8_COMP
/* Error score of frames still to be coded in kf group */ /* Error score of frames still to be coded in kf group */
int64_t kf_group_error_left; int64_t kf_group_error_left;
/* Projected Bits available for a group including 1 GF or ARF */ /* Projected Bits available for a group including 1 GF or ARF */
int gf_group_bits; int64_t gf_group_bits;
/* Bits for the golden frame or ARF */ /* Bits for the golden frame or ARF */
int gf_bits; int gf_bits;
int alt_extra_bits; int alt_extra_bits;

4
vp8/encoder/pickinter.c
View File

@ -389,7 +389,7 @@ static void pick_intra_mbuv_mode(MACROBLOCK *mb)
} }
static void update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) static void update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv)
{ {
MACROBLOCKD *xd = &x->e_mbd; MACROBLOCKD *xd = &x->e_mbd;
/* Split MV modes currently not supported when RD is nopt enabled, /* Split MV modes currently not supported when RD is nopt enabled,
@ -1241,7 +1241,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
!= cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame])
best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int; best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
update_mvcount(cpi, x, &best_ref_mv); update_mvcount(x, &best_ref_mv);
} }

8
vp8/encoder/ratectrl.c
View File

@ -1360,10 +1360,10 @@ static int estimate_keyframe_frequency(VP8_COMP *cpi)
* whichever is smaller. * whichever is smaller.
*/ */
int key_freq = cpi->oxcf.key_freq>0 ? cpi->oxcf.key_freq : 1; int key_freq = cpi->oxcf.key_freq>0 ? cpi->oxcf.key_freq : 1;
av_key_frame_frequency = (int)cpi->output_frame_rate * 2; av_key_frame_frequency = 1 + (int)cpi->output_frame_rate * 2;
if (cpi->oxcf.auto_key && av_key_frame_frequency > key_freq) if (cpi->oxcf.auto_key && av_key_frame_frequency > key_freq)
av_key_frame_frequency = cpi->oxcf.key_freq; av_key_frame_frequency = key_freq;
cpi->prior_key_frame_distance[KEY_FRAME_CONTEXT - 1] cpi->prior_key_frame_distance[KEY_FRAME_CONTEXT - 1]
= av_key_frame_frequency; = av_key_frame_frequency;
@ -1393,6 +1393,10 @@ static int estimate_keyframe_frequency(VP8_COMP *cpi)
av_key_frame_frequency /= total_weight; av_key_frame_frequency /= total_weight;
} }
// TODO (marpan): Given the checks above, |av_key_frame_frequency|
// should always be above 0. But for now we keep the sanity check in.
if (av_key_frame_frequency == 0)
av_key_frame_frequency = 1;
return av_key_frame_frequency; return av_key_frame_frequency;
} }

4
vp8/encoder/rdopt.c
View File

@ -1733,7 +1733,7 @@ void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffse
} }
} }
static void rd_update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) static void rd_update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv)
{ {
if (x->e_mbd.mode_info_context->mbmi.mode == SPLITMV) if (x->e_mbd.mode_info_context->mbmi.mode == SPLITMV)
{ {
@ -2608,7 +2608,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
!= cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame])
best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int; best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
rd_update_mvcount(cpi, x, &best_ref_mv); rd_update_mvcount(x, &best_ref_mv);
} }
void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_) void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_)

4
vp8/encoder/x86/dct_sse2.asm
View File

@ -29,7 +29,7 @@
movsxd rax, dword ptr arg(2) movsxd rax, dword ptr arg(2)
lea rcx, [rsi + rax*2] lea rcx, [rsi + rax*2]
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%define input rcx %define input rcx
%define output rdx %define output rdx
%define pitch r8 %define pitch r8
@ -53,7 +53,7 @@
RESTORE_GOT RESTORE_GOT
pop rbp pop rbp
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
RESTORE_XMM RESTORE_XMM
%endif %endif
%endif %endif

147
vp8/encoder/x86/quantize_sse2.asm
View File

@ -27,7 +27,7 @@ sym(vp8_regular_quantize_b_sse2):
push rdi push rdi
push rsi push rsi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
push rdi push rdi
push rsi push rsi
%endif %endif
@ -46,7 +46,7 @@ sym(vp8_regular_quantize_b_sse2):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -226,7 +226,7 @@ ZIGZAG_LOOP 15
pop rsi pop rsi
pop rdi pop rdi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
%endif %endif
@ -236,147 +236,6 @@ ZIGZAG_LOOP 15
pop rbp pop rbp
ret ret
; void vp8_fast_quantize_b_sse2 | arg
; (BLOCK *b, | 0
; BLOCKD *d) | 1
global sym(vp8_fast_quantize_b_sse2) PRIVATE
sym(vp8_fast_quantize_b_sse2):
push rbp
mov rbp, rsp
GET_GOT rbx
%if ABI_IS_32BIT
push rdi
push rsi
%else
%ifidn __OUTPUT_FORMAT__,x64
push rdi
push rsi
%else
; these registers are used for passing arguments
%endif
%endif
; end prolog
%if ABI_IS_32BIT
mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d
%else
%ifidn __OUTPUT_FORMAT__,x64
mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d
%else
;mov rdi, rdi ; BLOCK *b
;mov rsi, rsi ; BLOCKD *d
%endif
%endif
mov rax, [rdi + vp8_block_coeff]
mov rcx, [rdi + vp8_block_round]
mov rdx, [rdi + vp8_block_quant_fast]
; z = coeff
movdqa xmm0, [rax]
movdqa xmm4, [rax + 16]
; dup z so we can save sz
movdqa xmm1, xmm0
movdqa xmm5, xmm4
; sz = z >> 15
psraw xmm0, 15
psraw xmm4, 15
; x = abs(z) = (z ^ sz) - sz
pxor xmm1, xmm0
pxor xmm5, xmm4
psubw xmm1, xmm0
psubw xmm5, xmm4
; x += round
paddw xmm1, [rcx]
paddw xmm5, [rcx + 16]
mov rax, [rsi + vp8_blockd_qcoeff]
mov rcx, [rsi + vp8_blockd_dequant]
mov rdi, [rsi + vp8_blockd_dqcoeff]
; y = x * quant >> 16
pmulhw xmm1, [rdx]
pmulhw xmm5, [rdx + 16]
; x = (y ^ sz) - sz
pxor xmm1, xmm0
pxor xmm5, xmm4
psubw xmm1, xmm0
psubw xmm5, xmm4
; qcoeff = x
movdqa [rax], xmm1
movdqa [rax + 16], xmm5
; x * dequant
movdqa xmm2, xmm1
movdqa xmm3, xmm5
pmullw xmm2, [rcx]
pmullw xmm3, [rcx + 16]
; dqcoeff = x * dequant
movdqa [rdi], xmm2
movdqa [rdi + 16], xmm3
pxor xmm4, xmm4 ;clear all bits
pcmpeqw xmm1, xmm4
pcmpeqw xmm5, xmm4
pcmpeqw xmm4, xmm4 ;set all bits
pxor xmm1, xmm4
pxor xmm5, xmm4
pand xmm1, [GLOBAL(inv_zig_zag)]
pand xmm5, [GLOBAL(inv_zig_zag + 16)]
pmaxsw xmm1, xmm5
mov rcx, [rsi + vp8_blockd_eob]
; now down to 8
pshufd xmm5, xmm1, 00001110b
pmaxsw xmm1, xmm5
; only 4 left
pshuflw xmm5, xmm1, 00001110b
pmaxsw xmm1, xmm5
; okay, just 2!
pshuflw xmm5, xmm1, 00000001b
pmaxsw xmm1, xmm5
movd eax, xmm1
and eax, 0xff
mov BYTE PTR [rcx], al ; store eob
; begin epilog
%if ABI_IS_32BIT
pop rsi
pop rdi
%else
%ifidn __OUTPUT_FORMAT__,x64
pop rsi
pop rdi
%endif
%endif
RESTORE_GOT
pop rbp
ret
SECTION_RODATA SECTION_RODATA
align 16 align 16
inv_zig_zag: inv_zig_zag:

103
vp8/encoder/x86/quantize_sse2.c Normal file
View File

@ -0,0 +1,103 @@
/*
* Copyright (c) 2012 The WebM project authors. All Rights Reserved.
*
* 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 "vp8/common/blockd.h"
#include "vp8/common/entropy.h"
#include "vp8/encoder/block.h"
#include <mmintrin.h> //MMX
#include <xmmintrin.h> //SSE
#include <emmintrin.h> //SSE2
void vp8_fast_quantize_b_sse2(BLOCK *b, BLOCKD *d)
{
__m128i z0 = _mm_load_si128((__m128i *)(b->coeff));
__m128i z1 = _mm_load_si128((__m128i *)(b->coeff + 8));
__m128i round0 = _mm_load_si128((__m128i *)(b->round));
__m128i round1 = _mm_load_si128((__m128i *)(b->round + 8));
__m128i quant_fast0 = _mm_load_si128((__m128i *)(b->quant_fast));
__m128i quant_fast1 = _mm_load_si128((__m128i *)(b->quant_fast + 8));
__m128i dequant0 = _mm_load_si128((__m128i *)(d->dequant));
__m128i dequant1 = _mm_load_si128((__m128i *)(d->dequant + 8));
__m128i inv_zig_zag0 = _mm_load_si128((const __m128i *)(vp8_default_inv_zig_zag));
__m128i inv_zig_zag1 = _mm_load_si128((const __m128i *)(vp8_default_inv_zig_zag + 8));
__m128i sz0, sz1, x0, x1, y0, y1, xdq0, xdq1, zeros, ones;
/* sign of z: z >> 15 */
sz0 = _mm_srai_epi16(z0, 15);
sz1 = _mm_srai_epi16(z1, 15);
/* x = abs(z): (z ^ sz) - sz */
x0 = _mm_xor_si128(z0, sz0);
x1 = _mm_xor_si128(z1, sz1);
x0 = _mm_sub_epi16(x0, sz0);
x1 = _mm_sub_epi16(x1, sz1);
/* x += round */
x0 = _mm_add_epi16(x0, round0);
x1 = _mm_add_epi16(x1, round1);
/* y = (x * quant) >> 16 */
y0 = _mm_mulhi_epi16(x0, quant_fast0);
y1 = _mm_mulhi_epi16(x1, quant_fast1);
/* x = abs(y) = (y ^ sz) - sz */
y0 = _mm_xor_si128(y0, sz0);
y1 = _mm_xor_si128(y1, sz1);
x0 = _mm_sub_epi16(y0, sz0);
x1 = _mm_sub_epi16(y1, sz1);
/* qcoeff = x */
_mm_store_si128((__m128i *)(d->qcoeff), x0);
_mm_store_si128((__m128i *)(d->qcoeff + 8), x1);
/* x * dequant */
xdq0 = _mm_mullo_epi16(x0, dequant0);
xdq1 = _mm_mullo_epi16(x1, dequant1);
/* dqcoeff = x * dequant */
_mm_store_si128((__m128i *)(d->dqcoeff), xdq0);
_mm_store_si128((__m128i *)(d->dqcoeff + 8), xdq1);
/* build a mask for the zig zag */
zeros = _mm_setzero_si128();
x0 = _mm_cmpeq_epi16(x0, zeros);
x1 = _mm_cmpeq_epi16(x1, zeros);
ones = _mm_cmpeq_epi16(zeros, zeros);
x0 = _mm_xor_si128(x0, ones);
x1 = _mm_xor_si128(x1, ones);
x0 = _mm_and_si128(x0, inv_zig_zag0);
x1 = _mm_and_si128(x1, inv_zig_zag1);
x0 = _mm_max_epi16(x0, x1);
/* now down to 8 */
x1 = _mm_shuffle_epi32(x0, 0xE); // 0b00001110
x0 = _mm_max_epi16(x0, x1);
/* only 4 left */
x1 = _mm_shufflelo_epi16(x0, 0xE); // 0b00001110
x0 = _mm_max_epi16(x0, x1);
/* okay, just 2! */
x1 = _mm_shufflelo_epi16(x0, 0x1); // 0b00000001
x0 = _mm_max_epi16(x0, x1);
*d->eob = 0xFF & _mm_cvtsi128_si32(x0);
}

6
vp8/encoder/x86/quantize_sse4.asm
View File

@ -31,7 +31,7 @@ sym(vp8_regular_quantize_b_sse4):
%define stack_size 32 %define stack_size 32
sub rsp, stack_size sub rsp, stack_size
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
SAVE_XMM 8, u SAVE_XMM 8, u
push rdi push rdi
push rsi push rsi
@ -43,7 +43,7 @@ sym(vp8_regular_quantize_b_sse4):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -240,7 +240,7 @@ ZIGZAG_LOOP 15, 7, xmm3, xmm7, xmm8
pop rbp pop rbp
%else %else
%undef xmm5 %undef xmm5
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
RESTORE_XMM RESTORE_XMM

6
vp8/encoder/x86/quantize_ssse3.asm
View File

@ -27,7 +27,7 @@ sym(vp8_fast_quantize_b_ssse3):
push rdi push rdi
push rsi push rsi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
push rdi push rdi
push rsi push rsi
%endif %endif
@ -38,7 +38,7 @@ sym(vp8_fast_quantize_b_ssse3):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -122,7 +122,7 @@ sym(vp8_fast_quantize_b_ssse3):
pop rsi pop rsi
pop rdi pop rdi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
%endif %endif

2
vp8/encoder/x86/temporal_filter_apply_sse2.asm
View File

@ -50,7 +50,7 @@ sym(vp8_temporal_filter_apply_sse2):
; 0x8000 >> (16 - strength) ; 0x8000 >> (16 - strength)
mov rdx, 16 mov rdx, 16
sub rdx, arg(4) ; 16 - strength sub rdx, arg(4) ; 16 - strength
movd xmm4, rdx ; can't use rdx w/ shift movq xmm4, rdx ; can't use rdx w/ shift
movdqa xmm5, [GLOBAL(_const_top_bit)] movdqa xmm5, [GLOBAL(_const_top_bit)]
psrlw xmm5, xmm4 psrlw xmm5, xmm4
movdqa [rsp + rounding_bit], xmm5 movdqa [rsp + rounding_bit], xmm5

130
vp8/vp8_dx_iface.c
View File

@ -64,7 +64,6 @@ struct vpx_codec_alg_priv
vp8_stream_info_t si; vp8_stream_info_t si;
int defer_alloc; int defer_alloc;
int decoder_init; int decoder_init;
struct VP8D_COMP *pbi;
int postproc_cfg_set; int postproc_cfg_set;
vp8_postproc_cfg_t postproc_cfg; vp8_postproc_cfg_t postproc_cfg;
#if CONFIG_POSTPROC_VISUALIZER #if CONFIG_POSTPROC_VISUALIZER
@ -76,7 +75,9 @@ struct vpx_codec_alg_priv
#endif #endif
vpx_image_t img; vpx_image_t img;
int img_setup; int img_setup;
struct frame_buffers yv12_frame_buffers;
void *user_priv; void *user_priv;
FRAGMENT_DATA fragments;
}; };
static unsigned long vp8_priv_sz(const vpx_codec_dec_cfg_t *si, vpx_codec_flags_t flags) static unsigned long vp8_priv_sz(const vpx_codec_dec_cfg_t *si, vpx_codec_flags_t flags)
@ -215,11 +216,36 @@ static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx,
{ {
vp8_init_ctx(ctx, &mmap); vp8_init_ctx(ctx, &mmap);
/* initialize number of fragments to zero */
ctx->priv->alg_priv->fragments.count = 0;
/* is input fragments enabled? */
ctx->priv->alg_priv->fragments.enabled =
(ctx->priv->alg_priv->base.init_flags &
VPX_CODEC_USE_INPUT_FRAGMENTS);
ctx->priv->alg_priv->defer_alloc = 1; ctx->priv->alg_priv->defer_alloc = 1;
/*post processing level initialized to do nothing */ /*post processing level initialized to do nothing */
} }
} }
ctx->priv->alg_priv->yv12_frame_buffers.use_frame_threads =
(ctx->priv->alg_priv->base.init_flags &
VPX_CODEC_USE_FRAME_THREADING);
/* for now, disable frame threading */
ctx->priv->alg_priv->yv12_frame_buffers.use_frame_threads = 0;
if(ctx->priv->alg_priv->yv12_frame_buffers.use_frame_threads &&
(( ctx->priv->alg_priv->base.init_flags &
VPX_CODEC_USE_ERROR_CONCEALMENT)
|| ( ctx->priv->alg_priv->base.init_flags &
VPX_CODEC_USE_INPUT_FRAGMENTS) ) )
{
/* row-based threading, error concealment, and input fragments will
* not be supported when using frame-based threading */
res = VPX_CODEC_INVALID_PARAM;
}
return res; return res;
} }
@ -227,7 +253,7 @@ static vpx_codec_err_t vp8_destroy(vpx_codec_alg_priv_t *ctx)
{ {
int i; int i;
vp8dx_remove_decompressor(ctx->pbi); vp8_remove_decoder_instances(&ctx->yv12_frame_buffers);
for (i = NELEMENTS(ctx->mmaps) - 1; i >= 0; i--) for (i = NELEMENTS(ctx->mmaps) - 1; i >= 0; i--)
{ {
@ -343,6 +369,47 @@ static void yuvconfig2image(vpx_image_t *img,
img->self_allocd = 0; img->self_allocd = 0;
} }
static int
update_fragments(vpx_codec_alg_priv_t *ctx,
const uint8_t *data,
unsigned int data_sz,
vpx_codec_err_t *res)
{
*res = VPX_CODEC_OK;
if (ctx->fragments.count == 0)
{
/* New frame, reset fragment pointers and sizes */
vpx_memset((void*)ctx->fragments.ptrs, 0, sizeof(ctx->fragments.ptrs));
vpx_memset(ctx->fragments.sizes, 0, sizeof(ctx->fragments.sizes));
}
if (ctx->fragments.enabled && !(data == NULL && data_sz == 0))
{
/* Store a pointer to this fragment and return. We haven't
* received the complete frame yet, so we will wait with decoding.
*/
ctx->fragments.ptrs[ctx->fragments.count] = data;
ctx->fragments.sizes[ctx->fragments.count] = data_sz;
ctx->fragments.count++;
if (ctx->fragments.count > (1 << EIGHT_PARTITION) + 1)
{
ctx->fragments.count = 0;
*res = VPX_CODEC_INVALID_PARAM;
return -1;
}
return 0;
}
if (!ctx->fragments.enabled)
{
ctx->fragments.ptrs[0] = data;
ctx->fragments.sizes[0] = data_sz;
ctx->fragments.count = 1;
}
return 1;
}
static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
const uint8_t *data, const uint8_t *data,
unsigned int data_sz, unsigned int data_sz,
@ -353,6 +420,11 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
unsigned int resolution_change = 0; unsigned int resolution_change = 0;
unsigned int w, h; unsigned int w, h;
/* Update the input fragment data */
if(update_fragments(ctx, data, data_sz, &res) <= 0)
return res;
/* Determine the stream parameters. Note that we rely on peek_si to /* Determine the stream parameters. Note that we rely on peek_si to
* validate that we have a buffer that does not wrap around the top * validate that we have a buffer that does not wrap around the top
* of the heap. * of the heap.
@ -360,7 +432,8 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
w = ctx->si.w; w = ctx->si.w;
h = ctx->si.h; h = ctx->si.h;
res = ctx->base.iface->dec.peek_si(data, data_sz, &ctx->si); res = ctx->base.iface->dec.peek_si(ctx->fragments.ptrs[0],
ctx->fragments.sizes[0], &ctx->si);
if((res == VPX_CODEC_UNSUP_BITSTREAM) && !ctx->si.is_kf) if((res == VPX_CODEC_UNSUP_BITSTREAM) && !ctx->si.is_kf)
{ {
@ -412,7 +485,6 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
if (!res) if (!res)
{ {
VP8D_CONFIG oxcf; VP8D_CONFIG oxcf;
struct VP8D_COMP* optr;
oxcf.Width = ctx->si.w; oxcf.Width = ctx->si.w;
oxcf.Height = ctx->si.h; oxcf.Height = ctx->si.h;
@ -421,10 +493,6 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
oxcf.max_threads = ctx->cfg.threads; oxcf.max_threads = ctx->cfg.threads;
oxcf.error_concealment = oxcf.error_concealment =
(ctx->base.init_flags & VPX_CODEC_USE_ERROR_CONCEALMENT); (ctx->base.init_flags & VPX_CODEC_USE_ERROR_CONCEALMENT);
oxcf.input_fragments =
(ctx->base.init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS);
optr = vp8dx_create_decompressor(&oxcf);
/* If postprocessing was enabled by the application and a /* If postprocessing was enabled by the application and a
* configuration has not been provided, default it. * configuration has not been provided, default it.
@ -438,20 +506,17 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
ctx->postproc_cfg.noise_level = 0; ctx->postproc_cfg.noise_level = 0;
} }
if (!optr) res = vp8_create_decoder_instances(&ctx->yv12_frame_buffers, &oxcf);
res = VPX_CODEC_ERROR;
else
ctx->pbi = optr;
} }
ctx->decoder_init = 1; ctx->decoder_init = 1;
} }
if (!res && ctx->pbi) if (!res)
{ {
VP8D_COMP *pbi = ctx->yv12_frame_buffers.pbi[0];
if(resolution_change) if(resolution_change)
{ {
VP8D_COMP *pbi = ctx->pbi;
VP8_COMMON *const pc = & pbi->common; VP8_COMMON *const pc = & pbi->common;
MACROBLOCKD *const xd = & pbi->mb; MACROBLOCKD *const xd = & pbi->mb;
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD
@ -541,15 +606,20 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
pbi->common.error.setjmp = 0; pbi->common.error.setjmp = 0;
/* required to get past the first get_free_fb() call */ /* required to get past the first get_free_fb() call */
ctx->pbi->common.fb_idx_ref_cnt[0] = 0; pbi->common.fb_idx_ref_cnt[0] = 0;
} }
/* update the pbi fragment data */
pbi->fragments = ctx->fragments;
ctx->user_priv = user_priv; ctx->user_priv = user_priv;
if (vp8dx_receive_compressed_data(ctx->pbi, data_sz, data, deadline)) if (vp8dx_receive_compressed_data(pbi, data_sz, data, deadline))
{ {
VP8D_COMP *pbi = (VP8D_COMP *)ctx->pbi;
res = update_error_state(ctx, &pbi->common.error); res = update_error_state(ctx, &pbi->common.error);
} }
/* get ready for the next series of fragments */
ctx->fragments.count = 0;
} }
return res; return res;
@ -590,7 +660,8 @@ static vpx_image_t *vp8_get_frame(vpx_codec_alg_priv_t *ctx,
#endif #endif
} }
if (0 == vp8dx_get_raw_frame(ctx->pbi, &sd, &time_stamp, &time_end_stamp, &flags)) if (0 == vp8dx_get_raw_frame(ctx->yv12_frame_buffers.pbi[0], &sd,
&time_stamp, &time_end_stamp, &flags))
{ {
yuvconfig2image(&ctx->img, &sd, ctx->user_priv); yuvconfig2image(&ctx->img, &sd, ctx->user_priv);
@ -715,14 +786,15 @@ static vpx_codec_err_t vp8_set_reference(vpx_codec_alg_priv_t *ctx,
vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *); vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *);
if (data) if (data && !ctx->yv12_frame_buffers.use_frame_threads)
{ {
vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data; vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data;
YV12_BUFFER_CONFIG sd; YV12_BUFFER_CONFIG sd;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
return vp8dx_set_reference(ctx->pbi, frame->frame_type, &sd); return vp8dx_set_reference(ctx->yv12_frame_buffers.pbi[0],
frame->frame_type, &sd);
} }
else else
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
@ -736,14 +808,15 @@ static vpx_codec_err_t vp8_get_reference(vpx_codec_alg_priv_t *ctx,
vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *); vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *);
if (data) if (data && !ctx->yv12_frame_buffers.use_frame_threads)
{ {
vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data; vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data;
YV12_BUFFER_CONFIG sd; YV12_BUFFER_CONFIG sd;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
return vp8dx_get_reference(ctx->pbi, frame->frame_type, &sd); return vp8dx_get_reference(ctx->yv12_frame_buffers.pbi[0],
frame->frame_type, &sd);
} }
else else
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
@ -799,10 +872,11 @@ static vpx_codec_err_t vp8_get_last_ref_updates(vpx_codec_alg_priv_t *ctx,
va_list args) va_list args)
{ {
int *update_info = va_arg(args, int *); int *update_info = va_arg(args, int *);
VP8D_COMP *pbi = (VP8D_COMP *)ctx->pbi;
if (update_info) if (update_info && !ctx->yv12_frame_buffers.use_frame_threads)
{ {
VP8D_COMP *pbi = (VP8D_COMP *)ctx->yv12_frame_buffers.pbi[0];
*update_info = pbi->common.refresh_alt_ref_frame * (int) VP8_ALTR_FRAME *update_info = pbi->common.refresh_alt_ref_frame * (int) VP8_ALTR_FRAME
+ pbi->common.refresh_golden_frame * (int) VP8_GOLD_FRAME + pbi->common.refresh_golden_frame * (int) VP8_GOLD_FRAME
+ pbi->common.refresh_last_frame * (int) VP8_LAST_FRAME; + pbi->common.refresh_last_frame * (int) VP8_LAST_FRAME;
@ -819,11 +893,11 @@ static vpx_codec_err_t vp8_get_last_ref_frame(vpx_codec_alg_priv_t *ctx,
va_list args) va_list args)
{ {
int *ref_info = va_arg(args, int *); int *ref_info = va_arg(args, int *);
VP8D_COMP *pbi = (VP8D_COMP *)ctx->pbi;
VP8_COMMON *oci = &pbi->common;
if (ref_info) if (ref_info && !ctx->yv12_frame_buffers.use_frame_threads)
{ {
VP8D_COMP *pbi = (VP8D_COMP *)ctx->yv12_frame_buffers.pbi[0];
VP8_COMMON *oci = &pbi->common;
*ref_info = *ref_info =
(vp8dx_references_buffer( oci, ALTREF_FRAME )?VP8_ALTR_FRAME:0) | (vp8dx_references_buffer( oci, ALTREF_FRAME )?VP8_ALTR_FRAME:0) |
(vp8dx_references_buffer( oci, GOLDEN_FRAME )?VP8_GOLD_FRAME:0) | (vp8dx_references_buffer( oci, GOLDEN_FRAME )?VP8_GOLD_FRAME:0) |
@ -844,7 +918,7 @@ static vpx_codec_err_t vp8_get_frame_corrupted(vpx_codec_alg_priv_t *ctx,
if (corrupted) if (corrupted)
{ {
VP8D_COMP *pbi = (VP8D_COMP *)ctx->pbi; VP8D_COMP *pbi = (VP8D_COMP *)ctx->yv12_frame_buffers.pbi[0];
*corrupted = pbi->common.frame_to_show->corrupted; *corrupted = pbi->common.frame_to_show->corrupted;
return VPX_CODEC_OK; return VPX_CODEC_OK;

8
vp8/vp8cx.mk
View File

@ -89,8 +89,15 @@ VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm
VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm
# TODO(johann) make this generic
ifeq ($(HAVE_SSE2),yes)
vp8/encoder/x86/quantize_sse2.c.o: CFLAGS += -msse2
vp8/encoder/x86/quantize_sse2.c.d: CFLAGS += -msse2
endif
ifeq ($(CONFIG_TEMPORAL_DENOISING),yes) ifeq ($(CONFIG_TEMPORAL_DENOISING),yes)
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c
ifeq ($(HAVE_SSE2),yes) ifeq ($(HAVE_SSE2),yes)
@ -112,7 +119,6 @@ ifeq ($(CONFIG_REALTIME_ONLY),yes)
VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
endif endif
VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes))
$(eval $(call asm_offsets_template,\ $(eval $(call asm_offsets_template,\

23
vp8_multi_resolution_encoder.c
View File

@ -216,7 +216,7 @@ int main(int argc, char **argv)
* If target bitrate for highest-resolution level is set to 0, * If target bitrate for highest-resolution level is set to 0,
* (i.e. target_bitrate[0]=0), we skip encoding at that level. * (i.e. target_bitrate[0]=0), we skip encoding at that level.
*/ */
unsigned int target_bitrate[NUM_ENCODERS]={1400, 500, 100}; unsigned int target_bitrate[NUM_ENCODERS]={1000, 500, 100};
/* Enter the frame rate of the input video */ /* Enter the frame rate of the input video */
int framerate = 30; int framerate = 30;
/* Set down-sampling factor for each resolution level. /* Set down-sampling factor for each resolution level.
@ -351,27 +351,26 @@ int main(int argc, char **argv)
if(vpx_codec_control(&codec[i], VP8E_SET_CPUUSED, speed)) if(vpx_codec_control(&codec[i], VP8E_SET_CPUUSED, speed))
die_codec(&codec[i], "Failed to set cpu_used"); die_codec(&codec[i], "Failed to set cpu_used");
} }
/* Set static thresh for highest-resolution encoder. Set it to 1000 for
* better performance. */ /* Set static threshold. */
for ( i=0; i<NUM_ENCODERS; i++)
{ {
unsigned int static_thresh = 1000; unsigned int static_thresh = 1;
if(vpx_codec_control(&codec[0], VP8E_SET_STATIC_THRESHOLD, static_thresh))
die_codec(&codec[0], "Failed to set static threshold");
}
/* Set static thresh = 0 for other encoders for better quality */
for ( i=1; i<NUM_ENCODERS; i++)
{
unsigned int static_thresh = 0;
if(vpx_codec_control(&codec[i], VP8E_SET_STATIC_THRESHOLD, static_thresh)) if(vpx_codec_control(&codec[i], VP8E_SET_STATIC_THRESHOLD, static_thresh))
die_codec(&codec[i], "Failed to set static threshold"); die_codec(&codec[i], "Failed to set static threshold");
} }
/* Set NOISE_SENSITIVITY to do TEMPORAL_DENOISING */ /* Set NOISE_SENSITIVITY to do TEMPORAL_DENOISING */
for ( i=0; i< NUM_ENCODERS; i++) /* Enable denoising for the highest-resolution encoder. */
if(vpx_codec_control(&codec[0], VP8E_SET_NOISE_SENSITIVITY, 1))
die_codec(&codec[0], "Failed to set noise_sensitivity");
for ( i=1; i< NUM_ENCODERS; i++)
{ {
if(vpx_codec_control(&codec[i], VP8E_SET_NOISE_SENSITIVITY, 0)) if(vpx_codec_control(&codec[i], VP8E_SET_NOISE_SENSITIVITY, 0))
die_codec(&codec[i], "Failed to set noise_sensitivity"); die_codec(&codec[i], "Failed to set noise_sensitivity");
} }
frame_avail = 1; frame_avail = 1;
got_data = 0; got_data = 0;

24
vp9/common/vp9_findnearmv.c
View File

@ -57,9 +57,9 @@ unsigned int vp9_sad16x3_c(const uint8_t *src_ptr,
unsigned int vp9_variance2x16_c(const uint8_t *src_ptr, unsigned int vp9_variance2x16_c(const uint8_t *src_ptr,
const int source_stride, int source_stride,
const uint8_t *ref_ptr, const uint8_t *ref_ptr,
const int recon_stride, int recon_stride,
unsigned int *sse) { unsigned int *sse) {
int sum; int sum;
variance(src_ptr, source_stride, ref_ptr, recon_stride, 2, 16, sse, &sum); variance(src_ptr, source_stride, ref_ptr, recon_stride, 2, 16, sse, &sum);
@ -67,9 +67,9 @@ unsigned int vp9_variance2x16_c(const uint8_t *src_ptr,
} }
unsigned int vp9_variance16x2_c(const uint8_t *src_ptr, unsigned int vp9_variance16x2_c(const uint8_t *src_ptr,
const int source_stride, int source_stride,
const uint8_t *ref_ptr, const uint8_t *ref_ptr,
const int recon_stride, int recon_stride,
unsigned int *sse) { unsigned int *sse) {
int sum; int sum;
variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 2, sse, &sum); variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 2, sse, &sum);
@ -77,11 +77,11 @@ unsigned int vp9_variance16x2_c(const uint8_t *src_ptr,
} }
unsigned int vp9_sub_pixel_variance16x2_c(const uint8_t *src_ptr, unsigned int vp9_sub_pixel_variance16x2_c(const uint8_t *src_ptr,
const int src_pixels_per_line, int src_pixels_per_line,
const int xoffset, int xoffset,
const int yoffset, int yoffset,
const uint8_t *dst_ptr, const uint8_t *dst_ptr,
const int dst_pixels_per_line, int dst_pixels_per_line,
unsigned int *sse) { unsigned int *sse) {
uint16_t FData3[16 * 3]; // Temp data buffer used in filtering uint16_t FData3[16 * 3]; // Temp data buffer used in filtering
uint8_t temp2[2 * 16]; uint8_t temp2[2 * 16];
@ -98,11 +98,11 @@ unsigned int vp9_sub_pixel_variance16x2_c(const uint8_t *src_ptr,
} }
unsigned int vp9_sub_pixel_variance2x16_c(const uint8_t *src_ptr, unsigned int vp9_sub_pixel_variance2x16_c(const uint8_t *src_ptr,
const int src_pixels_per_line, int src_pixels_per_line,
const int xoffset, int xoffset,
const int yoffset, int yoffset,
const uint8_t *dst_ptr, const uint8_t *dst_ptr,
const int dst_pixels_per_line, int dst_pixels_per_line,
unsigned int *sse) { unsigned int *sse) {
uint16_t FData3[2 * 17]; // Temp data buffer used in filtering uint16_t FData3[2 * 17]; // Temp data buffer used in filtering
uint8_t temp2[2 * 16]; uint8_t temp2[2 * 16];

8
vp9/common/vp9_rtcd_defs.sh
View File

@ -14,7 +14,7 @@ struct loop_filter_info;
/* Encoder forward decls */ /* Encoder forward decls */
struct block; struct block;
struct macroblock; struct macroblock;
struct variance_vtable; struct vp9_variance_vtable;
#define DEC_MVCOSTS int *mvjcost, int *mvcost[2] #define DEC_MVCOSTS int *mvjcost, int *mvcost[2]
union int_mv; union int_mv;
@ -577,16 +577,16 @@ specialize vp9_short_walsh8x4_x8
# #
# Motion search # Motion search
# #
prototype int vp9_full_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_full_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_full_search_sad sse3 sse4_1 specialize vp9_full_search_sad sse3 sse4_1
vp9_full_search_sad_sse3=vp9_full_search_sadx3 vp9_full_search_sad_sse3=vp9_full_search_sadx3
vp9_full_search_sad_sse4_1=vp9_full_search_sadx8 vp9_full_search_sad_sse4_1=vp9_full_search_sadx8
prototype int vp9_refining_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_refining_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_refining_search_sad sse3 specialize vp9_refining_search_sad sse3
vp9_refining_search_sad_sse3=vp9_refining_search_sadx4 vp9_refining_search_sad_sse3=vp9_refining_search_sadx4
prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_diamond_search_sad sse3 specialize vp9_diamond_search_sad sse3
vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4 vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4

8
vp9/common/x86/vp9_subpixel_8t_ssse3.asm
View File

@ -113,7 +113,7 @@
mov rcx, 0x0400040 mov rcx, 0x0400040
movdqa xmm4, [rdx] ;load filters movdqa xmm4, [rdx] ;load filters
movd xmm5, rcx movq xmm5, rcx
packsswb xmm4, xmm4 packsswb xmm4, xmm4
pshuflw xmm0, xmm4, 0b ;k0_k1 pshuflw xmm0, xmm4, 0b ;k0_k1
pshuflw xmm1, xmm4, 01010101b ;k2_k3 pshuflw xmm1, xmm4, 01010101b ;k2_k3
@ -198,7 +198,7 @@
mov rcx, 0x0400040 mov rcx, 0x0400040
movdqa xmm4, [rdx] ;load filters movdqa xmm4, [rdx] ;load filters
movd xmm5, rcx movq xmm5, rcx
packsswb xmm4, xmm4 packsswb xmm4, xmm4
pshuflw xmm0, xmm4, 0b ;k0_k1 pshuflw xmm0, xmm4, 0b ;k0_k1
pshuflw xmm1, xmm4, 01010101b ;k2_k3 pshuflw xmm1, xmm4, 01010101b ;k2_k3
@ -542,7 +542,7 @@ sym(vp9_filter_block1d16_v8_avg_ssse3):
mov rcx, 0x0400040 mov rcx, 0x0400040
movdqa xmm4, [rdx] ;load filters movdqa xmm4, [rdx] ;load filters
movd xmm5, rcx movq xmm5, rcx
packsswb xmm4, xmm4 packsswb xmm4, xmm4
pshuflw xmm0, xmm4, 0b ;k0_k1 pshuflw xmm0, xmm4, 0b ;k0_k1
pshuflw xmm1, xmm4, 01010101b ;k2_k3 pshuflw xmm1, xmm4, 01010101b ;k2_k3
@ -681,7 +681,7 @@ sym(vp9_filter_block1d16_v8_avg_ssse3):
mov rcx, 0x0400040 mov rcx, 0x0400040
movdqa xmm4, [rdx] ;load filters movdqa xmm4, [rdx] ;load filters
movd xmm5, rcx movq xmm5, rcx
packsswb xmm4, xmm4 packsswb xmm4, xmm4
pshuflw xmm0, xmm4, 0b ;k0_k1 pshuflw xmm0, xmm4, 0b ;k0_k1
pshuflw xmm1, xmm4, 01010101b ;k2_k3 pshuflw xmm1, xmm4, 01010101b ;k2_k3

4
vp9/decoder/vp9_decodframe.c
View File

@ -565,7 +565,7 @@ static void decode_4x4_sb(VP9D_COMP *pbi, MACROBLOCKD *xd,
}; };
static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd, static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd,
int mb_row, unsigned int mb_col, int mb_row, int mb_col,
BOOL_DECODER* const bc) { BOOL_DECODER* const bc) {
int n, eobtotal; int n, eobtotal;
TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;
@ -688,7 +688,7 @@ static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd,
} }
static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd, static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd,
int mb_row, unsigned int mb_col, int mb_row, int mb_col,
BOOL_DECODER* const bc) { BOOL_DECODER* const bc) {
int n, eobtotal; int n, eobtotal;
TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;

7
vp9/encoder/vp9_firstpass.c
View File

@ -751,7 +751,8 @@ void vp9_first_pass(VP9_COMP *cpi) {
((cm->current_video_frame > 0) && ((cm->current_video_frame > 0) &&
(cpi->twopass.this_frame_stats->pcnt_inter > 0.20) && (cpi->twopass.this_frame_stats->pcnt_inter > 0.20) &&
((cpi->twopass.this_frame_stats->intra_error / ((cpi->twopass.this_frame_stats->intra_error /
cpi->twopass.this_frame_stats->coded_error) > 2.0))) { DOUBLE_DIVIDE_CHECK(cpi->twopass.this_frame_stats->coded_error)) >
2.0))) {
vp8_yv12_copy_frame(lst_yv12, gld_yv12); vp8_yv12_copy_frame(lst_yv12, gld_yv12);
cpi->twopass.sr_update_lag = 1; cpi->twopass.sr_update_lag = 1;
} else } else
@ -1650,8 +1651,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
if ((cpi->twopass.kf_group_bits > 0) && if ((cpi->twopass.kf_group_bits > 0) &&
(cpi->twopass.kf_group_error_left > 0)) { (cpi->twopass.kf_group_error_left > 0)) {
cpi->twopass.gf_group_bits = cpi->twopass.gf_group_bits =
(int)((double)cpi->twopass.kf_group_bits * (int64_t)(cpi->twopass.kf_group_bits *
(gf_group_err / cpi->twopass.kf_group_error_left)); (gf_group_err / cpi->twopass.kf_group_error_left));
} else } else
cpi->twopass.gf_group_bits = 0; cpi->twopass.gf_group_bits = 0;

2
vp9/encoder/vp9_lookahead.c
View File

@ -174,7 +174,7 @@ vp9_lookahead_peek(struct lookahead_ctx *ctx,
int index) { int index) {
struct lookahead_entry *buf = NULL; struct lookahead_entry *buf = NULL;
assert(index < ctx->max_sz); assert(index < (int)ctx->max_sz);
if (index < (int)ctx->sz) { if (index < (int)ctx->sz) {
index += ctx->read_idx; index += ctx->read_idx;
if (index >= (int)ctx->max_sz) if (index >= (int)ctx->max_sz)

8
vp9/encoder/vp9_rdopt.c
View File

@ -756,7 +756,7 @@ static int vp9_sb_block_error_c(int16_t *coeff, int16_t *dqcoeff,
error += this_diff * this_diff; error += this_diff * this_diff;
} }
return error > INT_MAX ? INT_MAX : error; return error > INT_MAX ? INT_MAX : (int)error;
} }
#define DEBUG_ERROR 0 #define DEBUG_ERROR 0
@ -3067,9 +3067,9 @@ static void store_coding_context(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx,
ctx->best_ref_mv.as_int = ref_mv->as_int; ctx->best_ref_mv.as_int = ref_mv->as_int;
ctx->second_best_ref_mv.as_int = second_ref_mv->as_int; ctx->second_best_ref_mv.as_int = second_ref_mv->as_int;
ctx->single_pred_diff = comp_pred_diff[SINGLE_PREDICTION_ONLY]; ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_PREDICTION_ONLY];
ctx->comp_pred_diff = comp_pred_diff[COMP_PREDICTION_ONLY]; ctx->comp_pred_diff = (int)comp_pred_diff[COMP_PREDICTION_ONLY];
ctx->hybrid_pred_diff = comp_pred_diff[HYBRID_PREDICTION]; ctx->hybrid_pred_diff = (int)comp_pred_diff[HYBRID_PREDICTION];
memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff)); memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff));
} }

2
vp9/encoder/vp9_variance.h
View File

@ -63,7 +63,7 @@ typedef unsigned int (*vp9_get16x16prederror_fn_t)(const uint8_t *src_ptr,
const uint8_t *ref_ptr, const uint8_t *ref_ptr,
int ref_stride); int ref_stride);
typedef struct variance_vtable { typedef struct vp9_variance_vtable {
vp9_sad_fn_t sdf; vp9_sad_fn_t sdf;
vp9_variance_fn_t vf; vp9_variance_fn_t vf;
vp9_subpixvariance_fn_t svf; vp9_subpixvariance_fn_t svf;

4
vp9/encoder/x86/vp9_dct_sse2.asm
View File

@ -29,7 +29,7 @@
movsxd rax, dword ptr arg(2) movsxd rax, dword ptr arg(2)
lea rcx, [rsi + rax*2] lea rcx, [rsi + rax*2]
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%define input rcx %define input rcx
%define output rdx %define output rdx
%define pitch r8 %define pitch r8
@ -53,7 +53,7 @@
RESTORE_GOT RESTORE_GOT
pop rbp pop rbp
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
RESTORE_XMM RESTORE_XMM
%endif %endif
%endif %endif

12
vp9/encoder/x86/vp9_quantize_sse2.asm
View File

@ -27,7 +27,7 @@ sym(vp9_regular_quantize_b_sse2):
push rdi push rdi
push rsi push rsi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
push rdi push rdi
push rsi push rsi
%endif %endif
@ -46,7 +46,7 @@ sym(vp9_regular_quantize_b_sse2):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -223,7 +223,7 @@ ZIGZAG_LOOP 15
pop rsi pop rsi
pop rdi pop rdi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
%endif %endif
@ -247,7 +247,7 @@ sym(vp9_fast_quantize_b_sse2):
push rdi push rdi
push rsi push rsi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
push rdi push rdi
push rsi push rsi
%else %else
@ -261,7 +261,7 @@ sym(vp9_fast_quantize_b_sse2):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -361,7 +361,7 @@ sym(vp9_fast_quantize_b_sse2):
pop rsi pop rsi
pop rdi pop rdi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
%endif %endif

6
vp9/encoder/x86/vp9_quantize_sse4.asm
View File

@ -31,7 +31,7 @@ sym(vp9_regular_quantize_b_sse4):
%define stack_size 32 %define stack_size 32
sub rsp, stack_size sub rsp, stack_size
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
SAVE_XMM 8, u SAVE_XMM 8, u
push rdi push rdi
push rsi push rsi
@ -43,7 +43,7 @@ sym(vp9_regular_quantize_b_sse4):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -238,7 +238,7 @@ ZIGZAG_LOOP 15, 7, xmm3, xmm7, xmm8
pop rbp pop rbp
%else %else
%undef xmm5 %undef xmm5
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
RESTORE_XMM RESTORE_XMM

6
vp9/encoder/x86/vp9_quantize_ssse3.asm
View File

@ -27,7 +27,7 @@ sym(vp9_fast_quantize_b_ssse3):
push rdi push rdi
push rsi push rsi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
push rdi push rdi
push rsi push rsi
%endif %endif
@ -38,7 +38,7 @@ sym(vp9_fast_quantize_b_ssse3):
mov rdi, arg(0) ; BLOCK *b mov rdi, arg(0) ; BLOCK *b
mov rsi, arg(1) ; BLOCKD *d mov rsi, arg(1) ; BLOCKD *d
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
mov rdi, rcx ; BLOCK *b mov rdi, rcx ; BLOCK *b
mov rsi, rdx ; BLOCKD *d mov rsi, rdx ; BLOCKD *d
%else %else
@ -122,7 +122,7 @@ sym(vp9_fast_quantize_b_ssse3):
pop rsi pop rsi
pop rdi pop rdi
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
pop rsi pop rsi
pop rdi pop rdi
%endif %endif

4
vp9/encoder/x86/vp9_sad_sse3.asm
View File

@ -33,7 +33,7 @@
movsxd rax, dword ptr arg(1) ; src_stride movsxd rax, dword ptr arg(1) ; src_stride
movsxd rdx, dword ptr arg(3) ; ref_stride movsxd rdx, dword ptr arg(3) ; ref_stride
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
SAVE_XMM 7, u SAVE_XMM 7, u
%define src_ptr rcx %define src_ptr rcx
%define src_stride rdx %define src_stride rdx
@ -76,7 +76,7 @@
pop rsi pop rsi
pop rbp pop rbp
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
RESTORE_XMM RESTORE_XMM
%endif %endif
%endif %endif

2
vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
View File

@ -50,7 +50,7 @@ sym(vp9_temporal_filter_apply_sse2):
; 0x8000 >> (16 - strength) ; 0x8000 >> (16 - strength)
mov rdx, 16 mov rdx, 16
sub rdx, arg(4) ; 16 - strength sub rdx, arg(4) ; 16 - strength
movd xmm4, rdx ; can't use rdx w/ shift movq xmm4, rdx ; can't use rdx w/ shift
movdqa xmm5, [GLOBAL(_const_top_bit)] movdqa xmm5, [GLOBAL(_const_top_bit)]
psrlw xmm5, xmm4 psrlw xmm5, xmm4
movdqa [rsp + rounding_bit], xmm5 movdqa [rsp + rounding_bit], xmm5

5
vpx/vpx_decoder.h
View File

@ -65,12 +65,17 @@ extern "C" {
* *
* The available flags are specified by VPX_CODEC_USE_* defines. * The available flags are specified by VPX_CODEC_USE_* defines.
*/ */
#define VPX_CODEC_CAP_FRAME_THREADING 0x200000 /**< Can support frame-based
multi-threading */
#define VPX_CODEC_USE_POSTPROC 0x10000 /**< Postprocess decoded frame */ #define VPX_CODEC_USE_POSTPROC 0x10000 /**< Postprocess decoded frame */
#define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000 /**< Conceal errors in decoded #define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000 /**< Conceal errors in decoded
frames */ frames */
#define VPX_CODEC_USE_INPUT_FRAGMENTS 0x40000 /**< The input frame should be #define VPX_CODEC_USE_INPUT_FRAGMENTS 0x40000 /**< The input frame should be
passed to the decoder one passed to the decoder one
fragment at a time */ fragment at a time */
#define VPX_CODEC_USE_FRAME_THREADING 0x80000 /**< Enable frame-based
multi-threading */
/*!\brief Stream properties /*!\brief Stream properties
* *

2
vpx_ports/emms.asm
View File

@ -18,7 +18,7 @@ sym(vpx_reset_mmx_state):
ret ret
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
global sym(vpx_winx64_fldcw) PRIVATE global sym(vpx_winx64_fldcw) PRIVATE
sym(vpx_winx64_fldcw): sym(vpx_winx64_fldcw):
sub rsp, 8 sub rsp, 8

27
vpx_ports/x86_abi_support.asm
View File

@ -78,6 +78,17 @@
%endif %endif
; LIBVPX_YASM_WIN64
; Set LIBVPX_YASM_WIN64 if output is Windows 64bit so the code will work if x64
; or win64 is defined on the Yasm command line.
%ifidn __OUTPUT_FORMAT__,win64
%define LIBVPX_YASM_WIN64 1
%elifidn __OUTPUT_FORMAT__,x64
%define LIBVPX_YASM_WIN64 1
%else
%define LIBVPX_YASM_WIN64 0
%endif
; sym() ; sym()
; Return the proper symbol name for the target ABI. ; Return the proper symbol name for the target ABI.
; ;
@ -90,7 +101,7 @@
%define sym(x) x %define sym(x) x
%elifidn __OUTPUT_FORMAT__,elfx32 %elifidn __OUTPUT_FORMAT__,elfx32
%define sym(x) x %define sym(x) x
%elifidn __OUTPUT_FORMAT__,x64 %elif LIBVPX_YASM_WIN64
%define sym(x) x %define sym(x) x
%else %else
%define sym(x) _ %+ x %define sym(x) _ %+ x
@ -114,7 +125,7 @@
%define PRIVATE :hidden %define PRIVATE :hidden
%elifidn __OUTPUT_FORMAT__,elfx32 %elifidn __OUTPUT_FORMAT__,elfx32
%define PRIVATE :hidden %define PRIVATE :hidden
%elifidn __OUTPUT_FORMAT__,x64 %elif LIBVPX_YASM_WIN64
%define PRIVATE %define PRIVATE
%else %else
%define PRIVATE :private_extern %define PRIVATE :private_extern
@ -131,7 +142,7 @@
%else %else
; 64 bit ABI passes arguments in registers. This is a workaround to get up ; 64 bit ABI passes arguments in registers. This is a workaround to get up
; and running quickly. Relies on SHADOW_ARGS_TO_STACK ; and running quickly. Relies on SHADOW_ARGS_TO_STACK
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%define arg(x) [rbp+16+8*x] %define arg(x) [rbp+16+8*x]
%else %else
%define arg(x) [rbp-8-8*x] %define arg(x) [rbp-8-8*x]
@ -230,6 +241,12 @@
%elifidn __OUTPUT_FORMAT__,elfx32 %elifidn __OUTPUT_FORMAT__,elfx32
%define WRT_PLT wrt ..plt %define WRT_PLT wrt ..plt
%define HIDDEN_DATA(x) x:data hidden %define HIDDEN_DATA(x) x:data hidden
%elifidn __OUTPUT_FORMAT__,macho64
%ifdef CHROMIUM
%define HIDDEN_DATA(x) x:private_extern
%else
%define HIDDEN_DATA(x) x
%endif
%else %else
%define HIDDEN_DATA(x) x %define HIDDEN_DATA(x) x
%endif %endif
@ -251,7 +268,7 @@
%endm %endm
%define UNSHADOW_ARGS %define UNSHADOW_ARGS
%else %else
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%macro SHADOW_ARGS_TO_STACK 1 ; argc %macro SHADOW_ARGS_TO_STACK 1 ; argc
%if %1 > 0 %if %1 > 0
mov arg(0),rcx mov arg(0),rcx
@ -307,7 +324,7 @@
; Win64 ABI requires 16 byte stack alignment, but then pushes an 8 byte return ; Win64 ABI requires 16 byte stack alignment, but then pushes an 8 byte return
; value. Typically we follow this up with 'push rbp' - re-aligning the stack - ; value. Typically we follow this up with 'push rbp' - re-aligning the stack -
; but in some cases this is not done and unaligned movs must be used. ; but in some cases this is not done and unaligned movs must be used.
%ifidn __OUTPUT_FORMAT__,x64 %if LIBVPX_YASM_WIN64
%macro SAVE_XMM 1-2 a %macro SAVE_XMM 1-2 a
%if %1 < 6 %if %1 < 6
%error Only xmm registers 6-15 must be preserved %error Only xmm registers 6-15 must be preserved

2
vpxenc.c
View File

@ -10,7 +10,7 @@
#include "vpx_config.h" #include "vpx_config.h"
#if defined(_WIN32) || !CONFIG_OS_SUPPORT #if defined(_WIN32) || defined(__OS2__) || !CONFIG_OS_SUPPORT
#define USE_POSIX_MMAP 0 #define USE_POSIX_MMAP 0
#else #else
#define USE_POSIX_MMAP 1 #define USE_POSIX_MMAP 1