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

Merge branch 'origin/eider' into master

Browse Source 
Conflicts:
	vp8/common/entropymode.c
	vp8/common/entropymode.h
	vp8/encoder/encodeframe.c
	vp8/vp8_cx_iface.c

Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265
This commit is contained in:
John Koleszar 2012-05-11 10:51:05 -07:00
commit 44d35f7b25
46 changed files with 450 additions and 1400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -5,3 +5,4 @@ Tom Finegan <tomfinegan@google.com>
Ralph Giles <giles@xiph.org> <giles@entropywave.com> Ralph Giles <giles@xiph.org> <giles@entropywave.com>
Ralph Giles <giles@xiph.org> <giles@mozilla.com> Ralph Giles <giles@xiph.org> <giles@mozilla.com>
Alpha Lam <hclam@google.com> <hclam@chromium.org> Alpha Lam <hclam@google.com> <hclam@chromium.org>
Deb Mukherjee <debargha@google.com>

4
AUTHORS
View File

@ -31,9 +31,11 @@ John Koleszar <jkoleszar@google.com>
Joshua Bleecher Snyder <josh@treelinelabs.com> Joshua Bleecher Snyder <josh@treelinelabs.com>
Justin Clift <justin@salasaga.org> Justin Clift <justin@salasaga.org>
Justin Lebar <justin.lebar@gmail.com> Justin Lebar <justin.lebar@gmail.com>
KO Myung-Hun <komh@chollian.net>
Lou Quillio <louquillio@google.com> Lou Quillio <louquillio@google.com>
Luca Barbato <lu_zero@gentoo.org> Luca Barbato <lu_zero@gentoo.org>
Makoto Kato <makoto.kt@gmail.com> Makoto Kato <makoto.kt@gmail.com>
Marco Paniconi <marpan@google.com>
Martin Ettl <ettl.martin78@googlemail.com> Martin Ettl <ettl.martin78@googlemail.com>
Michael Kohler <michaelkohler@live.com> Michael Kohler <michaelkohler@live.com>
Mike Hommey <mhommey@mozilla.com> Mike Hommey <mhommey@mozilla.com>
@ -43,6 +45,7 @@ Patrik Westin <patrik.westin@gmail.com>
Paul Wilkins <paulwilkins@google.com> Paul Wilkins <paulwilkins@google.com>
Pavol Rusnak <stick@gk2.sk> Pavol Rusnak <stick@gk2.sk>
Philip Jägenstedt <philipj@opera.com> Philip Jägenstedt <philipj@opera.com>
Priit Laes <plaes@plaes.org>
Rafael Ávila de Espíndola <rafael.espindola@gmail.com> Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
Rafaël Carré <funman@videolan.org> Rafaël Carré <funman@videolan.org>
Ralph Giles <giles@xiph.org> Ralph Giles <giles@xiph.org>
@ -50,6 +53,7 @@ Ronald S. Bultje <rbultje@google.com>
Scott LaVarnway <slavarnway@google.com> Scott LaVarnway <slavarnway@google.com>
Stefan Holmer <holmer@google.com> Stefan Holmer <holmer@google.com>
Taekhyun Kim <takim@nvidia.com> Taekhyun Kim <takim@nvidia.com>
Takanori MATSUURA <t.matsuu@gmail.com>
Tero Rintaluoma <teror@google.com> Tero Rintaluoma <teror@google.com>
Thijs Vermeir <thijsvermeir@gmail.com> Thijs Vermeir <thijsvermeir@gmail.com>
Timothy B. Terriberry <tterribe@xiph.org> Timothy B. Terriberry <tterribe@xiph.org>

93
CHANGELOG
View File

@ -1,5 +1,94 @@
NOTE FOR NEXT RELEASE: PLEASE DOCUMENT API CHANGE TO NOISE SENSITIVITY FEATURE 2012-05-09 v1.1.0 "Eider"
AND WARN PEOPLE THAT FOR NOW IT'S EITHER ON OR OFF This introduces a number of enhancements, mostly focused on real-time
encoding. In addition, it fixes a decoder bug (first introduced in
Duclair) so all users of that release are encouraged to upgrade.
- Upgrading:
This release is ABI and API compatible with Duclair (v1.0.0). Users
of older releases should refer to the Upgrading notes in this
document for that release.
This release introduces a new temporal denoiser, controlled by the
VP8E_SET_NOISE_SENSITIVITY control. The temporal denoiser does not
currently take a strength parameter, so the control is effectively
a boolean - zero (off) or non-zero (on). For compatibility with
existing applications, the values accepted are the same as those
for the spatial denoiser (0-6). The temporal denoiser is enabled
by default, and the older spatial denoiser may be restored by
configuring with --disable-temporal-denoising. The temporal denoiser
is more computationally intensive than the spatial one.
This release removes support for a legacy, decode only API that was
supported, but deprecated, at the initial release of libvpx
(v0.9.0). This is not expected to have any impact. If you are
impacted, you can apply a reversion to commit 2bf8fb58 locally.
Please update to the latest libvpx API if you are affected.
- Enhancements:
Adds a motion compensated temporal denoiser to the encoder, which
gives higher quality than the older spatial denoiser. (See above
for notes on upgrading).
In addition, support for new compilers and platforms were added,
including:
improved support for XCode
Android x86 NDK build
OS/2 support
SunCC support
Changing resolution with vpx_codec_enc_config_set() is now
supported. Previously, reinitializing the codec was required to
change the input resolution.
The vpxenc application has initial support for producing multiple
encodes from the same input in one call. Resizing is not yet
supported, but varying other codec parameters is. Use -- to
delineate output streams. Options persist from one stream to the
next.
Also, the vpxenc application will now use a keyframe interval of
5 seconds by default. Use the --kf-max-dist option to override.
- Speed:
Decoder performance improved 2.5% versus Duclair. Encoder speed is
consistent with Duclair for most material. Two pass encoding of
slideshow-like material will see significant improvements.
Large realtime encoding speed gains at a small quality expense are
possible by configuring the on-the-fly bitpacking experiment with
--enable-onthefly-bitpacking. Realtime encoder can be up to 13%
faster (ARM) depending on the number of threads and bitrate
settings. This technique sees constant gain over the 5-16 speed
range. For VC style input the loss seen is up to 0.2dB. See commit
52cf4dca for further details.
- Quality:
On the whole, quality is consistent with the Duclair release. Some
tweaks:
Reduced blockiness in easy sections by applying a penalty to
intra modes.
Improved quality of static sections (like slideshows) with
two pass encoding.
Improved keyframe sizing with multiple temporal layers
- Bug Fixes:
Corrected alt-ref contribution to frame rate for visible updates
to the alt-ref buffer. This affected applications making manual
usage of the frame reference flags, or temporal layers.
Additional constraints were added to disable multi-frame quality
enhancement (MFQE) in sections of the frame where there is motion.
(#392)
Fixed corruption issues when vpx_codec_enc_config_set() was called
with spatial resampling enabled.
Fixed a decoder error introduced in Duclair where the segmentation
map was not being reinitialized on keyframes (#378)
2012-01-27 v1.0.0 "Duclair" 2012-01-27 v1.0.0 "Duclair"
Our fourth named release, focused on performance and features related to Our fourth named release, focused on performance and features related to

13
build/make/configure.sh
View File

@ -588,6 +588,10 @@ process_common_toolchain() {
tgt_isa=x86_64 tgt_isa=x86_64
tgt_os=darwin11 tgt_os=darwin11
;; ;;
*darwin12*)
tgt_isa=x86_64
tgt_os=darwin12
;;
*mingw32*|*cygwin*) *mingw32*|*cygwin*)
[ -z "$tgt_isa" ] && tgt_isa=x86 [ -z "$tgt_isa" ] && tgt_isa=x86
tgt_os=win32 tgt_os=win32
@ -679,6 +683,10 @@ process_common_toolchain() {
add_cflags "-mmacosx-version-min=10.7" add_cflags "-mmacosx-version-min=10.7"
add_ldflags "-mmacosx-version-min=10.7" add_ldflags "-mmacosx-version-min=10.7"
;; ;;
*-darwin12-*)
add_cflags "-mmacosx-version-min=10.8"
add_ldflags "-mmacosx-version-min=10.8"
;;
esac esac
# Handle Solaris variants. Solaris 10 needs -lposix4 # Handle Solaris variants. Solaris 10 needs -lposix4
@ -813,7 +821,8 @@ process_common_toolchain() {
darwin*) darwin*)
if [ -z "${sdk_path}" ]; then if [ -z "${sdk_path}" ]; then
SDK_PATH=/Developer/Platforms/iPhoneOS.platform/Developer SDK_PATH=`xcode-select -print-path 2> /dev/null`
SDK_PATH=${SDK_PATH}/Platforms/iPhoneOS.platform/Developer
else else
SDK_PATH=${sdk_path} SDK_PATH=${sdk_path}
fi fi
@ -835,7 +844,7 @@ process_common_toolchain() {
add_ldflags -arch_only ${tgt_isa} add_ldflags -arch_only ${tgt_isa}
if [ -z "${alt_libc}" ]; then if [ -z "${alt_libc}" ]; then
alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.0.sdk alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk
fi fi
add_cflags "-isysroot ${alt_libc}" add_cflags "-isysroot ${alt_libc}"

27
configure vendored
View File

@ -109,6 +109,8 @@ all_platforms="${all_platforms} x86-darwin8-icc"
all_platforms="${all_platforms} x86-darwin9-gcc" all_platforms="${all_platforms} x86-darwin9-gcc"
all_platforms="${all_platforms} x86-darwin9-icc" all_platforms="${all_platforms} x86-darwin9-icc"
all_platforms="${all_platforms} x86-darwin10-gcc" all_platforms="${all_platforms} x86-darwin10-gcc"
all_platforms="${all_platforms} x86-darwin11-gcc"
all_platforms="${all_platforms} x86-darwin12-gcc"
all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-gcc"
all_platforms="${all_platforms} x86-linux-icc" all_platforms="${all_platforms} x86-linux-icc"
all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-os2-gcc"
@ -120,6 +122,7 @@ all_platforms="${all_platforms} x86-win32-vs9"
all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc"
all_platforms="${all_platforms} x86_64-darwin10-gcc" all_platforms="${all_platforms} x86_64-darwin10-gcc"
all_platforms="${all_platforms} x86_64-darwin11-gcc" all_platforms="${all_platforms} x86_64-darwin11-gcc"
all_platforms="${all_platforms} x86_64-darwin12-gcc"
all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-gcc"
all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-linux-icc"
all_platforms="${all_platforms} x86_64-solaris-gcc" all_platforms="${all_platforms} x86_64-solaris-gcc"
@ -128,6 +131,9 @@ all_platforms="${all_platforms} x86_64-win64-vs8"
all_platforms="${all_platforms} x86_64-win64-vs9" all_platforms="${all_platforms} x86_64-win64-vs9"
all_platforms="${all_platforms} universal-darwin8-gcc" all_platforms="${all_platforms} universal-darwin8-gcc"
all_platforms="${all_platforms} universal-darwin9-gcc" all_platforms="${all_platforms} universal-darwin9-gcc"
all_platforms="${all_platforms} universal-darwin10-gcc"
all_platforms="${all_platforms} universal-darwin11-gcc"
all_platforms="${all_platforms} universal-darwin12-gcc"
all_platforms="${all_platforms} generic-gnu" all_platforms="${all_platforms} generic-gnu"
# all_targets is a list of all targets that can be configured # all_targets is a list of all targets that can be configured
@ -493,11 +499,20 @@ process_toolchain() {
case $toolchain in case $toolchain in
universal-darwin*) universal-darwin*)
local darwin_ver=${tgt_os##darwin} local darwin_ver=${tgt_os##darwin}
fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-gcc"
# Intel # Snow Leopard (10.6/darwin10) dropped support for PPC
fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" # Include PPC support for all prior versions
if [ $darwin_ver -gt 8 ]; then if [ $darwin_ver -lt 10 ]; then
fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-gcc"
fi
# Tiger (10.4/darwin8) brought support for x86
if [ $darwin_ver -ge 8 ]; then
fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}"
fi
# Leopard (10.5/darwin9) brought 64 bit support
if [ $darwin_ver -ge 9 ]; then
fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}" fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}"
fi fi
;; ;;
@ -513,6 +528,10 @@ process_toolchain() {
check_add_cflags -Wpointer-arith check_add_cflags -Wpointer-arith
check_add_cflags -Wtype-limits check_add_cflags -Wtype-limits
check_add_cflags -Wcast-qual check_add_cflags -Wcast-qual
check_add_cflags -Wimplicit-function-declaration
check_add_cflags -Wuninitialized
check_add_cflags -Wunused-variable
check_add_cflags -Wunused-but-set-variable
enabled extra_warnings || check_add_cflags -Wno-unused-function enabled extra_warnings || check_add_cflags -Wno-unused-function
fi fi

3
docs.mk
View File

@ -21,9 +21,6 @@ CODEC_DOX := mainpage.dox \
usage_dx.dox \ usage_dx.dox \
# Other doxy files sourced in Markdown # Other doxy files sourced in Markdown
TXT_DOX-$(CONFIG_VP8) += vp8_api1_migration.dox
vp8_api1_migration.dox.DESC = VP8 API 1.x Migration
TXT_DOX = $(call enabled,TXT_DOX) TXT_DOX = $(call enabled,TXT_DOX)
%.dox: %.txt %.dox: %.txt

7
libs.mk
View File

@ -35,9 +35,9 @@ ifeq ($(CONFIG_VP8_ENCODER),yes)
include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk
CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS)) CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS))
CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS)) CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS))
CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk vpx/vp8.h vpx/vp8cx.h
CODEC_SRCS-$(ARCH_ARM) += $(VP8_PREFIX)vp8cx_arm.mk CODEC_SRCS-$(ARCH_ARM) += $(VP8_PREFIX)vp8cx_arm.mk
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8e.h include/vpx/vp8cx.h INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
CODEC_DOC_SECTIONS += vp8 vp8_encoder CODEC_DOC_SECTIONS += vp8 vp8_encoder
@ -116,7 +116,6 @@ INSTALL-LIBS-yes += include/vpx/vpx_integer.h
INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_top.h INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_top.h
INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_bottom.h INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_bottom.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder.h INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder_compat.h
INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx/vpx_encoder.h INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx/vpx_encoder.h
ifeq ($(CONFIG_EXTERNAL_BUILD),yes) ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
ifeq ($(CONFIG_MSVS),yes) ifeq ($(CONFIG_MSVS),yes)
@ -235,7 +234,7 @@ vpx.pc: config.mk libs.mk
$(qexec)echo '# pkg-config file from libvpx $(VERSION_STRING)' > $@ $(qexec)echo '# pkg-config file from libvpx $(VERSION_STRING)' > $@
$(qexec)echo 'prefix=$(PREFIX)' >> $@ $(qexec)echo 'prefix=$(PREFIX)' >> $@
$(qexec)echo 'exec_prefix=$${prefix}' >> $@ $(qexec)echo 'exec_prefix=$${prefix}' >> $@
$(qexec)echo 'libdir=$${prefix}/lib' >> $@ $(qexec)echo 'libdir=$${prefix}/$(LIBSUBDIR)' >> $@
$(qexec)echo 'includedir=$${prefix}/include' >> $@ $(qexec)echo 'includedir=$${prefix}/include' >> $@
$(qexec)echo '' >> $@ $(qexec)echo '' >> $@
$(qexec)echo 'Name: vpx' >> $@ $(qexec)echo 'Name: vpx' >> $@

14
vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm
View File

@ -9,6 +9,11 @@
; ;
bilinear_taps_coeff
DCD 128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
;-----------------
EXPORT |vp8_sub_pixel_variance16x16_neon_func| EXPORT |vp8_sub_pixel_variance16x16_neon_func|
ARM ARM
REQUIRE8 REQUIRE8
@ -27,7 +32,7 @@
|vp8_sub_pixel_variance16x16_neon_func| PROC |vp8_sub_pixel_variance16x16_neon_func| PROC
push {r4-r6, lr} push {r4-r6, lr}
ldr r12, _BilinearTaps_coeff_ adr r12, bilinear_taps_coeff
ldr r4, [sp, #16] ;load *dst_ptr from stack ldr r4, [sp, #16] ;load *dst_ptr from stack
ldr r5, [sp, #20] ;load dst_pixels_per_line from stack ldr r5, [sp, #20] ;load dst_pixels_per_line from stack
ldr r6, [sp, #24] ;load *sse from stack ldr r6, [sp, #24] ;load *sse from stack
@ -415,11 +420,4 @@ sub_pixel_variance16x16_neon_loop
ENDP ENDP
;-----------------
_BilinearTaps_coeff_
DCD bilinear_taps_coeff
bilinear_taps_coeff
DCD 128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112
END END

4
vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm
View File

@ -27,7 +27,7 @@
|vp8_sub_pixel_variance8x8_neon| PROC |vp8_sub_pixel_variance8x8_neon| PROC
push {r4-r5, lr} push {r4-r5, lr}
ldr r12, _BilinearTaps_coeff_ adr r12, bilinear_taps_coeff
ldr r4, [sp, #12] ;load *dst_ptr from stack ldr r4, [sp, #12] ;load *dst_ptr from stack
ldr r5, [sp, #16] ;load dst_pixels_per_line from stack ldr r5, [sp, #16] ;load dst_pixels_per_line from stack
ldr lr, [sp, #20] ;load *sse from stack ldr lr, [sp, #20] ;load *sse from stack
@ -216,8 +216,6 @@ sub_pixel_variance8x8_neon_loop
;----------------- ;-----------------
_BilinearTaps_coeff_
DCD bilinear_taps_coeff
bilinear_taps_coeff bilinear_taps_coeff
DCD 128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112 DCD 128, 0, 112, 16, 96, 32, 80, 48, 64, 64, 48, 80, 32, 96, 16, 112

11
vp8/common/arm/variance_arm.c
View File

@ -97,6 +97,17 @@ unsigned int vp8_sub_pixel_variance16x16_armv6
#if HAVE_NEON #if HAVE_NEON
extern unsigned int vp8_sub_pixel_variance16x16_neon_func
(
const unsigned char *src_ptr,
int src_pixels_per_line,
int xoffset,
int yoffset,
const unsigned char *dst_ptr,
int dst_pixels_per_line,
unsigned int *sse
);
unsigned int vp8_sub_pixel_variance16x16_neon unsigned int vp8_sub_pixel_variance16x16_neon
( (
const unsigned char *src_ptr, const unsigned char *src_ptr,

1
vp8/common/entropymode.c
View File

@ -169,4 +169,3 @@ void vp8_default_bmode_probs(vp8_prob p [VP8_BINTRAMODES-1])
vpx_memcpy(p, vp8_bmode_prob, sizeof(vp8_bmode_prob)); vpx_memcpy(p, vp8_bmode_prob, sizeof(vp8_bmode_prob));
} }

1
vp8/common/entropymode.h
View File

@ -73,7 +73,6 @@ extern const vp8_prob vp8_kf_bmode_prob[VP8_BINTRAMODES][VP8_BINTRAMODES]
extern const vp8_prob vp8_kf_uv_mode_prob[VP8_UV_MODES-1]; extern const vp8_prob vp8_kf_uv_mode_prob[VP8_UV_MODES-1];
extern const vp8_prob vp8_kf_ymode_prob[VP8_YMODES-1]; extern const vp8_prob vp8_kf_ymode_prob[VP8_YMODES-1];
void vp8_init_mbmode_probs(VP8_COMMON *x); void vp8_init_mbmode_probs(VP8_COMMON *x);
void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES-1]); void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES-1]);
void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]); void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]);

54
vp8/common/generic/systemdependent.c
View File

@ -82,6 +82,58 @@ static int get_cpu_count()
} }
#endif #endif
#if HAVE_PTHREAD_H
#include <pthread.h>
static void once(void (*func)(void))
{
static pthread_once_t lock = PTHREAD_ONCE_INIT;
pthread_once(&lock, func);
}
#elif defined(_WIN32)
static void once(void (*func)(void))
{
/* Using a static initializer here rather than InitializeCriticalSection()
* since there's no race-free context in which to execute it. Protecting
* it with an atomic op like InterlockedCompareExchangePointer introduces
* an x86 dependency, and InitOnceExecuteOnce requires Vista.
*/
static CRITICAL_SECTION lock = {(void *)-1, -1, 0, 0, 0, 0};
static int done;
EnterCriticalSection(&lock);
if (!done)
{
func();
done = 1;
}
LeaveCriticalSection(&lock);
}
#else
/* No-op version that performs no synchronization. vpx_rtcd() is idempotent,
* so as long as your platform provides atomic loads/stores of pointers
* no synchronization is strictly necessary.
*/
static void once(void (*func)(void))
{
static int done;
if(!done)
{
func();
done = 1;
}
}
#endif
void vp8_machine_specific_config(VP8_COMMON *ctx) void vp8_machine_specific_config(VP8_COMMON *ctx)
{ {
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD
@ -94,5 +146,5 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
ctx->cpu_caps = x86_simd_caps(); ctx->cpu_caps = x86_simd_caps();
#endif #endif
vpx_rtcd(); once(vpx_rtcd);
} }

55
vp8/common/mbpitch.c
View File

@ -11,45 +11,6 @@
#include "blockd.h" #include "blockd.h"
typedef enum
{
PRED = 0,
DEST = 1
} BLOCKSET;
static void setup_macroblock(MACROBLOCKD *x, BLOCKSET bs)
{
int block;
unsigned char **y, **u, **v;
if (bs == DEST)
{
y = &x->dst.y_buffer;
u = &x->dst.u_buffer;
v = &x->dst.v_buffer;
}
else
{
y = &x->pre.y_buffer;
u = &x->pre.u_buffer;
v = &x->pre.v_buffer;
}
for (block = 0; block < 16; block++) /* y blocks */
{
x->block[block].offset =
(block >> 2) * 4 * x->dst.y_stride + (block & 3) * 4;
}
for (block = 16; block < 20; block++) /* U and V blocks */
{
x->block[block+4].offset =
x->block[block].offset =
((block - 16) >> 1) * 4 * x->dst.uv_stride + (block & 1) * 4;
}
}
void vp8_setup_block_dptrs(MACROBLOCKD *x) void vp8_setup_block_dptrs(MACROBLOCKD *x)
{ {
int r, c; int r, c;
@ -90,8 +51,18 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
void vp8_build_block_doffsets(MACROBLOCKD *x) void vp8_build_block_doffsets(MACROBLOCKD *x)
{ {
int block;
/* handle the destination pitch features */ for (block = 0; block < 16; block++) /* y blocks */
setup_macroblock(x, DEST); {
setup_macroblock(x, PRED); x->block[block].offset =
(block >> 2) * 4 * x->dst.y_stride + (block & 3) * 4;
}
for (block = 16; block < 20; block++) /* U and V blocks */
{
x->block[block+4].offset =
x->block[block].offset =
((block - 16) >> 1) * 4 * x->dst.uv_stride + (block & 1) * 4;
}
} }

8
vp8/common/mfqe.c
View File

@ -118,7 +118,7 @@ static unsigned int int_sqrt(unsigned int x)
#define USE_SSD #define USE_SSD
static void multiframe_quality_enhance_block static void multiframe_quality_enhance_block
( (
int blksize, /* Currently only values supported are 16, 8, 4 */ int blksize, /* Currently only values supported are 16, 8 */
int qcurr, int qcurr,
int qprev, int qprev,
unsigned char *y, unsigned char *y,
@ -140,9 +140,7 @@ static void multiframe_quality_enhance_block
int uvblksize = blksize >> 1; int uvblksize = blksize >> 1;
int qdiff = qcurr - qprev; int qdiff = qcurr - qprev;
int i, j; int i;
unsigned char *yp;
unsigned char *ydp;
unsigned char *up; unsigned char *up;
unsigned char *udp; unsigned char *udp;
unsigned char *vp; unsigned char *vp;
@ -167,7 +165,7 @@ static void multiframe_quality_enhance_block
vsad = (vp8_sad8x8(v, uv_stride, vd, uvd_stride, INT_MAX)+32)>>6; vsad = (vp8_sad8x8(v, uv_stride, vd, uvd_stride, INT_MAX)+32)>>6;
#endif #endif
} }
else if (blksize == 8) else /* if (blksize == 8) */
{ {
actd = (vp8_variance8x8(yd, yd_stride, VP8_ZEROS, 0, &sse)+32)>>6; actd = (vp8_variance8x8(yd, yd_stride, VP8_ZEROS, 0, &sse)+32)>>6;
act = (vp8_variance8x8(y, y_stride, VP8_ZEROS, 0, &sse)+32)>>6; act = (vp8_variance8x8(y, y_stride, VP8_ZEROS, 0, &sse)+32)>>6;

6
vp8/common/onyx.h
View File

@ -207,10 +207,10 @@ extern "C"
// Temporal scaling parameters // Temporal scaling parameters
unsigned int number_of_layers; unsigned int number_of_layers;
unsigned int target_bitrate[MAX_PERIODICITY]; unsigned int target_bitrate[VPX_TS_MAX_PERIODICITY];
unsigned int rate_decimator[MAX_PERIODICITY]; unsigned int rate_decimator[VPX_TS_MAX_PERIODICITY];
unsigned int periodicity; unsigned int periodicity;
unsigned int layer_id[MAX_PERIODICITY]; unsigned int layer_id[VPX_TS_MAX_PERIODICITY];
#if CONFIG_MULTI_RES_ENCODING #if CONFIG_MULTI_RES_ENCODING
/* Number of total resolutions encoded */ /* Number of total resolutions encoded */

1
vp8/common/rtcd_defs.sh
View File

@ -129,6 +129,7 @@ specialize vp8_build_intra_predictors_mby_s sse2 ssse3
prototype void vp8_build_intra_predictors_mbuv_s "struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride" prototype void vp8_build_intra_predictors_mbuv_s "struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride"
specialize vp8_build_intra_predictors_mbuv_s sse2 ssse3 specialize vp8_build_intra_predictors_mbuv_s sse2 ssse3
prototype void vp8_intra4x4_predict_d "unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left"
prototype void vp8_intra4x4_predict "unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride" prototype void vp8_intra4x4_predict "unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride"
specialize vp8_intra4x4_predict media specialize vp8_intra4x4_predict media
vp8_intra4x4_predict_media=vp8_intra4x4_predict_armv6 vp8_intra4x4_predict_media=vp8_intra4x4_predict_armv6

8
vp8/decoder/decodframe.c
View File

@ -53,7 +53,7 @@ void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
} }
} }
void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
{ {
int i; int i;
int QIndex; int QIndex;
@ -117,7 +117,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
mode = xd->mode_info_context->mbmi.mode; mode = xd->mode_info_context->mbmi.mode;
if (xd->segmentation_enabled) if (xd->segmentation_enabled)
mb_init_dequantizer(pbi, xd); vp8_mb_init_dequantizer(pbi, xd);
#if CONFIG_ERROR_CONCEALMENT #if CONFIG_ERROR_CONCEALMENT
@ -507,7 +507,7 @@ static unsigned int read_available_partition_size(
{ {
VP8_COMMON* pc = &pbi->common; VP8_COMMON* pc = &pbi->common;
const unsigned char *partition_size_ptr = token_part_sizes + i * 3; const unsigned char *partition_size_ptr = token_part_sizes + i * 3;
unsigned int partition_size; unsigned int partition_size = 0;
ptrdiff_t bytes_left = fragment_end - fragment_start; ptrdiff_t bytes_left = fragment_end - fragment_start;
/* Calculate the length of this partition. The last partition /* Calculate the length of this partition. The last partition
* size is implicit. If the partition size can't be read, then * size is implicit. If the partition size can't be read, then
@ -997,7 +997,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vp8cx_init_de_quantizer(pbi); vp8cx_init_de_quantizer(pbi);
/* MB level dequantizer setup */ /* MB level dequantizer setup */
mb_init_dequantizer(pbi, &pbi->mb); vp8_mb_init_dequantizer(pbi, &pbi->mb);
} }
/* Determine if the golden frame or ARF buffer should be updated and how. /* Determine if the golden frame or ARF buffer should be updated and how.

4
vp8/decoder/threading.c
View File

@ -28,7 +28,7 @@
#include "error_concealment.h" #include "error_concealment.h"
#endif #endif
extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd); extern void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count) static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count)
{ {
@ -106,7 +106,7 @@ static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
mode = xd->mode_info_context->mbmi.mode; mode = xd->mode_info_context->mbmi.mode;
if (xd->segmentation_enabled) if (xd->segmentation_enabled)
mb_init_dequantizer(pbi, xd); vp8_mb_init_dequantizer(pbi, xd);
#if CONFIG_ERROR_CONCEALMENT #if CONFIG_ERROR_CONCEALMENT

7
vp8/encoder/arm/neon/fastquantizeb_neon.asm
View File

@ -98,7 +98,7 @@
vmul.s16 q2, q6, q4 ; x * Dequant vmul.s16 q2, q6, q4 ; x * Dequant
vmul.s16 q3, q7, q5 vmul.s16 q3, q7, q5
ldr r0, _inv_zig_zag_ ; load ptr of inverse zigzag table adr r0, inv_zig_zag ; load ptr of inverse zigzag table
vceq.s16 q8, q8 ; set q8 to all 1 vceq.s16 q8, q8 ; set q8 to all 1
@ -181,7 +181,7 @@
vadd.s16 q12, q14 ; x + Round vadd.s16 q12, q14 ; x + Round
vadd.s16 q13, q15 vadd.s16 q13, q15
ldr r0, _inv_zig_zag_ ; load ptr of inverse zigzag table adr r0, inv_zig_zag ; load ptr of inverse zigzag table
vqdmulh.s16 q12, q8 ; y = ((Round+abs(z)) * Quant) >> 16 vqdmulh.s16 q12, q8 ; y = ((Round+abs(z)) * Quant) >> 16
vqdmulh.s16 q13, q9 vqdmulh.s16 q13, q9
@ -247,9 +247,6 @@ zero_output
ENDP ENDP
; default inverse zigzag table is defined in vp8/common/entropy.c ; default inverse zigzag table is defined in vp8/common/entropy.c
_inv_zig_zag_
DCD inv_zig_zag
ALIGN 16 ; enable use of @128 bit aligned loads ALIGN 16 ; enable use of @128 bit aligned loads
inv_zig_zag inv_zig_zag
DCW 0x0001, 0x0002, 0x0006, 0x0007 DCW 0x0001, 0x0002, 0x0006, 0x0007

2
vp8/encoder/arm/neon/picklpf_arm.c
View File

@ -22,11 +22,9 @@ void vp8_yv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc,
unsigned char *src_y, *dst_y; unsigned char *src_y, *dst_y;
int yheight; int yheight;
int ystride; int ystride;
int border;
int yoffset; int yoffset;
int linestocopy; int linestocopy;
border = src_ybc->border;
yheight = src_ybc->y_height; yheight = src_ybc->y_height;
ystride = src_ybc->y_stride; ystride = src_ybc->y_stride;

3
vp8/encoder/bitstream.c
View File

@ -521,12 +521,11 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
const MV_CONTEXT *mvc = pc->fc.mvc; const MV_CONTEXT *mvc = pc->fc.mvc;
MODE_INFO *m = pc->mi, *ms; MODE_INFO *m = pc->mi;
const int mis = pc->mode_info_stride; const int mis = pc->mode_info_stride;
int mb_row = -1; int mb_row = -1;
int prob_skip_false = 0; int prob_skip_false = 0;
ms = pc->mi - 1;
cpi->mb.partition_info = cpi->mb.pi; cpi->mb.partition_info = cpi->mb.pi;

8
vp8/encoder/denoising.c
View File

@ -15,11 +15,11 @@
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_rtcd.h" #include "vpx_rtcd.h"
const unsigned int NOISE_MOTION_THRESHOLD = 20*20; static const unsigned int NOISE_MOTION_THRESHOLD = 20*20;
const unsigned int NOISE_DIFF2_THRESHOLD = 75; static const unsigned int NOISE_DIFF2_THRESHOLD = 75;
// SSE_DIFF_THRESHOLD is selected as ~95% confidence assuming var(noise) ~= 100. // SSE_DIFF_THRESHOLD is selected as ~95% confidence assuming var(noise) ~= 100.
const unsigned int SSE_DIFF_THRESHOLD = 16*16*20; static const unsigned int SSE_DIFF_THRESHOLD = 16*16*20;
const unsigned int SSE_THRESHOLD = 16*16*40; static const unsigned int SSE_THRESHOLD = 16*16*40;
static uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8) static uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8)
{ {

10
vp8/encoder/encodeframe.c
View File

@ -31,6 +31,7 @@
#if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
#include "bitstream.h" #include "bitstream.h"
#endif #endif
#include "encodeframe.h"
extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) ; extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) ;
extern void vp8_calc_ref_frame_costs(int *ref_frame_cost, extern void vp8_calc_ref_frame_costs(int *ref_frame_cost,
@ -46,13 +47,6 @@ extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
MB_ROW_COMP *mbr_ei, MB_ROW_COMP *mbr_ei,
int mb_row, int mb_row,
int count); int count);
void vp8_build_block_offsets(MACROBLOCK *x);
void vp8_setup_block_ptrs(MACROBLOCK *x);
int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t,
int recon_yoffset, int recon_uvoffset,
int mb_row, int mb_col);
int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
TOKENEXTRA **t);
static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x ); static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x );
#ifdef MODE_STATS #ifdef MODE_STATS
@ -596,7 +590,7 @@ void encode_mb_row(VP8_COMP *cpi,
x->partition_info++; x->partition_info++;
} }
void init_encode_frame_mb_context(VP8_COMP *cpi) static void init_encode_frame_mb_context(VP8_COMP *cpi)
{ {
MACROBLOCK *const x = & cpi->mb; MACROBLOCK *const x = & cpi->mb;
VP8_COMMON *const cm = & cpi->common; VP8_COMMON *const cm = & cpi->common;

27
vp8/encoder/encodeframe.h Normal file
View File

@ -0,0 +1,27 @@
/*
* 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.
*/
#ifndef ENCODEFRAME_H
#define ENCODEFRAME_H
extern void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x);
extern void vp8_build_block_offsets(MACROBLOCK *x);
extern void vp8_setup_block_ptrs(MACROBLOCK *x);
extern void vp8_encode_frame(VP8_COMP *cpi);
extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
TOKENEXTRA **t,
int recon_yoffset, int recon_uvoffset,
int mb_row, int mb_col);
extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
TOKENEXTRA **t);
#endif

4
vp8/encoder/ethreading.c
View File

@ -12,8 +12,8 @@
#include "vp8/common/threading.h" #include "vp8/common/threading.h"
#include "vp8/common/common.h" #include "vp8/common/common.h"
#include "vp8/common/extend.h" #include "vp8/common/extend.h"
#include "bitstream.h" #include "bitstream.h"
#include "encodeframe.h"
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD
@ -24,8 +24,6 @@ extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
TOKENEXTRA **t); TOKENEXTRA **t);
extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip); extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip);
extern void vp8_build_block_offsets(MACROBLOCK *x);
extern void vp8_setup_block_ptrs(MACROBLOCK *x);
extern void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm); extern void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm);

11
vp8/encoder/firstpass.c
View File

@ -28,11 +28,10 @@
#include "rdopt.h" #include "rdopt.h"
#include "vp8/common/quant_common.h" #include "vp8/common/quant_common.h"
#include "encodemv.h" #include "encodemv.h"
#include "encodeframe.h"
//#define OUTPUT_FPF 1 //#define OUTPUT_FPF 1
extern void vp8_build_block_offsets(MACROBLOCK *x);
extern void vp8_setup_block_ptrs(MACROBLOCK *x);
extern void vp8cx_frame_init_quantizer(VP8_COMP *cpi); extern void vp8cx_frame_init_quantizer(VP8_COMP *cpi);
extern void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv); extern void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv);
extern void vp8_alloc_compressor_data(VP8_COMP *cpi); extern void vp8_alloc_compressor_data(VP8_COMP *cpi);
@ -869,7 +868,7 @@ extern const int vp8_bits_per_mb[2][QINDEX_RANGE];
// //
double bitcost( double prob ) static double bitcost( double prob )
{ {
return -(log( prob ) / log( 2.0 )); return -(log( prob ) / log( 2.0 ));
} }
@ -2313,12 +2312,9 @@ void vp8_second_pass(VP8_COMP *cpi)
FIRSTPASS_STATS this_frame = {0}; FIRSTPASS_STATS this_frame = {0};
FIRSTPASS_STATS this_frame_copy; FIRSTPASS_STATS this_frame_copy;
double this_frame_error;
double this_frame_intra_error; double this_frame_intra_error;
double this_frame_coded_error; double this_frame_coded_error;
FIRSTPASS_STATS *start_pos;
int overhead_bits; int overhead_bits;
if (!cpi->twopass.stats_in) if (!cpi->twopass.stats_in)
@ -2331,12 +2327,9 @@ void vp8_second_pass(VP8_COMP *cpi)
if (EOF == input_stats(cpi, &this_frame)) if (EOF == input_stats(cpi, &this_frame))
return; return;
this_frame_error = this_frame.ssim_weighted_pred_err;
this_frame_intra_error = this_frame.intra_error; this_frame_intra_error = this_frame.intra_error;
this_frame_coded_error = this_frame.coded_error; this_frame_coded_error = this_frame.coded_error;
start_pos = cpi->twopass.stats_in;
// keyframe and section processing ! // keyframe and section processing !
if (cpi->twopass.frames_to_key == 0) if (cpi->twopass.frames_to_key == 0)
{ {

84
vp8/encoder/onyx_if.c
View File

@ -36,6 +36,7 @@
#if CONFIG_MULTI_RES_ENCODING #if CONFIG_MULTI_RES_ENCODING
#include "mr_dissim.h" #include "mr_dissim.h"
#endif #endif
#include "encodeframe.h"
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
@ -1016,8 +1017,10 @@ void vp8_set_speed_features(VP8_COMP *cpi)
static void alloc_raw_frame_buffers(VP8_COMP *cpi) static void alloc_raw_frame_buffers(VP8_COMP *cpi)
{ {
#if VP8_TEMPORAL_ALT_REF
int width = (cpi->oxcf.Width + 15) & ~15; int width = (cpi->oxcf.Width + 15) & ~15;
int height = (cpi->oxcf.Height + 15) & ~15; int height = (cpi->oxcf.Height + 15) & ~15;
#endif
cpi->lookahead = vp8_lookahead_init(cpi->oxcf.Width, cpi->oxcf.Height, cpi->lookahead = vp8_lookahead_init(cpi->oxcf.Width, cpi->oxcf.Height,
cpi->oxcf.lag_in_frames); cpi->oxcf.lag_in_frames);
@ -1336,7 +1339,7 @@ static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
#endif #endif
} }
void update_layer_contexts (VP8_COMP *cpi) static void update_layer_contexts (VP8_COMP *cpi)
{ {
VP8_CONFIG *oxcf = &cpi->oxcf; VP8_CONFIG *oxcf = &cpi->oxcf;
@ -1398,12 +1401,24 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
if (!oxcf) if (!oxcf)
return; return;
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if (cpi->b_lpf_running)
{
sem_wait(&cpi->h_event_end_lpf);
cpi->b_lpf_running = 0;
}
#endif
if (cm->version != oxcf->Version) if (cm->version != oxcf->Version)
{ {
cm->version = oxcf->Version; cm->version = oxcf->Version;
vp8_setup_version(cm); vp8_setup_version(cm);
} }
last_w = cpi->oxcf.Width;
last_h = cpi->oxcf.Height;
cpi->oxcf = *oxcf; cpi->oxcf = *oxcf;
switch (cpi->oxcf.Mode) switch (cpi->oxcf.Mode)
@ -1598,14 +1613,14 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
cpi->target_bandwidth = cpi->oxcf.target_bandwidth; cpi->target_bandwidth = cpi->oxcf.target_bandwidth;
last_w = cm->Width;
last_h = cm->Height;
cm->Width = cpi->oxcf.Width; cm->Width = cpi->oxcf.Width;
cm->Height = cpi->oxcf.Height; cm->Height = cpi->oxcf.Height;
cm->horiz_scale = cpi->horiz_scale; /* TODO(jkoleszar): if an internal spatial resampling is active,
cm->vert_scale = cpi->vert_scale; * and we downsize the input image, maybe we should clear the
* internal scale immediately rather than waiting for it to
* correct.
*/
// VP8 sharpness level mapping 0-7 (vs 0-10 in general VPx dialogs) // VP8 sharpness level mapping 0-7 (vs 0-10 in general VPx dialogs)
if (cpi->oxcf.Sharpness > 7) if (cpi->oxcf.Sharpness > 7)
@ -1626,7 +1641,7 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
cm->Height = (vs - 1 + cpi->oxcf.Height * vr) / vs; cm->Height = (vs - 1 + cpi->oxcf.Height * vr) / vs;
} }
if (last_w != cm->Width || last_h != cm->Height) if (last_w != cpi->oxcf.Width || last_h != cpi->oxcf.Height)
cpi->force_next_frame_intra = 1; cpi->force_next_frame_intra = 1;
if (((cm->Width + 15) & 0xfffffff0) != if (((cm->Width + 15) & 0xfffffff0) !=
@ -3009,7 +3024,7 @@ static int recode_loop_test( VP8_COMP *cpi,
return force_recode; return force_recode;
} }
void update_reference_frames(VP8_COMMON *cm) static void update_reference_frames(VP8_COMMON *cm)
{ {
YV12_BUFFER_CONFIG *yv12_fb = cm->yv12_fb; YV12_BUFFER_CONFIG *yv12_fb = cm->yv12_fb;
@ -3158,20 +3173,21 @@ static void encode_frame_to_data_rate
int Loop = 0; int Loop = 0;
int loop_count; int loop_count;
int this_q;
int last_zbin_oq;
VP8_COMMON *cm = &cpi->common;
int active_worst_qchanged = 0;
#if !(CONFIG_REALTIME_ONLY)
int q_low; int q_low;
int q_high; int q_high;
int zbin_oq_high; int zbin_oq_high;
int zbin_oq_low = 0; int zbin_oq_low = 0;
int top_index; int top_index;
int bottom_index; int bottom_index;
VP8_COMMON *cm = &cpi->common;
int active_worst_qchanged = 0;
int overshoot_seen = 0; int overshoot_seen = 0;
int undershoot_seen = 0; int undershoot_seen = 0;
#endif
int drop_mark = cpi->oxcf.drop_frames_water_mark * cpi->oxcf.optimal_buffer_level / 100; int drop_mark = cpi->oxcf.drop_frames_water_mark * cpi->oxcf.optimal_buffer_level / 100;
int drop_mark75 = drop_mark * 2 / 3; int drop_mark75 = drop_mark * 2 / 3;
int drop_mark50 = drop_mark / 4; int drop_mark50 = drop_mark / 4;
@ -3181,6 +3197,15 @@ static void encode_frame_to_data_rate
// Clear down mmx registers to allow floating point in what follows // Clear down mmx registers to allow floating point in what follows
vp8_clear_system_state(); vp8_clear_system_state();
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if (cpi->b_lpf_running)
{
sem_wait(&cpi->h_event_end_lpf);
cpi->b_lpf_running = 0;
}
#endif
// Test code for segmentation of gf/arf (0,0) // Test code for segmentation of gf/arf (0,0)
//segmentation_test_function( cpi); //segmentation_test_function( cpi);
@ -3322,7 +3347,6 @@ static void encode_frame_to_data_rate
{ {
cpi->decimation_factor = 1; cpi->decimation_factor = 1;
} }
//vpx_log("Encoder: Decimation Factor: %d \n",cpi->decimation_factor); //vpx_log("Encoder: Decimation Factor: %d \n",cpi->decimation_factor);
} }
@ -3564,7 +3588,8 @@ static void encode_frame_to_data_rate
// Determine initial Q to try // Determine initial Q to try
Q = vp8_regulate_q(cpi, cpi->this_frame_target); Q = vp8_regulate_q(cpi, cpi->this_frame_target);
last_zbin_oq = cpi->zbin_over_quant;
#if !(CONFIG_REALTIME_ONLY)
// Set highest allowed value for Zbin over quant // Set highest allowed value for Zbin over quant
if (cm->frame_type == KEY_FRAME) if (cm->frame_type == KEY_FRAME)
@ -3576,6 +3601,7 @@ static void encode_frame_to_data_rate
} }
else else
zbin_oq_high = ZBIN_OQ_MAX; zbin_oq_high = ZBIN_OQ_MAX;
#endif
// Setup background Q adjustment for error resilient mode. // Setup background Q adjustment for error resilient mode.
// For multi-layer encodes only enable this for the base layer. // For multi-layer encodes only enable this for the base layer.
@ -3584,18 +3610,20 @@ static void encode_frame_to_data_rate
vp8_compute_frame_size_bounds(cpi, &frame_under_shoot_limit, &frame_over_shoot_limit); vp8_compute_frame_size_bounds(cpi, &frame_under_shoot_limit, &frame_over_shoot_limit);
#if !(CONFIG_REALTIME_ONLY)
// Limit Q range for the adaptive loop. // Limit Q range for the adaptive loop.
bottom_index = cpi->active_best_quality; bottom_index = cpi->active_best_quality;
top_index = cpi->active_worst_quality; top_index = cpi->active_worst_quality;
q_low = cpi->active_best_quality; q_low = cpi->active_best_quality;
q_high = cpi->active_worst_quality; q_high = cpi->active_worst_quality;
#endif
vp8_save_coding_context(cpi); vp8_save_coding_context(cpi);
loop_count = 0; loop_count = 0;
scale_and_extend_source(cpi->un_scaled_source, cpi); scale_and_extend_source(cpi->un_scaled_source, cpi);
#if !(CONFIG_REALTIME_ONLY) && CONFIG_POSTPROC && !(CONFIG_TEMPORAL_DENOISING) #if !(CONFIG_REALTIME_ONLY) && CONFIG_POSTPROC && !(CONFIG_TEMPORAL_DENOISING)
if (cpi->oxcf.noise_sensitivity > 0) if (cpi->oxcf.noise_sensitivity > 0)
@ -3659,7 +3687,6 @@ static void encode_frame_to_data_rate
*/ */
vp8_set_quantizer(cpi, Q); vp8_set_quantizer(cpi, Q);
this_q = Q;
// setup skip prob for costing in mode/mv decision // setup skip prob for costing in mode/mv decision
if (cpi->common.mb_no_coeff_skip) if (cpi->common.mb_no_coeff_skip)
@ -3735,14 +3762,7 @@ static void encode_frame_to_data_rate
vp8_setup_key_frame(cpi); vp8_setup_key_frame(cpi);
} }
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if (cpi->b_lpf_running)
{
sem_wait(&cpi->h_event_end_lpf);
cpi->b_lpf_running = 0;
}
#endif
#if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
{ {
@ -3789,9 +3809,10 @@ static void encode_frame_to_data_rate
if (cpi->compressor_speed == 2) if (cpi->compressor_speed == 2)
{ {
/* we don't do re-encoding in realtime mode /* we don't do re-encoding in realtime mode
* if key frame is decided than we force it on next frame */ * if key frame is decided then we force it on next frame */
cpi->force_next_frame_intra = key_frame_decision; cpi->force_next_frame_intra = key_frame_decision;
} }
#if !(CONFIG_REALTIME_ONLY)
else if (key_frame_decision) else if (key_frame_decision)
{ {
// Reset all our sizing numbers and recode // Reset all our sizing numbers and recode
@ -3829,6 +3850,7 @@ static void encode_frame_to_data_rate
continue; continue;
} }
#endif
} }
vp8_clear_system_state(); vp8_clear_system_state();
@ -3848,10 +3870,12 @@ static void encode_frame_to_data_rate
while ((cpi->active_worst_quality < cpi->worst_quality) && (over_size_percent > 0)) while ((cpi->active_worst_quality < cpi->worst_quality) && (over_size_percent > 0))
{ {
cpi->active_worst_quality++; cpi->active_worst_quality++;
top_index = cpi->active_worst_quality;
over_size_percent = (int)(over_size_percent * 0.96); // Assume 1 qstep = about 4% on frame size. over_size_percent = (int)(over_size_percent * 0.96); // Assume 1 qstep = about 4% on frame size.
} }
#if !(CONFIG_REALTIME_ONLY)
top_index = cpi->active_worst_quality;
#endif
// If we have updated the active max Q do not call vp8_update_rate_correction_factors() this loop. // If we have updated the active max Q do not call vp8_update_rate_correction_factors() this loop.
active_worst_qchanged = 1; active_worst_qchanged = 1;
} }
@ -4010,9 +4034,7 @@ static void encode_frame_to_data_rate
// Clamp cpi->zbin_over_quant // Clamp cpi->zbin_over_quant
cpi->zbin_over_quant = (cpi->zbin_over_quant < zbin_oq_low) ? zbin_oq_low : (cpi->zbin_over_quant > zbin_oq_high) ? zbin_oq_high : cpi->zbin_over_quant; cpi->zbin_over_quant = (cpi->zbin_over_quant < zbin_oq_low) ? zbin_oq_low : (cpi->zbin_over_quant > zbin_oq_high) ? zbin_oq_high : cpi->zbin_over_quant;
//Loop = (Q != last_q) || (last_zbin_oq != cpi->zbin_over_quant);
Loop = Q != last_q; Loop = Q != last_q;
last_zbin_oq = cpi->zbin_over_quant;
} }
else else
#endif #endif
@ -4797,7 +4819,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
} }
// adjust frame rates based on timestamps given // adjust frame rates based on timestamps given
if (!cm->refresh_alt_ref_frame || (cpi->oxcf.number_of_layers > 1)) if (cm->show_frame)
{ {
int64_t this_duration; int64_t this_duration;
int step = 0; int step = 0;

34
vp8/encoder/onyx_int.h
View File

@ -57,8 +57,6 @@
#define VP8_TEMPORAL_ALT_REF 1 #define VP8_TEMPORAL_ALT_REF 1
#endif #endif
#define MAX_PERIODICITY 16
#define MAX(x,y) (((x)>(y))?(x):(y)) #define MAX(x,y) (((x)>(y))?(x):(y))
#define MIN(x,y) (((x)<(y))?(x):(y)) #define MIN(x,y) (((x)<(y))?(x):(y))
@ -485,8 +483,6 @@ typedef struct VP8_COMP
int goldfreq; int goldfreq;
int auto_worst_q; int auto_worst_q;
int cpu_used; int cpu_used;
int horiz_scale;
int vert_scale;
int pass; int pass;
@ -672,21 +668,21 @@ typedef struct VP8_COMP
// Coding layer state variables // Coding layer state variables
unsigned int current_layer; unsigned int current_layer;
LAYER_CONTEXT layer_context[MAX_LAYERS]; LAYER_CONTEXT layer_context[VPX_TS_MAX_LAYERS];
int64_t frames_in_layer[MAX_LAYERS]; int64_t frames_in_layer[VPX_TS_MAX_LAYERS];
int64_t bytes_in_layer[MAX_LAYERS]; int64_t bytes_in_layer[VPX_TS_MAX_LAYERS];
double sum_psnr[MAX_LAYERS]; double sum_psnr[VPX_TS_MAX_LAYERS];
double sum_psnr_p[MAX_LAYERS]; double sum_psnr_p[VPX_TS_MAX_LAYERS];
double total_error2[MAX_LAYERS]; double total_error2[VPX_TS_MAX_LAYERS];
double total_error2_p[MAX_LAYERS]; double total_error2_p[VPX_TS_MAX_LAYERS];
double sum_ssim[MAX_LAYERS]; double sum_ssim[VPX_TS_MAX_LAYERS];
double sum_weights[MAX_LAYERS]; double sum_weights[VPX_TS_MAX_LAYERS];
double total_ssimg_y_in_layer[MAX_LAYERS]; double total_ssimg_y_in_layer[VPX_TS_MAX_LAYERS];
double total_ssimg_u_in_layer[MAX_LAYERS]; double total_ssimg_u_in_layer[VPX_TS_MAX_LAYERS];
double total_ssimg_v_in_layer[MAX_LAYERS]; double total_ssimg_v_in_layer[VPX_TS_MAX_LAYERS];
double total_ssimg_all_in_layer[MAX_LAYERS]; double total_ssimg_all_in_layer[VPX_TS_MAX_LAYERS];
#if CONFIG_MULTI_RES_ENCODING #if CONFIG_MULTI_RES_ENCODING
/* Number of MBs per row at lower-resolution level */ /* Number of MBs per row at lower-resolution level */
@ -708,12 +704,8 @@ typedef struct VP8_COMP
void control_data_rate(VP8_COMP *cpi); void control_data_rate(VP8_COMP *cpi);
void vp8_encode_frame(VP8_COMP *cpi);
void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char *dest_end, unsigned long *size); void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char *dest_end, unsigned long *size);
void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x);
int rd_cost_intra_mb(MACROBLOCKD *x); int rd_cost_intra_mb(MACROBLOCKD *x);
void vp8_tokenize_mb(VP8_COMP *, MACROBLOCKD *, TOKENEXTRA **); void vp8_tokenize_mb(VP8_COMP *, MACROBLOCKD *, TOKENEXTRA **);

2
vp8/encoder/picklpf.c
View File

@ -28,11 +28,9 @@ void vp8_yv12_copy_partial_frame_c(YV12_BUFFER_CONFIG *src_ybc,
unsigned char *src_y, *dst_y; unsigned char *src_y, *dst_y;
int yheight; int yheight;
int ystride; int ystride;
int border;
int yoffset; int yoffset;
int linestocopy; int linestocopy;
border = src_ybc->border;
yheight = src_ybc->y_height; yheight = src_ybc->y_height;
ystride = src_ybc->y_stride; ystride = src_ybc->y_stride;

7
vp8/encoder/temporal_filter.c
View File

@ -146,7 +146,6 @@ static int vp8_temporal_filter_find_matching_mb_c
{ {
MACROBLOCK *x = &cpi->mb; MACROBLOCK *x = &cpi->mb;
int step_param; int step_param;
int further_steps;
int sadpb = x->sadperbit16; int sadpb = x->sadperbit16;
int bestsme = INT_MAX; int bestsme = INT_MAX;
@ -179,15 +178,11 @@ static int vp8_temporal_filter_find_matching_mb_c
// Further step/diamond searches as necessary // Further step/diamond searches as necessary
if (cpi->Speed < 8) if (cpi->Speed < 8)
{ {
step_param = cpi->sf.first_step + step_param = cpi->sf.first_step + (cpi->Speed > 5);
(cpi->Speed > 5);
further_steps =
(cpi->sf.max_step_search_steps - 1)-step_param;
} }
else else
{ {
step_param = cpi->sf.first_step + 2; step_param = cpi->sf.first_step + 2;
further_steps = 0;
} }
/*cpi->sf.search_method == HEX*/ /*cpi->sf.search_method == HEX*/

128
vp8/vp8_cx_iface.c
View File

@ -13,17 +13,12 @@
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h" #include "vpx_version.h"
#include "vp8/encoder/onyx_int.h" #include "vp8/encoder/onyx_int.h"
#include "vpx/vp8e.h" #include "vpx/vp8cx.h"
#include "vp8/encoder/firstpass.h" #include "vp8/encoder/firstpass.h"
#include "vp8/common/onyx.h" #include "vp8/common/onyx.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/* This value is a sentinel for determining whether the user has set a mode
* directly through the deprecated VP8E_SET_ENCODING_MODE control.
*/
#define NO_MODE_SET 255
struct vp8_extracfg struct vp8_extracfg
{ {
struct vpx_codec_pkt_list *pkt_list; struct vpx_codec_pkt_list *pkt_list;
@ -94,7 +89,6 @@ struct vpx_codec_alg_priv
unsigned int next_frame_flag; unsigned int next_frame_flag;
vp8_postproc_cfg_t preview_ppcfg; vp8_postproc_cfg_t preview_ppcfg;
vpx_codec_pkt_list_decl(64) pkt_list; // changed to accomendate the maximum number of lagged frames allowed vpx_codec_pkt_list_decl(64) pkt_list; // changed to accomendate the maximum number of lagged frames allowed
int deprecated_mode;
unsigned int fixed_kf_cntr; unsigned int fixed_kf_cntr;
}; };
@ -183,19 +177,16 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
RANGE_CHECK_BOOL(vp8_cfg, enable_auto_alt_ref); RANGE_CHECK_BOOL(vp8_cfg, enable_auto_alt_ref);
RANGE_CHECK(vp8_cfg, cpu_used, -16, 16); RANGE_CHECK(vp8_cfg, cpu_used, -16, 16);
#if CONFIG_TEMPORAL_DENOISING
RANGE_CHECK(vp8_cfg, noise_sensitivity, 0, 1);
#endif
#if !(CONFIG_REALTIME_ONLY) #if !(CONFIG_REALTIME_ONLY)
RANGE_CHECK(vp8_cfg, encoding_mode, VP8_BEST_QUALITY_ENCODING, VP8_REAL_TIME_ENCODING); RANGE_CHECK(vp8_cfg, encoding_mode, VP8_BEST_QUALITY_ENCODING, VP8_REAL_TIME_ENCODING);
#if !(CONFIG_TEMPORAL_DENOISING)
RANGE_CHECK_HI(vp8_cfg, noise_sensitivity, 6);
#endif
#else #else
RANGE_CHECK(vp8_cfg, encoding_mode, VP8_REAL_TIME_ENCODING, VP8_REAL_TIME_ENCODING); RANGE_CHECK(vp8_cfg, encoding_mode, VP8_REAL_TIME_ENCODING, VP8_REAL_TIME_ENCODING);
#if !(CONFIG_TEMPORAL_DENOISING)
RANGE_CHECK(vp8_cfg, noise_sensitivity, 0, 0);
#endif #endif
#if CONFIG_REALTIME_ONLY && !CONFIG_TEMPORAL_DENOISING
RANGE_CHECK(vp8_cfg, noise_sensitivity, 0, 0);
#else
RANGE_CHECK_HI(vp8_cfg, noise_sensitivity, 6);
#endif #endif
RANGE_CHECK(vp8_cfg, token_partitions, VP8_ONE_TOKENPARTITION, VP8_EIGHT_TOKENPARTITION); RANGE_CHECK(vp8_cfg, token_partitions, VP8_ONE_TOKENPARTITION, VP8_EIGHT_TOKENPARTITION);
@ -516,7 +507,6 @@ static vpx_codec_err_t set_param(vpx_codec_alg_priv_t *ctx,
switch (ctrl_id) switch (ctrl_id)
{ {
MAP(VP8E_SET_ENCODING_MODE, ctx->deprecated_mode);
MAP(VP8E_SET_CPUUSED, xcfg.cpu_used); MAP(VP8E_SET_CPUUSED, xcfg.cpu_used);
MAP(VP8E_SET_ENABLEAUTOALTREF, xcfg.enable_auto_alt_ref); MAP(VP8E_SET_ENABLEAUTOALTREF, xcfg.enable_auto_alt_ref);
MAP(VP8E_SET_NOISE_SENSITIVITY, xcfg.noise_sensitivity); MAP(VP8E_SET_NOISE_SENSITIVITY, xcfg.noise_sensitivity);
@ -571,7 +561,7 @@ static vpx_codec_err_t vp8e_mr_alloc_mem(const vpx_codec_enc_cfg_t *cfg,
static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx, static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx,
vpx_codec_priv_enc_mr_cfg_t *mr_cfg) vpx_codec_priv_enc_mr_cfg_t *mr_cfg)
{ {
vpx_codec_err_t res = VPX_DEC_OK; vpx_codec_err_t res = VPX_CODEC_OK;
struct vpx_codec_alg_priv *priv; struct vpx_codec_alg_priv *priv;
vpx_codec_enc_cfg_t *cfg; vpx_codec_enc_cfg_t *cfg;
unsigned int i; unsigned int i;
@ -626,8 +616,6 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx,
return VPX_CODEC_MEM_ERROR; return VPX_CODEC_MEM_ERROR;
} }
priv->deprecated_mode = NO_MODE_SET;
res = validate_config(priv, &priv->cfg, &priv->vp8_cfg, 0); res = validate_config(priv, &priv->cfg, &priv->vp8_cfg, 0);
if (!res) if (!res)
@ -718,19 +706,6 @@ static void pick_quickcompress_mode(vpx_codec_alg_priv_t *ctx,
new_qc = MODE_REALTIME; new_qc = MODE_REALTIME;
#endif #endif
switch (ctx->deprecated_mode)
{
case VP8_BEST_QUALITY_ENCODING:
new_qc = MODE_BESTQUALITY;
break;
case VP8_GOOD_QUALITY_ENCODING:
new_qc = MODE_GOODQUALITY;
break;
case VP8_REAL_TIME_ENCODING:
new_qc = MODE_REALTIME;
break;
}
if (ctx->cfg.g_pass == VPX_RC_FIRST_PASS) if (ctx->cfg.g_pass == VPX_RC_FIRST_PASS)
new_qc = MODE_FIRSTPASS; new_qc = MODE_FIRSTPASS;
else if (ctx->cfg.g_pass == VPX_RC_LAST_PASS) else if (ctx->cfg.g_pass == VPX_RC_LAST_PASS)
@ -755,6 +730,9 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx,
{ {
vpx_codec_err_t res = VPX_CODEC_OK; vpx_codec_err_t res = VPX_CODEC_OK;
if (!ctx->cfg.rc_target_bitrate)
return res;
if (!ctx->cfg.rc_target_bitrate) if (!ctx->cfg.rc_target_bitrate)
return res; return res;
@ -1207,7 +1185,6 @@ static vpx_codec_ctrl_fn_map_t vp8e_ctf_maps[] =
{VP8E_SET_ROI_MAP, vp8e_set_roi_map}, {VP8E_SET_ROI_MAP, vp8e_set_roi_map},
{VP8E_SET_ACTIVEMAP, vp8e_set_activemap}, {VP8E_SET_ACTIVEMAP, vp8e_set_activemap},
{VP8E_SET_SCALEMODE, vp8e_set_scalemode}, {VP8E_SET_SCALEMODE, vp8e_set_scalemode},
{VP8E_SET_ENCODING_MODE, set_param},
{VP8E_SET_CPUUSED, set_param}, {VP8E_SET_CPUUSED, set_param},
{VP8E_SET_NOISE_SENSITIVITY, set_param}, {VP8E_SET_NOISE_SENSITIVITY, set_param},
{VP8E_SET_ENABLEAUTOALTREF, set_param}, {VP8E_SET_ENABLEAUTOALTREF, set_param},
@ -1318,88 +1295,3 @@ CODEC_INTERFACE(vpx_codec_vp8_cx) =
vp8e_mr_alloc_mem, vp8e_mr_alloc_mem,
} /* encoder functions */ } /* encoder functions */
}; };
/*
* BEGIN BACKWARDS COMPATIBILITY SHIM.
*/
#define FORCE_KEY 2
static vpx_codec_err_t api1_control(vpx_codec_alg_priv_t *ctx,
int ctrl_id,
va_list args)
{
vpx_codec_ctrl_fn_map_t *entry;
switch (ctrl_id)
{
case VP8E_SET_FLUSHFLAG:
/* VP8 sample code did VP8E_SET_FLUSHFLAG followed by
* vpx_codec_get_cx_data() rather than vpx_codec_encode().
*/
return vp8e_encode(ctx, NULL, 0, 0, 0, 0);
case VP8E_SET_FRAMETYPE:
ctx->base.enc.tbd |= FORCE_KEY;
return VPX_CODEC_OK;
}
for (entry = vp8e_ctf_maps; entry && entry->fn; entry++)
{
if (!entry->ctrl_id || entry->ctrl_id == ctrl_id)
{
return entry->fn(ctx, ctrl_id, args);
}
}
return VPX_CODEC_ERROR;
}
static vpx_codec_ctrl_fn_map_t api1_ctrl_maps[] =
{
{0, api1_control},
{ -1, NULL}
};
static vpx_codec_err_t api1_encode(vpx_codec_alg_priv_t *ctx,
const vpx_image_t *img,
vpx_codec_pts_t pts,
unsigned long duration,
vpx_enc_frame_flags_t flags,
unsigned long deadline)
{
int force = ctx->base.enc.tbd;
ctx->base.enc.tbd = 0;
return vp8e_encode
(ctx,
img,
pts,
duration,
flags | ((force & FORCE_KEY) ? VPX_EFLAG_FORCE_KF : 0),
deadline);
}
vpx_codec_iface_t vpx_enc_vp8_algo =
{
"WebM Project VP8 Encoder (Deprecated API)" VERSION_STRING,
VPX_CODEC_INTERNAL_ABI_VERSION,
VPX_CODEC_CAP_ENCODER,
/* vpx_codec_caps_t caps; */
vp8e_init, /* vpx_codec_init_fn_t init; */
vp8e_destroy, /* vpx_codec_destroy_fn_t destroy; */
api1_ctrl_maps, /* vpx_codec_ctrl_fn_map_t *ctrl_maps; */
NOT_IMPLEMENTED, /* vpx_codec_get_mmap_fn_t get_mmap; */
NOT_IMPLEMENTED, /* vpx_codec_set_mmap_fn_t set_mmap; */
{NOT_IMPLEMENTED}, /* decoder functions */
{
vp8e_usage_cfg_map, /* vpx_codec_enc_cfg_map_t peek_si; */
api1_encode, /* vpx_codec_encode_fn_t encode; */
vp8e_get_cxdata, /* vpx_codec_get_cx_data_fn_t frame_get; */
vp8e_set_config,
NOT_IMPLEMENTED,
vp8e_get_preview,
vp8e_mr_alloc_mem,
} /* encoder functions */
};

30
vp8/vp8_dx_iface.c
View File

@ -785,33 +785,3 @@ CODEC_INTERFACE(vpx_codec_vp8_dx) =
NOT_IMPLEMENTED NOT_IMPLEMENTED
} }
}; };
/*
* BEGIN BACKWARDS COMPATIBILITY SHIM.
*/
vpx_codec_iface_t vpx_codec_vp8_algo =
{
"WebM Project VP8 Decoder (Deprecated API)" VERSION_STRING,
VPX_CODEC_INTERNAL_ABI_VERSION,
VPX_CODEC_CAP_DECODER | VP8_CAP_POSTPROC | VP8_CAP_ERROR_CONCEALMENT,
/* vpx_codec_caps_t caps; */
vp8_init, /* vpx_codec_init_fn_t init; */
vp8_destroy, /* vpx_codec_destroy_fn_t destroy; */
vp8_ctf_maps, /* vpx_codec_ctrl_fn_map_t *ctrl_maps; */
vp8_xma_get_mmap, /* vpx_codec_get_mmap_fn_t get_mmap; */
vp8_xma_set_mmap, /* vpx_codec_set_mmap_fn_t set_mmap; */
{
vp8_peek_si, /* vpx_codec_peek_si_fn_t peek_si; */
vp8_get_si, /* vpx_codec_get_si_fn_t get_si; */
vp8_decode, /* vpx_codec_decode_fn_t decode; */
vp8_get_frame, /* vpx_codec_frame_get_fn_t frame_get; */
},
{ /* encoder functions */
NOT_IMPLEMENTED,
NOT_IMPLEMENTED,
NOT_IMPLEMENTED,
NOT_IMPLEMENTED,
NOT_IMPLEMENTED,
NOT_IMPLEMENTED
}
};

1
vp8/vp8cx.mk
View File

@ -39,6 +39,7 @@ VP8_CX_SRCS-yes += encoder/bitstream.c
VP8_CX_SRCS-yes += encoder/boolhuff.c VP8_CX_SRCS-yes += encoder/boolhuff.c
VP8_CX_SRCS-yes += encoder/dct.c VP8_CX_SRCS-yes += encoder/dct.c
VP8_CX_SRCS-yes += encoder/encodeframe.c VP8_CX_SRCS-yes += encoder/encodeframe.c
VP8_CX_SRCS-yes += encoder/encodeframe.h
VP8_CX_SRCS-yes += encoder/encodeintra.c VP8_CX_SRCS-yes += encoder/encodeintra.c
VP8_CX_SRCS-yes += encoder/encodemb.c VP8_CX_SRCS-yes += encoder/encodemb.c
VP8_CX_SRCS-yes += encoder/encodemv.c VP8_CX_SRCS-yes += encoder/encodemv.c

198
vp8_api1_migration.txt
View File

@ -1,198 +0,0 @@
Version 2.x of this library has deprecated or removed a number of interfaces to
the VP8 codec. Where possible, the old interfaces have been left in place in a
deprecated state, and will generate compiler warnings when they are referenced.
All users are encouraged to update their code to the new interfaces as soon as
possible. To assist in this effort, the `VPX_CODEC_DISABLE_COMPAT` symbol can
be #defined to 1 prior to including vpx headers. This will disable the
backwards compatability workarounds and ensure that you are using only the
latest API.
The *TWO-PASS STATISTICS* sections detail the one section of code which is not
backwards compatable and will require code changes.
HEADER FILES
============
The following header files were renamed:
vp8.h -> vp8dx.h
vp8e.h -> vp8cx.h
INTERFACE SYMBOLS
=================
The following interface symbols were renamed:
vpx_codec_vp8_algo -> vpx_codec_vp8_dx_algo
vpx_enc_vp8_algo -> vpx_codec_vp8_cx_algo
TWO-PASS STATISTICS
===================
Two-pass statistics are handled significantly differently. The version 1 API
stored statistics in a file, and the application passed the name of that file
in the `vpx_codec_enc_cfg` structure. In this version, statistics are returned
though the application though the `vpx_codec_get_cx_data()` interface. The
application must concatenate these packets into a contiguous buffer and then
pass that buffer to the encoder through the `vpx_codec_enc_cfg` structure on
the second pass initialization. The application may choose to keep these packets
in memory or write them to disk. Statistics packets are approximately 112 bytes
per frame. See the example code for more detailed examples.
ENCODER CONTROLS
================
Renames
-------
The following controls are duplicated between the encoder and the decoder, but
the encoder unnecessarily introduced unique identifiers for them. These
identifiers were removed in favor of the ones used by the decoder:
VP8E_SET_REFERENCE -> VP8_SET_REFERENCE
VP8E_COPY_REFERENCE -> VP8_COPY_REFERENCE
VP8E_SET_PREVIEWPP -> VP8_SET_POSTPROC
VP8E_SET_FRAMETYPE
------------------
This control was removed in favor of the `flags` parameter to
`vpx_codec_encode()`. Existing code such as:
~~~
vpx_codec_control(&encoder, VP8E_SET_FRAMETYPE, KEY_FRAME);
...
vpx_codec_encode(&encoder, img, pts, 1, 0, 0);
~~~
becomes:
~~~
vpx_codec_encode(&encoder, img, pts, 1, VPX_EFLAG_FORCE_KF,
VPX_DL_REALTIME);
~~~
VP8E_SET_FLUSHFLAG
------------------
Flush is handled by passing `NULL` to the `img` parameter of
`vpx_codec_encode()`. You must do this at least once, regardless of your encoder
configuration. i.e. it's not specific to g_lag_in_frames. This control was
removed.
~~~
while(...) {
...
vpx_codec_encode(&encoder, img, pts, 1, 0, 0);
while( (pkt = vpx_codec_get_cx_data(&encoder, &iter)) ) {
...
}
}
vpx_codec_control(&encoder, VP8E_SET_FLUSHFLAG, 1);
while( (pkt = vpx_codec_get_cx_data(&encoder, &iter)) ) {
...
}
vpx_codec_encode(&encoder, img, pts, 1, 0, 0);
~~~
becomes
~~~
while(new_image && ...) {
...
vpx_codec_encode(&encoder, new_image?img:NULL, pts, 1, 0, 0);
while( (pkt = vpx_codec_get_cx_data(&encoder, &iter)) ) {
...
}
}
~~~
VP8E_SET_ENCODING_MODE
----------------------
This control was removed in favor of the `deadline` parameter to
`vpx_codec_encode()`. There are three macros that can be used to get the
equivalent behavior: VPX_DL_REALTIME, VPX_DL_GOOD_QUALITY,
VPX_DL_BEST_QUALITY. Existing code such as:
~~~
vpx_codec_control(&encoder, VP8E_SET_ENCODING_MODE, VP8_REAL_TIME_ENCODING);
...
vpx_codec_encode(&encoder, img, pts, 1, 0, 0);
~~~
becomes:
~~~
vpx_codec_encode(&encoder, img, pts, 1, 0, VPX_DL_REALTIME);
~~~
VP8E_UPD_ENTROPY
------------------
This control was deprecated in favor of the `flags` parameter to
`vpx_codec_encode()`. Existing code such as:
~~~
vpx_codec_control(&encoder, VP8E_UPD_ENTROPY, 0);
~~~
becomes:
~~~
vpx_codec_encode(&encoder, img, pts, 1, VP8_EFLAG_NO_UPD_ENTROPY,
VPX_DL_REALTIME);
~~~
VP8E_UPD_REFERENCE
------------------
This control was deprecated in favor of the `flags` parameter to
`vpx_codec_encode()`. A set bit on the VP8E_UPD_REFERENCE bitfield is
analogous to setting the VP8_EFLAG_FORCE_* flag. A cleared bit is analogous
to setting the VP8_EFLAG_NO_UPD_* flag. If neither the FORCE or NO_UPD bit
is set, the encoder will make its decision automatically, as usual. Setting
both bits will result in an error being returned. Existing code such as:
~~~
vpx_codec_control(&encoder, VP8E_UPD_REFERENCE,
VP8_LAST_FRAME | VP8_GOLD_FRAME);
vpx_codec_control(&encoder, VP8E_UPD_REFERENCE, 0);
...
vpx_codec_encode(&encoder, img, pts, 1, 0, VPX_DL_REALTIME);
~~~
becomes:
~~~
vpx_codec_encode(&encoder, img, pts, 1, VP8_EFLAG_FORCE_GF,
VPX_DL_REALTIME);
vpx_codec_encode(&encoder, img, pts, 1, VP8_EFLAG_NO_UPD_LAST
| VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF,
VPX_DL_REALTIME);
~~~
VP8E_USE_REFERENCE
------------------
This control was deprecated in favor of the `flags` parameter to
`vpx_codec_encode()`. A cleared bit on the VP8E_USE_REFERENCE bitfield is
analogous to setting the VP8_EFLAG_NO_REF* flag. A set bit indicates that
the encoder will make its decision automatically, as usual.
Existing code such as:
~~~
vpx_codec_control(&encoder, VP8E_USE_REFERENCE,
VP8_ALTR_FRAME | VP8_GOLD_FRAME);
...
vpx_codec_encode(&encoder, img, pts, 1, 0, VPX_DL_REALTIME);
~~~
becomes
~~~
vpx_codec_encode(&encoder, img, pts, 1, VP8_EFLAG_NO_REF_LAST,
VPX_DL_REALTIME);
~~~

9
vp8_scalable_patterns.c
View File

@ -117,7 +117,7 @@ static void write_ivf_frame_header(FILE *outfile,
static int mode_to_num_layers[9] = {2, 2, 3, 3, 3, 3, 5, 2, 3}; static int mode_to_num_layers[9] = {2, 2, 3, 3, 3, 3, 5, 2, 3};
int main(int argc, char **argv) { int main(int argc, char **argv) {
FILE *infile, *outfile[MAX_LAYERS]; FILE *infile, *outfile[VPX_TS_MAX_LAYERS];
vpx_codec_ctx_t codec; vpx_codec_ctx_t codec;
vpx_codec_enc_cfg_t cfg; vpx_codec_enc_cfg_t cfg;
int frame_cnt = 0; int frame_cnt = 0;
@ -133,8 +133,8 @@ int main(int argc, char **argv) {
int frame_duration = 1; // 1 timebase tick per frame int frame_duration = 1; // 1 timebase tick per frame
int layering_mode = 0; int layering_mode = 0;
int frames_in_layer[MAX_LAYERS] = {0}; int frames_in_layer[VPX_TS_MAX_LAYERS] = {0};
int layer_flags[MAX_PERIODICITY] = {0}; int layer_flags[VPX_TS_MAX_PERIODICITY] = {0};
int flag_periodicity; int flag_periodicity;
int max_intra_size_pct; int max_intra_size_pct;
@ -438,6 +438,7 @@ int main(int argc, char **argv) {
} }
case 8: case 8:
default:
{ {
// 3-layers // 3-layers
int ids[4] = {0,2,1,2}; int ids[4] = {0,2,1,2};
@ -469,8 +470,6 @@ int main(int argc, char **argv) {
VP8_EFLAG_NO_UPD_ENTROPY; VP8_EFLAG_NO_UPD_ENTROPY;
break; break;
} }
default:
break;
} }
// Open input file // Open input file

201
vpx/src/vpx_decoder_compat.c
View File

@ -1,201 +0,0 @@
/*
* Copyright (c) 2010 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.
*/
/*!\file
* \brief Provides the high level interface to wrap decoder algorithms.
*
*/
#include <stdlib.h>
#include <string.h>
#include "vpx/vpx_decoder.h"
#include "vpx/internal/vpx_codec_internal.h"
#define SAVE_STATUS(ctx,var) (ctx?(ctx->err = var):var)
const char *vpx_dec_iface_name(vpx_dec_iface_t *iface)
{
return vpx_codec_iface_name((vpx_codec_iface_t *)iface);
}
const char *vpx_dec_err_to_string(vpx_dec_err_t err)
{
return vpx_codec_err_to_string(err);
}
const char *vpx_dec_error(vpx_dec_ctx_t *ctx)
{
return vpx_codec_error((vpx_codec_ctx_t *)ctx);
}
const char *vpx_dec_error_detail(vpx_dec_ctx_t *ctx)
{
return vpx_codec_error_detail((vpx_codec_ctx_t *)ctx);
}
vpx_dec_err_t vpx_dec_init_ver(vpx_dec_ctx_t *ctx,
vpx_dec_iface_t *iface,
int ver)
{
return vpx_codec_dec_init_ver((vpx_codec_ctx_t *)ctx,
(vpx_codec_iface_t *)iface,
NULL,
0,
ver);
}
vpx_dec_err_t vpx_dec_destroy(vpx_dec_ctx_t *ctx)
{
return vpx_codec_destroy((vpx_codec_ctx_t *)ctx);
}
vpx_dec_caps_t vpx_dec_get_caps(vpx_dec_iface_t *iface)
{
return vpx_codec_get_caps((vpx_codec_iface_t *)iface);
}
vpx_dec_err_t vpx_dec_peek_stream_info(vpx_dec_iface_t *iface,
const uint8_t *data,
unsigned int data_sz,
vpx_dec_stream_info_t *si)
{
return vpx_codec_peek_stream_info((vpx_codec_iface_t *)iface, data, data_sz,
(vpx_codec_stream_info_t *)si);
}
vpx_dec_err_t vpx_dec_get_stream_info(vpx_dec_ctx_t *ctx,
vpx_dec_stream_info_t *si)
{
return vpx_codec_get_stream_info((vpx_codec_ctx_t *)ctx,
(vpx_codec_stream_info_t *)si);
}
vpx_dec_err_t vpx_dec_control(vpx_dec_ctx_t *ctx,
int ctrl_id,
void *data)
{
return vpx_codec_control_((vpx_codec_ctx_t *)ctx, ctrl_id, data);
}
vpx_dec_err_t vpx_dec_decode(vpx_dec_ctx_t *ctx,
uint8_t *data,
unsigned int data_sz,
void *user_priv,
int rel_pts)
{
(void)rel_pts;
return vpx_codec_decode((vpx_codec_ctx_t *)ctx, data, data_sz, user_priv,
0);
}
vpx_image_t *vpx_dec_get_frame(vpx_dec_ctx_t *ctx,
vpx_dec_iter_t *iter)
{
return vpx_codec_get_frame((vpx_codec_ctx_t *)ctx, iter);
}
vpx_dec_err_t vpx_dec_register_put_frame_cb(vpx_dec_ctx_t *ctx,
vpx_dec_put_frame_cb_fn_t cb,
void *user_priv)
{
return vpx_codec_register_put_frame_cb((vpx_codec_ctx_t *)ctx, cb,
user_priv);
}
vpx_dec_err_t vpx_dec_register_put_slice_cb(vpx_dec_ctx_t *ctx,
vpx_dec_put_slice_cb_fn_t cb,
void *user_priv)
{
return vpx_codec_register_put_slice_cb((vpx_codec_ctx_t *)ctx, cb,
user_priv);
}
vpx_dec_err_t vpx_dec_xma_init_ver(vpx_dec_ctx_t *ctx,
vpx_dec_iface_t *iface,
int ver)
{
return vpx_codec_dec_init_ver((vpx_codec_ctx_t *)ctx,
(vpx_codec_iface_t *)iface,
NULL,
VPX_CODEC_USE_XMA,
ver);
}
vpx_dec_err_t vpx_dec_get_mem_map(vpx_dec_ctx_t *ctx_,
vpx_dec_mmap_t *mmap,
const vpx_dec_stream_info_t *si,
vpx_dec_iter_t *iter)
{
vpx_codec_ctx_t *ctx = (vpx_codec_ctx_t *)ctx_;
vpx_dec_err_t res = VPX_DEC_OK;
if (!ctx || !mmap || !si || !iter || !ctx->iface)
res = VPX_DEC_INVALID_PARAM;
else if (!(ctx->iface->caps & VPX_DEC_CAP_XMA))
res = VPX_DEC_ERROR;
else
{
if (!ctx->config.dec)
{
ctx->config.dec = malloc(sizeof(vpx_codec_dec_cfg_t));
ctx->config.dec->w = si->w;
ctx->config.dec->h = si->h;
}
res = ctx->iface->get_mmap(ctx, mmap, iter);
}
return SAVE_STATUS(ctx, res);
}
vpx_dec_err_t vpx_dec_set_mem_map(vpx_dec_ctx_t *ctx_,
vpx_dec_mmap_t *mmap,
unsigned int num_maps)
{
vpx_codec_ctx_t *ctx = (vpx_codec_ctx_t *)ctx_;
vpx_dec_err_t res = VPX_DEC_MEM_ERROR;
if (!ctx || !mmap || !ctx->iface)
res = VPX_DEC_INVALID_PARAM;
else if (!(ctx->iface->caps & VPX_DEC_CAP_XMA))
res = VPX_DEC_ERROR;
else
{
void *save = (ctx->priv) ? NULL : ctx->config.dec;
unsigned int i;
for (i = 0; i < num_maps; i++, mmap++)
{
if (!mmap->base)
break;
/* Everything look ok, set the mmap in the decoder */
res = ctx->iface->set_mmap(ctx, mmap);
if (res)
break;
}
if (save) free(save);
}
return SAVE_STATUS(ctx, res);
}

8
vpx/vp8.h
View File

@ -119,13 +119,5 @@ VPX_CTRL_USE_TYPE(VP8_SET_DBG_DISPLAY_MV, int)
/*! @} - end defgroup vp8 */ /*! @} - end defgroup vp8 */
#if !defined(VPX_CODEC_DISABLE_COMPAT) || !VPX_CODEC_DISABLE_COMPAT
/* The following definitions are provided for backward compatibility with
* the VP8 1.0.x SDK. USE IN PRODUCTION CODE IS NOT RECOMMENDED.
*/
DECLSPEC_DEPRECATED extern vpx_codec_iface_t vpx_codec_vp8_algo DEPRECATED;
#endif
#include "vpx_codec_impl_bottom.h" #include "vpx_codec_impl_bottom.h"
#endif #endif

63
vpx/vp8e.h
View File

@ -1,63 +0,0 @@
/*
* Copyright (c) 2010 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.
*/
/* This file contains backwards compatibility stubs for applications using
* the VP8 version 1.0 API.
*/
#ifndef VP8E_H
#define VP8E_H
#include "vpx_codec_impl_top.h"
#if defined(VPX_CODEC_DISABLE_COMPAT) && VPX_CODEC_DISABLE_COMPAT
#error "Backwards compatibility disabled: don't include vp8e.h"
#endif
#include "vp8cx.h"
DECLSPEC_DEPRECATED extern vpx_codec_iface_t vpx_enc_vp8_algo DEPRECATED;
enum
{
VP8E_SET_REFERENCE = VP8_SET_REFERENCE,
VP8E_COPY_REFERENCE = VP8_COPY_REFERENCE,
VP8E_SET_PREVIEWPP = VP8_SET_POSTPROC,
VP8E_SET_FLUSHFLAG = 4,
VP8E_SET_FRAMETYPE = 10,
VP8E_SET_ENCODING_MODE = 12
};
#define NORMAL_FRAME (0)
#define KEY_FRAME (1)
/* Change VP8E to VP8 to get the undeprecated version of these (defined in
* vp8.h)
*/
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_REFERENCE, vpx_ref_frame_t *)
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_COPY_REFERENCE, vpx_ref_frame_t *)
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_PREVIEWPP, vp8_postproc_cfg_t *)
/* Flush is done by calling vpx_codec_encode with a NULL input image. */
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_FLUSHFLAG, int)
/* Frame type is set with a flag to vpx_codec_control. See VPX_EFLAG_FORCE_KF
*/
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_FRAMETYPE, int)
/* This control has been deprecated in favor of the duration parameter to
* vpx_codec_encode(). Use the #VPX_DL_REALTIME, #VPX_DL_GOOD_QUALITY,
* #VPX_DL_BEST_QUALITY constants to that parameter instead.
*/
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_ENCODING_MODE, vp8e_encoding_mode)
#include "vpx_codec_impl_bottom.h"
#endif

2
vpx/vpx_codec.mk
View File

@ -12,9 +12,7 @@
API_EXPORTS += exports API_EXPORTS += exports
API_SRCS-yes += src/vpx_decoder.c API_SRCS-yes += src/vpx_decoder.c
API_SRCS-yes += src/vpx_decoder_compat.c
API_SRCS-yes += vpx_decoder.h API_SRCS-yes += vpx_decoder.h
API_SRCS-yes += vpx_decoder_compat.h
API_SRCS-yes += src/vpx_encoder.c API_SRCS-yes += src/vpx_encoder.c
API_SRCS-yes += vpx_encoder.h API_SRCS-yes += vpx_encoder.h
API_SRCS-yes += internal/vpx_codec_internal.h API_SRCS-yes += internal/vpx_codec_internal.h

4
vpx/vpx_decoder.h
View File

@ -327,7 +327,3 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#if !defined(VPX_CODEC_DISABLE_COMPAT) || !VPX_CODEC_DISABLE_COMPAT
#include "vpx_decoder_compat.h"
#endif

587
vpx/vpx_decoder_compat.h
View File

@ -1,587 +0,0 @@
/*
* Copyright (c) 2010 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.
*/
/*!\defgroup decoder Common Decoder Algorithm Interface
* This abstraction allows applications using this decoder to easily support
* multiple video formats with minimal code duplication. This section describes
* the interface common to all codecs.
* @{
*/
/*!\file
* \brief Provides a compatibility layer between version 1 and 2 of this API.
*
* This interface has been deprecated. Only existing code should make use
* of this interface, and therefore, it is only thinly documented. Existing
* code should be ported to the vpx_codec_* API.
*/
#ifdef __cplusplus
extern "C" {
#endif
#ifndef VPX_DECODER_COMPAT_H
#define VPX_DECODER_COMPAT_H
/*!\brief Decoder algorithm return codes */
typedef enum {
/*!\brief Operation completed without error */
VPX_DEC_OK = VPX_CODEC_OK,
/*!\brief Unspecified error */
VPX_DEC_ERROR = VPX_CODEC_ERROR,
/*!\brief Memory operation failed */
VPX_DEC_MEM_ERROR = VPX_CODEC_MEM_ERROR,
/*!\brief ABI version mismatch */
VPX_DEC_ABI_MISMATCH = VPX_CODEC_ABI_MISMATCH,
/*!\brief The given bitstream is not supported.
*
* The bitstream was unable to be parsed at the highest level. The decoder
* is unable to proceed. This error \ref SHOULD be treated as fatal to the
* stream. */
VPX_DEC_UNSUP_BITSTREAM = VPX_CODEC_UNSUP_BITSTREAM,
/*!\brief Encoded bitstream uses an unsupported feature
*
* The decoder does not implement a feature required by the encoder. This
* return code should only be used for features that prevent future
* pictures from being properly decoded. This error \ref MAY be treated as
* fatal to the stream or \ref MAY be treated as fatal to the current GOP.
*/
VPX_DEC_UNSUP_FEATURE = VPX_CODEC_UNSUP_FEATURE,
/*!\brief The coded data for this stream is corrupt or incomplete
*
* There was a problem decoding the current frame. This return code
* should only be used for failures that prevent future pictures from
* being properly decoded. This error \ref MAY be treated as fatal to the
* stream or \ref MAY be treated as fatal to the current GOP. If decoding
* is continued for the current GOP, artifacts may be present.
*/
VPX_DEC_CORRUPT_FRAME = VPX_CODEC_CORRUPT_FRAME,
/*!\brief An application-supplied parameter is not valid.
*
*/
VPX_DEC_INVALID_PARAM = VPX_CODEC_INVALID_PARAM,
/*!\brief An iterator reached the end of list.
*
*/
VPX_DEC_LIST_END = VPX_CODEC_LIST_END
}
vpx_dec_err_t;
/*! \brief Decoder capabilities bitfield
*
* Each decoder advertises the capabilities it supports as part of its
* ::vpx_dec_iface_t interface structure. Capabilities are extra interfaces
* or functionality, and are not required to be supported by a decoder.
*
* The available flags are specified by VPX_DEC_CAP_* defines.
*/
typedef int vpx_dec_caps_t;
#define VPX_DEC_CAP_PUT_SLICE 0x0001 /**< Will issue put_slice callbacks */
#define VPX_DEC_CAP_PUT_FRAME 0x0002 /**< Will issue put_frame callbacks */
#define VPX_DEC_CAP_XMA 0x0004 /**< Supports eXternal Memory Allocation */
/*!\brief Stream properties
*
* This structure is used to query or set properties of the decoded
* stream. Algorithms may extend this structure with data specific
* to their bitstream by setting the sz member appropriately.
*/
#if 1
typedef vpx_codec_stream_info_t vpx_dec_stream_info_t;
#else
typedef struct
{
unsigned int sz; /**< Size of this structure */
unsigned int w; /**< Width (or 0 for unknown/default) */
unsigned int h; /**< Height (or 0 for unknown/default) */
unsigned int is_kf; /**< Current frame is a keyframe */
} vpx_dec_stream_info_t;
#endif
/*!\brief Decoder interface structure.
*
* Contains function pointers and other data private to the decoder
* implementation. This structure is opaque to the application.
*/
typedef const struct vpx_codec_iface vpx_dec_iface_t;
typedef struct vpx_codec_priv vpx_dec_priv_t;
/*!\brief Iterator
*
* Opaque storage used for iterating over lists.
*/
typedef vpx_codec_iter_t vpx_dec_iter_t;
/*!\brief Decoder context structure
*
* All decoders \ref MUST support this context structure fully. In general,
* this data should be considered private to the decoder algorithm, and
* not be manipulated or examined by the calling application. Applications
* may reference the 'name' member to get a printable description of the
* algorithm.
*/
#if 1
typedef vpx_codec_ctx_t vpx_dec_ctx_t;
#else
typedef struct
{
const char *name; /**< Printable interface name */
vpx_dec_iface_t *iface; /**< Interface pointers */
vpx_dec_err_t err; /**< Last returned error */
vpx_dec_priv_t *priv; /**< Algorithm private storage */
} vpx_dec_ctx_t;
#endif
/*!\brief Return the build configuration
*
* Returns a printable string containing an encoded version of the build
* configuration. This may be useful to vpx support.
*
*/
const char *vpx_dec_build_config(void) DEPRECATED;
/*!\brief Return the name for a given interface
*
* Returns a human readable string for name of the given decoder interface.
*
* \param[in] iface Interface pointer
*
*/
const char *vpx_dec_iface_name(vpx_dec_iface_t *iface) DEPRECATED;
/*!\brief Convert error number to printable string
*
* Returns a human readable string for the last error returned by the
* algorithm. The returned error will be one line and will not contain
* any newline characters.
*
*
* \param[in] err Error number.
*
*/
const char *vpx_dec_err_to_string(vpx_dec_err_t err) DEPRECATED;
/*!\brief Retrieve error synopsis for decoder context
*
* Returns a human readable string for the last error returned by the
* algorithm. The returned error will be one line and will not contain
* any newline characters.
*
*
* \param[in] ctx Pointer to this instance's context.
*
*/
const char *vpx_dec_error(vpx_dec_ctx_t *ctx) DEPRECATED;
/*!\brief Retrieve detailed error information for decoder context
*
* Returns a human readable string providing detailed information about
* the last error.
*
* \param[in] ctx Pointer to this instance's context.
*
* \retval NULL
* No detailed information is available.
*/
const char *vpx_dec_error_detail(vpx_dec_ctx_t *ctx) DEPRECATED;
/* REQUIRED FUNCTIONS
*
* The following functions are required to be implemented for all decoders.
* They represent the base case functionality expected of all decoders.
*/
/*!\brief Initialize a decoder instance
*
* Initializes a decoder context using the given interface. Applications
* should call the vpx_dec_init convenience macro instead of this
* function directly, to ensure that the ABI version number parameter
* is properly initialized.
*
* \param[in] ctx Pointer to this instance's context.
* \param[in] iface Pointer to the algorithm interface to use.
* \param[in] ver ABI version number. Must be set to
* VPX_DECODER_ABI_VERSION
* \retval #VPX_DEC_OK
* The decoder algorithm initialized.
* \retval #VPX_DEC_MEM_ERROR
* Memory allocation failed.
*/
vpx_dec_err_t vpx_dec_init_ver(vpx_dec_ctx_t *ctx,
vpx_dec_iface_t *iface,
int ver) DEPRECATED;
#define vpx_dec_init(ctx, iface) \
vpx_dec_init_ver(ctx, iface, VPX_DECODER_ABI_VERSION)
/*!\brief Destroy a decoder instance
*
* Destroys a decoder context, freeing any associated memory buffers.
*
* \param[in] ctx Pointer to this instance's context
*
* \retval #VPX_DEC_OK
* The decoder algorithm initialized.
* \retval #VPX_DEC_MEM_ERROR
* Memory allocation failed.
*/
vpx_dec_err_t vpx_dec_destroy(vpx_dec_ctx_t *ctx) DEPRECATED;
/*!\brief Get the capabilities of an algorithm.
*
* Retrieves the capabilities bitfield from the algorithm's interface.
*
* \param[in] iface Pointer to the algorithm interface
*
*/
vpx_dec_caps_t vpx_dec_get_caps(vpx_dec_iface_t *iface) DEPRECATED;
/*!\brief Parse stream info from a buffer
*
* Performs high level parsing of the bitstream. Construction of a decoder
* context is not necessary. Can be used to determine if the bitstream is
* of the proper format, and to extract information from the stream.
*
* \param[in] iface Pointer to the algorithm interface
* \param[in] data Pointer to a block of data to parse
* \param[in] data_sz Size of the data buffer
* \param[in,out] si Pointer to stream info to update. The size member
* \ref MUST be properly initialized, but \ref MAY be
* clobbered by the algorithm. This parameter \ref MAY
* be NULL.
*
* \retval #VPX_DEC_OK
* Bitstream is parsable and stream information updated
*/
vpx_dec_err_t vpx_dec_peek_stream_info(vpx_dec_iface_t *iface,
const uint8_t *data,
unsigned int data_sz,
vpx_dec_stream_info_t *si) DEPRECATED;
/*!\brief Return information about the current stream.
*
* Returns information about the stream that has been parsed during decoding.
*
* \param[in] ctx Pointer to this instance's context
* \param[in,out] si Pointer to stream info to update. The size member
* \ref MUST be properly initialized, but \ref MAY be
* clobbered by the algorithm. This parameter \ref MAY
* be NULL.
*
* \retval #VPX_DEC_OK
* Bitstream is parsable and stream information updated
*/
vpx_dec_err_t vpx_dec_get_stream_info(vpx_dec_ctx_t *ctx,
vpx_dec_stream_info_t *si) DEPRECATED;
/*!\brief Control algorithm
*
* This function is used to exchange algorithm specific data with the decoder
* instance. This can be used to implement features specific to a particular
* algorithm.
*
* This wrapper function dispatches the request to the helper function
* associated with the given ctrl_id. It tries to call this function
* transparently, but will return #VPX_DEC_ERROR if the request could not
* be dispatched.
*
* \param[in] ctx Pointer to this instance's context
* \param[in] ctrl_id Algorithm specific control identifier
* \param[in,out] data Data to exchange with algorithm instance.
*
* \retval #VPX_DEC_OK
* The control request was processed.
* \retval #VPX_DEC_ERROR
* The control request was not processed.
* \retval #VPX_DEC_INVALID_PARAM
* The data was not valid.
*/
vpx_dec_err_t vpx_dec_control(vpx_dec_ctx_t *ctx,
int ctrl_id,
void *data) DEPRECATED;
/*!\brief Decode data
*
* Processes a buffer of coded data. If the processing results in a new
* decoded frame becoming available, #VPX_DEC_CB_PUT_SLICE and
* #VPX_DEC_CB_PUT_FRAME events may be generated, as appropriate. Encoded data
* \ref MUST be passed in DTS (decode time stamp) order. Frames produced will
* always be in PTS (presentation time stamp) order.
*
* \param[in] ctx Pointer to this instance's context
* \param[in] data Pointer to this block of new coded data. If
* NULL, a VPX_DEC_CB_PUT_FRAME event is posted
* for the previously decoded frame.
* \param[in] data_sz Size of the coded data, in bytes.
* \param[in] user_priv Application specific data to associate with
* this frame.
* \param[in] rel_pts PTS relative to the previous frame, in us. If
* unknown or unavailable, set to zero.
*
* \return Returns #VPX_DEC_OK if the coded data was processed completely
* and future pictures can be decoded without error. Otherwise,
* see the descriptions of the other error codes in ::vpx_dec_err_t
* for recoverability capabilities.
*/
vpx_dec_err_t vpx_dec_decode(vpx_dec_ctx_t *ctx,
uint8_t *data,
unsigned int data_sz,
void *user_priv,
int rel_pts) DEPRECATED;
/*!\brief Decoded frames iterator
*
* Iterates over a list of the frames available for display. The iterator
* storage should be initialized to NULL to start the iteration. Iteration is
* complete when this function returns NULL.
*
* The list of available frames becomes valid upon completion of the
* vpx_dec_decode call, and remains valid until the next call to vpx_dec_decode.
*
* \param[in] ctx Pointer to this instance's context
* \param[in out] iter Iterator storage, initialized to NULL
*
* \return Returns a pointer to an image, if one is ready for display. Frames
* produced will always be in PTS (presentation time stamp) order.
*/
vpx_image_t *vpx_dec_get_frame(vpx_dec_ctx_t *ctx,
vpx_dec_iter_t *iter) DEPRECATED;
/*!\defgroup cap_put_frame Frame-Based Decoding Functions
*
* The following functions are required to be implemented for all decoders
* that advertise the VPX_DEC_CAP_PUT_FRAME capability. Calling these functions
* for codecs that don't advertise this capability will result in an error
* code being returned, usually VPX_DEC_ERROR
* @{
*/
/*!\brief put frame callback prototype
*
* This callback is invoked by the decoder to notify the application of
* the availability of decoded image data.
*/
typedef void (*vpx_dec_put_frame_cb_fn_t)(void *user_priv,
const vpx_image_t *img);
/*!\brief Register for notification of frame completion.
*
* Registers a given function to be called when a decoded frame is
* available.
*
* \param[in] ctx Pointer to this instance's context
* \param[in] cb Pointer to the callback function
* \param[in] user_priv User's private data
*
* \retval #VPX_DEC_OK
* Callback successfully registered.
* \retval #VPX_DEC_ERROR
* Decoder context not initialized, or algorithm not capable of
* posting slice completion.
*/
vpx_dec_err_t vpx_dec_register_put_frame_cb(vpx_dec_ctx_t *ctx,
vpx_dec_put_frame_cb_fn_t cb,
void *user_priv) DEPRECATED;
/*!@} - end defgroup cap_put_frame */
/*!\defgroup cap_put_slice Slice-Based Decoding Functions
*
* The following functions are required to be implemented for all decoders
* that advertise the VPX_DEC_CAP_PUT_SLICE capability. Calling these functions
* for codecs that don't advertise this capability will result in an error
* code being returned, usually VPX_DEC_ERROR
* @{
*/
/*!\brief put slice callback prototype
*
* This callback is invoked by the decoder to notify the application of
* the availability of partially decoded image data. The
*/
typedef void (*vpx_dec_put_slice_cb_fn_t)(void *user_priv,
const vpx_image_t *img,
const vpx_image_rect_t *valid,
const vpx_image_rect_t *update);
/*!\brief Register for notification of slice completion.
*
* Registers a given function to be called when a decoded slice is
* available.
*
* \param[in] ctx Pointer to this instance's context
* \param[in] cb Pointer to the callback function
* \param[in] user_priv User's private data
*
* \retval #VPX_DEC_OK
* Callback successfully registered.
* \retval #VPX_DEC_ERROR
* Decoder context not initialized, or algorithm not capable of
* posting slice completion.
*/
vpx_dec_err_t vpx_dec_register_put_slice_cb(vpx_dec_ctx_t *ctx,
vpx_dec_put_slice_cb_fn_t cb,
void *user_priv) DEPRECATED;
/*!@} - end defgroup cap_put_slice*/
/*!\defgroup cap_xma External Memory Allocation Functions
*
* The following functions are required to be implemented for all decoders
* that advertise the VPX_DEC_CAP_XMA capability. Calling these functions
* for codecs that don't advertise this capability will result in an error
* code being returned, usually VPX_DEC_ERROR
* @{
*/
/*!\brief Memory Map Entry
*
* This structure is used to contain the properties of a memory segment. It
* is populated by the decoder in the request phase, and by the calling
* application once the requested allocation has been performed.
*/
#if 1
#define VPX_DEC_MEM_ZERO 0x1 /**< Segment must be zeroed by allocation */
#define VPX_DEC_MEM_WRONLY 0x2 /**< Segment need not be readable */
#define VPX_DEC_MEM_FAST 0x4 /**< Place in fast memory, if available */
typedef struct vpx_codec_mmap vpx_dec_mmap_t;
#else
typedef struct vpx_dec_mmap
{
/*
* The following members are set by the codec when requesting a segment
*/
unsigned int id; /**< identifier for the segment's contents */
unsigned long sz; /**< size of the segment, in bytes */
unsigned int align; /**< required alignment of the segment, in bytes */
unsigned int flags; /**< bitfield containing segment properties */
#define VPX_DEC_MEM_ZERO 0x1 /**< Segment must be zeroed by allocation */
#define VPX_DEC_MEM_WRONLY 0x2 /**< Segment need not be readable */
#define VPX_DEC_MEM_FAST 0x4 /**< Place in fast memory, if available */
/* The following members are to be filled in by the allocation function */
void *base; /**< pointer to the allocated segment */
void (*dtor)(struct vpx_dec_mmap *map); /**< destructor to call */
void *priv; /**< allocator private storage */
} vpx_dec_mmap_t;
#endif
/*!\brief Initialize a decoder instance in external allocation mode
*
* Initializes a decoder context using the given interface. Applications
* should call the vpx_dec_xma_init convenience macro instead of this
* function directly, to ensure that the ABI version number parameter
* is properly initialized.
*
* \param[in] ctx Pointer to this instance's context.
* \param[in] iface Pointer to the algorithm interface to use.
* \param[in] ver ABI version number. Must be set to
* VPX_DECODER_ABI_VERSION
* \retval #VPX_DEC_OK
* The decoder algorithm initialized.
* \retval #VPX_DEC_ERROR
* Decoder does not support XMA mode.
*/
vpx_dec_err_t vpx_dec_xma_init_ver(vpx_dec_ctx_t *ctx,
vpx_dec_iface_t *iface,
int ver) DEPRECATED;
#define vpx_dec_xma_init(ctx, iface) \
vpx_dec_xma_init_ver(ctx, iface, VPX_DECODER_ABI_VERSION)
/*!\brief Iterate over the list of segments to allocate.
*
* Iterates over a list of the segments to allocate. The iterator storage
* should be initialized to NULL to start the iteration. Iteration is complete
* when this function returns VPX_DEC_LIST_END. The amount of memory needed to
* allocate is dependent upon the size of the encoded stream. This means that
* the stream info structure must be known at allocation time. It can be
* populated with the vpx_dec_peek_stream_info() function. In cases where the
* stream to be decoded is not available at allocation time, a fixed size must
* be requested. The decoder will not be able to decode streams larger than
* the size used at allocation time.
*
* \param[in] ctx Pointer to this instance's context.
* \param[out] mmap Pointer to the memory map entry to populate.
* \param[in] si Pointer to the stream info.
* \param[in out] iter Iterator storage, initialized to NULL
*
* \retval #VPX_DEC_OK
* The memory map entry was populated.
* \retval #VPX_DEC_ERROR
* Decoder does not support XMA mode.
* \retval #VPX_DEC_MEM_ERROR
* Unable to determine segment size from stream info.
*/
vpx_dec_err_t vpx_dec_get_mem_map(vpx_dec_ctx_t *ctx,
vpx_dec_mmap_t *mmap,
const vpx_dec_stream_info_t *si,
vpx_dec_iter_t *iter) DEPRECATED;
/*!\brief Identify allocated segments to decoder instance
*
* Stores a list of allocated segments in the decoder. Segments \ref MUST be
* passed in the order they are read from vpx_dec_get_mem_map(), but may be
* passed in groups of any size. Segments \ref MUST be set only once. The
* allocation function \ref MUST ensure that the vpx_dec_mmap_t::base member
* is non-NULL. If the segment requires cleanup handling (e.g., calling free()
* or close()) then the vpx_dec_mmap_t::dtor member \ref MUST be populated.
*
* \param[in] ctx Pointer to this instance's context.
* \param[in] mmaps Pointer to the first memory map entry in the list.
* \param[in] num_maps Number of entries being set at this time
*
* \retval #VPX_DEC_OK
* The segment was stored in the decoder context.
* \retval #VPX_DEC_ERROR
* Decoder does not support XMA mode.
* \retval #VPX_DEC_MEM_ERROR
* Segment base address was not set, or segment was already stored.
*/
vpx_dec_err_t vpx_dec_set_mem_map(vpx_dec_ctx_t *ctx,
vpx_dec_mmap_t *mmaps,
unsigned int num_maps) DEPRECATED;
/*!@} - end defgroup cap_xma*/
/*!@} - end defgroup decoder*/
#endif
#ifdef __cplusplus
}
#endif

21
vpx/vpx_encoder.h
View File

@ -32,8 +32,19 @@ extern "C" {
#define VPX_ENCODER_H #define VPX_ENCODER_H
#include "vpx_codec.h" #include "vpx_codec.h"
#define MAX_PERIODICITY 16 /*! Temporal Scalability: Maximum length of the sequence defining frame
#define MAX_LAYERS 5 * layer membership
*/
#define VPX_TS_MAX_PERIODICITY 16
/*! Temporal Scalability: Maximum number of coding layers */
#define VPX_TS_MAX_LAYERS 5
/*!\deprecated Use #VPX_TS_MAX_PERIODICITY instead. */
#define MAX_PERIODICITY VPX_TS_MAX_PERIODICITY
/*!\deprecated Use #VPX_TS_MAX_LAYERS instead. */
#define MAX_LAYERS VPX_TS_MAX_LAYERS
/*!\brief Current ABI version number /*!\brief Current ABI version number
* *
@ -608,14 +619,14 @@ extern "C" {
* *
* These values specify the target coding bitrate for each coding layer. * These values specify the target coding bitrate for each coding layer.
*/ */
unsigned int ts_target_bitrate[MAX_LAYERS]; unsigned int ts_target_bitrate[VPX_TS_MAX_LAYERS];
/*!\brief Frame rate decimation factor for each layer /*!\brief Frame rate decimation factor for each layer
* *
* These values specify the frame rate decimation factors to apply * These values specify the frame rate decimation factors to apply
* to each layer. * to each layer.
*/ */
unsigned int ts_rate_decimator[MAX_LAYERS]; unsigned int ts_rate_decimator[VPX_TS_MAX_LAYERS];
/*!\brief Length of the sequence defining frame layer membership /*!\brief Length of the sequence defining frame layer membership
* *
@ -633,7 +644,7 @@ extern "C" {
* and odd numbered frames to a second layer (1) with ts_periodicity=8, * and odd numbered frames to a second layer (1) with ts_periodicity=8,
* then ts_layer_id = (0,1,0,1,0,1,0,1). * then ts_layer_id = (0,1,0,1,0,1,0,1).
*/ */
unsigned int ts_layer_id[MAX_PERIODICITY]; unsigned int ts_layer_id[VPX_TS_MAX_PERIODICITY];
} vpx_codec_enc_cfg_t; /**< alias for struct vpx_codec_enc_cfg */ } vpx_codec_enc_cfg_t; /**< alias for struct vpx_codec_enc_cfg */

2
vpx_ports/mem.h
View File

@ -14,7 +14,7 @@
#include "vpx_config.h" #include "vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#if defined(__GNUC__) && __GNUC__ #if (defined(__GNUC__) && __GNUC__) || defined(__SUNPRO_C)
#define DECLARE_ALIGNED(n,typ,val) typ val __attribute__ ((aligned (n))) #define DECLARE_ALIGNED(n,typ,val) typ val __attribute__ ((aligned (n)))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define DECLARE_ALIGNED(n,typ,val) __declspec(align(n)) typ val #define DECLARE_ALIGNED(n,typ,val) __declspec(align(n)) typ val

40
vpx_ports/x86.h
View File

@ -50,6 +50,26 @@ typedef enum
: "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \ : "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \
: "a" (func)); : "a" (func));
#endif #endif
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#if ARCH_X86_64
#define cpuid(func,ax,bx,cx,dx)\
asm volatile (\
"xchg %rsi, %rbx \n\t" \
"cpuid \n\t" \
"movl %ebx, %edi \n\t" \
"xchg %rsi, %rbx \n\t" \
: "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \
: "a" (func));
#else
#define cpuid(func,ax,bx,cx,dx)\
asm volatile (\
"pushl %ebx \n\t" \
"cpuid \n\t" \
"movl %ebx, %edi \n\t" \
"popl %ebx \n\t" \
: "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \
: "a" (func));
#endif
#else #else
#if ARCH_X86_64 #if ARCH_X86_64
void __cpuid(int CPUInfo[4], int info_type); void __cpuid(int CPUInfo[4], int info_type);
@ -136,6 +156,10 @@ x86_readtsc(void)
unsigned int tsc; unsigned int tsc;
__asm__ __volatile__("rdtsc\n\t":"=a"(tsc):); __asm__ __volatile__("rdtsc\n\t":"=a"(tsc):);
return tsc; return tsc;
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
unsigned int tsc;
asm volatile("rdtsc\n\t":"=a"(tsc):);
return tsc;
#else #else
#if ARCH_X86_64 #if ARCH_X86_64
return __rdtsc(); return __rdtsc();
@ -149,6 +173,9 @@ x86_readtsc(void)
#if defined(__GNUC__) && __GNUC__ #if defined(__GNUC__) && __GNUC__
#define x86_pause_hint()\ #define x86_pause_hint()\
__asm__ __volatile__ ("pause \n\t") __asm__ __volatile__ ("pause \n\t")
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#define x86_pause_hint()\
asm volatile ("pause \n\t")
#else #else
#if ARCH_X86_64 #if ARCH_X86_64
#define x86_pause_hint()\ #define x86_pause_hint()\
@ -172,6 +199,19 @@ x87_get_control_word(void)
__asm__ __volatile__("fstcw %0\n\t":"=m"(*&mode):); __asm__ __volatile__("fstcw %0\n\t":"=m"(*&mode):);
return mode; return mode;
} }
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
static void
x87_set_control_word(unsigned short mode)
{
asm volatile("fldcw %0" : : "m"(*&mode));
}
static unsigned short
x87_get_control_word(void)
{
unsigned short mode;
asm volatile("fstcw %0\n\t":"=m"(*&mode):);
return mode;
}
#elif ARCH_X86_64 #elif ARCH_X86_64
/* No fldcw intrinsics on Windows x64, punt to external asm */ /* No fldcw intrinsics on Windows x64, punt to external asm */
extern void vpx_winx64_fldcw(unsigned short mode); extern void vpx_winx64_fldcw(unsigned short mode);

42
vpxenc.c
View File

@ -1517,6 +1517,7 @@ struct stream_config
int arg_ctrls[ARG_CTRL_CNT_MAX][2]; int arg_ctrls[ARG_CTRL_CNT_MAX][2];
int arg_ctrl_cnt; int arg_ctrl_cnt;
int write_webm; int write_webm;
int have_kf_max_dist;
}; };
@ -1542,6 +1543,23 @@ struct stream_state
}; };
void validate_positive_rational(const char *msg,
struct vpx_rational *rat)
{
if (rat->den < 0)
{
rat->num *= -1;
rat->den *= -1;
}
if (rat->num < 0)
die("Error: %s must be positive\n", msg);
if (!rat->den)
die("Error: %s has zero denominator\n", msg);
}
static void parse_global_config(struct global_config *global, char **argv) static void parse_global_config(struct global_config *global, char **argv)
{ {
char **argi, **argj; char **argi, **argj;
@ -1610,6 +1628,7 @@ static void parse_global_config(struct global_config *global, char **argv)
else if (arg_match(&arg, &framerate, argi)) else if (arg_match(&arg, &framerate, argi))
{ {
global->framerate = arg_parse_rational(&arg); global->framerate = arg_parse_rational(&arg);
validate_positive_rational(arg.name, &global->framerate);
global->have_framerate = 1; global->have_framerate = 1;
} }
else if (arg_match(&arg,&out_part, argi)) else if (arg_match(&arg,&out_part, argi))
@ -1807,7 +1826,10 @@ static int parse_stream_params(struct global_config *global,
else if (arg_match(&arg, &stereo_mode, argi)) else if (arg_match(&arg, &stereo_mode, argi))
config->stereo_fmt = arg_parse_enum_or_int(&arg); config->stereo_fmt = arg_parse_enum_or_int(&arg);
else if (arg_match(&arg, &timebase, argi)) else if (arg_match(&arg, &timebase, argi))
{
config->cfg.g_timebase = arg_parse_rational(&arg); config->cfg.g_timebase = arg_parse_rational(&arg);
validate_positive_rational(arg.name, &config->cfg.g_timebase);
}
else if (arg_match(&arg, &error_resilient, argi)) else if (arg_match(&arg, &error_resilient, argi))
config->cfg.g_error_resilient = arg_parse_uint(&arg); config->cfg.g_error_resilient = arg_parse_uint(&arg);
else if (arg_match(&arg, &lag_in_frames, argi)) else if (arg_match(&arg, &lag_in_frames, argi))
@ -1862,7 +1884,10 @@ static int parse_stream_params(struct global_config *global,
else if (arg_match(&arg, &kf_min_dist, argi)) else if (arg_match(&arg, &kf_min_dist, argi))
config->cfg.kf_min_dist = arg_parse_uint(&arg); config->cfg.kf_min_dist = arg_parse_uint(&arg);
else if (arg_match(&arg, &kf_max_dist, argi)) else if (arg_match(&arg, &kf_max_dist, argi))
{
config->cfg.kf_max_dist = arg_parse_uint(&arg); config->cfg.kf_max_dist = arg_parse_uint(&arg);
config->have_kf_max_dist = 1;
}
else if (arg_match(&arg, &kf_disabled, argi)) else if (arg_match(&arg, &kf_disabled, argi))
config->cfg.kf_mode = VPX_KF_DISABLED; config->cfg.kf_mode = VPX_KF_DISABLED;
else else
@ -1965,6 +1990,21 @@ static void set_stream_dimensions(struct stream_state *stream,
} }
static void set_default_kf_interval(struct stream_state *stream,
struct global_config *global)
{
/* Use a max keyframe interval of 5 seconds, if none was
* specified on the command line.
*/
if (!stream->config.have_kf_max_dist)
{
double framerate = (double)global->framerate.num/global->framerate.den;
if (framerate > 0.0)
stream->config.cfg.kf_max_dist = 5.0*framerate;
}
}
static void show_stream_config(struct stream_state *stream, static void show_stream_config(struct stream_state *stream,
struct global_config *global, struct global_config *global,
struct input_state *input) struct input_state *input)
@ -2381,6 +2421,8 @@ int main(int argc, const char **argv_)
if (!global.have_framerate) if (!global.have_framerate)
global.framerate = input.framerate; global.framerate = input.framerate;
FOREACH_STREAM(set_default_kf_interval(stream, &global));
/* Show configuration */ /* Show configuration */
if (global.verbose && pass == 0) if (global.verbose && pass == 0)
FOREACH_STREAM(show_stream_config(stream, &global, &input)); FOREACH_STREAM(show_stream_config(stream, &global, &input));