mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-02 17:03:52 +00:00
Merge branch 'master' into v1.10
This commit is contained in:
Andrey Volk
commit
129de34d84
.drone.yml.gitconfig.gitignoreMakefile.amconfigure.ac
build
conf
testing/autoload_configs
vanilla
autoload_configs
sip_profiles
debian
docs/phrase
freeswitch.speclibs
apr-util
apr
file_io/unix
memory/unix
misc/unix
network_io/unix
random/unix
strings
tables
esl/src
iksemel
libdingaling/src
libnatpmp
libvpx
AUTHORSCHANGELOGREADMEargs.h
build
codereview.settingsconfigureexamples.mkexamples
svc_context.hsvc_encodeframe.cvp8_multi_resolution_encoder.cvp9_spatial_svc_encoder.cvp9cx_set_ref.cvpx_dec_fuzzer.ccvpx_temporal_svc_encoder.c
ivfdec.civfdec.hivfenc.hlibs.doxy_templatelibs.mkmainpage.doxmd5_utils.cmd5_utils.hrate_hist.htest
81
.drone.yml
81
.drone.yml
@ -2,20 +2,30 @@
|
||||
kind: pipeline
|
||||
name: unit-tests
|
||||
|
||||
node:
|
||||
freeswitch: public
|
||||
|
||||
steps:
|
||||
- name: run-tests
|
||||
image: signalwire/freeswitch-public-base
|
||||
pull: true
|
||||
commands:
|
||||
- cat /proc/sys/kernel/core_pattern
|
||||
- ./bootstrap.sh -j
|
||||
- echo "applications/mod_test" >> modules.conf
|
||||
- ./configure
|
||||
- sed -i '/applications\/mod_http_cache/s/^#//g' modules.conf
|
||||
- sed -i '/event_handlers\/mod_rayo/s/^#//g' modules.conf
|
||||
- sed -i '/formats\/mod_opusfile/s/^#//g' modules.conf
|
||||
- sed -i '/languages\/mod_lua/s/^#//g' modules.conf
|
||||
- export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1;
|
||||
- ./configure --enable-address-sanitizer
|
||||
- echo "#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./build-status.txt\nmake install\n" > build.sh
|
||||
- chmod +x build.sh
|
||||
- ./build.sh
|
||||
- cd tests/unit
|
||||
- ./run-tests.sh
|
||||
- mkdir logs && (mv log_run-tests_*.html logs || true)
|
||||
- ls -la /cores
|
||||
- mkdir logs && (mv log_run-tests_*.html logs || true) && (mv backtrace_*.txt logs || true)
|
||||
- echo 0 > run-tests-status.txt
|
||||
- ./collect-test-logs.sh && exit 0 || echo 'Some tests failed'
|
||||
- echo 1 > run-tests-status.txt
|
||||
@ -40,8 +50,73 @@ trigger:
|
||||
event:
|
||||
- pull_request
|
||||
- push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
name: scan-build
|
||||
|
||||
node:
|
||||
freeswitch: public
|
||||
|
||||
steps:
|
||||
- name: scan-build
|
||||
image: signalwire/freeswitch-public-base:stretch
|
||||
pull: true
|
||||
commands:
|
||||
- ./bootstrap.sh -j
|
||||
- cp build/modules.conf.most modules.conf
|
||||
#Enable/Uncomment mods
|
||||
- sed -i "/mod_mariadb/s/^#//g" modules.conf
|
||||
- sed -i "/mod_v8/s/^#//g" modules.conf
|
||||
#Disable/Comment out mods
|
||||
- sed -i '/mod_ilbc/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_isac/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_mp4/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_mongo/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_pocketsphinx/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_sangoma_codec/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_siren/s/^/#/g' modules.conf
|
||||
#Comment out mods for a while
|
||||
- sed -i '/mod_avmd/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_basic/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_cdr_mongodb/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_cv/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_erlang_event/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_perl/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_rtmp/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_unimrcp/s/^/#/g' modules.conf
|
||||
- sed -i '/mod_xml_rpc/s/^/#/g' modules.conf
|
||||
- ./configure
|
||||
- mkdir -p scan-build
|
||||
- echo "#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./scan-build-status.txt\n" > scan.sh
|
||||
- chmod +x scan.sh
|
||||
- ./scan.sh
|
||||
- exitstatus=`cat ./scan-build-status.txt`
|
||||
- echo "*** Exit status is $exitstatus"
|
||||
|
||||
- name: notify
|
||||
image: signalwire/scan-build-notify
|
||||
pull: true
|
||||
environment:
|
||||
GITHUB_CI_APP_PEM:
|
||||
from_secret: github_ci_app_pem
|
||||
SSH_KEY:
|
||||
from_secret: ssh_key
|
||||
SLACK_WEBHOOK_URL:
|
||||
from_secret: slack_webhook_url
|
||||
commands:
|
||||
- /root/notify.sh
|
||||
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- master
|
||||
event:
|
||||
- pull_request
|
||||
- push
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: a34718dd1e2b9468a845962219ff05cac0c922ddf90d885af557a937a9e412e0
|
||||
hmac: d354f6d232ae6417b539fb9b40fc15765c3247ab58c87a5135a0ac6c448e1cd0
|
||||
|
||||
...
|
||||
|
||||
9
.gitconfig
Normal file
9
.gitconfig
Normal file
@ -0,0 +1,9 @@
|
||||
# This repository contains two commits with multiple authors.
|
||||
|
||||
# By default, fsck will show errors for those commits.
|
||||
# Run the following command to ignore them:
|
||||
|
||||
# git config --local include.path ../.gitconfig
|
||||
|
||||
[fsck]
|
||||
multipleAuthors=ignore
|
||||
9
.gitignore
vendored
9
.gitignore
vendored
@ -271,4 +271,11 @@ src/mod/applications/mod_http_cache/test/test-suite.log
|
||||
src/mod/applications/mod_http_cache/test/test_aws
|
||||
src/mod/applications/mod_http_cache/test/test_aws.log
|
||||
src/mod/applications/mod_http_cache/test/test_aws.trs
|
||||
|
||||
src/mod/formats/mod_sndfile/test/test_sndfile
|
||||
src/mod/formats/mod_sndfile/test/test_sndfile_conf
|
||||
src/mod/*/*/test/*.log
|
||||
src/mod/*/*/test/*.trs
|
||||
src/mod/*/*/test/[0-9]*/*
|
||||
test-suite.log
|
||||
src/mod/applications/mod_av/test/test_BT7.mp4
|
||||
src/mod/applications/mod_av/test/test_RGB.mp4
|
||||
|
||||
@ -547,6 +547,8 @@ $(switch_builddir)/modules.conf:
|
||||
src/mod/modules.inc: $(switch_builddir)/modules.conf
|
||||
@echo "OUR_MODULES=$(OUR_MODS)" > $(switch_builddir)/src/mod/modules.inc
|
||||
@echo "OUR_CLEAN_MODULES=$(OUR_CLEAN_MODS)" >> $(switch_builddir)/src/mod/modules.inc
|
||||
@echo "OUR_TEST_MODULES=$(OUR_TEST_MODS)" >> $(switch_builddir)/src/mod/modules.inc
|
||||
@echo "OUR_CHECK_MODULES=$(OUR_CHECK_MODS)" >> $(switch_builddir)/src/mod/modules.inc
|
||||
@echo "OUR_INSTALL_MODULES=$(OUR_INSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
|
||||
@echo "OUR_UNINSTALL_MODULES=$(OUR_UNINSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
|
||||
@echo "OUR_DISABLED_MODULES=$(OUR_DISABLED_MODS)" >> $(switch_builddir)/src/mod/modules.inc
|
||||
@ -848,6 +850,10 @@ modclean: $(switch_builddir)/modules.conf src/mod/modules.inc
|
||||
modwipe:
|
||||
rm -f $(modulesdir)/*.so $(modulesdir)/*.la $(modulesdir)/*.dll $(modulesdir)/*.dylib
|
||||
|
||||
print_tests: libfreeswitch.la $(switch_builddir)/modules.conf src/mod/modules.inc
|
||||
@cd tests/unit && $(MAKE) $(AM_MAKEFLAGS) print_tests
|
||||
@cd src/mod && $(MAKE) $(AM_MAKEFLAGS) print_tests
|
||||
|
||||
dox:
|
||||
cd docs && doxygen $(PWD)/docs/Doxygen.conf
|
||||
|
||||
|
||||
@ -107,6 +107,7 @@ install-modules: all-modules depend_install local_install mod_install
|
||||
uninstall-modules: local_uninstall mod_uninstall
|
||||
distclean-modules: clean-modules local_distclean
|
||||
extraclean-modules: distclean local_extraclean
|
||||
print_tests:
|
||||
|
||||
Makefile:
|
||||
@if test ! -f $@; then \
|
||||
@ -270,4 +271,4 @@ $(switch_srcdir)/src/include/switch_xml.h:
|
||||
.PHONY: all clean depend install distclean extraclean \
|
||||
all-modules clean-modules depend-modules install-modules distclean-modules extraclean-modules \
|
||||
local_all local_clean local_depend local_install local_distclean local_extraclean \
|
||||
mod_clean mod_install mod_uninstall depend_install
|
||||
mod_clean mod_install mod_uninstall depend_install print_tests
|
||||
|
||||
@ -14,3 +14,8 @@ install-modules: install
|
||||
uninstall-modules: uninstall
|
||||
distclean-modules: distclean
|
||||
extraclean-modules: extraclean
|
||||
|
||||
print_tests:
|
||||
@set +e; \
|
||||
test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done;
|
||||
|
||||
@ -1 +1 @@
|
||||
1.10.2-release
|
||||
1.10.3-release
|
||||
|
||||
9
conf/testing/autoload_configs/sndfile.conf.xml
Normal file
9
conf/testing/autoload_configs/sndfile.conf.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<configuration name="sndfile.conf">
|
||||
<settings>
|
||||
<!-- Allow only these file extensions. Default: allow all sndfile provided extensions + FS custom extra -->
|
||||
<!--
|
||||
<param name="allowed-extensions" value="wav,raw,r8,r16"/>
|
||||
-->
|
||||
</settings>
|
||||
</configuration>
|
||||
|
||||
@ -190,7 +190,9 @@
|
||||
|
||||
<!-- Allow multiple registrations to the same account in the central registration table -->
|
||||
<!-- <param name="multiple-registrations" value="true"/> -->
|
||||
|
||||
|
||||
<!-- <param name="max-audio-channels" value="2"/> -->
|
||||
|
||||
</settings>
|
||||
|
||||
</configuration>
|
||||
|
||||
@ -105,6 +105,8 @@
|
||||
<!-- <param name="ssl-key-password" value="MyPrivateKeyPassword"/> -->
|
||||
<!-- optional timeout -->
|
||||
<!-- <param name="timeout" value="10"/> -->
|
||||
<!-- optional: maximum amount of time in seconds that is allowed to make the connection to the server -->
|
||||
<!-- <param name="connect-timeout" value="2"/> -->
|
||||
|
||||
<!-- optional: use a custom CA certificate in PEM format to verify the peer
|
||||
with. This is useful if you are acting as your own certificate authority.
|
||||
|
||||
9
conf/vanilla/autoload_configs/sndfile.conf.xml
Normal file
9
conf/vanilla/autoload_configs/sndfile.conf.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<configuration name="sndfile.conf">
|
||||
<settings>
|
||||
<!-- Allow only these file extensions. Default: allow all sndfile provided extensions + FS custom extra -->
|
||||
<!--
|
||||
<param name="allowed-extensions" value="wav,raw,r8,r16"/>
|
||||
-->
|
||||
</settings>
|
||||
</configuration>
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
<global_settings>
|
||||
<param name="log-level" value="0"/>
|
||||
<!-- <param name="abort-on-empty-external-ip" value="true"/> -->
|
||||
<!-- <param name="auto-restart" value="false"/> -->
|
||||
<param name="debug-presence" value="0"/>
|
||||
<!-- <param name="capture-server" value="udp:homer.domain.com:5060"/> -->
|
||||
|
||||
@ -200,6 +200,8 @@
|
||||
<!-- Allow multiple registrations to the same account in the central registration table -->
|
||||
<!-- <param name="multiple-registrations" value="true"/> -->
|
||||
|
||||
<!-- <param name="max-audio-channels" value="2"/> -->
|
||||
|
||||
</settings>
|
||||
|
||||
</configuration>
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
<param name="rtp-ip" value="$${local_ip_v4}"/>
|
||||
<param name="sip-ip" value="$${local_ip_v4}"/>
|
||||
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
|
||||
<param name="ext-sip-ip" value="$${external_rtp_ip}"/>
|
||||
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
|
||||
<param name="rtp-timeout-sec" value="300"/>
|
||||
<param name="rtp-hold-timeout-sec" value="1800"/>
|
||||
<!--<param name="enable-3pcc" value="true"/>-->
|
||||
|
||||
@ -282,7 +282,7 @@
|
||||
auto-nat - Use ip learned from NAT-PMP or UPNP
|
||||
-->
|
||||
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
|
||||
<param name="ext-sip-ip" value="$${external_rtp_ip}"/>
|
||||
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
|
||||
|
||||
<!-- rtp inactivity timeout -->
|
||||
<param name="rtp-timeout-sec" value="300"/>
|
||||
|
||||
19
configure.ac
19
configure.ac
@ -3,10 +3,10 @@
|
||||
|
||||
# Must change all of the below together
|
||||
# For a release, set revision for that tagged release as well and uncomment
|
||||
AC_INIT([freeswitch], [1.10.2-release], bugs@freeswitch.org)
|
||||
AC_INIT([freeswitch], [1.10.3-release], bugs@freeswitch.org)
|
||||
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
|
||||
AC_SUBST(SWITCH_VERSION_MINOR, [10])
|
||||
AC_SUBST(SWITCH_VERSION_MICRO, [2-release])
|
||||
AC_SUBST(SWITCH_VERSION_MICRO, [3-release])
|
||||
AC_SUBST(SWITCH_VERSION_REVISION, [])
|
||||
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
|
||||
|
||||
@ -708,7 +708,11 @@ AC_SUBST([POSTGRESQL_LIBDIR], [$POSTGRESQL_LIBDIR])
|
||||
|
||||
PKG_CHECK_MODULES([MARIADB], [libmariadb >= 3.0.9],[
|
||||
AM_CONDITIONAL([HAVE_MARIADB],[true])],[
|
||||
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MARIADB],[false])])
|
||||
PKG_CHECK_MODULES([MARIADB], [mariadb >= 3.0.9],[
|
||||
AM_CONDITIONAL([HAVE_MARIADB],[true])],[
|
||||
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MARIADB],[false])
|
||||
])
|
||||
])
|
||||
|
||||
AC_ARG_ENABLE(deprecated-core-db-events,
|
||||
[AS_HELP_STRING([--enable-deprecated-core-db-events], [Keep deprecated core db events])],,[enable_deprecated_core_db_events="no"])
|
||||
@ -1873,7 +1877,6 @@ AC_CONFIG_FILES([Makefile
|
||||
src/mod/applications/mod_hiredis/Makefile
|
||||
src/mod/applications/mod_httapi/Makefile
|
||||
src/mod/applications/mod_http_cache/Makefile
|
||||
src/mod/applications/mod_http_cache/test/Makefile
|
||||
src/mod/applications/mod_ladspa/Makefile
|
||||
src/mod/applications/mod_lcr/Makefile
|
||||
src/mod/applications/mod_limit/Makefile
|
||||
@ -1901,7 +1904,6 @@ AC_CONFIG_FILES([Makefile
|
||||
src/mod/applications/mod_spy/Makefile
|
||||
src/mod/applications/mod_stress/Makefile
|
||||
src/mod/applications/mod_test/Makefile
|
||||
src/mod/applications/mod_test/test/Makefile
|
||||
src/mod/applications/mod_translate/Makefile
|
||||
src/mod/applications/mod_valet_parking/Makefile
|
||||
src/mod/applications/mod_vmd/Makefile
|
||||
@ -1970,7 +1972,6 @@ AC_CONFIG_FILES([Makefile
|
||||
src/mod/event_handlers/mod_radius_cdr/Makefile
|
||||
src/mod/event_handlers/mod_odbc_cdr/Makefile
|
||||
src/mod/event_handlers/mod_rayo/Makefile
|
||||
src/mod/event_handlers/mod_rayo/test/Makefile
|
||||
src/mod/event_handlers/mod_smpp/Makefile
|
||||
src/mod/event_handlers/mod_snmp/Makefile
|
||||
src/mod/event_handlers/mod_event_zmq/Makefile
|
||||
@ -1978,6 +1979,7 @@ AC_CONFIG_FILES([Makefile
|
||||
src/mod/formats/mod_local_stream/Makefile
|
||||
src/mod/formats/mod_native_file/Makefile
|
||||
src/mod/formats/mod_opusfile/Makefile
|
||||
src/mod/formats/mod_png/Makefile
|
||||
src/mod/formats/mod_shell_stream/Makefile
|
||||
src/mod/formats/mod_shout/Makefile
|
||||
src/mod/formats/mod_sndfile/Makefile
|
||||
@ -1987,7 +1989,6 @@ AC_CONFIG_FILES([Makefile
|
||||
src/mod/formats/mod_portaudio_stream/Makefile
|
||||
src/mod/languages/mod_java/Makefile
|
||||
src/mod/languages/mod_lua/Makefile
|
||||
src/mod/languages/mod_lua/test/Makefile
|
||||
src/mod/languages/mod_managed/Makefile
|
||||
src/mod/languages/mod_perl/Makefile
|
||||
src/mod/languages/mod_python/Makefile
|
||||
@ -2061,6 +2062,8 @@ OUR_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp
|
||||
OUR_CLEAN_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-clean ; done )"; echo $$mods )'
|
||||
OUR_INSTALL_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'
|
||||
OUR_UNINSTALL_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-uninstall ; done)"; echo $$mods )'
|
||||
OUR_TEST_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-print_tests ; done )"; echo $$mods )'
|
||||
OUR_CHECK_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-check ; done )"; echo $$mods )'
|
||||
OUR_DISABLED_MODS='$$(tmp_mods="$(CONF_DISABLED_MODULES)"; mods="$$(for i in $$tmp_mods ; do echo $$i-all ; done )"; echo $$mods )'
|
||||
OUR_DISABLED_CLEAN_MODS='$$(tmp_mods="$(CONF_DISABLED_MODULES)"; mods="$$(for i in $$tmp_mods ; do echo $$i-clean ; done )"; echo $$mods )'
|
||||
OUR_DISABLED_INSTALL_MODS='$$(tmp_mods="$(CONF_DISABLED_MODULES)"; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'
|
||||
@ -2075,6 +2078,8 @@ AC_SUBST(CONF_MODULES)
|
||||
|
||||
AC_SUBST(OUR_MODS)
|
||||
AC_SUBST(OUR_CLEAN_MODS)
|
||||
AC_SUBST(OUR_TEST_MODS)
|
||||
AC_SUBST(OUR_CHECK_MODS)
|
||||
AC_SUBST(OUR_INSTALL_MODS)
|
||||
AC_SUBST(OUR_UNINSTALL_MODS)
|
||||
AC_SUBST(OUR_DISABLED_MODS)
|
||||
|
||||
9
debian/bootstrap.sh
vendored
9
debian/bootstrap.sh
vendored
@ -44,7 +44,6 @@ avoid_mods=(
|
||||
applications/mod_cluechoo
|
||||
asr_tts/mod_cepstral
|
||||
codecs/mod_com_g729
|
||||
codecs/mod_ilbc
|
||||
codecs/mod_openh264
|
||||
codecs/mod_siren
|
||||
codecs/mod_sangoma_codec
|
||||
@ -943,7 +942,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
|
||||
|
||||
Package: freeswitch-all-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Priority: optional
|
||||
Architecture: amd64 armhf
|
||||
Depends: \${misc:Depends}, freeswitch-meta-all (= \${binary:Version}), freeswitch-meta-all-dbg (= \${binary:Version})
|
||||
Description: debugging symbols for FreeSWITCH
|
||||
@ -953,7 +952,7 @@ Description: debugging symbols for FreeSWITCH
|
||||
|
||||
Package: freeswitch-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Priority: optional
|
||||
Architecture: amd64 armhf
|
||||
Depends: \${misc:Depends}, freeswitch (= \${binary:Version})
|
||||
Description: debugging symbols for FreeSWITCH
|
||||
@ -963,7 +962,7 @@ Description: debugging symbols for FreeSWITCH
|
||||
|
||||
Package: libfreeswitch1-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Priority: optional
|
||||
Architecture: amd64 armhf
|
||||
Depends: \${misc:Depends}, libfreeswitch1 (= \${binary:Version})
|
||||
Description: debugging symbols for FreeSWITCH
|
||||
@ -1066,7 +1065,7 @@ Description: ${description} for FreeSWITCH
|
||||
|
||||
Package: freeswitch-${module_name//_/-}-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Priority: optional
|
||||
Architecture: amd64 armhf
|
||||
Depends: \${misc:Depends},
|
||||
freeswitch-${module_name//_/-} (= \${binary:Version})
|
||||
|
||||
2
debian/control-modules
vendored
2
debian/control-modules
vendored
@ -117,7 +117,7 @@ Module: applications/mod_hiredis
|
||||
Description: Redis client support
|
||||
This module provides a mechanism to use Redis as a datastore.
|
||||
Build-Depends: libhiredis-dev
|
||||
Depends: libhiredis0.10 | libhiredis0.13
|
||||
Depends: libhiredis0.10 | libhiredis0.13 | libhiredis0.14
|
||||
|
||||
Module: applications/mod_httapi
|
||||
Description: HT-TAPI Hypertext Telephony API
|
||||
|
||||
@ -5,6 +5,34 @@
|
||||
<prompt phrase="Raute" filename="35.wav"/>
|
||||
<prompt phrase="Stern" filename="42.wav"/>
|
||||
<prompt phrase="Punkt" filename="46.wav"/>
|
||||
<prompt phrase="Bindestrich" filename="45.wav"/>
|
||||
<prompt phrase="Ausrufezeichen" filename="33.wav"/>
|
||||
<prompt phrase="Ät" filename="64.wav"/>
|
||||
<prompt phrase="Dollar-Zeichen" filename="36.wav"/>
|
||||
<prompt phrase="Prozent-Zeichen" filename="37.wav"/>
|
||||
<prompt phrase="Kaufmännisches Und-Zeichen" filename="38.wav"/>
|
||||
<prompt phrase="Doppelte Anführungszeichen" filename="34.wav"/>
|
||||
<prompt phrase="Einfache Anführungszeichen" filename="39.wav"/>
|
||||
<prompt phrase="Schrägstrich" filename="47.wav"/>
|
||||
<prompt phrase="Unterstrich" filename="95.wav"/>
|
||||
<prompt phrase="Backslash" filename="92.wav"/>
|
||||
<prompt phrase="Tilde" filename="126.wav"/>
|
||||
<prompt phrase="Gleichheitszeichen" filename="61.wav"/>
|
||||
<prompt phrase="Doppelpunkt" filename="58.wav"/>
|
||||
<prompt phrase="Strichpunkt" filename="59.wav"/>
|
||||
<prompt phrase="Zirkumflex" filename="94.wav"/>
|
||||
<prompt phrase="senkrechter Strich" filename="124.wav"/>
|
||||
<prompt phrase="Plus" filename="43.wav"/>
|
||||
<prompt phrase="linke Klammer" filename="40.wav"/>
|
||||
<prompt phrase="rechte Klammer" filename="41.wav"/>
|
||||
<prompt phrase="linke geschweifte Klammer" filename="123.wav"/>
|
||||
<prompt phrase="rechte geschweifte Klammer" filename="125.wav"/>
|
||||
<prompt phrase="linke eckige Klammer" filename="91.wav"/>
|
||||
<prompt phrase="rechte eckige Klammer" filename="93.wav"/>
|
||||
<prompt phrase="Komma" filename="44.wav"/>
|
||||
<prompt phrase="Gravis-Zeichen" filename="96.wav"/>
|
||||
<prompt phrase="kleiner als Zeichen" filename="60.wav"/>
|
||||
<prompt phrase="größer als Zeichen" filename="62.wav"/>
|
||||
<prompt phrase="A" filename="97.wav"/>
|
||||
<prompt phrase="B" filename="98.wav"/>
|
||||
<prompt phrase="C" filename="99.wav"/>
|
||||
@ -67,6 +95,8 @@
|
||||
<prompt phrase="Ökonom" filename="201.wav"/>
|
||||
<prompt phrase="Übermut" filename="202.wav"/>
|
||||
<prompt phrase="Eszet" filename="203.wav"/>
|
||||
<prompt phrase="Stern" filename="42.wav"/>
|
||||
<prompt phrase="Raute" filename="35.wav"/>
|
||||
</phonetic-ascii>
|
||||
<digits>
|
||||
<prompt phrase="Null" filename="0.wav"/>
|
||||
@ -98,49 +128,125 @@
|
||||
<prompt phrase="Achtzig" filename="80.wav"/>
|
||||
<prompt phrase="Neunzig" filename="90.wav"/>
|
||||
<prompt phrase="Punkt" filename="dot.wav"/>
|
||||
<prompt phrase="Erstes" filename="h-1.wav"/>
|
||||
<prompt phrase="Zweites" filename="h-2.wav"/>
|
||||
<prompt phrase="Drittes" filename="h-3.wav"/>
|
||||
<prompt phrase="Viertes" filename="h-4.wav"/>
|
||||
<prompt phrase="Fünftes" filename="h-5.wav"/>
|
||||
<prompt phrase="Sechstes" filename="h-6.wav"/>
|
||||
<prompt phrase="Siebtes" filename="h-7.wav"/>
|
||||
<prompt phrase="Achtes" filename="h-8.wav"/>
|
||||
<prompt phrase="Neuntes" filename="h-9.wav"/>
|
||||
<prompt phrase="Zehntes" filename="h-10.wav"/>
|
||||
<prompt phrase="Elftes" filename="h-11.wav"/>
|
||||
<prompt phrase="Zwölftes" filename="h-12.wav"/>
|
||||
<prompt phrase="Dreizehntes" filename="h-13.wav"/>
|
||||
<prompt phrase="Vierzehntes" filename="h-14.wav"/>
|
||||
<prompt phrase="Fünfzehntes" filename="h-15.wav"/>
|
||||
<prompt phrase="Sechzehntes" filename="h-16.wav"/>
|
||||
<prompt phrase="Siebzehntes" filename="h-17.wav"/>
|
||||
<prompt phrase="Achtzehntes" filename="h-18.wav"/>
|
||||
<prompt phrase="Neunzehntes" filename="h-19.wav"/>
|
||||
<prompt phrase="Zwanzigstes" filename="h-20.wav"/>
|
||||
<prompt phrase="Dreissigstes" filename="h-30.wav"/>
|
||||
<prompt phrase="Erste" filename="h-1.wav"/>
|
||||
<prompt phrase="Zweite" filename="h-2.wav"/>
|
||||
<prompt phrase="Dritte" filename="h-3.wav"/>
|
||||
<prompt phrase="Vierte" filename="h-4.wav"/>
|
||||
<prompt phrase="Fünfte" filename="h-5.wav"/>
|
||||
<prompt phrase="Sechste" filename="h-6.wav"/>
|
||||
<prompt phrase="Siebte" filename="h-7.wav"/>
|
||||
<prompt phrase="Achte" filename="h-8.wav"/>
|
||||
<prompt phrase="Neunte" filename="h-9.wav"/>
|
||||
<prompt phrase="Zehnte" filename="h-10.wav"/>
|
||||
<prompt phrase="Elfte" filename="h-11.wav"/>
|
||||
<prompt phrase="Zwölfte" filename="h-12.wav"/>
|
||||
<prompt phrase="Dreizehnte" filename="h-13.wav"/>
|
||||
<prompt phrase="Vierzehnte" filename="h-14.wav"/>
|
||||
<prompt phrase="Fünfzehnte" filename="h-15.wav"/>
|
||||
<prompt phrase="Sechzehnte" filename="h-16.wav"/>
|
||||
<prompt phrase="Siebzehnte" filename="h-17.wav"/>
|
||||
<prompt phrase="Achtzehnte" filename="h-18.wav"/>
|
||||
<prompt phrase="Neunzehnte" filename="h-19.wav"/>
|
||||
<prompt phrase="Zwanzigste" filename="h-20.wav"/>
|
||||
<prompt phrase="Dreissigste" filename="h-30.wav"/>
|
||||
<prompt phrase="Erster" filename="h-1_m.wav"/>
|
||||
<prompt phrase="Zweiter" filename="h-2_m.wav"/>
|
||||
<prompt phrase="Dritter" filename="h-3_m.wav"/>
|
||||
<prompt phrase="Vierter" filename="h-4_m.wav"/>
|
||||
<prompt phrase="Fünfter" filename="h-5_m.wav"/>
|
||||
<prompt phrase="Sechster" filename="h-6_m.wav"/>
|
||||
<prompt phrase="Siebter" filename="h-7_m.wav"/>
|
||||
<prompt phrase="Achter" filename="h-8_m.wav"/>
|
||||
<prompt phrase="Neunter" filename="h-9_m.wav"/>
|
||||
<prompt phrase="Zehnter" filename="h-10_m.wav"/>
|
||||
<prompt phrase="Elfter" filename="h-11_m.wav"/>
|
||||
<prompt phrase="Zwölfter" filename="h-12_m.wav"/>
|
||||
<prompt phrase="Dreizehnter" filename="h-13_m.wav"/>
|
||||
<prompt phrase="Vierzehnter" filename="h-14_m.wav"/>
|
||||
<prompt phrase="Fünfzehnter" filename="h-15_m.wav"/>
|
||||
<prompt phrase="Sechzehnter" filename="h-16_m.wav"/>
|
||||
<prompt phrase="Siebzehnter" filename="h-17_m.wav"/>
|
||||
<prompt phrase="Achtzehnter" filename="h-18_m.wav"/>
|
||||
<prompt phrase="Neunzehnter" filename="h-19_m.wav"/>
|
||||
<prompt phrase="Zwanzigster" filename="h-20_m.wav"/>
|
||||
<prompt phrase="Dreissigster" filename="h-30_m.wav"/>
|
||||
<prompt phrase="Erste" filename="h-1_f.wav"/>
|
||||
<prompt phrase="Zweite" filename="h-2_f.wav"/>
|
||||
<prompt phrase="Dritte" filename="h-3_f.wav"/>
|
||||
<prompt phrase="Vierte" filename="h-4_f.wav"/>
|
||||
<prompt phrase="Fünfte" filename="h-5_f.wav"/>
|
||||
<prompt phrase="Sechste" filename="h-6_f.wav"/>
|
||||
<prompt phrase="Siebte" filename="h-7_f.wav"/>
|
||||
<prompt phrase="Achte" filename="h-8_f.wav"/>
|
||||
<prompt phrase="Neunte" filename="h-9_f.wav"/>
|
||||
<prompt phrase="Zehnte" filename="h-10_f.wav"/>
|
||||
<prompt phrase="Elfte" filename="h-11_f.wav"/>
|
||||
<prompt phrase="Zwölfte" filename="h-12_f.wav"/>
|
||||
<prompt phrase="Dreizehnte" filename="h-13_f.wav"/>
|
||||
<prompt phrase="Vierzehnte" filename="h-14_f.wav"/>
|
||||
<prompt phrase="Fünfzehnte" filename="h-15_f.wav"/>
|
||||
<prompt phrase="Sechzehnte" filename="h-16_f.wav"/>
|
||||
<prompt phrase="Siebzehnte" filename="h-17_f.wav"/>
|
||||
<prompt phrase="Achtzehnte" filename="h-18_f.wav"/>
|
||||
<prompt phrase="Neunzehnte" filename="h-19_f.wav"/>
|
||||
<prompt phrase="Zwanzigste" filename="h-20_f.wav"/>
|
||||
<prompt phrase="Dreissigste" filename="h-30_f.wav"/>
|
||||
<prompt phrase="Erstes" filename="h-1_n.wav"/>
|
||||
<prompt phrase="Zweites" filename="h-2_n.wav"/>
|
||||
<prompt phrase="Drittes" filename="h-3_n.wav"/>
|
||||
<prompt phrase="Viertes" filename="h-4_n.wav"/>
|
||||
<prompt phrase="Fünftes" filename="h-5_n.wav"/>
|
||||
<prompt phrase="Sechstes" filename="h-6_n.wav"/>
|
||||
<prompt phrase="Siebtes" filename="h-7_n.wav"/>
|
||||
<prompt phrase="Achtes" filename="h-8_n.wav"/>
|
||||
<prompt phrase="Neuntes" filename="h-9_n.wav"/>
|
||||
<prompt phrase="Zehntes" filename="h-10_n.wav"/>
|
||||
<prompt phrase="Elftes" filename="h-11_n.wav"/>
|
||||
<prompt phrase="Zwölftes" filename="h-12_n.wav"/>
|
||||
<prompt phrase="Dreizehntes" filename="h-13_n.wav"/>
|
||||
<prompt phrase="Vierzehntes" filename="h-14_n.wav"/>
|
||||
<prompt phrase="Fünfzehntes" filename="h-15_n.wav"/>
|
||||
<prompt phrase="Sechzehntes" filename="h-16_n.wav"/>
|
||||
<prompt phrase="Siebzehntes" filename="h-17_n.wav"/>
|
||||
<prompt phrase="Achtzehntes" filename="h-18_n.wav"/>
|
||||
<prompt phrase="Neunzehntes" filename="h-19_n.wav"/>
|
||||
<prompt phrase="Zwanzigstes" filename="h-20_n.wav"/>
|
||||
<prompt phrase="Dreissigstes" filename="h-30_n.wav"/>
|
||||
<prompt phrase="Hundert" filename="hundred.wav"/>
|
||||
<prompt phrase="Tausend" filename="thousand.wav"/>
|
||||
<prompt phrase="Millionen" filename="million.wav"/>
|
||||
<prompt phrase="Millionen" filename="millionen.wav"/>
|
||||
<prompt phrase="Milliarden" filename="milliarden.wav"/>
|
||||
<prompt phrase="Komma" filename="period.wav"/>
|
||||
<prompt phrase="Punkt" filename="point.wav"/>
|
||||
<prompt phrase="Raute" filename="pound.wav"/>
|
||||
<prompt phrase="Stern" filename="star.wav"/>
|
||||
<prompt phrase="Tausend" filename="thousand.wav"/>
|
||||
<prompt phrase="Ein" filename="1_m.wav"/>
|
||||
<prompt phrase="Eine" filename="1_f.wav"/>
|
||||
<prompt phrase="Ein" filename="1_n.wav"/>
|
||||
<prompt phrase="Ein und" filename="1-and.wav"/>
|
||||
<prompt phrase="Zwei und" filename="2-and.wav"/>
|
||||
<prompt phrase="Drei und" filename="3-and.wav"/>
|
||||
<prompt phrase="Vier und" filename="4-and.wav"/>
|
||||
<prompt phrase="Fünf und" filename="5-and.wav"/>
|
||||
<prompt phrase="Sechs und" filename="6-and.wav"/>
|
||||
<prompt phrase="Sieben und" filename="7-and.wav"/>
|
||||
<prompt phrase="Acht und" filename="8-and.wav"/>
|
||||
<prompt phrase="Neun und" filename="9-and.wav"/>
|
||||
</digits>
|
||||
<currency>
|
||||
<prompt phrase="Und" filename="and.wav"/>
|
||||
<prompt phrase="Cent" filename="cent.wav"/>
|
||||
<!-- vvv ??? -->
|
||||
<prompt phrase="Zentral" filename="central.wav"/>
|
||||
<prompt phrase="Zentrale" filename="central.wav"/>
|
||||
<prompt phrase="Cent pro Minute" filename="cents-per-minute.wav"/>
|
||||
<prompt phrase="Cent" filename="cents.wav"/>
|
||||
<prompt phrase="Euro" filename="dollar.wav"/>
|
||||
<prompt phrase="Euro" filename="dollars.wav"/>
|
||||
<prompt phrase="Minus" filename="minus.wav"/>
|
||||
<prompt phrase="Negativ" filename="negative.wav"/>
|
||||
<prompt phrase="Minus" filename="negative.wav"/>
|
||||
</currency>
|
||||
<time>
|
||||
<prompt phrase="A.M." filename="a-m.wav"/>
|
||||
<prompt phrase="vormittags" filename="a-m.wav"/>
|
||||
<prompt phrase="um" filename="at.wav"/>
|
||||
<prompt phrase="Sonntag" filename="day-0.wav"/>
|
||||
<prompt phrase="Montag" filename="day-1.wav"/>
|
||||
@ -153,6 +259,8 @@
|
||||
<prompt phrase="Stunden" filename="hours.wav"/>
|
||||
<prompt phrase="Minute" filename="minute.wav"/>
|
||||
<prompt phrase="Minuten" filename="minutes.wav"/>
|
||||
<prompt phrase="Sekunde" filename="second.wav"/>
|
||||
<prompt phrase="Sekunden" filename="seconds.wav"/>
|
||||
<prompt phrase="Januar" filename="mon-0.wav"/>
|
||||
<prompt phrase="Febuar" filename="mon-1.wav"/>
|
||||
<prompt phrase="März" filename="mon-2.wav"/>
|
||||
@ -167,55 +275,573 @@
|
||||
<prompt phrase="Dezember" filename="mon-11.wav"/>
|
||||
<prompt phrase="Uhr" filename="oclock.wav"/>
|
||||
<prompt phrase="oh" filename="oh.wav"/>
|
||||
<prompt phrase="P.M." filename="p-m.wav"/>
|
||||
<prompt phrase="Sekunde" filename="second.wav"/>
|
||||
<prompt phrase="Sekunden" filename="seconds.wav"/>
|
||||
<prompt phrase="nachmittags" filename="p-m.wav"/>
|
||||
<prompt phrase="Heute" filename="today.wav"/>
|
||||
<prompt phrase="Morgen" filename="tomorrow.wav"/>
|
||||
<prompt phrase="Gestern" filename="yesterday.wav"/>
|
||||
</time>
|
||||
<voicemail>
|
||||
<prompt phrase="Die Person unter der Durchwahl" filename="vm-person.wav"/>
|
||||
<prompt phrase="als dringend markiert" filename="vm-marked-urgent.wav"/>
|
||||
<prompt phrase="als neu markiert" filename="vm-marked_new.wav"/>
|
||||
<prompt phrase="per E-Mail verschickt" filename="vm-emailed.wav"/>
|
||||
<prompt phrase="Sie haben" filename="vm-you_have.wav"/>
|
||||
<prompt phrase="Nachricht von" filename="vm-from.wav"/>
|
||||
<prompt phrase="Bitte geben Sie Ihren Benutzernamen ein, gefolgt von" filename="vm-enter_id.wav"/>
|
||||
<prompt phrase="Bitte geben Sie Ihr Passwort ein, gefolgt von" filename="vm-enter_pass.wav"/>
|
||||
<prompt phrase="Benutzerdaten falsch" filename="vm-fail_auth.wav"/>
|
||||
<prompt phrase="Willkommen in Ihrem Postfach" filename="vm-hello.wav"/>
|
||||
<prompt phrase="Auf Wiedersehen" filename="vm-goodbye.wav"/>
|
||||
<prompt phrase="Sagen Sie Ihren Namen nach dem Ton, drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden." filename="vm-record_name1.wav"/>
|
||||
<prompt phrase="Wählen Sie eine Ansage zwischen 1 und 3" filename="vm-choose_greeting.wav"/>
|
||||
<prompt phrase="Wählen Sie eine Ansage zwischen 1 und 9" filename="vm-choose_greeting_choose.wav"/>
|
||||
<prompt phrase="Ungültige Eingabe" filename="vm-choose_greeting_fail.wav"/>
|
||||
<prompt phrase="Zu viele Fehlversuche" filename="vm-abort.wav"/>
|
||||
<prompt phrase="Sprechen Sie nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden" filename="vm-record_greeting.wav"/>
|
||||
<prompt phrase="Sprechen Sie nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden" filename="vm-record_message.wav"/>
|
||||
<prompt phrase="Um Ihr Passwort zu ändern" filename="vm-change_password.wav"/>
|
||||
<prompt phrase="Sprechen Sie Ihre Ansage nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden." filename="vm-record_greeting.wav"/>
|
||||
<prompt phrase="Sprechen Sie Ihre Nachricht nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden." filename="vm-record_message.wav"/>
|
||||
<prompt phrase="ist nicht verfügbar" filename="vm-play_greeting.wav"/>
|
||||
<prompt phrase="dringend, neu" filename="vm-urgent-new.wav"/>
|
||||
<prompt phrase="neu" filename="vm-new.wav"/>
|
||||
<prompt phrase="dringend, gespeichert" filename="vm-urgent-saved.wav"/>
|
||||
<prompt phrase="gespeichert" filename="vm-saved.wav"/>
|
||||
<prompt phrase="Nachricht" filename="vm-message.wav"/>
|
||||
<prompt phrase="Nachricht" filename="vm-message_alt.wav"/>
|
||||
<prompt phrase="Nachrichten" filename="vm-messages.wav"/>
|
||||
<prompt phrase="Nachrichten" filename="vm-messages_alt.wav"/>
|
||||
<prompt phrase="keine weiteren Nachrichten" filename="vm-no_more_messages.wav"/>
|
||||
<prompt phrase="um diese Nachricht zu wiederholen" filename="vm-repeat_message.wav"/>
|
||||
<prompt phrase="um diese Nachricht zu löschen" filename="vm-delete_message.wav"/>
|
||||
<prompt phrase="um diese Nachricht zu speichern" filename="vm-save_message.wav"/>
|
||||
<prompt phrase="um die nächste Nachricht abzuspielen" filename="vm-play_next_message.wav"/>
|
||||
<prompt phrase="um die letzte Nachricht abzuspielen" filename="vm-play_previous_message.wav"/>
|
||||
<prompt phrase="um das Löschen dieser Nachricht rückgängig zu machen" filename="vm-undelete_message.wav"/>
|
||||
<prompt phrase="um diese Nachricht jetzt zu senden" filename="vm-send_message_now.wav"/>
|
||||
<prompt phrase="um den Umschlag der Nachricht zu hören" filename="vm-message_envelope.wav"/>
|
||||
<prompt phrase="wurde geändert in" filename="vm-has_been_changed_to.wav"/>
|
||||
<prompt phrase="drücken Sie" filename="vm-press.wav"/>
|
||||
<prompt phrase="empfangene" filename="vm-received.wav"/>
|
||||
<prompt phrase="gefolgt von" filename="vm-followed_by.wav"/>
|
||||
<prompt phrase="Das war eine ungültige Durchwahl." filename="vm-that_was_an_invalid_ext.wav"/>
|
||||
<prompt phrase="Löschen rückgängig gemacht." filename="vm-undeleted.wav"/>
|
||||
<prompt phrase="gefolgt von der Raute Taste." filename="vm-followed_by_pound.wav"/>
|
||||
<prompt phrase="nächste" filename="vm-next.wav"/>
|
||||
<prompt phrase="zum anhören neuer Nachrichten" filename="vm-listen_new.wav"/>
|
||||
<prompt phrase="zum anhören gespeicherter Nachrichten" filename="vm-listen_saved.wav"/>
|
||||
<prompt phrase="für erweiterte Optionen" filename="vm-advanced.wav"/>
|
||||
<prompt phrase="für erweiterte Optionen" filename="vm-advanced_alt.wav"/>
|
||||
<prompt phrase="zum verlassen" filename="vm-to_exit.wav"/>
|
||||
<prompt phrase="zum aufnehmen einer Ansage" filename="vm-record_greeting.wav"/>
|
||||
<prompt phrase="zum verlassen" filename="vm-to_exit_alt.wav"/>
|
||||
<prompt phrase="zum aufnehmen einer Ansage" filename="vm-to_record_greeting.wav"/>
|
||||
<prompt phrase="zum auswählen einer Ansage" filename="vm-choose_greeting.wav"/>
|
||||
<prompt phrase="zum aufnehmen Ihres Namens" filename="vm-record_name2.wav"/>
|
||||
<prompt phrase="für das Hauptmenü" filename="vm-main_menu.wav"/>
|
||||
<prompt phrase="zum anhören dieser Nachricht" filename="vm-listen_to_recording.wav"/>
|
||||
<prompt phrase="zum speichern der Nachricht" filename="vm-save_recording.wav"/>
|
||||
<prompt phrase="zum erneuten Aufnehmen" filename="vm-rerecord.wav"/>
|
||||
<prompt phrase="um diese Nachricht als dringen zu markieren" filename="vm-mark_urgent.wav"/>
|
||||
<prompt phrase="um diese Nachricht als dringend zu markieren" filename="vm-mark-urgent.wav"/>
|
||||
<prompt phrase="um diese Nachricht als neu zu markieren" filename="vm-mark_message_new.wav"/>
|
||||
<prompt phrase="zum Fortfahren" filename="vm-continue.wav"/>
|
||||
<prompt phrase="zum erneuten anhören dieser Nachricht" filename="vm-listen_to_recording_again.wav"/>
|
||||
<prompt phrase="zum löschen dieser Nachricht" filename="vm-delete_recording.wav"/>
|
||||
<prompt phrase="um diese Nachricht an Ihre EMailadresse weiter zu leiten" filename="vm-forward_to_email.wav"/>
|
||||
<prompt phrase="um diese Nachricht an Ihre E-Mail-Adresse weiterzuleiten" filename="vm-forward_to_email.wav"/>
|
||||
<prompt phrase="um diese Nachricht an ein anderes Postfach weiterzuleiten" filename="vm-to_forward.wav"/>
|
||||
<prompt phrase="Bitte geben Die die Durchwahl an, an die diese Nachricht weitergeleitet werden soll" filename="vm-forward_enter_ext.wav"/>
|
||||
<prompt phrase="Um eine Einleitung zu dieser Nachricht hinzuzufügen" filename="vm-forward_add_intro.wav"/>
|
||||
<prompt phrase="Ansage" filename="vm-greeting.wav"/>
|
||||
<prompt phrase="ausgewählt" filename="vm-selected.wav"/>
|
||||
<prompt phrase="ist nicht verfügbar" filename="vm-not_avaliable.wav"/>
|
||||
<prompt phrase="ist nicht verfügbar" filename="vm-not_available.wav"/>
|
||||
<prompt phrase="Nachricht nummer" filename="vm-message_number.wav"/>
|
||||
<prompt phrase="gelöscht" filename="vm-deleted.wav"/>
|
||||
<prompt phrase="Ihre Aufnahme ist kürzer als die erlaubte Mindestlänge. Bitte versuchen Sie es erneut." filename="vm-too-small.wav"/>
|
||||
<prompt phrase="im Posteingang" filename="vm-in_folder.wav"/>
|
||||
<prompt phrase="um jetzt zurückzurufen" filename="vm-return_call.wav"/>
|
||||
<prompt phrase="dringend" filename="vm-urgent.wav"/>
|
||||
<prompt phrase="Dieses Postfach ist voll. Bitte versuchen Sie es später erneut." filename="vm-mailbox_full.wav"/>
|
||||
<prompt phrase="Willkommen in Ihrem neuen Sprach-Postfach. Für eine Erklärung und um Ihr Postfach einzurichten, drücken Sie bitte 1, zum Überspringen 2." filename="vm-tutorial_yes_no.wav"/>
|
||||
<prompt phrase="Bitte sprechen Sie Ihren Vor- und Nachnamen. Diese Aufnahme wird in der Telefonanlage auch für das Verzeichnis der Nebenstellen verwendet." filename="vm-tutorial_record_name.wav"/>
|
||||
<prompt phrase="Ihr persönlicher Zugangs-Code, auch PIN genannt, wird verwendet, damit andere nicht auf Ihr Sprach-Postfach zugreifen können. Wollen Sie die PIN jetzt ändern?" filename="vm-tutorial_change_pin.wav"/>
|
||||
<prompt phrase="Die Person, die Sie erreichen wollen, ist im Moment nicht verfügbar und hat kein Sprach-Postfach." filename="vm-not_available_no_voicemail.wav"/>
|
||||
<prompt phrase="Die von Ihnen eingegebene PIN ist kürzer als die erlaubte Mindestlänge." filename="vm-pin_below_minimum_length.wav"/>
|
||||
<prompt phrase="Die minimale PIN-Länge ist" filename="vm-minimum_pin_length_is.wav"/>
|
||||
<prompt phrase="Ihr Passwort wurde geändert." filename="vm-password_has_been_changed.wav"/>
|
||||
<prompt phrase="Bitte geben Sie Ihr neues Passwort ein, gefolgt von der Raute Taste. " filename="vm-enter_new_pin.wav"/>
|
||||
<prompt phrase="Das von Ihnen eingegebene Passwort ist in diesem System nicht gültig." filename="vm-password_not_valid.wav"/>
|
||||
<prompt phrase="Ein Passwort wie zum Beispiel 1 1 1 1 oder 1 2 3 4 ist nicht sicher." filename="vm-password_is_not_secure.wav"/>
|
||||
<prompt phrase="Bitte geben wählen Sie ein Passwort aus, das nicht nur aus gleichen oder aufeinanderfolgenden Ziffern besteht." filename="vm-choose_password.wav"/>
|
||||
<prompt phrase="Bitte denken Sie daran, dass das Passwort für Ihr Sprach-Postfach auf für das Web Interface genutzt wird." filename="vm-voicemail_password_is_web_password.wav"/>
|
||||
<prompt phrase="Nachricht von" filename="vm-message_from.wav"/>
|
||||
<prompt phrase="Niemand hinterlässt derzeit eine Nachricht in diesem Postfach." filename="vm-nobody_leaving_message.wav"/>
|
||||
<prompt phrase="letzte" filename="vm-last.wav"/>
|
||||
<prompt phrase="Um die Ansage zu löschen" filename="vm-delete_greeting.wav"/>
|
||||
<prompt phrase="Um die Ansage anzuhören" filename="vm-listen_to_greeting.wav"/>
|
||||
<prompt phrase="Für das Hauptmenü" filename="vm-main_menu_alt.wav"/>
|
||||
<prompt phrase="Nachricht weitergeleitet" filename="vm-message_forwarded.wav"/>
|
||||
<prompt phrase="Der von Ihnen angerufene Teilnehmer antwortet nicht und hat auch keinen Anrufbeantworter." filename="vm-no_answer_no_vm.wav"/>
|
||||
</voicemail>
|
||||
<directory>
|
||||
<prompt phrase="Bitte geben Sie ein die ersten paar Buchstaben des" filename="dir-enter_person.wav"/>
|
||||
<prompt phrase="Nachnamen" filename="dir-last_name.wav"/>
|
||||
<prompt phrase="Zur Suche nach" filename="dir-to_search_by.wav"/>
|
||||
<prompt phrase="Vornamen" filename="dir-first_name.wav"/>
|
||||
<prompt phrase="Es gab keine übereinstimmenden Ergebnisse." filename="dir-no_matching_results.wav"/>
|
||||
<prompt phrase="Ergebnisse stimmen mit Ihrer Suche überein." filename="dir-result_match.wav"/>
|
||||
<prompt phrase="Ihre Suche ergab zu viele Ergebnisse." filename="dir-too_many_result.wav"/>
|
||||
<prompt phrase="Keine weiteren Ergebnisse." filename="dir-no_more_results.wav"/>
|
||||
<prompt phrase="Ergebnis Nummer" filename="dir-result_number.wav"/>
|
||||
<prompt phrase="mit der Durchwahl" filename="dir-at_extension.wav"/>
|
||||
<prompt phrase="Um diesen Eintrag auszuwählen" filename="dir-to_select_entry.wav"/>
|
||||
<prompt phrase="Für den nächsten Eintrag" filename="dir-for_next.wav"/>
|
||||
<prompt phrase="Für den vorhergehenden Eintrag" filename="dir-for_prev.wav"/>
|
||||
<prompt phrase="Um eine neue Suche zu starten" filename="dir-start_new_search.wav"/>
|
||||
<prompt phrase="Bitte nennen Sie mindestens" filename="dir-specify_mininum.wav"/>
|
||||
<prompt phrase="Buchstaben des Namens der Person." filename="dir-letters_of_person_name.wav"/>
|
||||
<prompt phrase="Bitte versuchen Sie es erneut." filename="dir-please_try_again.wav"/>
|
||||
<prompt phrase="drücken Sie" filename="dir-press.wav" info="we can copy vm/vm-press.wav"/>
|
||||
<prompt phrase="Für den nächsten Eintrag" filename="dir-for_next.wav" note="re-recorded because original was wrong"/>
|
||||
<prompt phrase="Bitte geben Sie die ersten paar Buchstaben des Vor- oder Nachnamens der Person ein." filename="dir-enter_person_first_or_last.wav"/>
|
||||
<prompt phrase="Bitte geben Sie ein die ersten paar Buchstaben des" filename="dir-enter-person.wav"/>
|
||||
<prompt phrase="Ihre Suche hat keine Ergebnisse gefunden. Bitte versuchen Sie es erneut." filename="dir-no_match_entry.wav"/>
|
||||
<prompt phrase="Keine weiteren Ergebnisse." filename="dir-no_more_result.wav"/>
|
||||
<prompt phrase="Die Eingabe erfordert die Angabe von mindestens" filename="dir-specify_mininum_first.wav"/>
|
||||
<prompt phrase="Um eine neue Suche zu beginnen" filename="dir-to_make_new_search.wav"/>
|
||||
<prompt phrase="Ihre Suche ergab zu viele Ergebnisse. Bitte versuchen Sie es erneut." filename="dir-to_many_result.wav"/>
|
||||
</directory>
|
||||
<conference>
|
||||
<prompt phrase="NULL" filename="conf-ack.wav" type="tone"/>
|
||||
<prompt phrase="NULL" filename="conf-nack.wav" type="tone"/>
|
||||
<prompt phrase="Sie sind jetzt stumm geschaltet." filename="conf-muted.wav"/>
|
||||
<prompt phrase="Sie sind jetzt nicht mehr stumm geschaltet." filename="conf-unmuted.wav"/>
|
||||
<prompt phrase="Sie sind derzeit die einzige Person in dieser Konferenz." filename="conf-alone.wav"/>
|
||||
<prompt phrase="NULL" filename="conf-perpetual.wav" type="music"/>
|
||||
<prompt phrase="NULL" filename="conf-enter.wav" type="tone"/>
|
||||
<prompt phrase="NULL" filename="conf-exit.wav" type="tone"/>
|
||||
<prompt phrase="Sie sind von der Konferenz ausgeschlossen worden." filename="conf-kicked.wav"/>
|
||||
<prompt phrase="Diese Konferenz ist gesperrt." filename="conf-locked.wav"/>
|
||||
<prompt phrase="Diese Konferenz ist jetzt gesperrt." filename="conf-is-locked.wav"/>
|
||||
<prompt phrase="Diese Konferenz ist jetzt nicht mehr gesperrt." filename="conf-is-unlocked.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die PIN Nummer der Konferenz ein." filename="conf-pin.wav"/>
|
||||
<prompt phrase="Ungültige PIN Nummer. Bitte versuchen Sie es erneut." filename="conf-bad-pin.wav"/>
|
||||
<prompt phrase="Auf Wiedersehen." filename="conf-goodbye.wav"/>
|
||||
<prompt phrase="Willkommen zur Konferenz." filename="conf-welcome.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Konferenz Nummer ein, gefolgt von der Raute Taste." filename="conf-enter_conf_number.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die PIN Nummer der Konferenz ein, gefolgt von der Raute Taste." filename="conf-enter_conf_pin.wav"/>
|
||||
<prompt phrase="nimmt jetzt an der Konferenz teil." filename="conf-has_joined.wav"/>
|
||||
<prompt phrase="hat die Konferenz verlassen." filename="conf-has_left.wav"/>
|
||||
<prompt phrase="Sie sind bereits stumm geschaltet." filename="conf-you_are_already_muted.wav"/>
|
||||
<prompt phrase="Sie sind jetzt in beiden Richtungen stumm geschaltet." filename="conf-you_are_now_bidirectionally_muted.wav"/>
|
||||
<prompt phrase="Geben Sie die Zahl der Zuhörer an diesem Ort ein, gefolgt von der Raute Taste." filename="conf-number_of_listeners.wav"/>
|
||||
<prompt phrase="Zuhörer in dieser Konferenz." filename="conf-listeners_in_conference.wav"/>
|
||||
<prompt phrase="Zuhörer in dieser Konferenz." filename="conf-listener_in_conference.wav"/>
|
||||
<prompt phrase="Mitglieder in dieser Konferenz." filename="conf-members_in_conference.wav"/>
|
||||
<prompt phrase="Diese Konferenz ist jetzt im Fragen und Antworten Modus." filename="conf-conference_is_in_qna_mode.wav"/>
|
||||
<prompt phrase="Fragen und Antworten Modus" filename="conf-qna_mode.wav"/>
|
||||
<prompt phrase="Signalton beim Betreten" filename="conf-entry_sound.wav"/>
|
||||
<prompt phrase="Signalton beim Verlassen" filename="conf-exit_sound.wav"/>
|
||||
<prompt phrase="Diese Konferenz ist voll. Bitte fragen Sie den Konferenz-Moderator." filename="conf-conference_is_full.wav"/>
|
||||
<prompt phrase="Ihre Konferenz wird in Kürze beginnen. Bitte bleiben Sie in der Leitung." filename="conf-conference_will_start_shortly.wav"/>
|
||||
<prompt phrase="andere Personen in dieser Konferenz." filename="conf-other_persons_conference.wav"/>
|
||||
<prompt phrase="Es ist eine weitere Person in dieser Konferenz." filename="conf-one_other_person_conference.wav"/>
|
||||
<prompt phrase="Es ist ein weiteres Mitglied in dieser Konferenz." filename="conf-one_other_member_conference.wav"/>
|
||||
<prompt phrase="Diese Konferenz wird aufgezeichnet." filename="conf-being_recorded.wav"/>
|
||||
<prompt phrase="Diese Konferenz wird nicht mehr aufgezeichnet." filename="conf-no_longer_being_recorded.wav"/>
|
||||
</conference>
|
||||
<ivr>
|
||||
<prompt phrase="Kontonummer" filename="ivr-account_number.wav"/>
|
||||
<prompt phrase="Mit dem Anrufer verbinden" filename="ivr-connect_to_caller.wav"/>
|
||||
<prompt phrase="Wenn Sie die Durchwahl der gewünschten Person kennen, geben Sie diese bitte jetzt ein." filename="ivr-enter_ext_pound.wav"/>
|
||||
<prompt phrase="Bitte geben Sie eine Durchwahl ein, gefolgt von der Raute Taste." filename="ivr-enter_ext.wav"/>
|
||||
<prompt phrase="Um diese Person" filename="ivr-for_this_person.wav"/>
|
||||
<prompt phrase="Bitte warten Sie, während Ihr Anruf verbunden wird." filename="ivr-hold_connect_call.wav"/>
|
||||
<prompt phrase="Es tut uns leid." filename="ivr-im_sorry.wav"/>
|
||||
<prompt phrase="Bitte" filename="ivr-please.wav"/>
|
||||
<prompt phrase="Bitte rufen Sie zurück unter" filename="ivr-please_return_our_call_at.wav"/>
|
||||
<prompt phrase="Bezüglich der Referenz Nummer" filename="ivr-regarding_reference_number.wav"/>
|
||||
<prompt phrase="Dies ist ein Beispiel-Untermenü des Ai Wee Arr." filename="ivr-sample_submenu.wav"/>
|
||||
<prompt phrase="Bitte sagen Sie Ihren Namen nach dem Ton." filename="ivr-say_name.wav"/>
|
||||
<prompt phrase="Leite diesen Anrufer zum Anrufbeantworter weiter" filename="ivr-send_to_voicemail.wav"/>
|
||||
<prompt phrase="Um mit einem Mitarbeiter des Kundenservice zu sprechen" filename="ivr-speak_to_a_customer_service_representative.wav"/>
|
||||
<prompt phrase="Eine Nachricht aufnehmen" filename="ivr-take_a_message.wav"/>
|
||||
<prompt phrase="Das war ein ungültiger Eintrag" filename="ivr-that_was_an_invalid_entry.wav"/>
|
||||
<prompt phrase="Dies ist ein Anruf von" filename="ivr-this_is_a_call_from.wav"/>
|
||||
<prompt phrase="Dieser Ai Wee Arr ermöglicht Ihnen den Test einiger Funktionen" filename="ivr-this_ivr_will_let_you_test_features.wav"/>
|
||||
<prompt phrase="Um die FreeSWITCH Konferenz anzurufen" filename="ivr-to_call_the_freeswitch_conference.wav"/>
|
||||
<prompt phrase="Um einen FreeSWITCH echo test zu machen" filename="ivr-to_do_a_freeswitch_echo_test.wav"/>
|
||||
<prompt phrase="Um einen vorwärts echo test zu machen" filename="ivr-to_do_a_fwd_echo_test.wav"/>
|
||||
<prompt phrase="Um ein Beispiel-Untermenü des Ai Wee Arr zu hören" filename="ivr-to_hear_sample_submenu.wav"/>
|
||||
<prompt phrase="Um schreiende Affen zu hören" filename="ivr-to_hear_screaming_monkeys.wav"/>
|
||||
<prompt phrase="Um Wartemusik zu hören" filename="ivr-to_listen_to_moh.wav"/>
|
||||
<prompt phrase="Um diese Optionen zu wiederholen" filename="ivr-to_repeat_these_options.wav"/>
|
||||
<prompt phrase="Um zum vorherigen Menü zurückzukehren" filename="ivr-to_return_to_previous_menu.wav"/>
|
||||
<prompt phrase="Um mit der Vermittlung zu sprechen" filename="ivr-to_speak_with_an_operator.wav"/>
|
||||
<prompt phrase="Willkommen bei FreeSWITCH, der Zukunft der Telefonie" filename="ivr-welcome_to_freeswitch.wav"/>
|
||||
<prompt phrase="Sie können jederzeit beenden, indem Sie einfach auflegen." filename="ivr-you_may_exit_by_hanging_up.wav"/>
|
||||
<prompt phrase="oder" filename="ivr-or.wav"/>
|
||||
<prompt phrase="nicht" filename="ivr-not.wav"/>
|
||||
<prompt phrase="Anruf" filename="ivr-call.wav"/>
|
||||
<prompt phrase="Sie können" filename="ivr-you_may.wav"/>
|
||||
<prompt phrase="Hallo" filename="ivr-hello.wav"/>
|
||||
<prompt phrase="Indem Sie die Tasten Ihres Telefons benutzen" filename="ivr-use_telephone_keypad.wav"/>
|
||||
<prompt phrase="Bitte buchstabieren Sie den Namen der Person, die Sie versuchen zu erreichen" filename="ivr-spell_name.wav"/>
|
||||
<prompt phrase="Nachname zuerst" filename="ivr-last_name_first.wav"/>
|
||||
<prompt phrase="Vorname zuerst" filename="ivr-first_name_first.wav"/>
|
||||
<prompt phrase="Drücken Sie 1 für Q oder Z" filename="ivr-press_one_q_or_z.wav"/>
|
||||
<prompt phrase="Vertrieb" filename="ivr-sales.wav"/>
|
||||
<prompt phrase="Kundendienst" filename="ivr-customer_service.wav"/>
|
||||
<prompt phrase="Technischer Support" filename="ivr-technical_support.wav"/>
|
||||
<prompt phrase="Vermittlung" filename="ivr-operator.wav"/>
|
||||
<prompt phrase="Sie haben eine ungültige Durchwahl gewählt." filename="ivr-you_have_dialed_an_invalid_extension.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer Ihrer Nebenstelle ein, gefolgt von der Raute Taste." filename="ivr-please_enter_extension_followed_by_pound.wav"/>
|
||||
<prompt phrase="Bitte geben Sie Ihre PIN Nummer ein, gefolgt von der Raute Taste." filename="ivr-please_enter_pin_followed_by_pound.wav"/>
|
||||
<prompt phrase="Ihre PIN Nummer oder Nebenstelle ist ungültig." filename="ivr-pin_or_extension_is-invalid.wav"/>
|
||||
<prompt phrase="Sie sind gerade dabei, dieses Telefon für Ihr Nutzerkonto einzurichten." filename="ivr-you_are_about_to_provision_this_phone.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die PIN Nummer erneut ein, um zu bestätigen." filename="ivr-please_reenter_your_pin.wav"/>
|
||||
<prompt phrase="Um sich für die ClueCon anzumelden, drücken Sie bitte" filename="ivr-register_for_cluecon.wav"/>
|
||||
<prompt phrase="Um sich anzumelden" filename="ivr-to_log_in.wav"/>
|
||||
<prompt phrase="Um sich abzumelden" filename="ivr-to_log_out.wav"/>
|
||||
<prompt phrase="Sie sind jetzt angemeldet." filename="ivr-you_are_now_logged_in.wav"/>
|
||||
<prompt phrase="Sie sind jetzt abgemeldet." filename="ivr-you_are_now_logged_out.wav"/>
|
||||
<prompt phrase="Bitte versuchen Sie es erneut." filename="ivr-please_try_again.wav"/>
|
||||
<prompt phrase="Sie sind gerade dabei, dieses Telefon permanent für Ihre Nebenstelle einzurichten." filename="ivr-provision_phone_permanently_to_extension.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer der Nebenstelle ein, für die Sie dieses Telefon einrichten wollen, gefolgt von der Raute Taste." filename="ivr-extension_to_provision_this_phone.wav"/>
|
||||
<prompt phrase="Danke. Dieses Telefon wird jetzt neu gestartet." filename="ivr-this_phone_will_now_reboot.wav"/>
|
||||
<prompt phrase="Danke. Ihre Aufnahme wurde gespeichert." filename="ivr-recording_saved.wav"/>
|
||||
<prompt phrase="Drücken Sie 1, um Ihre Aufnahme zu speichern. Drücken Sie 2, um Ihre Aufnahme anzuhören. Drücken Sie 3, um sie erneut aufzunehmen." filename="ivr-save_review_record.wav"/>
|
||||
<prompt phrase="Das System kann Ihre Aufnahmne derzeit nicht speichern. Bitte versuchen Sie es später erneut." filename="ivr-unable_save.wav"/>
|
||||
<prompt phrase="Sie sind Nummer" filename="ivr-you_are_number.wav"/>
|
||||
<prompt phrase="in der Warteschlange." filename="ivr-in_line.wav"/>
|
||||
<prompt phrase="Vielen Dank für Ihre Geduld." filename="ivr-thank_you_for_holding.wav"/>
|
||||
<prompt phrase="Die geschätzte Wartezeit ist" filename="ivr-estimated_hold_time.wav"/>
|
||||
<prompt phrase="Mehr als" filename="ivr-more_than.wav"/>
|
||||
<prompt phrase="Weniger als" filename="ivr-less_than.wav"/>
|
||||
<prompt phrase="Beginne mit der Aufnahme" filename="ivr-begin_recording.wav"/>
|
||||
<prompt phrase="Anrufweiterleitung wurde abgebrochen." filename="ivr-call_forwarding_has_been_cancelled.wav"/>
|
||||
<prompt phrase="Anrufweiterleitung wurde aktiviert." filename="ivr-call_forwarding_has_been_set.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Telefonnummer ein." filename="ivr-please_enter_the_phone_number.wav"/>
|
||||
<prompt phrase="Bitte sagen Sie Ihren Namen und den Grund Ihres Anrufs." filename="ivr-please_state_your_name_and_reason_for_calling.wav"/>
|
||||
<prompt phrase="Um zu akzeptieren, drücken Sie 1. Um abzulehnen, drücken Sie 2. Für Weiterleitung zum Anrufbeantworter drücken Sie 3." filename="ivr-accept_reject_voicemail.wav"/>
|
||||
<prompt phrase="Um zu akzeptieren, drücken Sie 1. Um abzulehnen, drücken Sie 2." filename="ivr-accept_reject.wav"/>
|
||||
<prompt phrase="Um zu akzeptieren, drücken Sie 1." filename="ivr-to_accept_press_one.wav"/>
|
||||
<prompt phrase="Eingehender Anruf." filename="ivr-incoming_call.wav"/>
|
||||
<prompt phrase="Vielen Dank für Ihren Anruf." filename="ivr-thank_you_for_calling.wav"/>
|
||||
<prompt phrase="Bitte warten Sie. Ihr Anruf wird sofort beantwortet." filename="ivr-stay_on_line_call_answered_momentarily.wav"/>
|
||||
<prompt phrase="Ihr Anruf wird weitergeleitet." filename="ivr-call_being_transferred.wav"/>
|
||||
<prompt phrase="Bitte genießen Sie die Musik, während Ihr Anruf weitergeleitet wird." filename="ivr-enjoy_music_while_transfer.wav"/>
|
||||
<prompt phrase="Sie haben einen Anruf von" filename="ivr-call_from.wav"/>
|
||||
<prompt phrase="Dieses Menü enthält keine Einträge. Bitte kontaktieren Sie den Administrator." filename="ivr-no_menu_items.wav"/>
|
||||
<prompt phrase="Für ein Verzeichnis, drücken Sie" filename="ivr-for_directory_press.wav"/>
|
||||
<prompt phrase="Indem Sie die Tasten Ihres Telefons benutzen" filename="ivr-using_telephone_keypad.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die ersten paar Buchstaben des Nachnamens der Person ein." filename="ivr-enter_letters_last_name.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die ersten paar Buchstaben des Vornamens der Person ein." filename="ivr-enter_letters_first_name.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die ersten paar Buchstaben des Vor oder Nachnamens der Person ein." filename="ivr-enter_letters_first_or_last_name.wav"/>
|
||||
<prompt phrase="Wenn dies korrekt ist, drücken Sie" filename="ivr-if_correct_press.wav"/>
|
||||
<prompt phrase="Wenn nicht, drücken Sie" filename="ivr-if_not_press.wav"/>
|
||||
<prompt phrase="Wenn Sie fertig sind, drücken Sie die Raute Taste." filename="ivr-finished_pound_hash_key.wav"/>
|
||||
<prompt phrase="Bitte nicht stören wurde aktiviert." filename="ivr-dnd_activated.wav"/>
|
||||
<prompt phrase="Bitte nicht stören wurde deaktiviert." filename="ivr-dnd_cancelled.wav"/>
|
||||
<prompt phrase="Drücken Sie irgendeine andere Ziffer" filename="ivr-any_other_digit.wav"/>
|
||||
<prompt phrase="Drücken Sie 1 für ja, 2 für nein." filename="ivr-one_yes_two_no.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer der Warteschlange ein, gefolgt von der Raute Taste." filename="ivr-enter_queue_number.wav"/>
|
||||
<prompt phrase="Bitte geben Sie ein die" filename="ivr-please_enter_the.wav"/>
|
||||
<prompt phrase="Nummer" filename="ivr-number.wav"/>
|
||||
<prompt phrase="gefolgt von der Raute Taste." filename="ivr-followed_by_pound.wav"/>
|
||||
<prompt phrase="Der Kontostand ist" filename="ivr-account_balance_is.wav"/>
|
||||
<prompt phrase="Datei" filename="ivr-file.wav"/>
|
||||
<prompt phrase="Dateien" filename="ivr-files.wav"/>
|
||||
<prompt phrase="Für einen Weckruf" filename="ivr-for_a_wakeup_call.wav"/>
|
||||
<prompt phrase="Dies ist Ihre Weckruf." filename="ivr-this_is_your_wakeup_call.wav"/>
|
||||
<prompt phrase="Um einen Weckruf anzufordern" filename="ivr-request_wakeup_call.wav"/>
|
||||
<prompt phrase="Um den Weckruf zu bestätigen" filename="ivr-confirm_wakeup_call.wav"/>
|
||||
<prompt phrase="Um den Weckruf zu löschen" filename="ivr-cancel_wakeup_call.wav"/>
|
||||
<prompt phrase="Sie haben einen Weckruf angefordert um" filename="ivr-requested_wakeup_call_for.wav"/>
|
||||
<prompt phrase="Sie haben keinen Weckruf angefordert." filename="ivr-not_requested_wakeup_call.wav"/>
|
||||
<prompt phrase="Ihr Weckruf wurde gelöscht." filename="ivr-wakeup_call_cancelled.wav"/>
|
||||
<prompt phrase="Für einen täglichen Wegruf" filename="ivr-for_daily_wakeup_call.wav"/>
|
||||
<prompt phrase="Täglichen Weckruf" filename="ivr-daily_wakeup_call.wav"/>
|
||||
<prompt phrase="Für tägliche Weckrufe" filename="ivr-for_daily_wakeup_calls.wav"/>
|
||||
<prompt phrase="Für einen einmaligen Weckruf" filename="ivr-for_one_time_wakeup_call.wav"/>
|
||||
<prompt phrase="Einmaliger Weckruf" filename="ivr-one_time_wakeup_call.wav"/>
|
||||
<prompt phrase="Weckruf" filename="ivr-wakeup_call.wav"/>
|
||||
<prompt phrase="Einen wunderschönen guten Morgen! Wach auf! Die Sonne scheint!" filename="ivr-wakey_wakey_sunshine.wav"/>
|
||||
<prompt phrase="Willkommen." filename="ivr-welcome.wav"/>
|
||||
<prompt phrase="Willkommen bei" filename="ivr-welcome_to.wav"/>
|
||||
<prompt phrase="Guten Morgen." filename="ivr-good_morning.wav"/>
|
||||
<prompt phrase="Guten Tag." filename="ivr-good_afternoon.wav"/>
|
||||
<prompt phrase="Guten Abend." filename="ivr-good_evening.wav"/>
|
||||
<prompt phrase="Danke." filename="ivr-thank_you.wav"/>
|
||||
<prompt phrase="Um" filename="ivr-for.wav"/>
|
||||
<prompt phrase="Die Wartezeiten sind derzeit länger als normal." filename="ivr-longer_than_usual_hold_times.wav"/>
|
||||
<prompt phrase="Sie sind der" filename="ivr-you_are_the.wav"/>
|
||||
<prompt phrase="Bitte warten Sie einen Moment." filename="ivr-one_moment_please.wav"/>
|
||||
<prompt phrase="Ihr Anruf wird in der Reihenfolge des Eingangs bearbeitet." filename="ivr-call_answered_order_received.wav"/>
|
||||
<prompt phrase="Sie haben eingegeben" filename="ivr-you_entered.wav"/>
|
||||
<prompt phrase="Durchwahl" filename="ivr-extension_number.wav"/>
|
||||
<prompt phrase="Bitte warten Sie, während Ihr Anruf verbunden wird." filename="ivr-please_hold_while_party_contacted.wav"/>
|
||||
<prompt phrase="Bitte genießen Sie die Musik, während Ihr Anruf verbunden wird." filename="ivr-please_enjoy_music_while_party_reached.wav"/>
|
||||
<prompt phrase="Vielen Dank für Ihren Anruf. Wenn Sie die Durchwahl der gewünschten Person kennen, geben Sie diese bitte jetzt ein. Um stattdessen ein Verzeichnis der Nebenstellen zu bekommen, drücken Sie bitte 9." filename="ivr-generic_greeting.wav"/>
|
||||
<prompt phrase="Wenn das korrekt ist, drücken Sie bitte 1, ansonsten 2." filename="ivr-if_correct_one_if_not_two.wav"/>
|
||||
<prompt phrase="Um diese information zu wiederholen." filename="ivr-repeat_this_information.wav"/>
|
||||
<prompt phrase="Nein Nein Nein" filename="ivr-no_no_no.wav"/>
|
||||
<prompt phrase="Wollten Sie wirklich diese Taste drücken?" filename="ivr-did_you_mean_to_press_key.wav"/>
|
||||
<prompt phrase="Mal ganz im Ernst, wollten Sie WIRKLICH diese Taste drücken?" filename="ivr-seriously_mean_to_press_key.wav"/>
|
||||
<prompt phrase="Oh ... wie auch immer." filename="ivr-oh_whatever.wav"/>
|
||||
<prompt phrase="Es reicht! Noch so ein Fehler und ich werde auflegen!" filename="ivr-one_more_mistake.wav"/>
|
||||
<prompt phrase="Herzlichen Glückwunsch. Sie haben Stern gedrückt. Das bedeutet nicht, dass Sie ein Star sind. Es heißt nur, dass Sie Tasten drücken können und wahrscheinlich Finger haben." filename="ivr-congratulations_you_pressed_star.wav"/>
|
||||
<prompt phrase="Alle unsere Techniker sind derzeit beschäftigt. Sie helfen den Vertrieblern bei Vorführungen, wie toll unser System ist." filename="ivr-engineers_busy_assisting_other_sales.wav"/>
|
||||
<prompt phrase="Diese Nachricht wird sich selbst zerstören in fünf ... vier ... drei ... zwei ... eins" filename="ivr-message_self_destruct.wav"/>
|
||||
<prompt phrase="Alle Ihre Anrufe gehören uns." filename="ivr-all_your_call_are_belong_to_us.wav"/>
|
||||
<prompt phrase="Ich liebe die Art, wie Du diese Tasten drückst." filename="ivr-love_those_touch_tones.wav"/>
|
||||
<prompt phrase="Ja, wir haben keine Bananen." filename="ivr-yes_we_have_no_bananas.wav"/>
|
||||
<prompt phrase="Hey Mann, Du nervst." filename="ivr-dude_you_suck.wav"/>
|
||||
<prompt phrase="Ihr Anruf liegt uns sehr am Herzen, aber Ihr Verstand nicht. Darum wird es uns eine Freude sein, Sie für immer in unserer Warteschleife hängen zu lassen, um Sie mit unserer nervigen Wartemusik zu quälen." filename="ivr-on_hold_indefinitely.wav"/>
|
||||
<prompt phrase="hat das Gebäude verlassen." filename="ivr-has_left_the_building.wav"/>
|
||||
<prompt phrase="Dieses Telefon ist nicht zugewiesen und darf keine externen Nummern anrufen." filename="ivr-phone_is_unassigned.wav"/>
|
||||
<prompt phrase="Dieses Telefon ist nicht richtig konfiguriert." filename="ivr-phone_not_configured.wav"/>
|
||||
<prompt phrase="Herzlichen Glückwunsch. Dieses Telefon ist korrekt configuriert und kann jetzt einem Nutzer zugewiesen werden." filename="ivr-phone_is_configured_properly.wav"/>
|
||||
<prompt phrase="Bitten Sie den Systemadministrator um Hilfe." filename="ivr-contact_system_administrator.wav"/>
|
||||
<prompt phrase="Es warten keine Anrufe in dieser Warteschlange." filename="ivr-no_calls_waiting_in_queue.wav"/>
|
||||
<prompt phrase="Sie sind Anrufer Nummer eins. Natürlich bekommt in unserem System jeder Anrufer die Nummer eins. Darum müssen Sie jetzt vielleicht ein bisschen warten." filename="ivr-you_are_number_one.wav"/>
|
||||
<prompt phrase="hat den Notruf gewählt." filename="ivr-has_called_emergency_services.wav"/>
|
||||
<prompt phrase="Es sind" filename="ivr-there_are.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Quell-Telefonnummer ein, dann drücken Sie die Raute Taste." filename="ivr-enter_source_telephone_number.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Ziel-Telefonnummer ein, dann drücken Sie die Raute Taste." filename="ivr-enter_destination_telephone_number.wav"/>
|
||||
<prompt phrase="Aufnahme gestartet." filename="ivr-recording_started.wav"/>
|
||||
<prompt phrase="Aufnahme beendet." filename="ivr-recording_stopped.wav"/>
|
||||
<prompt phrase="Aufnahme-Pause." filename="ivr-recording_paused.wav"/>
|
||||
<prompt phrase="Aufnahme gelöscht." filename="ivr-recording_deleted.wav"/>
|
||||
<prompt phrase="Sie sind nicht mehr in der Warteschlange." filename="ivr-no_longer_in_queue.wav"/>
|
||||
<prompt phrase="zurückgezogen." filename="ivr-withdrawn.wav"/>
|
||||
<prompt phrase="Frage" filename="ivr-question.wav"/>
|
||||
<prompt phrase="Fragen" filename="ivr-questions.wav"/>
|
||||
<prompt phrase="wurde beantwortet." filename="ivr-has_been_answered.wav"/>
|
||||
<prompt phrase="wurde entfernt." filename="ivr-has_been_removed.wav"/>
|
||||
<prompt phrase="Keine Fragen in der Warteschlange." filename="ivr-no_questions_in_queue.wav"/>
|
||||
<prompt phrase="ist jetzt ein." filename="ivr-is_now_on.wav"/>
|
||||
<prompt phrase="ist jetzt aus." filename="ivr-is_now_off.wav"/>
|
||||
<prompt phrase="Dieses Telefon darf keine externen Nummern anrufen." filename="ivr-phone_not_make_external_calls.wav"/>
|
||||
<prompt phrase="Identifikationsnummer" filename="ivr-id_number.wav"/>
|
||||
<prompt phrase="Um diese Anleitung zu überspringen" filename="ivr-skip_instructions.wav"/>
|
||||
<prompt phrase="Um die Aufnahme zu verwerfen, legen Sie auf, ohne eine Taste zu drücken." filename="ivr-hangup_to_discard.wav"/>
|
||||
<prompt phrase="oder drücken Sie" filename="ivr-or_press.wav"/>
|
||||
<prompt phrase="Für Englisch, drücken Sie" filename="ivr-for_english_press.wav"/>
|
||||
<prompt phrase="Kein Anschluss unter dieser Nummer." filename="ivr-call_cannot_be_completed_as_dialed.wav"/>
|
||||
<prompt phrase="Bitte überprüfen Sie die Nummer und versuchen Sie es erneut." filename="ivr-please_check_number_try_again.wav"/>
|
||||
<prompt phrase="Der Grund für den Fehler ist" filename="ivr-failure_reason_is.wav"/>
|
||||
<prompt phrase="nicht vergebene Nummer" filename="ivr-unallocated_number.wav"/>
|
||||
<prompt phrase="keine Antwort" filename="ivr-no_user_response.wav"/>
|
||||
<prompt phrase="ungültiges Zahlenformat" filename="ivr-invalid_number_format.wav"/>
|
||||
<prompt phrase="ungültige Sprachansage" filename="ivr-invalid_sound_prompt.wav"/>
|
||||
<prompt phrase="Netzübergang außer Betrieb" filename="ivr-gateway_down.wav"/>
|
||||
<prompt phrase="keine Route zum Ziel" filename="ivr-no_route_destination.wav"/>
|
||||
<prompt phrase="Benutzer besetzt" filename="ivr-user_busy.wav"/>
|
||||
<prompt phrase="Anruf wurde abgewiesen" filename="ivr-call_rejected.wav"/>
|
||||
<prompt phrase="Grund nicht angegeben" filename="ivr-normal_unspecified.wav"/>
|
||||
<prompt phrase="Inkompatibles Ziel" filename="ivr-incompatible_destination.wav"/>
|
||||
<prompt phrase="Normaler Verbindungsabbau" filename="ivr-normal_clearing.wav"/>
|
||||
<prompt phrase="Sie haben nicht das Recht, diese Aktion durchzuführen." filename="ivr-not_have_permission.wav"/>
|
||||
<prompt phrase="Sie machen es falsch, aber ich werde trotzdem versuchen, Sie zu Verbinden. Dummkopf!" filename="ivr-youre_doing_it_wrong.wav"/>
|
||||
<prompt phrase="drei ... zwei ... eins ... wir sind ASTERISK los!" filename="ivr-were_asterisk_free.wav"/>
|
||||
<prompt phrase="Vielen Dank für Ihren Anruf bei der Dusche Telekom A G. Bei uns fühlen sich Ihre Anrufe niemals nicht so frisch an! " filename="ivr-douche_telecom.wav"/>
|
||||
<prompt phrase="Um mehr über FreeSWITCH zu erfahren" filename="ivr-to_learn_more_about_freeswitch.wav"/>
|
||||
<prompt phrase="Es gibt" filename="ivr-there_is.wav"/>
|
||||
<prompt phrase="Diese Nummer ist auf der Sperrliste." filename="ivr-do_not_call_list.wav"/>
|
||||
<prompt phrase="Der Verbindungsaufbau wurde abgebrochen." filename="ivr-call_attempt_aborted.wav"/>
|
||||
<prompt phrase="Bitte bleiben Sie in der Leitung, um auf den nächsten freien Bearbeiter zu warten." filename="ivr-to_wait_stay_on_the_line.wav"/>
|
||||
<prompt phrase="Wenn Sie möchten, dass wir Sie zurückrufen, drücken Sie bitte" filename="ivr-if_you_would_like_us_to_call_back.wav"/>
|
||||
<prompt phrase="Die von Ihnen übermittelte Rufnummer ist" filename="ivr-it_appears_that_your_phone_number_is.wav"/>
|
||||
<prompt phrase="Möchten Sie einen Rückruf unter dieser Nummer?" filename="ivr-would_you_like_to_receive_a_call_at_this_number.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer ein, unter der wir Sie erreichen können." filename="ivr-please_enter_the_number_where_we_can_reach_you.wav"/>
|
||||
<prompt phrase="Wir werden so schnell wie möglich zurückrufen." filename="ivr-we_will_return_your_call_at_this_number.wav"/>
|
||||
<prompt phrase="Anonymer Anrufer." filename="ivr-anonymous_caller.wav"/>
|
||||
<prompt phrase="Bitte nehmen Sie sich ein Stück kostenlose, klebrige Torte" filename="ivr-freeguipy.wav"/>
|
||||
<prompt phrase="Mehr Informationen erhalten Sie unter F R E E G U I P Y punkt org" filename="ivr-learn_more_freeguipydotorg.wav"/>
|
||||
<prompt phrase="Irgendetwas ist ganz, ganz fürchterlich schiefgelaufen. Wie peinlich!" filename="ivr-terribly_wrong_awkward.wav"/>
|
||||
<prompt phrase="Ich glaub's ja nicht. Es war DIESER Fehler!" filename="ivr-it_was_that_bug.wav"/>
|
||||
<prompt phrase="Konzentrieren Sie sich. Achten Sie auf den Hasen! ACHTEN SIE AUF DEN HASEN!" filename="ivr-concentrate.wav"/>
|
||||
<prompt phrase="Wenn Sie es nicht mögen, können Sie ein Ticket aufmachen." filename="ivr-file_a_jira.wav"/>
|
||||
<prompt phrase="Darf ich Ihnen vorstellen, den Gründer von FreeSOURCE, Anthony Ministrone." filename="ivr-founder_of_freesource.wav"/>
|
||||
<prompt phrase="Hey Mann, das ist dumm. SAUDUMM." filename="ivr-cold_foolish.wav"/>
|
||||
<prompt phrase="Herzlichen Glückwunsch. Sie haben diesen Monat 1500 Überlaberungs-Minuten verdient." filename="ivr-trollover_minutes.wav"/>
|
||||
<prompt phrase="Alter!" filename="ivr-yuno_silent_drill.wav"/>
|
||||
<prompt phrase="Weile, die Stimmen warn zimlich gutt." filename="ivr-beacuase.wav"/>
|
||||
<prompt phrase="Tag-Modus" filename="ivr-day_mode.wav"/>
|
||||
<prompt phrase="Nacht-Modus" filename="ivr-night_mode.wav"/>
|
||||
<prompt phrase="Mittagspausen-Modus" filename="ivr-lunch_mode.wav"/>
|
||||
<prompt phrase="Nutzerspezifischer Modus Nummer" filename="ivr-custom_mode_number.wav"/>
|
||||
<prompt phrase="Sie haben keine Berechtigung für die Änderung von" filename="ivr-not_have_permission_to_edit.wav"/>
|
||||
<prompt phrase="Diesem Merkmal." filename="ivr-this_feature.wav"/>
|
||||
<prompt phrase="Merkmal." filename="ivr-feature.wav"/>
|
||||
<prompt phrase="Automatische Anrufbeantworter." filename="ivr-automated_attendants.wav"/>
|
||||
<prompt phrase="Automatischer Anrufbeantworter." filename="ivr-automated_attendant.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer der Nebenstelle ein, von dem" filename="ivr-please_enter_extension_number_of.wav"/>
|
||||
<prompt phrase="das Sie ändern wollen." filename="ivr-that_you_would_like_to_modify.wav"/>
|
||||
<prompt phrase="Ungültige Nebenstelle. Bitte versuchen Sie es erneut." filename="ivr-invalid_extension_try_again.wav"/>
|
||||
<prompt phrase="Für die Änderung einer Haupt-Ansage" filename="ivr-modify_main_prompts.wav"/>
|
||||
<prompt phrase="Für die Änderung einer Options-Ansage" filename="ivr-modify_option_prompts.wav"/>
|
||||
<prompt phrase="Um Nutzungsstatistiken anzuhören" filename="ivr-hear_usage_stats.wav"/>
|
||||
<prompt phrase="Nach dem Signalton" filename="ivr-at_the_tone.wav"/>
|
||||
<prompt phrase="Bite nehmen Sie die Ansage auf." filename="ivr-record_prompt.wav"/>
|
||||
<prompt phrase="Bitte nehmen Sie die kurz-Begrüßung auf." filename="ivr-record_short_greeting.wav"/>
|
||||
<prompt phrase="Bitte nehmen Sie den ungültig-Ton auf." filename="ivr-record_invalid_sound.wav"/>
|
||||
<prompt phrase="Bite nehmen Sie den verlassen-Ton auf." filename="ivr-record_exit_sound.wav"/>
|
||||
<prompt phrase="Wenn Sie fertig sind, drücken Sie bitte irgendeine Taste." filename="ivr-when_finished_press_any_key.wav"/>
|
||||
<prompt phrase="Bitte drücken Sie die Taste der Ansage, die Sie ändern möchten." filename="ivr-press_key_of_prompt_to_modify.wav"/>
|
||||
<prompt phrase="Taste" filename="ivr-key.wav"/>
|
||||
<prompt phrase="enthält keine Aufnahme." filename="ivr-does_not_contain_a_recording.wav"/>
|
||||
<prompt phrase="enthält bereits eine Aufnahme." filename="ivr-already_contains_a_recording.wav"/>
|
||||
<prompt phrase="Option" filename="ivr-option.wav"/>
|
||||
<prompt phrase="hatte" filename="ivr-has_had.wav"/>
|
||||
<prompt phrase="Besucher." filename="ivr-visitors.wav"/>
|
||||
<prompt phrase="Besucher." filename="ivr-visitor.wav"/>
|
||||
<prompt phrase="Um die Zähler der Nutzungsstatistik zurückzusetzen" filename="ivr-reset_usage_totals.wav"/>
|
||||
<prompt phrase="Sie haben die Zähler-Rücksetzung ausgewählt." filename="ivr-reset_usage_totals_confirm.wav"/>
|
||||
<prompt phrase="um zu bestätigen." filename="ivr-to_confirm.wav"/>
|
||||
<prompt phrase="Die Zähler der Nutzungsstatistik wurden auf Null zurückgesetzt." filename="ivr-usage_totals_have_been_reset.wav"/>
|
||||
<prompt phrase="Um zu ändern" filename="ivr-to_modify.wav"/>
|
||||
<prompt phrase="Für die Änderung einer Haupt-Ansage" filename="ivr-to_modify_main_prompt.wav"/>
|
||||
<prompt phrase="der kurz-Begrüßung." filename="ivr-short_greeting.wav"/>
|
||||
<prompt phrase="des ungültig-Tons." filename="ivr-ivalid_sound_prompt.wav"/>
|
||||
<prompt phrase="des verlassen-Tons." filename="ivr-exit_sound_prompt.wav"/>
|
||||
<prompt phrase="Diese Person akzeptiert keine anonymen Anrufe." filename="ivr-not_accept_anonymous_calls.wav"/>
|
||||
<prompt phrase="Um zu akzeptieren, drücken Sie bitte" filename="ivr-to_accept_press.wav"/>
|
||||
<prompt phrase="Um abzuweisen" filename="ivr-to_reject.wav"/>
|
||||
<prompt phrase="legen Sie auf." filename="ivr-hang_up.wav"/>
|
||||
<prompt phrase="Um abzuweisen, legen Sie auf, ohne eine Taste zu drücken." filename="ivr-to_reject_hangup.wav"/>
|
||||
<prompt phrase="Zugang verweigert." filename="ivr-access_denied.wav"/>
|
||||
<prompt phrase="Um einen D T M F test zu machen, drücken Sie bitte" filename="ivr-perform_dtmf_test.wav"/>
|
||||
<prompt phrase="Um einen Echo-test zu machen, drücken Sie bitte" filename="ivr-perform_echo_test.wav"/>
|
||||
<prompt phrase="Um einen verzögerten Echo-test zu machen, drücken Sie bitte" filename="ivr-perform_delayed_echo_test.wav"/>
|
||||
<prompt phrase="Legen Sie auf, um den Test zu beenden." filename="ivr-hangup_to_end_test.wav"/>
|
||||
<prompt phrase="Drücken Sie eine oder mehrere Tasten. Jede gedrückte Taste wird Ihnen vorgelesen." filename="ivr-read_each_key_press_back.wav"/>
|
||||
<prompt phrase="Nach dem Signalton wird Ihr Audio-Signal an Sie zurückgesendet." filename="ivr-echo_your_audio_back.wav"/>
|
||||
<prompt phrase="Nach dem Signalton wird Ihr Audio-Signal zeitverzögert an Sie zurückgesendet." filename="ivr-delayed_echo_your_audio_back.wav"/>
|
||||
<prompt phrase="Um ein Fax zu senden, drücken Sie bitte" filename="ivr-send_fax.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer ein, an die dieses Fax gesendet werden soll. Dann drücken Sie bitte die Raute Taste." filename="ivr-enter_number_send_fax.wav"/>
|
||||
<prompt phrase="Verschicke Ihr Fax jetzt." filename="ivr-send_fax_now.wav"/>
|
||||
<prompt phrase="wurde auf die Sperrliste gesetzt." filename="ivr-has_been_added_to_the_blacklist.wav"/>
|
||||
<prompt phrase="wurde von der Sperrliste entfernt." filename="ivr-has_been_removed_from_blacklist.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer ein, die zur Sperrliste hinzugefügt werden soll." filename="ivr-enter_number_to_add_to_blacklist.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Nummer ein, die zur Sperrliste entfernt werden soll." filename="ivr-enter_number_to_remove_from_blacklist.wav"/>
|
||||
<prompt phrase="ist nicht auf der Sperrliste." filename="ivr-is_not_on_the_blacklist.wav"/>
|
||||
<prompt phrase="ist bereits auf der Sperrliste." filename="ivr-is_already_on_the_blacklist.wav"/>
|
||||
<prompt phrase="Für weitere Optionen, drücken Sie bitte" filename="ivr-for_other_options.wav"/>
|
||||
<prompt phrase="Die von Ihnen übermittelte Rufnummer ist" filename="ivr-your_caller_id_information_is.wav"/>
|
||||
<prompt phrase="Rufnummernunterdrückung wurde aktiviert." filename="ivr-call_screening_enabled.wav"/>
|
||||
<prompt phrase="Rufnummernunterdrückung wurde deaktiviert." filename="ivr-call_screening_disabled.wav"/>
|
||||
<prompt phrase="Ansage." filename="ivr-prompt.wav"/>
|
||||
<prompt phrase="aktiviert." filename="ivr-enabled.wav"/>
|
||||
<prompt phrase="deaktiviert." filename="ivr-disabled.wav"/>
|
||||
<prompt phrase="Niemand hat doch Zeit für sowas!" filename="ivr-aint_nobody_got_time_for_that.wav"/>
|
||||
<prompt phrase="Wir würden Ihnen ja helfen bis Ihnen Hören und Sehen vergeht, wenn Sie doch nur unsere Anrufe und E-Mails beantworten würden." filename="ivr-we_would_support.wav"/>
|
||||
<prompt phrase="nerven." filename="ivr-suck.wav"/>
|
||||
<prompt phrase="nervt." filename="ivr-sucks.wav"/>
|
||||
<prompt phrase="Um Ihre letzte Nummer erneut zu wählen" filename="ivr-to_redial_last_call.wav"/>
|
||||
<prompt phrase="Um die Funktion Ihres Dienstes sicherzustellen" filename="ivr-ensure_service_keeps_working.wav"/>
|
||||
<prompt phrase="Bitte wenden Sie sich an" filename="ivr-please_contact.wav"/>
|
||||
<prompt phrase="die Rechnungs-Abteilung" filename="ivr-the_billing_department.wav"/>
|
||||
<prompt phrase="durch Wahl von" filename="ivr-by_dialing.wav"/>
|
||||
<prompt phrase="Die hinterlegte Kreditkarten Nummer konnte nicht belastet werden." filename="ivr-credit_card_could_not_be_charged.wav"/>
|
||||
<prompt phrase="Einheiten" filename="ivr-units.wav"/>
|
||||
<prompt phrase="pro Minute." filename="ivr-per_minute.wav"/>
|
||||
<prompt phrase="Die von Ihnen übermittelte Rufnummer ist gesperrt." filename="ivr-your_caller_id_number_is_blocked.wav"/>
|
||||
<prompt phrase="Sie müssen die von Ihnen übermittelte Rufnummer entsprerren, um die Anruf-Karte ohne PIN benutzen zu können." filename="ivr-unblock_caller_id.wav"/>
|
||||
<prompt phrase="Alternativ können Sie auch eine PIN für Ihr Konto verwenden." filename="ivr-request_or_use_pin.wav"/>
|
||||
<prompt phrase="Sie haben genutzt" filename="ivr-you_have_used.wav"/>
|
||||
<prompt phrase="von" filename="ivr-out_of.wav"/>
|
||||
<prompt phrase="Der nächste Abrechnungszeitraum beginnt am" filename="ivr-next_billing_cycle.wav"/>
|
||||
<prompt phrase="Nichts." filename="ivr-nothing.wav"/>
|
||||
<prompt phrase="Zum Überspringen der" filename="ivr-to_skip.wav"/>
|
||||
<prompt phrase="Bitte warten Sie. Wir verbinden Sie mit der Vermittlung." filename="ivr_connect_live_operator.wav"/>
|
||||
<prompt phrase="Bitte warten Sie. Wir verbinden Sie mit einem echten Menschen." filename="ivr-connect_actual_human_being.wav"/>
|
||||
<prompt phrase="Das System wird für Wartungsarbeiten heruntergefahren." filename="ivr-system_down_for_maintenance.wav"/>
|
||||
<prompt phrase="Das System wird wieder zur Verfügung stehen in etwa" filename="ivr-system_back_up_in_approximately.wav"/>
|
||||
<prompt phrase="Da haben wir es, Schwarz auf Weiß, kristallklar! Sie haben kohlensäurehaltige Drinks gestohlen! Sie sind an die Decke gestoßen, die jetzt gewaschen und sterilisiert werden muss, damit man sich nichts holt! Sie verlieren! Guten Tag der Herr!" filename="ivr-you_lose.wav"/>
|
||||
<prompt phrase="Für ein kaltes Getränk, drücken Sie bitte" filename="ivr-cold_pop.wav"/>
|
||||
<prompt phrase="Wenn Sie dachten dass jemand grillt, drücken Sie bitte" filename="ivr-barbecuing.wav"/>
|
||||
<prompt phrase="Wenn Sie keine Schuhe und nichts anderes mitgenommen haben und um Ihr Leben gerannt sind, drücken Sie bitte" filename="ivr-no_shoes.wav"/>
|
||||
<prompt phrase="Wenn bei Ihnen Rauch hereingelassen wurde, drücken Sie bitte" filename="ivr-smoke_got_you.wav"/>
|
||||
<prompt phrase="Wenn Sie eine Bronchitis haben, drücken Sie bitte" filename="ivr-got_bronchitis.wav"/>
|
||||
<prompt phrase="Wenn Sie keine Zeit für sowas haben, drücken Sie bitte" filename="ivr-nobody_got_time_for_that.wav"/>
|
||||
<prompt phrase="Dies ist eine Erinnerung an" filename="ivr-reminder_for.wav"/>
|
||||
<prompt phrase="Sie haben einen Termin um" filename="ivr-appointment_schedule_for.wav"/>
|
||||
<prompt phrase="Ihre PIN ist" filename="ivr-Your_verification_PIN_is.wav"/>
|
||||
<prompt phrase="Um das Fliegender-Wechsel-Menü zu hören, geben Sie bitte die Nummer Ihrer Nebenstelle ein, gefolgt von der Raute Taste." filename="ivr-hotseat_intro.wav"/>
|
||||
<prompt phrase="Um die Haupt-Ansage zu ändern" filename="ivr-modify_main_prompt.wav"/>
|
||||
<prompt phrase="Bitte geben Sie Ihre PIN ein, gefolgt von der Raute Taste." filename="ivr-hotseat_pin.wav"/>
|
||||
<prompt phrase="Um dieses Telefon Ihrer Nebenstelle zuzuordnen, drücken Sie bitte 1. Um die Zuordnung zu löschen, drücken Sie 2." filename="ivr-hotseat_options.wav"/>
|
||||
<!-- The following phrases still need to be recorded -->
|
||||
<prompt phrase="Sie haben die maximale Anzahl von Kanälen erreicht." filename="ivr-maximum_number_of_channels.wav"/>
|
||||
<prompt phrase="Um einen Echo-Test zu machen" filename="ivr-to_do_a_echo_test.wav"/>
|
||||
</ivr>
|
||||
<misc>
|
||||
<prompt phrase="Dieser Anruf wurde gesichert" filename="call_secured.wav"/>
|
||||
<prompt phrase="gefolgt von der Raute Taste" filename="followed.wav"/>
|
||||
<prompt phrase="Wenn Sie diese Person sind" filename="if_you_are_this_person.wav"/>
|
||||
<prompt phrase="Wenn Sie möchten" filename="if_you_would_like_to.wav"/>
|
||||
<prompt phrase="Angabe der Referenznummer" filename="provide_reference_number.wav"/>
|
||||
<prompt phrase="Bitte geben Sie die Durchwahl ein, an die Sie weiterleiten wollen" filename="transfer1.wav"/>
|
||||
<prompt phrase="Weiterleiten" filename="transfer2.wav"/>
|
||||
<prompt phrase="Wir versuchen zu erreichen" filename="we_are_trying_to_reach.wav"/>
|
||||
<prompt phrase="Es ist ein Fehler aufgetreten. Bitte benachrichtigen Sie den Administrator." filename="error.wav"/>
|
||||
<prompt phrase="Ihr Anruf wird beendet in" filename="misc-your_call_will_be_terminated_in.wav"/>
|
||||
<prompt phrase="Ihr Anruf wurde beendet." filename="misc-your_call_has_been_terminated.wav"/>
|
||||
<prompt phrase="Um etwas über die ClueCon zu erfahren" filename="misc-to_hear_about_cluecon.wav"/>
|
||||
<prompt phrase="Die ClueCon ist die wichtigste Konferenz für Open Source Telefonie Entwickler." filename="misc-cluecon_is_premier_conference.wav"/>
|
||||
<prompt phrase="Sie findet jeden Sommer in Chicago statt." filename="misc-chicago_each_summer.wav"/>
|
||||
<prompt phrase="Die ClueCon bringt ein breites Spektrum von VoIP Ingenieuren, Software-Entwicklern und Geschäftsleuten zusammen." filename="misc-wide_range_of_persons.wav"/>
|
||||
<prompt phrase="Indem Sie an der ClueCon teilnehmen, zeigen Sie nicht nur Unterstützung für FreeSwitch, sondern auch für das ganze Spektrum der Open Source Telefonie Software." filename="misc-support_open_source_by_attending.wav"/>
|
||||
<prompt phrase="FreeSWITCH ist eine Open Source Software, die von der Open Source Telephony Advancement Group OSTAG unterstützt wird." filename="misc-freeswitch_sponsored_by_ostag.wav"/>
|
||||
<prompt phrase="OSTAG treibt die nächste Generation der Telefonie durch Open Source Software voran. Mehr Informationen erhalten Sie unter W W W punkt OSTAG punkt org." filename="misc-ostag_learn_more.wav"/>
|
||||
<prompt phrase="Um mehr über FreeSWITCH Lösungen zu erfahren, drücken Sie bitte" filename="misc-learn_more_about_freeswitch_solutions.wav"/>
|
||||
<prompt phrase="Um mehr über FreeSWITCH zu erfahren, drücken Sie bitte" filename="misc-information_about_freeswitch.wav"/>
|
||||
<prompt phrase="FreeSWITCH ist eine Telekommunikations-Plattform auf dem neuesten Stand der Technik." filename="misc-freeswitch_is_state_of_the_art.wav"/>
|
||||
<prompt phrase="Sie ist stabil, hoch skalierbar und erweiterbar." filename="misc-it_is_stable_scalable_extensible.wav"/>
|
||||
<prompt phrase="Und das beste ist: jedermann kann sie kostenlos herunterladen und benutzen." filename="misc-free_to_download.wav"/>
|
||||
<prompt phrase="Besuchen Sie W W W punkt freeswitch punkt org um mehr über unser Projekt und die weltweite Gemeinschaft zu erfahren." filename="misc-freeswitch_dot_org_more.wav"/>
|
||||
<prompt phrase="Sangoma." filename="misc-Sangoma.wav"/>
|
||||
<prompt phrase="FreeSWITCH Solutions bietet das beste FreeSWITCH consulting, das man für Geld kaufen kann." filename="misc-fss_best_consulting.wav"/>
|
||||
<prompt phrase="Wir haben ein Netzwerk von FreeSWITCH experten, das auch die Kern-Entwickler von FreeSWITCH umfasst." filename="misc-fss_network_of_experts.wav"/>
|
||||
<prompt phrase="Nehmen Sie mit uns Kontakt auf unter W W W punkt freeswitch solutions punkt com um zu erfahren wie wir Sie unterstützen können, ihre FreeSWITCH Erfahrung auf ein ganz neues Niveau zu bringen." filename="misc-fss_contact_us.wav"/>
|
||||
<prompt phrase="Das ist so ein Scheiß für Helikopter-Eltern." filename="misc-soccer_mom.wav"/>
|
||||
<prompt phrase="Möchten Sie live mit anderen Mitgliedern der FreeSWITCH Gemeinschaft reden?" filename="misc-speak_live_with_community.wav"/>
|
||||
<prompt phrase="Machen Sie mit, jeden Mittwoch um 13 Uhr nordamerikanischer Ostküsten-Zeit beziehungsweise 19 Uhr mitteleuropäischer Zeit, bei der öffentlichen FreeSWITCH Konferenz." filename="misc-join_us_each_wed.wav"/>
|
||||
<prompt phrase="Weitere Informationen gibt es online unter wiki punkt FreeSwitch punkt org." filename="misc-more_info_wiki.wav"/>
|
||||
<prompt phrase="Willkommen bei der FreeSWITCH Telefonkonferenz!" filename="misc-welcome_freeswitch_conf_call.wav"/>
|
||||
<prompt phrase="E hundert vierundsechtzig punkt org" filename="misc-e164_dot_org.wav"/>
|
||||
<prompt phrase="Dieses Telefon darf keine externen Nummern wählen." filename="phone_not_auth.wav"/>
|
||||
<prompt phrase="Es tut mir leid." filename="sorry.wav"/>
|
||||
<prompt phrase="Dieser Anruf kann zur Qualitätssicherung oder für Trainings-Zwecke überwacht oder aufgenommen werden." filename="call_monitoring_blurb.wav"/>
|
||||
<prompt phrase="Spanisch." filename="es.wav"/>
|
||||
<prompt phrase="Das ist eine ungültige Durchwahl." filename="invalid_extension.wav"/>
|
||||
<prompt phrase="Englisch." filename="en.wav"/>
|
||||
</misc>
|
||||
<zrtp>
|
||||
<!-- Event prompts -->
|
||||
<prompt phrase="Willkommen bei der Anmeldung zum Z R T P Sicherheits-System." filename="zrtp-enroll_welcome.wav"/>
|
||||
<prompt phrase="Sie müssen den Authentisierungs-String mit Ihrem Gesprächspartner vergleichen. Wenn er nicht übereinstimmt, ist dies ein Hinweis darauf, dass das Gespräch abgehört wird." filename="zrtp-check_sas.wav"/>
|
||||
<prompt phrase="Nur authentisierte Telefone können so konfiguriert werden, dass sie diesem System vertrauen bezüglich der Vermittlung von Verbindungen die mit Z R T P gesichert sind. Ihr Telefon ist nicht authentisiert, daher wird dieser Anruf nicht vermittelt." filename="zrtp-enroll_not_sip_registered.wav"/>
|
||||
<prompt phrase="Ihr Telefon signalisiert, dass es diesem System bereits vertraut bezüglich der Vermittlung von Verbindungen die mit Z R T P gesichert sind. Sie müssen deshalb nichts weiter tun." filename="zrtp-enroll_already_enrolled.wav"/>
|
||||
<prompt phrase="Nur Telefone, die das Z R T P Protokoll unterstützen, können diese Nebenstelle Nutzen. Ihr Telefon unterstützt Z R T P nicht, daher wird dieser Anruf nicht vermittelt." filename="zrtp-enroll_notzrtp.wav"/>
|
||||
<prompt phrase="Dieses System ist für die Verarbeitung von mit Z R T P verschlüsselten Telefonanrufen ausgestattet. Sie müssen entscheiden, ob Sie zulassen möchten, dass dieses System Ihre sicheren Telefonanrufe abfangen und möglicherweise überwachen kann. Sie können auflegen, nachdem Sie dies getan haben." filename="zrtp-enroll_confirmed.wav"/>
|
||||
<prompt phrase="Vergleichen Sie diesen Authentifizierungscode mit Ihrem Gesprächspartner, indem Sie sich diesen Code vorlesen." filename="zrtp-is_secure.wav"/>
|
||||
<prompt phrase="Der Authentifizierungscode ist derzeit nicht überprüft." filename="zrtp-is_unverified.wav"/>
|
||||
<prompt phrase="Der Authentifizierungscode ist jetzt überprüft." filename="zrtp-is_verified.wav"/>
|
||||
<prompt phrase="Vielen Dank für Ihren Anruf. Auf Wiedersehen." filename="zrtp-thankyou_goodbye.wav"/>
|
||||
<prompt phrase="Etwas stimmt nicht." filename="zrtp-somethings_wrong.wav"/>
|
||||
<prompt phrase="Fehler." filename="zrtp-status_error.wav"/>
|
||||
<prompt phrase="Verbindung ist nicht sicher." filename="zrtp-status_notsecure.wav"/>
|
||||
<prompt phrase="Verbindung ist sicher." filename="zrtp-status_secure.wav"/>
|
||||
<prompt phrase="Sichere die Verbindung." filename="zrtp-status_securing.wav"/>
|
||||
</zrtp>
|
||||
</de>
|
||||
</language>
|
||||
<!--
|
||||
For Emacs:
|
||||
Local Variables:
|
||||
mode:xml
|
||||
indent-tabs-mode:nil
|
||||
tab-width:2
|
||||
c-basic-offset:2
|
||||
End:
|
||||
For VIM:
|
||||
vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
|
||||
-->
|
||||
|
||||
@ -248,7 +248,6 @@
|
||||
<prompt phrase="for advanced options" filename="vm-advanced_alt.wav"/>
|
||||
<prompt phrase="to exit" filename="vm-to_exit.wav"/>
|
||||
<prompt phrase="to exit" filename="vm-to_exit_alt.wav"/>
|
||||
<prompt phrase="to record a greeting" filename="vm-record_greeting.wav"/>
|
||||
<prompt phrase="to record a greeting" filename="vm-to_record_greeting.wav"/>
|
||||
<prompt phrase="to choose greeting" filename="vm-choose_greeting.wav"/>
|
||||
<prompt phrase="to record your name" filename="vm-record_name2.wav"/>
|
||||
@ -393,10 +392,10 @@
|
||||
<prompt phrase="To speak with an operator" filename="ivr-to_speak_with_an_operator.wav"/>
|
||||
<prompt phrase="Welcome to FreeSWITCH, the future of telephony" filename="ivr-welcome_to_freeswitch.wav"/>
|
||||
<prompt phrase="You may exit at any time by simply hanging up" filename="ivr-you_may_exit_by_hanging_up.wav"/>
|
||||
<prompt phrase="or" filename ="ivr-or.wav"/>
|
||||
<prompt phrase="not" filename ="ivr-not.wav"/>
|
||||
<prompt phrase="call" filename ="ivr-call.wav"/>
|
||||
<prompt phrase="You may" filename ="ivr-you_may.wav"/>
|
||||
<prompt phrase="or" filename="ivr-or.wav"/>
|
||||
<prompt phrase="not" filename="ivr-not.wav"/>
|
||||
<prompt phrase="call" filename="ivr-call.wav"/>
|
||||
<prompt phrase="You may" filename="ivr-you_may.wav"/>
|
||||
<prompt phrase="hello" filename="ivr-hello.wav"/>
|
||||
<prompt phrase="Using your telephone keypad..." filename="ivr-use_telephone_keypad.wav"/>
|
||||
<prompt phrase="Please spell the name of the person you are trying to reach." filename="ivr-spell_name.wav"/>
|
||||
@ -463,7 +462,6 @@
|
||||
<prompt phrase="Number." filename="ivr-number.wav"/>
|
||||
<prompt phrase="...followed by the pound or hash key." filename="ivr-followed_by_pound.wav"/>
|
||||
<prompt phrase="The account balance is..." filename="ivr-account_balance_is.wav"/>
|
||||
<prompt phrase="Thank you for calling. If you know your party's extension, please enter it now. For a directory, press..." filename="ivr-generic_greeting.wav"/>
|
||||
<prompt phrase="...file..." filename="ivr-file.wav"/>
|
||||
<prompt phrase="...files..." filename="ivr-files.wav"/>
|
||||
<prompt phrase="For a wakeup call..." filename="ivr-for_a_wakeup_call.wav"/>
|
||||
@ -680,7 +678,6 @@
|
||||
<prompt phrase="If the smoke got you, press..." filename="ivr-smoke_got_you.wav"/>
|
||||
<prompt phrase="If you got bronchitis, press..." filename="ivr-got_bronchitis.wav"/>
|
||||
<prompt phrase="If ain't nobody got time for that, press..." filename="ivr-nobody_got_time_for_that.wav"/>
|
||||
<prompt phrase="This is a call from..." filename="ivr-call_from.wav"/>
|
||||
<prompt phrase="This is a reminder for..." filename="ivr-reminder_for.wav"/>
|
||||
<prompt phrase="You have an appointment scheduled for..." filename="ivr-appointment_schedule_for.wav"/>
|
||||
<prompt phrase="Your verification PIN is..." filename="ivr-Your_verification_PIN_is.wav"/>
|
||||
@ -690,9 +687,6 @@
|
||||
<prompt phrase="To hotseat this phone to your extension, press 1. To remove hotseat on this phone, press 2." filename="ivr-hotseat_options.wav"/>
|
||||
<!-- The following phrases still need to be recorded -->
|
||||
<prompt phrase="You have reached the maximum number of channels." filename="ivr-maximum_number_of_channels.wav"/>
|
||||
<prompt phrase="" filename=""/>
|
||||
<prompt phrase="" filename=""/>
|
||||
<prompt phrase="" filename=""/>
|
||||
<prompt phrase="To do an echo test" filename="ivr-to_do_a_echo_test.wav"/>
|
||||
</ivr>
|
||||
<misc>
|
||||
|
||||
@ -2028,6 +2028,7 @@ fi
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/skinny.conf.xml
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/smpp.conf.xml
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sms_flowroute.conf.xml
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sndfile.conf.xml
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sofia.conf.xml
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/spandsp.conf.xml
|
||||
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/switch.conf.xml
|
||||
@ -2629,6 +2630,8 @@ fi
|
||||
#
|
||||
######################################################################################################################
|
||||
%changelog
|
||||
* Fri Jan 31 2020 - Andrey Volk
|
||||
- Add sndfile.conf.xml
|
||||
* Tue Apr 23 2019 - Andrey Volk
|
||||
- Fix build for Stack 20.x
|
||||
* Tue Dec 11 2018 - Andrey Volk
|
||||
|
||||
@ -180,7 +180,9 @@ static TSort *tsort(TSort *pData,int nItems)
|
||||
break;
|
||||
}
|
||||
}
|
||||
pTail->pNext=NULL; /* unfudge the tail */
|
||||
if (pTail) {
|
||||
pTail->pNext = NULL; /* unfudge the tail */
|
||||
}
|
||||
return pHead;
|
||||
}
|
||||
|
||||
|
||||
@ -222,7 +222,7 @@ APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data)
|
||||
}
|
||||
|
||||
if (apr_queue_full(queue)) {
|
||||
rv = apr_thread_mutex_unlock(queue->one_big_mutex);
|
||||
apr_thread_mutex_unlock(queue->one_big_mutex);
|
||||
return APR_EAGAIN;
|
||||
}
|
||||
|
||||
@ -397,7 +397,7 @@ APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data)
|
||||
}
|
||||
|
||||
if (apr_queue_empty(queue)) {
|
||||
rv = apr_thread_mutex_unlock(queue->one_big_mutex);
|
||||
apr_thread_mutex_unlock(queue->one_big_mutex);
|
||||
return APR_EAGAIN;
|
||||
}
|
||||
|
||||
|
||||
@ -82,7 +82,7 @@ static int find_prefix(apr_xml_parser *parser, const char *prefix)
|
||||
** prefix.
|
||||
*/
|
||||
for (; elem; elem = elem->parent) {
|
||||
apr_xml_ns_scope *ns_scope = elem->ns_scope;
|
||||
apr_xml_ns_scope *ns_scope;
|
||||
|
||||
for (ns_scope = elem->ns_scope; ns_scope; ns_scope = ns_scope->next) {
|
||||
if (strcmp(prefix, ns_scope->prefix) == 0) {
|
||||
|
||||
@ -1225,7 +1225,7 @@ void unknown_toUtf8(const ENCODING *enc,
|
||||
const char **fromP, const char *fromLim,
|
||||
char **toP, const char *toLim)
|
||||
{
|
||||
char buf[XML_UTF8_ENCODE_MAX];
|
||||
char buf[XML_UTF8_ENCODE_MAX] = {0};
|
||||
for (;;) {
|
||||
const char *utf8;
|
||||
int n;
|
||||
|
||||
@ -133,12 +133,15 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
|
||||
* but required since the compiler (at least vc) doesn't like
|
||||
* passing the address of a char const* for a char** arg.
|
||||
*/
|
||||
char *getpath;
|
||||
char *getpath = NULL;
|
||||
rv = apr_filepath_get(&getpath, flags, p);
|
||||
rootpath = getpath;
|
||||
if (rv != APR_SUCCESS)
|
||||
return errno;
|
||||
|
||||
if (!getpath)
|
||||
return APR_ENOMEM;
|
||||
|
||||
/* XXX: Any kernel subject to goofy, uncanonical results
|
||||
* must run the rootpath against the user's given flags.
|
||||
* Simplest would be a recursive call to apr_filepath_merge
|
||||
|
||||
@ -130,7 +130,7 @@ APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
|
||||
apr_pool_t *pool)
|
||||
{
|
||||
apr_status_t status;
|
||||
apr_finfo_t finfo;
|
||||
apr_finfo_t finfo = {0};
|
||||
|
||||
/* Don't do anything if we can't handle the requested attributes */
|
||||
if (!(attr_mask & (APR_FILE_ATTR_READONLY
|
||||
@ -185,7 +185,7 @@ APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname,
|
||||
apr_pool_t *pool)
|
||||
{
|
||||
apr_status_t status;
|
||||
apr_finfo_t finfo;
|
||||
apr_finfo_t finfo = {0};
|
||||
|
||||
status = apr_stat(&finfo, fname, APR_FINFO_ATIME, pool);
|
||||
if (status) {
|
||||
|
||||
@ -821,8 +821,17 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
|
||||
if (!abort_fn && parent)
|
||||
abort_fn = parent->abort_fn;
|
||||
|
||||
if (allocator == NULL)
|
||||
if (allocator == NULL) {
|
||||
if (!parent) {
|
||||
/* There is no way to continue without an allocator when no parent */
|
||||
if (abort_fn)
|
||||
abort_fn(APR_EINVAL);
|
||||
|
||||
return APR_EINVAL;
|
||||
}
|
||||
|
||||
allocator = parent->allocator;
|
||||
}
|
||||
|
||||
if ((node = allocator_alloc(allocator,
|
||||
MIN_ALLOC - APR_MEMNODE_T_SIZE)) == NULL) {
|
||||
|
||||
@ -96,7 +96,7 @@ APR_DECLARE(void) apr_proc_other_child_unregister(void *data)
|
||||
}
|
||||
|
||||
/* segfault if this function called with invalid parm */
|
||||
apr_pool_cleanup_kill(cur->p, cur->data, other_child_cleanup);
|
||||
if (cur) apr_pool_cleanup_kill(cur->p, cur->data, other_child_cleanup);
|
||||
other_child_cleanup(data);
|
||||
}
|
||||
|
||||
|
||||
@ -27,6 +27,8 @@
|
||||
#include <osreldate.h>
|
||||
#endif
|
||||
|
||||
#include <assert.h> /* assert() */
|
||||
|
||||
apr_status_t apr_socket_send(apr_socket_t *sock, const char *buf,
|
||||
apr_size_t *len)
|
||||
{
|
||||
@ -287,6 +289,7 @@ apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
|
||||
|
||||
/* Ignore flags for now. */
|
||||
flags = 0;
|
||||
assert(flags==0);
|
||||
|
||||
if (hdtr->numheaders > 0) {
|
||||
apr_size_t hdrbytes;
|
||||
|
||||
@ -32,7 +32,11 @@ static apr_status_t socket_cleanup(void *sock)
|
||||
{
|
||||
apr_socket_t *thesocket = sock;
|
||||
|
||||
if (thesocket && thesocket->socketdes == -1) {
|
||||
if (!thesocket) {
|
||||
return APR_ENOTSOCK;
|
||||
}
|
||||
|
||||
if (thesocket->socketdes == -1) {
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@ -444,6 +444,16 @@ void apr__SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
|
||||
|
||||
/* Clean up */
|
||||
a = b = c = d = e = f = g = h = T1 = T2 = 0;
|
||||
assert(a==0);
|
||||
assert(b==0);
|
||||
assert(c==0);
|
||||
assert(d==0);
|
||||
assert(e==0);
|
||||
assert(f==0);
|
||||
assert(g==0);
|
||||
assert(h==0);
|
||||
assert(T1==0);
|
||||
assert(T2==0);
|
||||
}
|
||||
|
||||
#endif /* SHA2_UNROLL_TRANSFORM */
|
||||
@ -478,6 +488,8 @@ void apr__SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len)
|
||||
context->bitcount += len << 3;
|
||||
/* Clean up: */
|
||||
usedspace = freespace = 0;
|
||||
assert(usedspace==0);
|
||||
assert(freespace==0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -495,6 +507,8 @@ void apr__SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len)
|
||||
}
|
||||
/* Clean up: */
|
||||
usedspace = freespace = 0;
|
||||
assert(usedspace==0);
|
||||
assert(freespace==0);
|
||||
}
|
||||
|
||||
void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
|
||||
@ -559,6 +573,7 @@ void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
|
||||
/* Clean up state data: */
|
||||
MEMSET_BZERO(context, sizeof(*context));
|
||||
usedspace = 0;
|
||||
assert(usedspace==0);
|
||||
}
|
||||
|
||||
char *apr__SHA256_End(SHA256_CTX* context, char buffer[]) {
|
||||
@ -768,6 +783,16 @@ void apr__SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
|
||||
|
||||
/* Clean up */
|
||||
a = b = c = d = e = f = g = h = T1 = T2 = 0;
|
||||
assert(a==0);
|
||||
assert(b==0);
|
||||
assert(c==0);
|
||||
assert(d==0);
|
||||
assert(e==0);
|
||||
assert(f==0);
|
||||
assert(g==0);
|
||||
assert(h==0);
|
||||
assert(T1==0);
|
||||
assert(T2==0);
|
||||
}
|
||||
|
||||
#endif /* SHA2_UNROLL_TRANSFORM */
|
||||
@ -802,6 +827,8 @@ void apr__SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len)
|
||||
ADDINC128(context->bitcount, len << 3);
|
||||
/* Clean up: */
|
||||
usedspace = freespace = 0;
|
||||
assert(usedspace==0);
|
||||
assert(freespace==0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -819,6 +846,8 @@ void apr__SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len)
|
||||
}
|
||||
/* Clean up: */
|
||||
usedspace = freespace = 0;
|
||||
assert(usedspace==0);
|
||||
assert(freespace==0);
|
||||
}
|
||||
|
||||
void apr__SHA512_Last(SHA512_CTX* context) {
|
||||
|
||||
@ -110,7 +110,6 @@ static char *apr_cvt(double arg, int ndigits, int *decpt, int *sign,
|
||||
arg = -arg;
|
||||
}
|
||||
arg = modf(arg, &fi);
|
||||
p1 = &buf[NDIG];
|
||||
/*
|
||||
* Do integer part
|
||||
*/
|
||||
|
||||
@ -124,7 +124,7 @@ APR_DECLARE(void *) apr_pmemdup(apr_pool_t *a, const void *m, apr_size_t n)
|
||||
APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
|
||||
{
|
||||
char *cp, *argp, *res;
|
||||
apr_size_t saved_lengths[MAX_SAVED_LENGTHS];
|
||||
apr_size_t saved_lengths[MAX_SAVED_LENGTHS] = { 0 };
|
||||
int nargs = 0;
|
||||
|
||||
/* Pass one --- find length of required string */
|
||||
|
||||
@ -459,7 +459,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p,
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!ent) {
|
||||
if (new_vals && !ent) {
|
||||
new_vals[j].klen = iter->klen;
|
||||
new_vals[j].key = iter->key;
|
||||
new_vals[j].val = iter->val;
|
||||
|
||||
1952
libs/esl/src/cJSON.c
1952
libs/esl/src/cJSON.c
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,16 +1,13 @@
|
||||
/*
|
||||
Copyright (c) 2009 Dave Gamble
|
||||
|
||||
Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
@ -28,10 +25,55 @@ extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
|
||||
#define __WINDOWS__
|
||||
#endif
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
|
||||
/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 3 define options:
|
||||
CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
|
||||
CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
|
||||
CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
|
||||
For *nix builds that support visibility attribute, you can define similar behavior by
|
||||
setting default visibility to hidden by adding
|
||||
-fvisibility=hidden (for gcc)
|
||||
or
|
||||
-xldscope=hidden (for sun cc)
|
||||
to CFLAGS
|
||||
then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
|
||||
*/
|
||||
|
||||
#define CJSON_CDECL __cdecl
|
||||
#define CJSON_STDCALL __stdcall
|
||||
|
||||
/* export symbols by default, this is necessary for copy pasting the C and header file */
|
||||
#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
|
||||
#define CJSON_EXPORT_SYMBOLS
|
||||
#endif
|
||||
|
||||
#if defined(CJSON_HIDE_SYMBOLS)
|
||||
#define CJSON_PUBLIC(type) type CJSON_STDCALL
|
||||
#elif defined(CJSON_EXPORT_SYMBOLS)
|
||||
#define CJSON_PUBLIC(type) __declspec(dllexport) type CJSON_STDCALL
|
||||
#elif defined(CJSON_IMPORT_SYMBOLS)
|
||||
#define CJSON_PUBLIC(type) __declspec(dllimport) type CJSON_STDCALL
|
||||
#endif
|
||||
#else /* !__WINDOWS__ */
|
||||
#define CJSON_CDECL
|
||||
#define CJSON_STDCALL
|
||||
|
||||
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
|
||||
#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type
|
||||
#else
|
||||
#define CJSON_PUBLIC(type) type
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* project version */
|
||||
#define CJSON_VERSION_MAJOR 1
|
||||
#define CJSON_VERSION_MINOR 3
|
||||
#define CJSON_VERSION_PATCH 0
|
||||
#define CJSON_VERSION_MINOR 7
|
||||
#define CJSON_VERSION_PATCH 12
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
@ -63,7 +105,7 @@ typedef struct cJSON
|
||||
|
||||
/* The item's string, if type==cJSON_String and type == cJSON_Raw */
|
||||
char *valuestring;
|
||||
/* The item's number, if type==cJSON_Number */
|
||||
/* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
|
||||
int valueint;
|
||||
/* The item's number, if type==cJSON_Number */
|
||||
double valuedouble;
|
||||
@ -74,45 +116,17 @@ typedef struct cJSON
|
||||
|
||||
typedef struct cJSON_Hooks
|
||||
{
|
||||
void *(*malloc_fn)(size_t sz);
|
||||
void (*free_fn)(void *ptr);
|
||||
/* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
|
||||
void *(CJSON_CDECL *malloc_fn)(size_t sz);
|
||||
void (CJSON_CDECL *free_fn)(void *ptr);
|
||||
} cJSON_Hooks;
|
||||
|
||||
#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
|
||||
#define __WINDOWS__
|
||||
#endif
|
||||
#ifdef __WINDOWS__
|
||||
typedef int cJSON_bool;
|
||||
|
||||
/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 2 define options:
|
||||
|
||||
CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
|
||||
CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols
|
||||
|
||||
For *nix builds that support visibility attribute, you can define similar behavior by
|
||||
|
||||
setting default visibility to hidden by adding
|
||||
-fvisibility=hidden (for gcc)
|
||||
or
|
||||
-xldscope=hidden (for sun cc)
|
||||
to CFLAGS
|
||||
|
||||
then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
|
||||
|
||||
*/
|
||||
|
||||
#if defined(CJSON_HIDE_SYMBOLS)
|
||||
#define CJSON_PUBLIC(type) type __stdcall
|
||||
#elif defined(CJSON_EXPORT_SYMBOLS)
|
||||
#define CJSON_PUBLIC(type) __declspec(dllexport) type __stdcall
|
||||
#else
|
||||
#define CJSON_PUBLIC(type) __declspec(dllimport) type __stdcall
|
||||
#endif
|
||||
#else /* !WIN32 */
|
||||
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
|
||||
#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type
|
||||
#else
|
||||
#define CJSON_PUBLIC(type) type
|
||||
#endif
|
||||
/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
|
||||
* This is to prevent stack overflows. */
|
||||
#ifndef CJSON_NESTING_LIMIT
|
||||
#define CJSON_NESTING_LIMIT 1000
|
||||
#endif
|
||||
|
||||
/* returns the version of cJSON as a string */
|
||||
@ -121,36 +135,56 @@ CJSON_PUBLIC(const char*) cJSON_Version(void);
|
||||
/* Supply malloc, realloc and free functions to cJSON */
|
||||
CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
|
||||
|
||||
|
||||
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
|
||||
/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
|
||||
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
|
||||
/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
|
||||
/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
|
||||
/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
|
||||
|
||||
/* Render a cJSON entity to text for transfer/storage. */
|
||||
CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
|
||||
/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
|
||||
/* Render a cJSON entity to text for transfer/storage without any formatting. */
|
||||
CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
|
||||
/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
|
||||
CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, int fmt);
|
||||
/* Render a cJSON entity to text using a buffer already allocated in memory with length buf_len. Returns 1 on success and 0 on failure. */
|
||||
CJSON_PUBLIC(int) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const int fmt);
|
||||
CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
|
||||
/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
|
||||
/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
|
||||
/* Delete a cJSON entity and all subentities. */
|
||||
CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
|
||||
|
||||
/* Returns the number of items in an array (or object). */
|
||||
CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
|
||||
/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int item);
|
||||
/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
|
||||
/* Get item "string" from object. Case insensitive. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON *object, const char *string);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON *object, const char *string);
|
||||
CJSON_PUBLIC(int) cJSON_HasObjectItem(const cJSON *object, const char *string);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
|
||||
/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
|
||||
CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
|
||||
|
||||
/* Check if the item is a string and return its valuestring */
|
||||
CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item);
|
||||
|
||||
/* These functions check the type of an item */
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
|
||||
|
||||
/* These calls create a cJSON item of the appropriate type. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateBool(int b);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
|
||||
/* raw json */
|
||||
@ -158,6 +192,14 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
|
||||
|
||||
/* Create a string where valuestring references a string so
|
||||
* it will not be freed by cJSON_Delete */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
|
||||
/* Create an object/arrray that only references it's elements so
|
||||
* they will not be freed by cJSON_Delete */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
|
||||
|
||||
/* These utilities create an Array of count items. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
|
||||
@ -176,36 +218,44 @@ CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
|
||||
CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
|
||||
|
||||
/* Remove/Detatch items from Arrays/Objects. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
|
||||
CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
|
||||
CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
|
||||
CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
|
||||
|
||||
/* Update array items. */
|
||||
CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
|
||||
CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
|
||||
CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
|
||||
CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
|
||||
|
||||
/* Duplicate a cJSON item */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, int recurse);
|
||||
CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
|
||||
/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
|
||||
need to be released. With recurse!=0, it will duplicate any children connected to the item.
|
||||
The item->next and ->prev pointers are always zero on return from Duplicate. */
|
||||
/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
|
||||
* case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
|
||||
CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
|
||||
|
||||
/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
|
||||
/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error. If not, then cJSON_GetErrorPtr() does the job. */
|
||||
CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, int require_null_terminated);
|
||||
|
||||
CJSON_PUBLIC(void) cJSON_Minify(char *json);
|
||||
|
||||
/* Macros for creating things quickly. */
|
||||
#define cJSON_AddNullToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateNull())
|
||||
#define cJSON_AddTrueToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
|
||||
#define cJSON_AddFalseToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
|
||||
#define cJSON_AddBoolToObject(object,name,b) cJSON_AddItemToObject(object, name, cJSON_CreateBool(b))
|
||||
#define cJSON_AddNumberToObject(object,name,n) cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
|
||||
#define cJSON_AddStringToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
|
||||
#define cJSON_AddRawToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateRaw(s))
|
||||
/* Helper functions for creating and adding items to an object at the same time.
|
||||
* They return the added item or NULL on failure. */
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
|
||||
|
||||
/* When assigning an integer value, it needs to be propagated to valuedouble too. */
|
||||
#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
|
||||
@ -213,9 +263,13 @@ CJSON_PUBLIC(void) cJSON_Minify(char *json);
|
||||
CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
|
||||
#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
|
||||
|
||||
/* Macro for iterating over an array */
|
||||
/* Macro for iterating over an array or object */
|
||||
#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
|
||||
|
||||
/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
|
||||
CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
|
||||
CJSON_PUBLIC(void) cJSON_free(void *object);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,14 +1,45 @@
|
||||
/*
|
||||
Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef cJSON_Utils__h
|
||||
#define cJSON_Utils__h
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#include "esl_cJSON.h"
|
||||
|
||||
/* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec. */
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON *object, const char *pointer);
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON * const object, const char *pointer);
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointerCaseSensitive(cJSON * const object, const char *pointer);
|
||||
|
||||
/* Implement RFC6902 (https://tools.ietf.org/html/rfc6902) JSON Patch spec. */
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatches(cJSON *from, cJSON *to);
|
||||
/* NOTE: This modifies objects in 'from' and 'to' by sorting the elements by their key */
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatches(cJSON * const from, cJSON * const to);
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatchesCaseSensitive(cJSON * const from, cJSON * const to);
|
||||
/* Utility for generating patch array entries. */
|
||||
CJSON_PUBLIC(void) cJSONUtils_AddPatchToArray(cJSON *array, const char *op, const char *path, cJSON *val);
|
||||
CJSON_PUBLIC(void) cJSONUtils_AddPatchToArray(cJSON * const array, const char * const operation, const char * const path, const cJSON * const value);
|
||||
/* Returns 0 for success. */
|
||||
CJSON_PUBLIC(int) cJSONUtils_ApplyPatches(cJSON *object, cJSON *patches);
|
||||
CJSON_PUBLIC(int) cJSONUtils_ApplyPatches(cJSON * const object, const cJSON * const patches);
|
||||
CJSON_PUBLIC(int) cJSONUtils_ApplyPatchesCaseSensitive(cJSON * const object, const cJSON * const patches);
|
||||
|
||||
/*
|
||||
// Note that ApplyPatches is NOT atomic on failure. To implement an atomic ApplyPatches, use:
|
||||
@ -33,12 +64,22 @@ CJSON_PUBLIC(int) cJSONUtils_ApplyPatches(cJSON *object, cJSON *patches);
|
||||
|
||||
/* Implement RFC7386 (https://tools.ietf.org/html/rfc7396) JSON Merge Patch spec. */
|
||||
/* target will be modified by patch. return value is new ptr for target. */
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatch(cJSON *target, cJSON *patch);
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatch(cJSON *target, const cJSON * const patch);
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatchCaseSensitive(cJSON *target, const cJSON * const patch);
|
||||
/* generates a patch to move from -> to */
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatch(cJSON *from, cJSON *to);
|
||||
/* NOTE: This modifies objects in 'from' and 'to' by sorting the elements by their key */
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatch(cJSON * const from, cJSON * const to);
|
||||
CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatchCaseSensitive(cJSON * const from, cJSON * const to);
|
||||
|
||||
/* Given a root object and a target object, construct a pointer from one to the other. */
|
||||
CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(cJSON *object, cJSON *target);
|
||||
CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(const cJSON * const object, const cJSON * const target);
|
||||
|
||||
/* Sorts the members of the object into alphabetical order. */
|
||||
CJSON_PUBLIC(void) cJSONUtils_SortObject(cJSON *object);
|
||||
CJSON_PUBLIC(void) cJSONUtils_SortObject(cJSON * const object);
|
||||
CJSON_PUBLIC(void) cJSONUtils_SortObjectCaseSensitive(cJSON * const object);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@ -32,7 +32,7 @@ static ikschunk *
|
||||
find_space (ikstack *s, ikschunk *c, size_t size)
|
||||
{
|
||||
/* FIXME: dont use *2 after over allocated chunks */
|
||||
while (1) {
|
||||
while (c) {
|
||||
if (c->size - c->used >= size) return c;
|
||||
if (!c->next) {
|
||||
if ((c->size * 2) > size) size = c->size * 2;
|
||||
|
||||
@ -213,22 +213,16 @@ sax_core (iksparser *prs, char *buf, int len)
|
||||
goto cont;
|
||||
} else {
|
||||
if (c & 0x80) {
|
||||
unsigned char mask;
|
||||
if ((c & 0x60) == 0x40) {
|
||||
prs->uni_max = 2;
|
||||
mask = 0x1F;
|
||||
} else if ((c & 0x70) == 0x60) {
|
||||
prs->uni_max = 3;
|
||||
mask = 0x0F;
|
||||
} else if ((c & 0x78) == 0x70) {
|
||||
prs->uni_max = 4;
|
||||
mask = 0x07;
|
||||
} else if ((c & 0x7C) == 0x78) {
|
||||
prs->uni_max = 5;
|
||||
mask = 0x03;
|
||||
} else if ((c & 0x7E) == 0x7C) {
|
||||
prs->uni_max = 6;
|
||||
mask = 0x01;
|
||||
} else {
|
||||
return IKS_BADXML;
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ test_stack (int cs)
|
||||
memset (mem, 'x', i);
|
||||
old = iks_stack_strcat (s, old, 0, buf + i, 1);
|
||||
}
|
||||
if (strcmp (old, buf) != 0) {
|
||||
if (old && strcmp (old, buf) != 0) {
|
||||
printf ("ikstack strcat bug:\nExpected: %s\n Result: %s\n", buf, old);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
@ -160,7 +160,7 @@ tagHook (void *udata, char *name, char **atts, int type)
|
||||
nr = tester.cur->nr_atts;
|
||||
while (nr) {
|
||||
flag = 0;
|
||||
for (i = 0;atts[i]; i+= 2) {
|
||||
for (i = 0;atts&&atts[i]; i+= 2) {
|
||||
if (iks_strcmp (atts[i], tester.cur->atts[nr-1]) == 0 && iks_strcmp (atts[i+1], tester.cur->vals[nr-1]) == 0) {
|
||||
flag = 1;
|
||||
break;
|
||||
|
||||
@ -117,7 +117,7 @@ hash_print (hash *h, char *title_fmt, char *line_fmt)
|
||||
struct item **tags, *t;
|
||||
unsigned int i = 0, pos = 0;
|
||||
|
||||
tags = calloc (sizeof (struct tag *), h->count);
|
||||
tags = calloc (sizeof (struct item *), h->count);
|
||||
|
||||
for (; i < h->size; i ++) {
|
||||
for (t = h->table[i]; t; t = t->next) {
|
||||
|
||||
@ -207,7 +207,6 @@ serialize_test (char *buf, int len)
|
||||
unsigned long time;
|
||||
iks *x;
|
||||
iksparser *prs;
|
||||
char *xml;
|
||||
int err;
|
||||
|
||||
prs = iks_dom_new (&x);
|
||||
@ -228,7 +227,7 @@ serialize_test (char *buf, int len)
|
||||
|
||||
t_reset ();
|
||||
|
||||
xml = iks_string (iks_stack (x), x);
|
||||
iks_string (iks_stack (x), x);
|
||||
|
||||
time = t_elapsed ();
|
||||
|
||||
|
||||
@ -499,7 +499,10 @@ static ldl_status parse_session_code(ldl_handle_t *handle, char *id, char *from,
|
||||
unsigned int *candidate_len = NULL;
|
||||
ldl_candidate_t (*candidates)[LDL_MAX_CANDIDATES] = NULL;
|
||||
|
||||
if ((key = iks_find_attrib(tag, "preference"))) {
|
||||
if (!(key = iks_find_attrib(tag, "preference"))) {
|
||||
globals.logger(DL_LOG_WARNING, "Field preference was not set\n");
|
||||
continue;
|
||||
} else {
|
||||
unsigned int x;
|
||||
|
||||
pref = strtod(key, NULL);
|
||||
@ -927,7 +930,7 @@ static int on_disco_default(void *user_data, ikspak *pak)
|
||||
char *node = NULL;
|
||||
char *ns = NULL;
|
||||
ldl_handle_t *handle = user_data;
|
||||
iks *iq, *query, *tag;
|
||||
iks *iq = NULL, *query, *tag;
|
||||
uint8_t send = 0;
|
||||
int x;
|
||||
|
||||
@ -936,10 +939,10 @@ static int on_disco_default(void *user_data, ikspak *pak)
|
||||
node = iks_find_attrib(pak->query, "node");
|
||||
}
|
||||
|
||||
if (pak->subtype == IKS_TYPE_RESULT) {
|
||||
if (pak && pak->subtype == IKS_TYPE_RESULT) {
|
||||
globals.logger(DL_LOG_CRIT, "FixME!!! node=[%s]\n", node?node:"");
|
||||
} else if (pak->subtype == IKS_TYPE_GET) {
|
||||
if ((iq = iks_new("iq"))) {
|
||||
} else if (pak && pak->subtype == IKS_TYPE_GET) {
|
||||
if (ns && (iq = iks_new("iq"))) {
|
||||
int all = 0;
|
||||
|
||||
iks_insert_attrib(iq, "from", handle->login);
|
||||
@ -1081,7 +1084,6 @@ static int on_presence(void *user_data, ikspak *pak)
|
||||
if (ext && strstr(ext, "voice-v1") && (buffer = apr_hash_get(handle->probe_hash, id, APR_HASH_KEY_STRING))) {
|
||||
apr_cpystrn(buffer->buf, from, buffer->len);
|
||||
buffer->hit = 1;
|
||||
done = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1149,7 +1151,6 @@ static ldl_avatar_t *ldl_get_avatar(ldl_handle_t *handle, char *path, char *from
|
||||
|
||||
bytes = read(fd, image, sizeof(image));
|
||||
close(fd);
|
||||
fd = -1;
|
||||
|
||||
ap = malloc(sizeof(*ap));
|
||||
assert(ap != NULL);
|
||||
@ -2565,7 +2566,6 @@ unsigned int ldl_session_candidates(ldl_session_t *session,
|
||||
iq = NULL;
|
||||
sess = NULL;
|
||||
tag = NULL;
|
||||
x = 0;
|
||||
id = 0;
|
||||
}
|
||||
|
||||
|
||||
@ -195,7 +195,7 @@ int sendnewportmappingrequest(natpmp_t * p, int protocol,
|
||||
int readnatpmpresponse(natpmp_t * p, natpmpresp_t * response)
|
||||
{
|
||||
unsigned char buf[16];
|
||||
struct sockaddr_in addr;
|
||||
struct sockaddr_in addr = {0};
|
||||
socklen_t addrlen = sizeof(addr);
|
||||
int n;
|
||||
if(!p)
|
||||
|
||||
@ -4,12 +4,13 @@
|
||||
Aaron Watry <awatry@gmail.com>
|
||||
Abo Talib Mahfoodh <ab.mahfoodh@gmail.com>
|
||||
Adrian Grange <agrange@google.com>
|
||||
Aℓex Converse <aconverse@google.com>
|
||||
Ahmad Sharif <asharif@google.com>
|
||||
Aidan Welch <aidansw@yahoo.com>
|
||||
Aleksey Vasenev <margtu-fivt@ya.ru>
|
||||
Alexander Potapenko <glider@google.com>
|
||||
Alexander Voronov <avoronov@graphics.cs.msu.ru>
|
||||
Alexandra Hájková <alexandra.khirnova@gmail.com>
|
||||
Aℓex Converse <aconverse@google.com>
|
||||
Alexis Ballier <aballier@gentoo.org>
|
||||
Alok Ahuja <waveletcoeff@gmail.com>
|
||||
Alpha Lam <hclam@google.com>
|
||||
@ -26,11 +27,13 @@ Brion Vibber <bvibber@wikimedia.org>
|
||||
changjun.yang <changjun.yang@intel.com>
|
||||
Charles 'Buck' Krasic <ckrasic@google.com>
|
||||
Cheng Chen <chengchen@google.com>
|
||||
Chi Yo Tsai <chiyotsai@google.com>
|
||||
chm <chm@rock-chips.com>
|
||||
Chris Cunningham <chcunningham@chromium.org>
|
||||
Christian Duvivier <cduvivier@google.com>
|
||||
Daniele Castagna <dcastagna@chromium.org>
|
||||
Daniel Kang <ddkang@google.com>
|
||||
Dan Zhu <zxdan@google.com>
|
||||
Deb Mukherjee <debargha@google.com>
|
||||
Deepa K G <deepa.kg@ittiam.com>
|
||||
Dim Temp <dimtemp0@gmail.com>
|
||||
@ -38,11 +41,13 @@ Dmitry Kovalev <dkovalev@google.com>
|
||||
Dragan Mrdjan <dmrdjan@mips.com>
|
||||
Ed Baker <edward.baker@intel.com>
|
||||
Ehsan Akhgari <ehsan.akhgari@gmail.com>
|
||||
Elliott Karpilovsky <elliottk@google.com>
|
||||
Erik Niemeyer <erik.a.niemeyer@intel.com>
|
||||
Fabio Pedretti <fabio.ped@libero.it>
|
||||
Frank Galligan <fgalligan@google.com>
|
||||
Fredrik Söderquist <fs@opera.com>
|
||||
Fritz Koenig <frkoenig@google.com>
|
||||
Fyodor Kyslov <kyslov@google.com>
|
||||
Gabriel Marin <gmx@chromium.org>
|
||||
Gaute Strokkenes <gaute.strokkenes@broadcom.com>
|
||||
Geza Lore <gezalore@gmail.com>
|
||||
@ -55,7 +60,9 @@ Guillermo Ballester Valor <gbvalor@gmail.com>
|
||||
Hangyu Kuang <hkuang@google.com>
|
||||
Hanno Böck <hanno@hboeck.de>
|
||||
Han Shen <shenhan@google.com>
|
||||
Harish Mahendrakar <harish.mahendrakar@ittiam.com>
|
||||
Henrik Lundin <hlundin@google.com>
|
||||
Hien Ho <hienho@google.com>
|
||||
Hui Su <huisu@google.com>
|
||||
Ivan Krasin <krasin@chromium.org>
|
||||
Ivan Maltz <ivanmaltz@google.com>
|
||||
@ -81,6 +88,7 @@ Johann Koenig <johannkoenig@google.com>
|
||||
John Koleszar <jkoleszar@google.com>
|
||||
Johnny Klonaris <google@jawknee.com>
|
||||
John Stark <jhnstrk@gmail.com>
|
||||
Jon Kunkee <jkunkee@microsoft.com>
|
||||
Joshua Bleecher Snyder <josh@treelinelabs.com>
|
||||
Joshua Litt <joshualitt@google.com>
|
||||
Julia Robson <juliamrobson@gmail.com>
|
||||
@ -91,15 +99,19 @@ KO Myung-Hun <komh@chollian.net>
|
||||
Kyle Siefring <kylesiefring@gmail.com>
|
||||
Lawrence Velázquez <larryv@macports.org>
|
||||
Linfeng Zhang <linfengz@google.com>
|
||||
Liu Peng <pengliu.mail@gmail.com>
|
||||
Lou Quillio <louquillio@google.com>
|
||||
Luca Barbato <lu_zero@gentoo.org>
|
||||
Luc Trudeau <luc@trud.ca>
|
||||
Makoto Kato <makoto.kt@gmail.com>
|
||||
Mans Rullgard <mans@mansr.com>
|
||||
Marco Paniconi <marpan@google.com>
|
||||
Mark Mentovai <mark@chromium.org>
|
||||
Martin Ettl <ettl.martin78@googlemail.com>
|
||||
Martin Storsjo <martin@martin.st>
|
||||
Martin Storsjö <martin@martin.st>
|
||||
Matthew Heaney <matthewjheaney@chromium.org>
|
||||
Matthias Räncker <theonetruecamper@gmx.de>
|
||||
Michael Horowitz <mhoro@webrtc.org>
|
||||
Michael Kohler <michaelkohler@live.com>
|
||||
Mike Frysinger <vapier@chromium.org>
|
||||
Mike Hommey <mhommey@mozilla.com>
|
||||
@ -107,10 +119,12 @@ Mikhal Shemer <mikhal@google.com>
|
||||
Min Chen <chenm003@gmail.com>
|
||||
Minghai Shang <minghai@google.com>
|
||||
Min Ye <yeemmi@google.com>
|
||||
Mirko Bonadei <mbonadei@google.com>
|
||||
Moriyoshi Koizumi <mozo@mozo.jp>
|
||||
Morton Jonuschat <yabawock@gmail.com>
|
||||
Nathan E. Egge <negge@mozilla.com>
|
||||
Nico Weber <thakis@chromium.org>
|
||||
Niveditha Rau <niveditha.rau@gmail.com>
|
||||
Parag Salasakar <img.mips1@gmail.com>
|
||||
Pascal Massimino <pascal.massimino@gmail.com>
|
||||
Patrik Westin <patrik.westin@gmail.com>
|
||||
@ -129,9 +143,13 @@ Rafael de Lucena Valle <rafaeldelucena@gmail.com>
|
||||
Rahul Chaudhry <rahulchaudhry@google.com>
|
||||
Ralph Giles <giles@xiph.org>
|
||||
Ranjit Kumar Tulabandu <ranjit.tulabandu@ittiam.com>
|
||||
Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||
Ravi Chaudhary <ravi.chaudhary@ittiam.com>
|
||||
Ritu Baldwa <ritu.baldwa@ittiam.com>
|
||||
Rob Bradford <rob@linux.intel.com>
|
||||
Ronald S. Bultje <rsbultje@gmail.com>
|
||||
Rui Ueyama <ruiu@google.com>
|
||||
Sai Deng <sdeng@google.com>
|
||||
Sami Pietilä <samipietila@google.com>
|
||||
Sarah Parker <sarahparker@google.com>
|
||||
Sasi Inguva <isasi@google.com>
|
||||
@ -139,12 +157,15 @@ Scott Graham <scottmg@chromium.org>
|
||||
Scott LaVarnway <slavarnway@google.com>
|
||||
Sean McGovern <gseanmcg@gmail.com>
|
||||
Sergey Kolomenkin <kolomenkin@gmail.com>
|
||||
Sergey Silkin <ssilkin@google.com>
|
||||
Sergey Ulanov <sergeyu@chromium.org>
|
||||
Shimon Doodkin <helpmepro1@gmail.com>
|
||||
Shiyou Yin <yinshiyou-hf@loongson.cn>
|
||||
Shubham Tandle <shubham.tandle@ittiam.com>
|
||||
Shunyao Li <shunyaoli@google.com>
|
||||
Stefan Holmer <holmer@google.com>
|
||||
Suman Sunkara <sunkaras@google.com>
|
||||
Supradeep T R <supradeep.tr@ittiam.com>
|
||||
Sylvestre Ledru <sylvestre@mozilla.com>
|
||||
Taekhyun Kim <takim@nvidia.com>
|
||||
Takanori MATSUURA <t.matsuu@gmail.com>
|
||||
@ -157,11 +178,15 @@ Timothy B. Terriberry <tterribe@xiph.org>
|
||||
Tom Finegan <tomfinegan@google.com>
|
||||
Tristan Matthews <le.businessman@gmail.com>
|
||||
Urvang Joshi <urvang@google.com>
|
||||
Venkatarama NG. Avadhani <venkatarama.avadhani@ittiam.com>
|
||||
Vignesh Venkatasubramanian <vigneshv@google.com>
|
||||
Vlad Tsyrklevich <vtsyrklevich@chromium.org>
|
||||
Wan-Teh Chang <wtc@google.com>
|
||||
xiwei gu <guxiwei-hf@loongson.cn>
|
||||
Yaowu Xu <yaowu@google.com>
|
||||
Yi Luo <luoyi@google.com>
|
||||
Yongzhe Wang <yongzhe@google.com>
|
||||
Yue Chen <yuec@google.com>
|
||||
Yunqing Wang <yunqingwang@google.com>
|
||||
Yury Gitman <yuryg@google.com>
|
||||
Zoe Liu <zoeliu@google.com>
|
||||
|
||||
@ -1,4 +1,63 @@
|
||||
2017-01-04 v1.7.0 "Mandarin Duck"
|
||||
2019-07-15 v1.8.1 "Orpington Duck"
|
||||
This release collects incremental improvements to many aspects of the library.
|
||||
|
||||
- Upgrading:
|
||||
VP8E_SET_CPUUSED now accepts values up to 9 for vp9.
|
||||
VPX_CTRL_VP9E_SET_MAX_INTER_BITRATE_PCT had a spelling fix (was VP8E).
|
||||
The --sdk-path option has been removed. If you were using it to build for
|
||||
Android please read build/make/Android.mk for alternatives.
|
||||
All PPC optimizations have been disabled:
|
||||
https://bugs.chromium.org/p/webm/issues/detail?id=1522.
|
||||
|
||||
- Enhancements:
|
||||
Various changes to improve encoder rate control, quality and speed
|
||||
for practically every use case.
|
||||
|
||||
- Bug fixes:
|
||||
vp9-rtc: Fix color artifacts for speed >= 8.
|
||||
|
||||
2019-01-31 v1.8.0 "Northern Shoveler Duck"
|
||||
This release focused on encoding performance for realtime and VOD use cases.
|
||||
|
||||
- Upgrading:
|
||||
This adds and improves several vp9 controls. Most are related to SVC:
|
||||
VP9E_SET_SVC_FRAME_DROP_LAYER:
|
||||
- Frame dropping in SVC.
|
||||
VP9E_SET_SVC_INTER_LAYER_PRED:
|
||||
- Inter-layer prediction in SVC.
|
||||
VP9E_SET_SVC_GF_TEMPORAL_REF:
|
||||
- Enable long term temporal reference in SVC.
|
||||
VP9E_SET_SVC_REF_FRAME_CONFIG/VP9E_GET_SVC_REF_FRAME_CONFIG:
|
||||
- Extend and improve this control for better flexibility in setting SVC
|
||||
pattern dynamically.
|
||||
VP9E_SET_POSTENCODE_DROP:
|
||||
- Allow for post-encode frame dropping (applies to non-SVC too).
|
||||
VP9E_SET_SVC_SPATIAL_LAYER_SYNC:
|
||||
- Enable spatial layer sync frames.
|
||||
VP9E_SET_SVC_LAYER_ID:
|
||||
- Extend api to specify temporal id for each spatial layers.
|
||||
VP9E_SET_ROI_MAP:
|
||||
- Extend Region of Interest functionality to VP9.
|
||||
|
||||
- Enhancements:
|
||||
2 pass vp9 encoding has improved substantially. When using --auto-alt-ref=6,
|
||||
we see approximately 8% for VBR and 10% for CQ. When using --auto-alt-ref=1,
|
||||
the gains are approximately 4% for VBR and 5% for CQ.
|
||||
|
||||
For real-time encoding, speed 7 has improved by ~5-10%. Encodes targeted at
|
||||
screen sharing have improved when the content changes significantly (slide
|
||||
sharing) or scrolls. There is a new speed 9 setting for mobile devices which
|
||||
is about 10-20% faster than speed 8.
|
||||
|
||||
- Bug fixes:
|
||||
VP9 denoiser issue.
|
||||
VP9 partition issue for 1080p.
|
||||
VP9 rate control improvments.
|
||||
Postprocessing Multi Frame Quality Enhancement (MFQE) issue.
|
||||
VP8 multithread decoder issues.
|
||||
A variety of fuzzing issues.
|
||||
|
||||
2018-01-04 v1.7.0 "Mandarin Duck"
|
||||
This release focused on high bit depth performance (10/12 bit) and vp9
|
||||
encoding improvements.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
README - 24 January 2018
|
||||
README - 15 July 2019
|
||||
|
||||
Welcome to the WebM VP8/VP9 Codec SDK!
|
||||
|
||||
@ -9,22 +9,26 @@ COMPILING THE APPLICATIONS/LIBRARIES:
|
||||
|
||||
1. Prerequisites
|
||||
|
||||
* All x86 targets require the Yasm[1] assembler be installed.
|
||||
* All Windows builds require that Cygwin[2] be installed.
|
||||
* Building the documentation requires Doxygen[3]. If you do not
|
||||
* All x86 targets require the Yasm[1] assembler be installed[2].
|
||||
* All Windows builds require that Cygwin[3] be installed.
|
||||
* Building the documentation requires Doxygen[4]. If you do not
|
||||
have this package, the install-docs option will be disabled.
|
||||
* Downloading the data for the unit tests requires curl[4] and sha1sum.
|
||||
* Downloading the data for the unit tests requires curl[5] and sha1sum.
|
||||
sha1sum is provided via the GNU coreutils, installed by default on
|
||||
many *nix platforms, as well as MinGW and Cygwin. If coreutils is not
|
||||
available, a compatible version of sha1sum can be built from
|
||||
source[5]. These requirements are optional if not running the unit
|
||||
source[6]. These requirements are optional if not running the unit
|
||||
tests.
|
||||
|
||||
[1]: http://www.tortall.net/projects/yasm
|
||||
[2]: http://www.cygwin.com
|
||||
[3]: http://www.doxygen.org
|
||||
[4]: http://curl.haxx.se
|
||||
[5]: http://www.microbrew.org/tools/md5sha1sum/
|
||||
[2]: For Visual Studio the base yasm binary (not vsyasm) should be in the
|
||||
PATH for Visual Studio. For VS2017 it is sufficient to rename
|
||||
yasm-<version>-<arch>.exe to yasm.exe and place it in:
|
||||
Program Files (x86)/Microsoft Visual Studio/2017/<level>/Common7/Tools/
|
||||
[3]: http://www.cygwin.com
|
||||
[4]: http://www.doxygen.org
|
||||
[5]: http://curl.haxx.se
|
||||
[6]: http://www.microbrew.org/tools/md5sha1sum/
|
||||
|
||||
2. Out-of-tree builds
|
||||
Out of tree builds are a supported method of building the application. For
|
||||
@ -41,7 +45,16 @@ COMPILING THE APPLICATIONS/LIBRARIES:
|
||||
used to get a list of supported options:
|
||||
$ ../libvpx/configure --help
|
||||
|
||||
4. Cross development
|
||||
4. Compiler analyzers
|
||||
Compilers have added sanitizers which instrument binaries with information
|
||||
about address calculation, memory usage, threading, undefined behavior, and
|
||||
other common errors. To simplify building libvpx with some of these features
|
||||
use tools/set_analyzer_env.sh before running configure. It will set the
|
||||
compiler and necessary flags for building as well as environment variables
|
||||
read by the analyzer when testing the binaries.
|
||||
$ source ../libvpx/tools/set_analyzer_env.sh address
|
||||
|
||||
5. Cross development
|
||||
For cross development, the most notable option is the --target option. The
|
||||
most up-to-date list of supported targets can be found at the bottom of the
|
||||
--help output of the configure script. As of this writing, the list of
|
||||
@ -50,20 +63,20 @@ COMPILING THE APPLICATIONS/LIBRARIES:
|
||||
arm64-android-gcc
|
||||
arm64-darwin-gcc
|
||||
arm64-linux-gcc
|
||||
arm64-win64-gcc
|
||||
arm64-win64-vs15
|
||||
armv7-android-gcc
|
||||
armv7-darwin-gcc
|
||||
armv7-linux-rvct
|
||||
armv7-linux-gcc
|
||||
armv7-none-rvct
|
||||
armv7-win32-vs11
|
||||
armv7-win32-vs12
|
||||
armv7-win32-gcc
|
||||
armv7-win32-vs14
|
||||
armv7-win32-vs15
|
||||
armv7s-darwin-gcc
|
||||
armv8-linux-gcc
|
||||
mips32-linux-gcc
|
||||
mips64-linux-gcc
|
||||
ppc64-linux-gcc
|
||||
ppc64le-linux-gcc
|
||||
sparc-solaris-gcc
|
||||
x86-android-gcc
|
||||
@ -78,15 +91,13 @@ COMPILING THE APPLICATIONS/LIBRARIES:
|
||||
x86-darwin14-gcc
|
||||
x86-darwin15-gcc
|
||||
x86-darwin16-gcc
|
||||
x86-darwin17-gcc
|
||||
x86-iphonesimulator-gcc
|
||||
x86-linux-gcc
|
||||
x86-linux-icc
|
||||
x86-os2-gcc
|
||||
x86-solaris-gcc
|
||||
x86-win32-gcc
|
||||
x86-win32-vs10
|
||||
x86-win32-vs11
|
||||
x86-win32-vs12
|
||||
x86-win32-vs14
|
||||
x86-win32-vs15
|
||||
x86_64-android-gcc
|
||||
@ -98,14 +109,12 @@ COMPILING THE APPLICATIONS/LIBRARIES:
|
||||
x86_64-darwin14-gcc
|
||||
x86_64-darwin15-gcc
|
||||
x86_64-darwin16-gcc
|
||||
x86_64-darwin17-gcc
|
||||
x86_64-iphonesimulator-gcc
|
||||
x86_64-linux-gcc
|
||||
x86_64-linux-icc
|
||||
x86_64-solaris-gcc
|
||||
x86_64-win64-gcc
|
||||
x86_64-win64-vs10
|
||||
x86_64-win64-vs11
|
||||
x86_64-win64-vs12
|
||||
x86_64-win64-vs14
|
||||
x86_64-win64-vs15
|
||||
generic-gnu
|
||||
@ -123,7 +132,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
|
||||
environment variables: CC, AR, LD, AS, STRIP, NM. Additional flags can be
|
||||
passed to these executables with CFLAGS, LDFLAGS, and ASFLAGS.
|
||||
|
||||
5. Configuration errors
|
||||
6. Configuration errors
|
||||
If the configuration step fails, the first step is to look in the error log.
|
||||
This defaults to config.log. This should give a good indication of what went
|
||||
wrong. If not, contact us for support.
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef ARGS_H_
|
||||
#define ARGS_H_
|
||||
#ifndef VPX_ARGS_H_
|
||||
#define VPX_ARGS_H_
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
@ -60,4 +60,4 @@ int arg_parse_enum_or_int(const struct arg *arg);
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif // ARGS_H_
|
||||
#endif // VPX_ARGS_H_
|
||||
|
||||
2
libs/libvpx/build/.gitattributes
vendored
2
libs/libvpx/build/.gitattributes
vendored
@ -1,2 +0,0 @@
|
||||
*-vs8/*.rules -crlf
|
||||
*-msvs/*.rules -crlf
|
||||
1
libs/libvpx/build/.gitignore
vendored
1
libs/libvpx/build/.gitignore
vendored
@ -1 +0,0 @@
|
||||
x86*-win32-vs*
|
||||
@ -14,7 +14,7 @@
|
||||
# Run the configure script from the jni directory. Base libvpx
|
||||
# encoder/decoder configuration will look similar to:
|
||||
# ./libvpx/configure --target=armv7-android-gcc --disable-examples \
|
||||
# --sdk-path=/opt/android-ndk-r6b/
|
||||
# --enable-external-build
|
||||
#
|
||||
# When targeting Android, realtime-only is enabled by default. This can
|
||||
# be overridden by adding the command line flag:
|
||||
@ -29,37 +29,20 @@
|
||||
# include $(CLEAR_VARS)
|
||||
# include jni/libvpx/build/make/Android.mk
|
||||
#
|
||||
# By default libvpx will detect at runtime the existance of NEON extension.
|
||||
# For this we import the 'cpufeatures' module from the NDK sources.
|
||||
# libvpx can also be configured without this runtime detection method.
|
||||
# Configuring with --disable-runtime-cpu-detect will assume presence of NEON.
|
||||
# Configuring with --disable-runtime-cpu-detect --disable-neon \
|
||||
# --disable-neon-asm
|
||||
# will remove any NEON dependency.
|
||||
# By default libvpx will use the 'cpufeatures' module from the NDK. This allows
|
||||
# the library to be built with all available optimizations (SSE2->AVX512 for
|
||||
# x86, NEON for arm, DSPr2 for mips). This can be disabled with
|
||||
# --disable-runtime-cpu-detect
|
||||
# but the resulting library *must* be run on devices supporting all of the
|
||||
# enabled extensions. They can be disabled individually with
|
||||
# --disable-{sse2, sse3, ssse3, sse4_1, avx, avx2, avx512}
|
||||
# --disable-neon[-asm]
|
||||
# --disable-{dspr2, msa}
|
||||
|
||||
#
|
||||
# Running ndk-build will build libvpx and include it in your project.
|
||||
#
|
||||
|
||||
# Alternatively, building the examples and unit tests can be accomplished in the
|
||||
# following way:
|
||||
#
|
||||
# Create a standalone toolchain from the NDK:
|
||||
# https://developer.android.com/ndk/guides/standalone_toolchain.html
|
||||
#
|
||||
# For example - to test on arm64 devices with clang:
|
||||
# $NDK/build/tools/make_standalone_toolchain.py \
|
||||
# --arch arm64 --install-dir=/tmp/my-android-toolchain
|
||||
# export PATH=/tmp/my-android-toolchain/bin:$PATH
|
||||
# CROSS=aarch64-linux-android- CC=clang CXX=clang++ /path/to/libvpx/configure \
|
||||
# --target=arm64-android-gcc
|
||||
#
|
||||
# Push the resulting binaries to a device and run them:
|
||||
# adb push test_libvpx /data/tmp/test_libvpx
|
||||
# adb shell /data/tmp/test_libvpx --gtest_filter=\*Sixtap\*
|
||||
#
|
||||
# Make sure to push the test data as well and set LIBVPX_TEST_DATA
|
||||
|
||||
CONFIG_DIR := $(LOCAL_PATH)/
|
||||
LIBVPX_PATH := $(LOCAL_PATH)/libvpx
|
||||
ASM_CNV_PATH_LOCAL := $(TARGET_ARCH_ABI)/ads2gas
|
||||
|
||||
@ -99,6 +99,7 @@ distclean: clean
|
||||
rm -f Makefile; \
|
||||
rm -f config.log config.mk; \
|
||||
rm -f vpx_config.[hc] vpx_config.asm; \
|
||||
rm -f arm_neon.h; \
|
||||
else \
|
||||
rm -f $(target)-$(TOOLCHAIN).mk; \
|
||||
fi
|
||||
|
||||
@ -23,16 +23,17 @@ use lib $FindBin::Bin;
|
||||
use thumb;
|
||||
|
||||
my $thumb = 0;
|
||||
my $elf = 1;
|
||||
|
||||
foreach my $arg (@ARGV) {
|
||||
$thumb = 1 if ($arg eq "-thumb");
|
||||
$elf = 0 if ($arg eq "-noelf");
|
||||
}
|
||||
|
||||
print "@ This file was created from a .asm file\n";
|
||||
print "@ using the ads2gas.pl script.\n";
|
||||
print "\t.equ DO1STROUNDING, 0\n";
|
||||
print "\t.syntax unified\n";
|
||||
if ($thumb) {
|
||||
print "\t.syntax unified\n";
|
||||
print "\t.thumb\n";
|
||||
}
|
||||
|
||||
@ -140,7 +141,11 @@ while (<STDIN>)
|
||||
|
||||
# Make function visible to linker, and make additional symbol with
|
||||
# prepended underscore
|
||||
s/EXPORT\s+\|([\$\w]*)\|/.global $1 \n\t.type $1, function/;
|
||||
if ($elf) {
|
||||
s/EXPORT\s+\|([\$\w]*)\|/.global $1 \n\t.type $1, function/;
|
||||
} else {
|
||||
s/EXPORT\s+\|([\$\w]*)\|/.global $1/;
|
||||
}
|
||||
s/IMPORT\s+\|([\$\w]*)\|/.global $1/;
|
||||
|
||||
s/EXPORT\s+([\$\w]*)/.global $1/;
|
||||
@ -181,11 +186,16 @@ while (<STDIN>)
|
||||
# eabi_attributes numerical equivalents can be found in the
|
||||
# "ARM IHI 0045C" document.
|
||||
|
||||
# REQUIRE8 Stack is required to be 8-byte aligned
|
||||
s/\sREQUIRE8/.eabi_attribute 24, 1 \@Tag_ABI_align_needed/g;
|
||||
if ($elf) {
|
||||
# REQUIRE8 Stack is required to be 8-byte aligned
|
||||
s/\sREQUIRE8/.eabi_attribute 24, 1 \@Tag_ABI_align_needed/g;
|
||||
|
||||
# PRESERVE8 Stack 8-byte align is preserved
|
||||
s/\sPRESERVE8/.eabi_attribute 25, 1 \@Tag_ABI_align_preserved/g;
|
||||
# PRESERVE8 Stack 8-byte align is preserved
|
||||
s/\sPRESERVE8/.eabi_attribute 25, 1 \@Tag_ABI_align_preserved/g;
|
||||
} else {
|
||||
s/\sREQUIRE8//;
|
||||
s/\sPRESERVE8//;
|
||||
}
|
||||
|
||||
# Use PROC and ENDP to give the symbols a .size directive.
|
||||
# This makes them show up properly in debugging tools like gdb and valgrind.
|
||||
@ -202,7 +212,7 @@ while (<STDIN>)
|
||||
my $proc;
|
||||
s/\bENDP\b/@ $&/;
|
||||
$proc = pop(@proc_stack);
|
||||
$_ = "\t.size $proc, .-$proc".$_ if ($proc);
|
||||
$_ = "\t.size $proc, .-$proc".$_ if ($proc and $elf);
|
||||
}
|
||||
|
||||
# EQU directive
|
||||
@ -225,4 +235,4 @@ while (<STDIN>)
|
||||
}
|
||||
|
||||
# Mark that this object doesn't need an executable stack.
|
||||
printf ("\t.section\t.note.GNU-stack,\"\",\%\%progbits\n");
|
||||
printf ("\t.section\t.note.GNU-stack,\"\",\%\%progbits\n") if $elf;
|
||||
|
||||
@ -20,9 +20,7 @@
|
||||
|
||||
print "@ This file was created from a .asm file\n";
|
||||
print "@ using the ads2gas_apple.pl script.\n\n";
|
||||
print "\t.set WIDE_REFERENCE, 0\n";
|
||||
print "\t.set ARCHITECTURE, 5\n";
|
||||
print "\t.set DO1STROUNDING, 0\n";
|
||||
print "\t.syntax unified\n";
|
||||
|
||||
my %register_aliases;
|
||||
my %macro_aliases;
|
||||
|
||||
@ -319,6 +319,12 @@ check_ld() {
|
||||
&& check_cmd ${LD} ${LDFLAGS} "$@" -o ${TMP_X} ${TMP_O} ${extralibs}
|
||||
}
|
||||
|
||||
check_lib() {
|
||||
log check_lib "$@"
|
||||
check_cc $@ \
|
||||
&& check_cmd ${LD} ${LDFLAGS} -o ${TMP_X} ${TMP_O} "$@" ${extralibs}
|
||||
}
|
||||
|
||||
check_header(){
|
||||
log check_header "$@"
|
||||
header=$1
|
||||
@ -420,6 +426,26 @@ check_gcc_machine_options() {
|
||||
fi
|
||||
}
|
||||
|
||||
check_gcc_avx512_compiles() {
|
||||
if disabled gcc; then
|
||||
return
|
||||
fi
|
||||
|
||||
check_cc -mavx512f <<EOF
|
||||
#include <immintrin.h>
|
||||
void f(void) {
|
||||
__m512i x = _mm512_set1_epi16(0);
|
||||
(void)x;
|
||||
}
|
||||
EOF
|
||||
compile_result=$?
|
||||
if [ ${compile_result} -ne 0 ]; then
|
||||
log_echo " disabling avx512: not supported by compiler"
|
||||
disable_feature avx512
|
||||
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 "
|
||||
fi
|
||||
}
|
||||
|
||||
write_common_config_banner() {
|
||||
print_webm_license config.mk "##" ""
|
||||
echo '# This file automatically generated by configure. Do not edit!' >> config.mk
|
||||
@ -481,6 +507,7 @@ AS_SFX = ${AS_SFX:-.asm}
|
||||
EXE_SFX = ${EXE_SFX}
|
||||
VCPROJ_SFX = ${VCPROJ_SFX}
|
||||
RTCD_OPTIONS = ${RTCD_OPTIONS}
|
||||
LIBYUV_CXXFLAGS = ${LIBYUV_CXXFLAGS}
|
||||
EOF
|
||||
|
||||
if enabled rvct; then cat >> $1 << EOF
|
||||
@ -520,6 +547,24 @@ EOF
|
||||
cmp "$1" ${TMP_H} >/dev/null 2>&1 || mv ${TMP_H} "$1"
|
||||
}
|
||||
|
||||
write_win_arm64_neon_h_workaround() {
|
||||
print_webm_license ${TMP_H} "/*" " */"
|
||||
cat >> ${TMP_H} << EOF
|
||||
/* This file automatically generated by configure. Do not edit! */
|
||||
#ifndef VPX_WIN_ARM_NEON_H_WORKAROUND
|
||||
#define VPX_WIN_ARM_NEON_H_WORKAROUND
|
||||
/* The Windows SDK has arm_neon.h, but unlike on other platforms it is
|
||||
* ARM32-only. ARM64 NEON support is provided by arm64_neon.h, a proper
|
||||
* superset of arm_neon.h. Work around this by providing a more local
|
||||
* arm_neon.h that simply #includes arm64_neon.h.
|
||||
*/
|
||||
#include <arm64_neon.h>
|
||||
#endif /* VPX_WIN_ARM_NEON_H_WORKAROUND */
|
||||
EOF
|
||||
mkdir -p `dirname "$1"`
|
||||
cmp "$1" ${TMP_H} >/dev/null 2>&1 || mv ${TMP_H} "$1"
|
||||
}
|
||||
|
||||
process_common_cmdline() {
|
||||
for opt in "$@"; do
|
||||
optval="${opt#*=}"
|
||||
@ -602,11 +647,7 @@ process_common_cmdline() {
|
||||
--libdir=*)
|
||||
libdir="${optval}"
|
||||
;;
|
||||
--sdk-path=*)
|
||||
[ -d "${optval}" ] || die "Not a directory: ${optval}"
|
||||
sdk_path="${optval}"
|
||||
;;
|
||||
--libc|--as|--prefix|--libdir|--sdk-path)
|
||||
--libc|--as|--prefix|--libdir)
|
||||
die "Option ${opt} requires argument"
|
||||
;;
|
||||
--help|-h)
|
||||
@ -713,11 +754,8 @@ process_common_toolchain() {
|
||||
*sparc*)
|
||||
tgt_isa=sparc
|
||||
;;
|
||||
power*64*-*)
|
||||
tgt_isa=ppc64
|
||||
;;
|
||||
power*)
|
||||
tgt_isa=ppc
|
||||
power*64le*-*)
|
||||
tgt_isa=ppc64le
|
||||
;;
|
||||
*mips64el*)
|
||||
tgt_isa=mips64
|
||||
@ -837,7 +875,7 @@ process_common_toolchain() {
|
||||
IOS_VERSION_MIN="8.0"
|
||||
else
|
||||
IOS_VERSION_OPTIONS=""
|
||||
IOS_VERSION_MIN="6.0"
|
||||
IOS_VERSION_MIN="7.0"
|
||||
fi
|
||||
|
||||
# Handle darwin variants. Newer SDKs allow targeting older
|
||||
@ -957,7 +995,6 @@ process_common_toolchain() {
|
||||
setup_gnu_toolchain
|
||||
arch_int=${tgt_isa##armv}
|
||||
arch_int=${arch_int%%te}
|
||||
check_add_asflags --defsym ARCHITECTURE=${arch_int}
|
||||
tune_cflags="-mtune="
|
||||
if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
|
||||
if [ -z "${float_abi}" ]; then
|
||||
@ -984,6 +1021,16 @@ EOF
|
||||
|
||||
enabled debug && add_asflags -g
|
||||
asm_conversion_cmd="${source_path}/build/make/ads2gas.pl"
|
||||
|
||||
case ${tgt_os} in
|
||||
win*)
|
||||
asm_conversion_cmd="$asm_conversion_cmd -noelf"
|
||||
AS="$CC -c"
|
||||
EXE_SFX=.exe
|
||||
enable_feature thumb
|
||||
;;
|
||||
esac
|
||||
|
||||
if enabled thumb; then
|
||||
asm_conversion_cmd="$asm_conversion_cmd -thumb"
|
||||
check_add_cflags -mthumb
|
||||
@ -991,18 +1038,41 @@ EOF
|
||||
fi
|
||||
;;
|
||||
vs*)
|
||||
asm_conversion_cmd="${source_path}/build/make/ads2armasm_ms.pl"
|
||||
AS_SFX=.S
|
||||
msvs_arch_dir=arm-msvs
|
||||
disable_feature multithread
|
||||
disable_feature unit_tests
|
||||
vs_version=${tgt_cc##vs}
|
||||
if [ $vs_version -ge 12 ]; then
|
||||
# MSVC 2013 doesn't allow doing plain .exe projects for ARM,
|
||||
# only "AppContainerApplication" which requires an AppxManifest.
|
||||
# Therefore disable the examples, just build the library.
|
||||
disable_feature examples
|
||||
disable_feature tools
|
||||
# A number of ARM-based Windows platforms are constrained by their
|
||||
# respective SDKs' limitations. Fortunately, these are all 32-bit ABIs
|
||||
# and so can be selected as 'win32'.
|
||||
if [ ${tgt_os} = "win32" ]; then
|
||||
asm_conversion_cmd="${source_path}/build/make/ads2armasm_ms.pl"
|
||||
AS_SFX=.S
|
||||
msvs_arch_dir=arm-msvs
|
||||
disable_feature multithread
|
||||
disable_feature unit_tests
|
||||
if [ ${tgt_cc##vs} -ge 12 ]; then
|
||||
# MSVC 2013 doesn't allow doing plain .exe projects for ARM32,
|
||||
# only "AppContainerApplication" which requires an AppxManifest.
|
||||
# Therefore disable the examples, just build the library.
|
||||
disable_feature examples
|
||||
disable_feature tools
|
||||
fi
|
||||
else
|
||||
# Windows 10 on ARM, on the other hand, has full Windows SDK support
|
||||
# for building Win32 ARM64 applications in addition to ARM64
|
||||
# Windows Store apps. It is the only 64-bit ARM ABI that
|
||||
# Windows supports, so it is the default definition of 'win64'.
|
||||
# ARM64 build support officially shipped in Visual Studio 15.9.0.
|
||||
|
||||
# Because the ARM64 Windows SDK's arm_neon.h is ARM32-specific
|
||||
# while LLVM's is not, probe its validity.
|
||||
if enabled neon; then
|
||||
if [ -n "${CC}" ]; then
|
||||
check_header arm_neon.h || check_header arm64_neon.h && \
|
||||
enable_feature win_arm64_neon_h_workaround
|
||||
else
|
||||
# If a probe is not possible, assume this is the pure Windows
|
||||
# SDK and so the workaround is necessary.
|
||||
enable_feature win_arm64_neon_h_workaround
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
rvct)
|
||||
@ -1030,7 +1100,6 @@ EOF
|
||||
fi
|
||||
arch_int=${tgt_isa##armv}
|
||||
arch_int=${arch_int%%te}
|
||||
check_add_asflags --pd "\"ARCHITECTURE SETA ${arch_int}\""
|
||||
enabled debug && add_asflags -g
|
||||
add_cflags --gnu
|
||||
add_cflags --enum_is_int
|
||||
@ -1045,51 +1114,10 @@ EOF
|
||||
;;
|
||||
|
||||
android*)
|
||||
if [ -n "${sdk_path}" ]; then
|
||||
SDK_PATH=${sdk_path}
|
||||
COMPILER_LOCATION=`find "${SDK_PATH}" \
|
||||
-name "arm-linux-androideabi-gcc*" -print -quit`
|
||||
TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/arm-linux-androideabi-
|
||||
CC=${TOOLCHAIN_PATH}gcc
|
||||
CXX=${TOOLCHAIN_PATH}g++
|
||||
AR=${TOOLCHAIN_PATH}ar
|
||||
LD=${TOOLCHAIN_PATH}gcc
|
||||
AS=${TOOLCHAIN_PATH}as
|
||||
STRIP=${TOOLCHAIN_PATH}strip
|
||||
NM=${TOOLCHAIN_PATH}nm
|
||||
|
||||
if [ -z "${alt_libc}" ]; then
|
||||
alt_libc=`find "${SDK_PATH}" -name arch-arm -print | \
|
||||
awk '{n = split($0,a,"/"); \
|
||||
split(a[n-1],b,"-"); \
|
||||
print $0 " " b[2]}' | \
|
||||
sort -g -k 2 | \
|
||||
awk '{ print $1 }' | tail -1`
|
||||
fi
|
||||
|
||||
if [ -d "${alt_libc}" ]; then
|
||||
add_cflags "--sysroot=${alt_libc}"
|
||||
add_ldflags "--sysroot=${alt_libc}"
|
||||
fi
|
||||
|
||||
# linker flag that routes around a CPU bug in some
|
||||
# Cortex-A8 implementations (NDK Dev Guide)
|
||||
add_ldflags "-Wl,--fix-cortex-a8"
|
||||
|
||||
enable_feature pic
|
||||
soft_enable realtime_only
|
||||
if [ ${tgt_isa} = "armv7" ]; then
|
||||
soft_enable runtime_cpu_detect
|
||||
fi
|
||||
if enabled runtime_cpu_detect; then
|
||||
add_cflags "-I${SDK_PATH}/sources/android/cpufeatures"
|
||||
fi
|
||||
else
|
||||
echo "Assuming standalone build with NDK toolchain."
|
||||
echo "See build/make/Android.mk for details."
|
||||
check_add_ldflags -static
|
||||
soft_enable unit_tests
|
||||
fi
|
||||
echo "Assuming standalone build with NDK toolchain."
|
||||
echo "See build/make/Android.mk for details."
|
||||
check_add_ldflags -static
|
||||
soft_enable unit_tests
|
||||
;;
|
||||
|
||||
darwin*)
|
||||
@ -1204,6 +1232,11 @@ EOF
|
||||
esac
|
||||
|
||||
if enabled msa; then
|
||||
# TODO(libyuv:793)
|
||||
# The new mips functions in libyuv do not build
|
||||
# with the toolchains we currently use for testing.
|
||||
soft_disable libyuv
|
||||
|
||||
add_cflags -mmsa
|
||||
add_asflags -mmsa
|
||||
add_ldflags -mmsa
|
||||
@ -1219,13 +1252,25 @@ EOF
|
||||
check_add_asflags -march=${tgt_isa}
|
||||
check_add_asflags -KPIC
|
||||
;;
|
||||
ppc*)
|
||||
ppc64le*)
|
||||
link_with_cc=gcc
|
||||
setup_gnu_toolchain
|
||||
check_gcc_machine_option "vsx"
|
||||
# Do not enable vsx by default.
|
||||
# https://bugs.chromium.org/p/webm/issues/detail?id=1522
|
||||
enabled vsx || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-vsx "
|
||||
if [ -n "${tune_cpu}" ]; then
|
||||
case ${tune_cpu} in
|
||||
power?)
|
||||
tune_cflags="-mcpu="
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
x86*)
|
||||
case ${tgt_os} in
|
||||
android)
|
||||
soft_enable realtime_only
|
||||
;;
|
||||
win*)
|
||||
enabled gcc && add_cflags -fno-common
|
||||
;;
|
||||
@ -1277,28 +1322,13 @@ EOF
|
||||
# Skip the check by setting AS arbitrarily
|
||||
AS=msvs
|
||||
msvs_arch_dir=x86-msvs
|
||||
vc_version=${tgt_cc##vs}
|
||||
case $vc_version in
|
||||
7|8|9|10|11|12|13|14)
|
||||
case ${tgt_cc##vs} in
|
||||
14)
|
||||
echo "${tgt_cc} does not support avx512, disabling....."
|
||||
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 "
|
||||
soft_disable avx512
|
||||
;;
|
||||
esac
|
||||
case $vc_version in
|
||||
7|8|9|10)
|
||||
echo "${tgt_cc} does not support avx/avx2, disabling....."
|
||||
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx --disable-avx2 "
|
||||
soft_disable avx
|
||||
soft_disable avx2
|
||||
;;
|
||||
esac
|
||||
case $vc_version in
|
||||
7|8|9)
|
||||
echo "${tgt_cc} omits stdint.h, disabling webm-io..."
|
||||
soft_disable webm_io
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1331,16 +1361,12 @@ EOF
|
||||
else
|
||||
if [ "$ext" = "avx512" ]; then
|
||||
check_gcc_machine_options $ext avx512f avx512cd avx512bw avx512dq avx512vl
|
||||
check_gcc_avx512_compiles
|
||||
else
|
||||
# use the shortened version for the flag: sse4_1 -> sse4
|
||||
check_gcc_machine_option ${ext%_*} $ext
|
||||
fi
|
||||
fi
|
||||
|
||||
# https://bugs.chromium.org/p/webm/issues/detail?id=1464
|
||||
# The assembly optimizations for vpx_sub_pixel_variance do not link with
|
||||
# gcc 6.
|
||||
enabled sse2 && soft_enable pic
|
||||
done
|
||||
|
||||
if enabled external_build; then
|
||||
@ -1400,7 +1426,8 @@ EOF
|
||||
add_cflags ${sim_arch}
|
||||
add_ldflags ${sim_arch}
|
||||
|
||||
if [ "$(show_darwin_sdk_major_version iphonesimulator)" -gt 8 ]; then
|
||||
if [ "$(disabled external_build)" ] &&
|
||||
[ "$(show_darwin_sdk_major_version iphonesimulator)" -gt 8 ]; then
|
||||
# yasm v1.3.0 doesn't know what -fembed-bitcode means, so turning it
|
||||
# on is pointless (unless building a C-only lib). Warn the user, but
|
||||
# do nothing here.
|
||||
@ -1490,7 +1517,13 @@ EOF
|
||||
# bionic includes basic pthread functionality, obviating -lpthread.
|
||||
;;
|
||||
*)
|
||||
check_header pthread.h && add_extralibs -lpthread
|
||||
check_header pthread.h && check_lib -lpthread <<EOF && add_extralibs -lpthread || disable_feature pthread_h
|
||||
#include <pthread.h>
|
||||
#include <stddef.h>
|
||||
void *thread_check (void *);
|
||||
void *thread_check (void *obj){ return obj;};
|
||||
int main(void) { pthread_t thread_id; return pthread_create(&thread_id, NULL, thread_check, NULL); }
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@ -261,6 +261,11 @@ case "$target" in
|
||||
asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)""
|
||||
asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)""
|
||||
;;
|
||||
arm64*)
|
||||
platforms[0]="ARM64"
|
||||
asm_Debug_cmdline="armasm64 -nologo -oldit "%(FullPath)""
|
||||
asm_Release_cmdline="armasm64 -nologo -oldit "%(FullPath)""
|
||||
;;
|
||||
arm*)
|
||||
platforms[0]="ARM"
|
||||
asm_Debug_cmdline="armasm -nologo -oldit "%(FullPath)""
|
||||
@ -307,6 +312,16 @@ generate_vcxproj() {
|
||||
tag_content ApplicationType "Windows Store"
|
||||
tag_content ApplicationTypeRevision 8.1
|
||||
fi
|
||||
if [ "${platforms[0]}" = "ARM64" ]; then
|
||||
# Require the first Visual Studio version to have ARM64 support.
|
||||
tag_content MinimumVisualStudioVersion 15.9
|
||||
fi
|
||||
if [ $vs_ver -eq 15 ] && [ "${platforms[0]}" = "ARM64" ]; then
|
||||
# Since VS 15 does not have a 'use latest SDK version' facility,
|
||||
# specifically require the contemporaneous SDK with official ARM64
|
||||
# support.
|
||||
tag_content WindowsTargetPlatformVersion 10.0.17763.0
|
||||
fi
|
||||
close_tag PropertyGroup
|
||||
|
||||
tag Import \
|
||||
|
||||
@ -132,7 +132,8 @@ create_vpx_framework_config_shim() {
|
||||
done
|
||||
|
||||
# Consume the last line of output from the loop: We don't want it.
|
||||
sed -i '' -e '$d' "${config_file}"
|
||||
sed -i.bak -e '$d' "${config_file}"
|
||||
rm "${config_file}.bak"
|
||||
|
||||
printf "#endif\n\n" >> "${config_file}"
|
||||
printf "#endif // ${include_guard}" >> "${config_file}"
|
||||
@ -244,7 +245,7 @@ build_framework() {
|
||||
# Trap function. Cleans up the subtree used to build all targets contained in
|
||||
# $TARGETS.
|
||||
cleanup() {
|
||||
local readonly res=$?
|
||||
local res=$?
|
||||
cd "${ORIG_PWD}"
|
||||
|
||||
if [ $res -ne 0 ]; then
|
||||
@ -350,7 +351,7 @@ if [ "$ENABLE_SHARED" = "yes" ]; then
|
||||
IOS_VERSION_MIN="8.0"
|
||||
else
|
||||
IOS_VERSION_OPTIONS=""
|
||||
IOS_VERSION_MIN="6.0"
|
||||
IOS_VERSION_MIN="7.0"
|
||||
fi
|
||||
|
||||
if [ "${VERBOSE}" = "yes" ]; then
|
||||
|
||||
@ -41,6 +41,15 @@ fix_path() {
|
||||
# Corrects the paths in file_list in one pass for efficiency.
|
||||
# $1 is the name of the array to be modified.
|
||||
fix_file_list() {
|
||||
if [ "${FIXPATH}" = "echo_path" ] ; then
|
||||
# When used with echo_path, fix_file_list is a no-op. Avoid warning about
|
||||
# unsupported 'declare -n' when it is not important.
|
||||
return 0
|
||||
elif [ "${BASH_VERSINFO}" -lt 4 ] ; then
|
||||
echo "Cygwin path conversion has failed. Please use a version of bash"
|
||||
echo "which supports nameref (-n), introduced in bash 4.3"
|
||||
return 1
|
||||
fi
|
||||
declare -n array_ref=$1
|
||||
files=$(fix_path "${array_ref[@]}")
|
||||
local IFS=$'\n'
|
||||
|
||||
@ -400,12 +400,13 @@ EOF
|
||||
#
|
||||
|
||||
&require("c");
|
||||
&require(keys %required);
|
||||
if ($opts{arch} eq 'x86') {
|
||||
@ALL_ARCHS = filter(qw/mmx sse sse2 sse3 ssse3 sse4_1 avx avx2 avx512/);
|
||||
x86;
|
||||
} elsif ($opts{arch} eq 'x86_64') {
|
||||
@ALL_ARCHS = filter(qw/mmx sse sse2 sse3 ssse3 sse4_1 avx avx2 avx512/);
|
||||
@REQUIRES = filter(keys %required ? keys %required : qw/mmx sse sse2/);
|
||||
@REQUIRES = filter(qw/mmx sse sse2/);
|
||||
&require(@REQUIRES);
|
||||
x86;
|
||||
} elsif ($opts{arch} eq 'mips32' || $opts{arch} eq 'mips64') {
|
||||
@ -433,6 +434,7 @@ if ($opts{arch} eq 'x86') {
|
||||
arm;
|
||||
} elsif ($opts{arch} eq 'armv8' || $opts{arch} eq 'arm64' ) {
|
||||
@ALL_ARCHS = filter(qw/neon/);
|
||||
&require("neon");
|
||||
arm;
|
||||
} elsif ($opts{arch} =~ /^ppc/ ) {
|
||||
@ALL_ARCHS = filter(qw/vsx/);
|
||||
|
||||
@ -54,13 +54,6 @@ sub FixThumbInstructions($$)
|
||||
# "addne r0, r0, r2".
|
||||
s/^(\s*)((ldr|str)(ne)?[bhd]?)(\s+)(\w+),(\s*\w+,)?\s*\[(\w+)\],\s*(\w+)/$1$2$5$6,$7 [$8]\n$1add$4$5$8, $8, $9/g;
|
||||
|
||||
# Convert a conditional addition to the pc register into a series of
|
||||
# instructions. This converts "addlt pc, pc, r3, lsl #2" into
|
||||
# "itttt lt", "movlt.n r12, pc", "addlt.w r12, #12",
|
||||
# "addlt.w r12, r12, r3, lsl #2", "movlt.n pc, r12".
|
||||
# This assumes that r12 is free at this point.
|
||||
s/^(\s*)addlt(\s+)pc,\s*pc,\s*(\w+),\s*lsl\s*#(\d+)/$1itttt$2lt\n$1movlt.n$2r12, pc\n$1addlt.w$2r12, #12\n$1addlt.w$2r12, r12, $3, lsl #($4-$branch_shift_offset)\n$1movlt.n$2pc, r12/g;
|
||||
|
||||
# Convert "mov pc, lr" into "bx lr", since the former only works
|
||||
# for switching from arm to thumb (and only in armv7), but not
|
||||
# from thumb to arm.
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# This file is used by gcl to get repository specific information.
|
||||
GERRIT_HOST: chromium-review.googlesource.com
|
||||
GERRIT_PORT: 29418
|
||||
# This file is used by git cl to get repository specific information.
|
||||
GERRIT_HOST: True
|
||||
CODE_REVIEW_SERVER: chromium-review.googlesource.com
|
||||
GERRIT_SQUASH_UPLOADS: False
|
||||
|
||||
96
libs/libvpx/configure
vendored
96
libs/libvpx/configure
vendored
@ -31,7 +31,6 @@ Advanced options:
|
||||
--libc=PATH path to alternate libc
|
||||
--size-limit=WxH max size to allow in the decoder
|
||||
--as={yasm|nasm|auto} use specified assembler [auto, yasm preferred]
|
||||
--sdk-path=PATH path to root of sdk (android builds only)
|
||||
${toggle_codec_srcs} in/exclude codec library source code
|
||||
${toggle_debug_libs} in/exclude debug version of libraries
|
||||
${toggle_static_msvcrt} use static MSVCRT (VS builds only)
|
||||
@ -101,20 +100,20 @@ EOF
|
||||
all_platforms="${all_platforms} arm64-android-gcc"
|
||||
all_platforms="${all_platforms} arm64-darwin-gcc"
|
||||
all_platforms="${all_platforms} arm64-linux-gcc"
|
||||
all_platforms="${all_platforms} arm64-win64-gcc"
|
||||
all_platforms="${all_platforms} arm64-win64-vs15"
|
||||
all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8
|
||||
all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8
|
||||
all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8
|
||||
all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8
|
||||
all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8
|
||||
all_platforms="${all_platforms} armv7-win32-vs11"
|
||||
all_platforms="${all_platforms} armv7-win32-vs12"
|
||||
all_platforms="${all_platforms} armv7-win32-gcc"
|
||||
all_platforms="${all_platforms} armv7-win32-vs14"
|
||||
all_platforms="${all_platforms} armv7-win32-vs15"
|
||||
all_platforms="${all_platforms} armv7s-darwin-gcc"
|
||||
all_platforms="${all_platforms} armv8-linux-gcc"
|
||||
all_platforms="${all_platforms} mips32-linux-gcc"
|
||||
all_platforms="${all_platforms} mips64-linux-gcc"
|
||||
all_platforms="${all_platforms} ppc64-linux-gcc"
|
||||
all_platforms="${all_platforms} ppc64le-linux-gcc"
|
||||
all_platforms="${all_platforms} sparc-solaris-gcc"
|
||||
all_platforms="${all_platforms} x86-android-gcc"
|
||||
@ -137,9 +136,6 @@ all_platforms="${all_platforms} x86-linux-icc"
|
||||
all_platforms="${all_platforms} x86-os2-gcc"
|
||||
all_platforms="${all_platforms} x86-solaris-gcc"
|
||||
all_platforms="${all_platforms} x86-win32-gcc"
|
||||
all_platforms="${all_platforms} x86-win32-vs10"
|
||||
all_platforms="${all_platforms} x86-win32-vs11"
|
||||
all_platforms="${all_platforms} x86-win32-vs12"
|
||||
all_platforms="${all_platforms} x86-win32-vs14"
|
||||
all_platforms="${all_platforms} x86-win32-vs15"
|
||||
all_platforms="${all_platforms} x86_64-android-gcc"
|
||||
@ -159,9 +155,6 @@ all_platforms="${all_platforms} x86_64-linux-gcc"
|
||||
all_platforms="${all_platforms} x86_64-linux-icc"
|
||||
all_platforms="${all_platforms} x86_64-solaris-gcc"
|
||||
all_platforms="${all_platforms} x86_64-win64-gcc"
|
||||
all_platforms="${all_platforms} x86_64-win64-vs10"
|
||||
all_platforms="${all_platforms} x86_64-win64-vs11"
|
||||
all_platforms="${all_platforms} x86_64-win64-vs12"
|
||||
all_platforms="${all_platforms} x86_64-win64-vs14"
|
||||
all_platforms="${all_platforms} x86_64-win64-vs15"
|
||||
all_platforms="${all_platforms} generic-gnu"
|
||||
@ -278,9 +271,9 @@ HAVE_LIST="
|
||||
unistd_h
|
||||
"
|
||||
EXPERIMENT_LIST="
|
||||
spatial_svc
|
||||
fp_mb_stats
|
||||
emulate_hardware
|
||||
non_greedy_mv
|
||||
"
|
||||
CONFIG_LIST="
|
||||
dependency_tracking
|
||||
@ -330,12 +323,15 @@ CONFIG_LIST="
|
||||
multi_res_encoding
|
||||
temporal_denoising
|
||||
vp9_temporal_denoising
|
||||
consistent_recode
|
||||
coefficient_range_checking
|
||||
vp9_highbitdepth
|
||||
better_hw_compatibility
|
||||
experimental
|
||||
size_limit
|
||||
always_adjust_bpm
|
||||
bitstream_debug
|
||||
mismatch_debug
|
||||
${EXPERIMENT_LIST}
|
||||
"
|
||||
CMDLINE_SELECT="
|
||||
@ -391,11 +387,14 @@ CMDLINE_SELECT="
|
||||
multi_res_encoding
|
||||
temporal_denoising
|
||||
vp9_temporal_denoising
|
||||
consistent_recode
|
||||
coefficient_range_checking
|
||||
better_hw_compatibility
|
||||
vp9_highbitdepth
|
||||
experimental
|
||||
always_adjust_bpm
|
||||
bitstream_debug
|
||||
mismatch_debug
|
||||
"
|
||||
|
||||
process_cmdline() {
|
||||
@ -426,6 +425,12 @@ process_cmdline() {
|
||||
}
|
||||
|
||||
post_process_cmdline() {
|
||||
if enabled coefficient_range_checking; then
|
||||
echo "coefficient-range-checking is for decoders only, disabling encoders:"
|
||||
soft_disable vp8_encoder
|
||||
soft_disable vp9_encoder
|
||||
fi
|
||||
|
||||
c=""
|
||||
|
||||
# Enable all detected codecs, if they haven't been disabled
|
||||
@ -447,6 +452,7 @@ process_targets() {
|
||||
enabled child || write_common_config_banner
|
||||
write_common_target_config_h ${BUILD_PFX}vpx_config.h
|
||||
write_common_config_targets
|
||||
enabled win_arm64_neon_h_workaround && write_win_arm64_neon_h_workaround ${BUILD_PFX}arm_neon.h
|
||||
|
||||
# Calculate the default distribution name, based on the enabled features
|
||||
cf=""
|
||||
@ -523,7 +529,7 @@ process_detect() {
|
||||
# here rather than at option parse time because the target auto-detect
|
||||
# magic happens after the command line has been parsed.
|
||||
case "${tgt_os}" in
|
||||
linux|os2|darwin*|iphonesimulator*)
|
||||
linux|os2|solaris|darwin*|iphonesimulator*)
|
||||
# Supported platforms
|
||||
;;
|
||||
*)
|
||||
@ -575,16 +581,32 @@ process_detect() {
|
||||
check_ld() {
|
||||
true
|
||||
}
|
||||
check_lib() {
|
||||
true
|
||||
}
|
||||
fi
|
||||
check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
|
||||
check_ld <<EOF || die "Toolchain is unable to link executables"
|
||||
int main(void) {return 0;}
|
||||
EOF
|
||||
# check system headers
|
||||
check_header pthread.h
|
||||
|
||||
# Use both check_header and check_lib here, since check_lib
|
||||
# could be a stub that always returns true.
|
||||
check_header pthread.h && check_lib -lpthread <<EOF || disable_feature pthread_h
|
||||
#include <pthread.h>
|
||||
#include <stddef.h>
|
||||
void *thread_check (void *);
|
||||
void *thread_check (void *obj){ return obj;};
|
||||
int main(void) { pthread_t thread_id; return pthread_create(&thread_id, NULL, thread_check, NULL); }
|
||||
EOF
|
||||
check_header unistd.h # for sysconf(3) and friends.
|
||||
|
||||
check_header vpx/vpx_integer.h -I${source_path} && enable_feature vpx_ports
|
||||
|
||||
if enabled neon && ! enabled external_build; then
|
||||
check_header arm_neon.h || die "Unable to find arm_neon.h"
|
||||
fi
|
||||
}
|
||||
|
||||
process_toolchain() {
|
||||
@ -603,22 +625,39 @@ process_toolchain() {
|
||||
check_add_cflags -Wcast-qual
|
||||
check_add_cflags -Wvla
|
||||
check_add_cflags -Wimplicit-function-declaration
|
||||
check_add_cflags -Wmissing-declarations
|
||||
check_add_cflags -Wmissing-prototypes
|
||||
check_add_cflags -Wuninitialized
|
||||
check_add_cflags -Wunused
|
||||
# -Wextra has some tricky cases. Rather than fix them all now, get the
|
||||
# flag for as many files as possible and fix the remaining issues
|
||||
# piecemeal.
|
||||
# https://bugs.chromium.org/p/webm/issues/detail?id=1069
|
||||
check_add_cflags -Wextra
|
||||
# check_add_cflags also adds to cxxflags. gtest does not do well with
|
||||
# -Wundef so add it explicitly to CFLAGS only.
|
||||
# these flags so add them explicitly to CFLAGS only.
|
||||
check_cflags -Wundef && add_cflags_only -Wundef
|
||||
check_cflags -Wframe-larger-than=52000 && \
|
||||
add_cflags_only -Wframe-larger-than=52000
|
||||
if enabled mips || [ -z "${INLINE}" ]; then
|
||||
enabled extra_warnings || check_add_cflags -Wno-unused-function
|
||||
fi
|
||||
# Enforce c89 for c files. Don't be too strict about it though. Allow
|
||||
# gnu extensions like "//" for comments.
|
||||
check_cflags -std=gnu89 && add_cflags_only -std=gnu89
|
||||
# Avoid this warning for third_party C++ sources. Some reorganization
|
||||
# would be needed to apply this only to test/*.cc.
|
||||
check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32
|
||||
|
||||
# Quiet gcc 6 vs 7 abi warnings:
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
|
||||
if enabled arm; then
|
||||
check_add_cxxflags -Wno-psabi
|
||||
fi
|
||||
|
||||
# disable some warnings specific to libyuv.
|
||||
check_cxxflags -Wno-missing-declarations \
|
||||
&& LIBYUV_CXXFLAGS="${LIBYUV_CXXFLAGS} -Wno-missing-declarations"
|
||||
check_cxxflags -Wno-missing-prototypes \
|
||||
&& LIBYUV_CXXFLAGS="${LIBYUV_CXXFLAGS} -Wno-missing-prototypes"
|
||||
check_cxxflags -Wno-unused-parameter \
|
||||
&& LIBYUV_CXXFLAGS="${LIBYUV_CXXFLAGS} -Wno-unused-parameter"
|
||||
fi
|
||||
|
||||
if enabled icc; then
|
||||
@ -689,7 +728,7 @@ process_toolchain() {
|
||||
soft_enable libyuv
|
||||
;;
|
||||
*-android-*)
|
||||
soft_enable webm_io
|
||||
check_add_cxxflags -std=c++11 && soft_enable webm_io
|
||||
soft_enable libyuv
|
||||
# GTestLog must be modified to use Android logging utilities.
|
||||
;;
|
||||
@ -698,30 +737,23 @@ process_toolchain() {
|
||||
# x86 targets.
|
||||
;;
|
||||
*-iphonesimulator-*)
|
||||
soft_enable webm_io
|
||||
check_add_cxxflags -std=c++11 && soft_enable webm_io
|
||||
soft_enable libyuv
|
||||
;;
|
||||
*-win*)
|
||||
# Some mingw toolchains don't have pthread available by default.
|
||||
# Treat these more like visual studio where threading in gtest
|
||||
# would be disabled for the same reason.
|
||||
check_cxx "$@" <<EOF && soft_enable unit_tests
|
||||
int z;
|
||||
EOF
|
||||
check_cxx "$@" <<EOF && soft_enable webm_io
|
||||
int z;
|
||||
EOF
|
||||
check_add_cxxflags -std=c++11 && soft_enable unit_tests \
|
||||
&& soft_enable webm_io
|
||||
check_cxx "$@" <<EOF && soft_enable libyuv
|
||||
int z;
|
||||
EOF
|
||||
;;
|
||||
*)
|
||||
enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests
|
||||
int z;
|
||||
EOF
|
||||
check_cxx "$@" <<EOF && soft_enable webm_io
|
||||
int z;
|
||||
EOF
|
||||
enabled pthread_h && check_add_cxxflags -std=c++11 \
|
||||
&& soft_enable unit_tests
|
||||
check_add_cxxflags -std=c++11 && soft_enable webm_io
|
||||
check_cxx "$@" <<EOF && soft_enable libyuv
|
||||
int z;
|
||||
EOF
|
||||
|
||||
@ -23,7 +23,7 @@ LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \
|
||||
third_party/libyuv/source/row_any.cc \
|
||||
third_party/libyuv/source/row_common.cc \
|
||||
third_party/libyuv/source/row_gcc.cc \
|
||||
third_party/libyuv/source/row_mips.cc \
|
||||
third_party/libyuv/source/row_msa.cc \
|
||||
third_party/libyuv/source/row_neon.cc \
|
||||
third_party/libyuv/source/row_neon64.cc \
|
||||
third_party/libyuv/source/row_win.cc \
|
||||
@ -31,7 +31,7 @@ LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \
|
||||
third_party/libyuv/source/scale_any.cc \
|
||||
third_party/libyuv/source/scale_common.cc \
|
||||
third_party/libyuv/source/scale_gcc.cc \
|
||||
third_party/libyuv/source/scale_mips.cc \
|
||||
third_party/libyuv/source/scale_msa.cc \
|
||||
third_party/libyuv/source/scale_neon.cc \
|
||||
third_party/libyuv/source/scale_neon64.cc \
|
||||
third_party/libyuv/source/scale_win.cc \
|
||||
@ -72,11 +72,12 @@ vpxdec.SRCS += vpx_ports/vpx_timer.h
|
||||
vpxdec.SRCS += vpx/vpx_integer.h
|
||||
vpxdec.SRCS += args.c args.h
|
||||
vpxdec.SRCS += ivfdec.c ivfdec.h
|
||||
vpxdec.SRCS += y4minput.c y4minput.h
|
||||
vpxdec.SRCS += tools_common.c tools_common.h
|
||||
vpxdec.SRCS += y4menc.c y4menc.h
|
||||
ifeq ($(CONFIG_LIBYUV),yes)
|
||||
vpxdec.SRCS += $(LIBYUV_SRCS)
|
||||
$(BUILD_PFX)third_party/libyuv/%.cc.o: CXXFLAGS += -Wno-unused-parameter
|
||||
$(BUILD_PFX)third_party/libyuv/%.cc.o: CXXFLAGS += ${LIBYUV_CXXFLAGS}
|
||||
endif
|
||||
ifeq ($(CONFIG_WEBM_IO),yes)
|
||||
vpxdec.SRCS += $(LIBWEBM_COMMON_SRCS)
|
||||
@ -109,18 +110,20 @@ ifeq ($(CONFIG_WEBM_IO),yes)
|
||||
endif
|
||||
vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1
|
||||
vpxenc.DESCRIPTION = Full featured encoder
|
||||
ifeq ($(CONFIG_SPATIAL_SVC),yes)
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_svc_encoder.c
|
||||
vp9_spatial_svc_encoder.SRCS += args.c args.h
|
||||
vp9_spatial_svc_encoder.SRCS += ivfenc.c ivfenc.h
|
||||
vp9_spatial_svc_encoder.SRCS += tools_common.c tools_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_writer.h video_writer.c
|
||||
vp9_spatial_svc_encoder.SRCS += vpx_ports/msvc.h
|
||||
vp9_spatial_svc_encoder.SRCS += vpxstats.c vpxstats.h
|
||||
vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D
|
||||
vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder
|
||||
endif
|
||||
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_svc_encoder.c
|
||||
vp9_spatial_svc_encoder.SRCS += args.c args.h
|
||||
vp9_spatial_svc_encoder.SRCS += ivfenc.c ivfenc.h
|
||||
vp9_spatial_svc_encoder.SRCS += y4minput.c y4minput.h
|
||||
vp9_spatial_svc_encoder.SRCS += tools_common.c tools_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_writer.h video_writer.c
|
||||
vp9_spatial_svc_encoder.SRCS += vpx_ports/msvc.h
|
||||
vp9_spatial_svc_encoder.SRCS += vpxstats.c vpxstats.h
|
||||
vp9_spatial_svc_encoder.SRCS += examples/svc_encodeframe.c
|
||||
vp9_spatial_svc_encoder.SRCS += examples/svc_context.h
|
||||
vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D
|
||||
vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder
|
||||
|
||||
ifneq ($(CONFIG_SHARED),yes)
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += resize_util.c
|
||||
@ -128,6 +131,7 @@ endif
|
||||
|
||||
EXAMPLES-$(CONFIG_ENCODERS) += vpx_temporal_svc_encoder.c
|
||||
vpx_temporal_svc_encoder.SRCS += ivfenc.c ivfenc.h
|
||||
vpx_temporal_svc_encoder.SRCS += y4minput.c y4minput.h
|
||||
vpx_temporal_svc_encoder.SRCS += tools_common.c tools_common.h
|
||||
vpx_temporal_svc_encoder.SRCS += video_common.h
|
||||
vpx_temporal_svc_encoder.SRCS += video_writer.h video_writer.c
|
||||
@ -137,6 +141,7 @@ vpx_temporal_svc_encoder.DESCRIPTION = Temporal SVC Encoder
|
||||
EXAMPLES-$(CONFIG_DECODERS) += simple_decoder.c
|
||||
simple_decoder.GUID = D3BBF1E9-2427-450D-BBFF-B2843C1D44CC
|
||||
simple_decoder.SRCS += ivfdec.h ivfdec.c
|
||||
simple_decoder.SRCS += y4minput.c y4minput.h
|
||||
simple_decoder.SRCS += tools_common.h tools_common.c
|
||||
simple_decoder.SRCS += video_common.h
|
||||
simple_decoder.SRCS += video_reader.h video_reader.c
|
||||
@ -146,6 +151,7 @@ simple_decoder.SRCS += vpx_ports/msvc.h
|
||||
simple_decoder.DESCRIPTION = Simplified decoder loop
|
||||
EXAMPLES-$(CONFIG_DECODERS) += postproc.c
|
||||
postproc.SRCS += ivfdec.h ivfdec.c
|
||||
postproc.SRCS += y4minput.c y4minput.h
|
||||
postproc.SRCS += tools_common.h tools_common.c
|
||||
postproc.SRCS += video_common.h
|
||||
postproc.SRCS += video_reader.h video_reader.c
|
||||
@ -157,6 +163,7 @@ postproc.DESCRIPTION = Decoder postprocessor control
|
||||
EXAMPLES-$(CONFIG_DECODERS) += decode_to_md5.c
|
||||
decode_to_md5.SRCS += md5_utils.h md5_utils.c
|
||||
decode_to_md5.SRCS += ivfdec.h ivfdec.c
|
||||
decode_to_md5.SRCS += y4minput.c y4minput.h
|
||||
decode_to_md5.SRCS += tools_common.h tools_common.c
|
||||
decode_to_md5.SRCS += video_common.h
|
||||
decode_to_md5.SRCS += video_reader.h video_reader.c
|
||||
@ -167,6 +174,7 @@ decode_to_md5.GUID = 59120B9B-2735-4BFE-B022-146CA340FE42
|
||||
decode_to_md5.DESCRIPTION = Frame by frame MD5 checksum
|
||||
EXAMPLES-$(CONFIG_ENCODERS) += simple_encoder.c
|
||||
simple_encoder.SRCS += ivfenc.h ivfenc.c
|
||||
simple_encoder.SRCS += y4minput.c y4minput.h
|
||||
simple_encoder.SRCS += tools_common.h tools_common.c
|
||||
simple_encoder.SRCS += video_common.h
|
||||
simple_encoder.SRCS += video_writer.h video_writer.c
|
||||
@ -175,6 +183,7 @@ simple_encoder.GUID = 4607D299-8A71-4D2C-9B1D-071899B6FBFD
|
||||
simple_encoder.DESCRIPTION = Simplified encoder loop
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_lossless_encoder.c
|
||||
vp9_lossless_encoder.SRCS += ivfenc.h ivfenc.c
|
||||
vp9_lossless_encoder.SRCS += y4minput.c y4minput.h
|
||||
vp9_lossless_encoder.SRCS += tools_common.h tools_common.c
|
||||
vp9_lossless_encoder.SRCS += video_common.h
|
||||
vp9_lossless_encoder.SRCS += video_writer.h video_writer.c
|
||||
@ -183,6 +192,7 @@ vp9_lossless_encoder.GUID = B63C7C88-5348-46DC-A5A6-CC151EF93366
|
||||
vp9_lossless_encoder.DESCRIPTION = Simplified lossless VP9 encoder
|
||||
EXAMPLES-$(CONFIG_ENCODERS) += twopass_encoder.c
|
||||
twopass_encoder.SRCS += ivfenc.h ivfenc.c
|
||||
twopass_encoder.SRCS += y4minput.c y4minput.h
|
||||
twopass_encoder.SRCS += tools_common.h tools_common.c
|
||||
twopass_encoder.SRCS += video_common.h
|
||||
twopass_encoder.SRCS += video_writer.h video_writer.c
|
||||
@ -191,6 +201,7 @@ twopass_encoder.GUID = 73494FA6-4AF9-4763-8FBB-265C92402FD8
|
||||
twopass_encoder.DESCRIPTION = Two-pass encoder loop
|
||||
EXAMPLES-$(CONFIG_DECODERS) += decode_with_drops.c
|
||||
decode_with_drops.SRCS += ivfdec.h ivfdec.c
|
||||
decode_with_drops.SRCS += y4minput.c y4minput.h
|
||||
decode_with_drops.SRCS += tools_common.h tools_common.c
|
||||
decode_with_drops.SRCS += video_common.h
|
||||
decode_with_drops.SRCS += video_reader.h video_reader.c
|
||||
@ -201,6 +212,7 @@ decode_with_drops.GUID = CE5C53C4-8DDA-438A-86ED-0DDD3CDB8D26
|
||||
decode_with_drops.DESCRIPTION = Drops frames while decoding
|
||||
EXAMPLES-$(CONFIG_ENCODERS) += set_maps.c
|
||||
set_maps.SRCS += ivfenc.h ivfenc.c
|
||||
set_maps.SRCS += y4minput.c y4minput.h
|
||||
set_maps.SRCS += tools_common.h tools_common.c
|
||||
set_maps.SRCS += video_common.h
|
||||
set_maps.SRCS += video_writer.h video_writer.c
|
||||
@ -209,6 +221,7 @@ set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F
|
||||
set_maps.DESCRIPTION = Set active and ROI maps
|
||||
EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8cx_set_ref.c
|
||||
vp8cx_set_ref.SRCS += ivfenc.h ivfenc.c
|
||||
vp8cx_set_ref.SRCS += y4minput.c y4minput.h
|
||||
vp8cx_set_ref.SRCS += tools_common.h tools_common.c
|
||||
vp8cx_set_ref.SRCS += video_common.h
|
||||
vp8cx_set_ref.SRCS += video_writer.h video_writer.c
|
||||
@ -220,6 +233,7 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
|
||||
ifeq ($(CONFIG_DECODERS),yes)
|
||||
EXAMPLES-yes += vp9cx_set_ref.c
|
||||
vp9cx_set_ref.SRCS += ivfenc.h ivfenc.c
|
||||
vp9cx_set_ref.SRCS += y4minput.c y4minput.h
|
||||
vp9cx_set_ref.SRCS += tools_common.h tools_common.c
|
||||
vp9cx_set_ref.SRCS += video_common.h
|
||||
vp9cx_set_ref.SRCS += video_writer.h video_writer.c
|
||||
@ -232,6 +246,7 @@ ifeq ($(CONFIG_MULTI_RES_ENCODING),yes)
|
||||
ifeq ($(CONFIG_LIBYUV),yes)
|
||||
EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_multi_resolution_encoder.c
|
||||
vp8_multi_resolution_encoder.SRCS += ivfenc.h ivfenc.c
|
||||
vp8_multi_resolution_encoder.SRCS += y4minput.c y4minput.h
|
||||
vp8_multi_resolution_encoder.SRCS += tools_common.h tools_common.c
|
||||
vp8_multi_resolution_encoder.SRCS += video_writer.h video_writer.c
|
||||
vp8_multi_resolution_encoder.SRCS += vpx_ports/msvc.h
|
||||
@ -403,3 +418,4 @@ CLEAN-OBJS += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox)
|
||||
DOCS-yes += examples.doxy samples.dox
|
||||
examples.doxy: samples.dox $(ALL_EXAMPLES:.c=.dox)
|
||||
@echo "INPUT += $^" > $@
|
||||
@echo "ENABLED_SECTIONS += samples" >> $@
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
* spatial SVC frame
|
||||
*/
|
||||
|
||||
#ifndef VPX_SVC_CONTEXT_H_
|
||||
#define VPX_SVC_CONTEXT_H_
|
||||
#ifndef VPX_EXAMPLES_SVC_CONTEXT_H_
|
||||
#define VPX_EXAMPLES_SVC_CONTEXT_H_
|
||||
|
||||
#include "./vp8cx.h"
|
||||
#include "./vpx_encoder.h"
|
||||
#include "vpx/vp8cx.h"
|
||||
#include "vpx/vpx_encoder.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -35,10 +35,8 @@ typedef struct {
|
||||
int temporal_layers; // number of temporal layers
|
||||
int temporal_layering_mode;
|
||||
SVC_LOG_LEVEL log_level; // amount of information to display
|
||||
int log_print; // when set, printf log messages instead of returning the
|
||||
// message with svc_get_message
|
||||
int output_rc_stat; // for outputting rc stats
|
||||
int speed; // speed setting for codec
|
||||
int output_rc_stat; // for outputting rc stats
|
||||
int speed; // speed setting for codec
|
||||
int threads;
|
||||
int aqmode; // turns on aq-mode=3 (cyclic_refresh): 0=off, 1=on.
|
||||
// private storage for vpx_svc_encode
|
||||
@ -71,7 +69,6 @@ typedef struct SvcInternal {
|
||||
int layer;
|
||||
int use_multiple_frame_contexts;
|
||||
|
||||
char message_buffer[2048];
|
||||
vpx_codec_ctx_t *codec_ctx;
|
||||
} SvcInternal_t;
|
||||
|
||||
@ -106,15 +103,10 @@ void vpx_svc_release(SvcContext *svc_ctx);
|
||||
/**
|
||||
* dump accumulated statistics and reset accumulated values
|
||||
*/
|
||||
const char *vpx_svc_dump_statistics(SvcContext *svc_ctx);
|
||||
|
||||
/**
|
||||
* get status message from previous encode
|
||||
*/
|
||||
const char *vpx_svc_get_message(const SvcContext *svc_ctx);
|
||||
void vpx_svc_dump_statistics(SvcContext *svc_ctx);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif // VPX_SVC_CONTEXT_H_
|
||||
#endif // VPX_EXAMPLES_SVC_CONTEXT_H_
|
||||
@ -22,7 +22,7 @@
|
||||
#include <string.h>
|
||||
#define VPX_DISABLE_CTRL_TYPECHECKS 1
|
||||
#include "./vpx_config.h"
|
||||
#include "vpx/svc_context.h"
|
||||
#include "./svc_context.h"
|
||||
#include "vpx/vp8cx.h"
|
||||
#include "vpx/vpx_encoder.h"
|
||||
#include "vpx_mem/vpx_mem.h"
|
||||
@ -95,17 +95,11 @@ static const SvcInternal_t *get_const_svc_internal(const SvcContext *svc_ctx) {
|
||||
return (const SvcInternal_t *)svc_ctx->internal;
|
||||
}
|
||||
|
||||
static void svc_log_reset(SvcContext *svc_ctx) {
|
||||
SvcInternal_t *const si = (SvcInternal_t *)svc_ctx->internal;
|
||||
si->message_buffer[0] = '\0';
|
||||
}
|
||||
|
||||
static int svc_log(SvcContext *svc_ctx, SVC_LOG_LEVEL level, const char *fmt,
|
||||
...) {
|
||||
char buf[512];
|
||||
int retval = 0;
|
||||
va_list ap;
|
||||
SvcInternal_t *const si = get_svc_internal(svc_ctx);
|
||||
|
||||
if (level > svc_ctx->log_level) {
|
||||
return retval;
|
||||
@ -115,16 +109,8 @@ static int svc_log(SvcContext *svc_ctx, SVC_LOG_LEVEL level, const char *fmt,
|
||||
retval = vsnprintf(buf, sizeof(buf), fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if (svc_ctx->log_print) {
|
||||
printf("%s", buf);
|
||||
} else {
|
||||
strncat(si->message_buffer, buf,
|
||||
sizeof(si->message_buffer) - strlen(si->message_buffer) - 1);
|
||||
}
|
||||
printf("%s", buf);
|
||||
|
||||
if (level == SVC_LOG_ERROR) {
|
||||
si->codec_ctx->err_detail = si->message_buffer;
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
@ -169,6 +155,7 @@ static vpx_codec_err_t parse_layer_options_from_string(SvcContext *svc_ctx,
|
||||
return VPX_CODEC_INVALID_PARAM;
|
||||
|
||||
input_string = strdup(input);
|
||||
if (input_string == NULL) return VPX_CODEC_MEM_ERROR;
|
||||
token = strtok_r(input_string, delim, &save_ptr);
|
||||
for (i = 0; i < num_layers; ++i) {
|
||||
if (token != NULL) {
|
||||
@ -208,6 +195,7 @@ static vpx_codec_err_t parse_options(SvcContext *svc_ctx, const char *options) {
|
||||
|
||||
if (options == NULL) return VPX_CODEC_OK;
|
||||
input_string = strdup(options);
|
||||
if (input_string == NULL) return VPX_CODEC_MEM_ERROR;
|
||||
|
||||
// parse option name
|
||||
option_name = strtok_r(input_string, "=", &input_ptr);
|
||||
@ -294,8 +282,8 @@ vpx_codec_err_t vpx_svc_set_options(SvcContext *svc_ctx, const char *options) {
|
||||
return VPX_CODEC_OK;
|
||||
}
|
||||
|
||||
vpx_codec_err_t assign_layer_bitrates(const SvcContext *svc_ctx,
|
||||
vpx_codec_enc_cfg_t *const enc_cfg) {
|
||||
static vpx_codec_err_t assign_layer_bitrates(
|
||||
const SvcContext *svc_ctx, vpx_codec_enc_cfg_t *const enc_cfg) {
|
||||
int i;
|
||||
const SvcInternal_t *const si = get_const_svc_internal(svc_ctx);
|
||||
int sl, tl, spatial_layer_target;
|
||||
@ -471,8 +459,7 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
|
||||
svc_log(svc_ctx, SVC_LOG_ERROR,
|
||||
"spatial layers * temporal layers exceeds the maximum number of "
|
||||
"allowed layers of %d\n",
|
||||
svc_ctx->spatial_layers * svc_ctx->temporal_layers,
|
||||
(int)VPX_MAX_LAYERS);
|
||||
svc_ctx->spatial_layers * svc_ctx->temporal_layers, VPX_MAX_LAYERS);
|
||||
return VPX_CODEC_INVALID_PARAM;
|
||||
}
|
||||
res = assign_layer_bitrates(svc_ctx, enc_cfg);
|
||||
@ -485,11 +472,6 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
|
||||
return VPX_CODEC_INVALID_PARAM;
|
||||
}
|
||||
|
||||
#if CONFIG_SPATIAL_SVC
|
||||
for (i = 0; i < svc_ctx->spatial_layers; ++i)
|
||||
enc_cfg->ss_enable_auto_alt_ref[i] = si->enable_auto_alt_ref[i];
|
||||
#endif
|
||||
|
||||
if (svc_ctx->temporal_layers > 1) {
|
||||
int i;
|
||||
for (i = 0; i < svc_ctx->temporal_layers; ++i) {
|
||||
@ -514,7 +496,17 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
|
||||
enc_cfg->rc_buf_initial_sz = 500;
|
||||
enc_cfg->rc_buf_optimal_sz = 600;
|
||||
enc_cfg->rc_buf_sz = 1000;
|
||||
enc_cfg->rc_dropframe_thresh = 0;
|
||||
}
|
||||
|
||||
for (tl = 0; tl < svc_ctx->temporal_layers; ++tl) {
|
||||
for (sl = 0; sl < svc_ctx->spatial_layers; ++sl) {
|
||||
i = sl * svc_ctx->temporal_layers + tl;
|
||||
if (enc_cfg->rc_end_usage == VPX_CBR &&
|
||||
enc_cfg->g_pass == VPX_RC_ONE_PASS) {
|
||||
si->svc_params.max_quantizers[i] = enc_cfg->rc_max_quantizer;
|
||||
si->svc_params.min_quantizers[i] = enc_cfg->rc_min_quantizer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (enc_cfg->g_error_resilient == 0 && si->use_multiple_frame_contexts == 0)
|
||||
@ -548,8 +540,6 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
|
||||
return VPX_CODEC_INVALID_PARAM;
|
||||
}
|
||||
|
||||
svc_log_reset(svc_ctx);
|
||||
|
||||
res =
|
||||
vpx_codec_encode(codec_ctx, rawimg, pts, (uint32_t)duration, 0, deadline);
|
||||
if (res != VPX_CODEC_OK) {
|
||||
@ -559,56 +549,7 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
|
||||
iter = NULL;
|
||||
while ((cx_pkt = vpx_codec_get_cx_data(codec_ctx, &iter))) {
|
||||
switch (cx_pkt->kind) {
|
||||
#if CONFIG_SPATIAL_SVC && defined(VPX_TEST_SPATIAL_SVC)
|
||||
case VPX_CODEC_SPATIAL_SVC_LAYER_PSNR: {
|
||||
int i;
|
||||
for (i = 0; i < svc_ctx->spatial_layers; ++i) {
|
||||
int j;
|
||||
svc_log(svc_ctx, SVC_LOG_DEBUG,
|
||||
"SVC frame: %d, layer: %d, PSNR(Total/Y/U/V): "
|
||||
"%2.3f %2.3f %2.3f %2.3f \n",
|
||||
si->psnr_pkt_received, i, cx_pkt->data.layer_psnr[i].psnr[0],
|
||||
cx_pkt->data.layer_psnr[i].psnr[1],
|
||||
cx_pkt->data.layer_psnr[i].psnr[2],
|
||||
cx_pkt->data.layer_psnr[i].psnr[3]);
|
||||
svc_log(svc_ctx, SVC_LOG_DEBUG,
|
||||
"SVC frame: %d, layer: %d, SSE(Total/Y/U/V): "
|
||||
"%2.3f %2.3f %2.3f %2.3f \n",
|
||||
si->psnr_pkt_received, i, cx_pkt->data.layer_psnr[i].sse[0],
|
||||
cx_pkt->data.layer_psnr[i].sse[1],
|
||||
cx_pkt->data.layer_psnr[i].sse[2],
|
||||
cx_pkt->data.layer_psnr[i].sse[3]);
|
||||
|
||||
for (j = 0; j < COMPONENTS; ++j) {
|
||||
si->psnr_sum[i][j] += cx_pkt->data.layer_psnr[i].psnr[j];
|
||||
si->sse_sum[i][j] += cx_pkt->data.layer_psnr[i].sse[j];
|
||||
}
|
||||
}
|
||||
++si->psnr_pkt_received;
|
||||
break;
|
||||
}
|
||||
case VPX_CODEC_SPATIAL_SVC_LAYER_SIZES: {
|
||||
int i;
|
||||
for (i = 0; i < svc_ctx->spatial_layers; ++i)
|
||||
si->bytes_sum[i] += cx_pkt->data.layer_sizes[i];
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
case VPX_CODEC_PSNR_PKT: {
|
||||
#if CONFIG_SPATIAL_SVC && defined(VPX_TEST_SPATIAL_SVC)
|
||||
int j;
|
||||
svc_log(svc_ctx, SVC_LOG_DEBUG,
|
||||
"frame: %d, layer: %d, PSNR(Total/Y/U/V): "
|
||||
"%2.3f %2.3f %2.3f %2.3f \n",
|
||||
si->psnr_pkt_received, 0, cx_pkt->data.layer_psnr[0].psnr[0],
|
||||
cx_pkt->data.layer_psnr[0].psnr[1],
|
||||
cx_pkt->data.layer_psnr[0].psnr[2],
|
||||
cx_pkt->data.layer_psnr[0].psnr[3]);
|
||||
for (j = 0; j < COMPONENTS; ++j) {
|
||||
si->psnr_sum[0][j] += cx_pkt->data.layer_psnr[0].psnr[j];
|
||||
si->sse_sum[0][j] += cx_pkt->data.layer_psnr[0].sse[j];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
++si->psnr_pkt_received;
|
||||
break;
|
||||
@ -619,19 +560,13 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
|
||||
return VPX_CODEC_OK;
|
||||
}
|
||||
|
||||
const char *vpx_svc_get_message(const SvcContext *svc_ctx) {
|
||||
const SvcInternal_t *const si = get_const_svc_internal(svc_ctx);
|
||||
if (svc_ctx == NULL || si == NULL) return NULL;
|
||||
return si->message_buffer;
|
||||
}
|
||||
|
||||
static double calc_psnr(double d) {
|
||||
if (d == 0) return 100;
|
||||
return -10.0 * log(d) / log(10.0);
|
||||
}
|
||||
|
||||
// dump accumulated statistics and reset accumulated values
|
||||
const char *vpx_svc_dump_statistics(SvcContext *svc_ctx) {
|
||||
void vpx_svc_dump_statistics(SvcContext *svc_ctx) {
|
||||
int number_of_frames;
|
||||
int i, j;
|
||||
uint32_t bytes_total = 0;
|
||||
@ -641,21 +576,19 @@ const char *vpx_svc_dump_statistics(SvcContext *svc_ctx) {
|
||||
double y_scale;
|
||||
|
||||
SvcInternal_t *const si = get_svc_internal(svc_ctx);
|
||||
if (svc_ctx == NULL || si == NULL) return NULL;
|
||||
|
||||
svc_log_reset(svc_ctx);
|
||||
if (svc_ctx == NULL || si == NULL) return;
|
||||
|
||||
number_of_frames = si->psnr_pkt_received;
|
||||
if (number_of_frames <= 0) return vpx_svc_get_message(svc_ctx);
|
||||
if (number_of_frames <= 0) return;
|
||||
|
||||
svc_log(svc_ctx, SVC_LOG_INFO, "\n");
|
||||
for (i = 0; i < svc_ctx->spatial_layers; ++i) {
|
||||
svc_log(svc_ctx, SVC_LOG_INFO,
|
||||
"Layer %d Average PSNR=[%2.3f, %2.3f, %2.3f, %2.3f], Bytes=[%u]\n",
|
||||
i, (double)si->psnr_sum[i][0] / number_of_frames,
|
||||
(double)si->psnr_sum[i][1] / number_of_frames,
|
||||
(double)si->psnr_sum[i][2] / number_of_frames,
|
||||
(double)si->psnr_sum[i][3] / number_of_frames, si->bytes_sum[i]);
|
||||
i, si->psnr_sum[i][0] / number_of_frames,
|
||||
si->psnr_sum[i][1] / number_of_frames,
|
||||
si->psnr_sum[i][2] / number_of_frames,
|
||||
si->psnr_sum[i][3] / number_of_frames, si->bytes_sum[i]);
|
||||
// the following psnr calculation is deduced from ffmpeg.c#print_report
|
||||
y_scale = si->width * si->height * 255.0 * 255.0 * number_of_frames;
|
||||
scale[1] = y_scale;
|
||||
@ -686,7 +619,6 @@ const char *vpx_svc_dump_statistics(SvcContext *svc_ctx) {
|
||||
si->psnr_pkt_received = 0;
|
||||
|
||||
svc_log(svc_ctx, SVC_LOG_INFO, "Total Bytes=[%u]\n", bytes_total);
|
||||
return vpx_svc_get_message(svc_ctx);
|
||||
}
|
||||
|
||||
void vpx_svc_release(SvcContext *svc_ctx) {
|
||||
@ -61,7 +61,7 @@ void usage_exit(void) { exit(EXIT_FAILURE); }
|
||||
|
||||
int (*read_frame_p)(FILE *f, vpx_image_t *img);
|
||||
|
||||
static int read_frame(FILE *f, vpx_image_t *img) {
|
||||
static int mulres_read_frame(FILE *f, vpx_image_t *img) {
|
||||
size_t nbytes, to_read;
|
||||
int res = 1;
|
||||
|
||||
@ -75,7 +75,7 @@ static int read_frame(FILE *f, vpx_image_t *img) {
|
||||
return res;
|
||||
}
|
||||
|
||||
static int read_frame_by_row(FILE *f, vpx_image_t *img) {
|
||||
static int mulres_read_frame_by_row(FILE *f, vpx_image_t *img) {
|
||||
size_t nbytes, to_read;
|
||||
int res = 1;
|
||||
int plane;
|
||||
@ -471,9 +471,9 @@ int main(int argc, char **argv) {
|
||||
die("Failed to allocate image", cfg[i].g_w, cfg[i].g_h);
|
||||
|
||||
if (raw[0].stride[VPX_PLANE_Y] == (int)raw[0].d_w)
|
||||
read_frame_p = read_frame;
|
||||
read_frame_p = mulres_read_frame;
|
||||
else
|
||||
read_frame_p = read_frame_by_row;
|
||||
read_frame_p = mulres_read_frame_by_row;
|
||||
|
||||
for (i = 0; i < NUM_ENCODERS; i++)
|
||||
if (outfile[i]) write_ivf_file_header(outfile[i], &cfg[i], 0);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -68,128 +68,6 @@ void usage_exit() {
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static int compare_img(const vpx_image_t *const img1,
|
||||
const vpx_image_t *const img2) {
|
||||
uint32_t l_w = img1->d_w;
|
||||
uint32_t c_w = (img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
||||
const uint32_t c_h =
|
||||
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
||||
uint32_t i;
|
||||
int match = 1;
|
||||
|
||||
match &= (img1->fmt == img2->fmt);
|
||||
match &= (img1->d_w == img2->d_w);
|
||||
match &= (img1->d_h == img2->d_h);
|
||||
|
||||
for (i = 0; i < img1->d_h; ++i)
|
||||
match &= (memcmp(img1->planes[VPX_PLANE_Y] + i * img1->stride[VPX_PLANE_Y],
|
||||
img2->planes[VPX_PLANE_Y] + i * img2->stride[VPX_PLANE_Y],
|
||||
l_w) == 0);
|
||||
|
||||
for (i = 0; i < c_h; ++i)
|
||||
match &= (memcmp(img1->planes[VPX_PLANE_U] + i * img1->stride[VPX_PLANE_U],
|
||||
img2->planes[VPX_PLANE_U] + i * img2->stride[VPX_PLANE_U],
|
||||
c_w) == 0);
|
||||
|
||||
for (i = 0; i < c_h; ++i)
|
||||
match &= (memcmp(img1->planes[VPX_PLANE_V] + i * img1->stride[VPX_PLANE_V],
|
||||
img2->planes[VPX_PLANE_V] + i * img2->stride[VPX_PLANE_V],
|
||||
c_w) == 0);
|
||||
|
||||
return match;
|
||||
}
|
||||
|
||||
#define mmin(a, b) ((a) < (b) ? (a) : (b))
|
||||
static void find_mismatch(const vpx_image_t *const img1,
|
||||
const vpx_image_t *const img2, int yloc[4],
|
||||
int uloc[4], int vloc[4]) {
|
||||
const uint32_t bsize = 64;
|
||||
const uint32_t bsizey = bsize >> img1->y_chroma_shift;
|
||||
const uint32_t bsizex = bsize >> img1->x_chroma_shift;
|
||||
const uint32_t c_w =
|
||||
(img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
||||
const uint32_t c_h =
|
||||
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
||||
int match = 1;
|
||||
uint32_t i, j;
|
||||
yloc[0] = yloc[1] = yloc[2] = yloc[3] = -1;
|
||||
for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
|
||||
for (j = 0; match && j < img1->d_w; j += bsize) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsize, img1->d_h) - i;
|
||||
const int sj = mmin(j + bsize, img1->d_w) - j;
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(img1->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img1->stride[VPX_PLANE_Y] + j + l) !=
|
||||
*(img2->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img2->stride[VPX_PLANE_Y] + j + l)) {
|
||||
yloc[0] = i + k;
|
||||
yloc[1] = j + l;
|
||||
yloc[2] = *(img1->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img1->stride[VPX_PLANE_Y] + j + l);
|
||||
yloc[3] = *(img2->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img2->stride[VPX_PLANE_Y] + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uloc[0] = uloc[1] = uloc[2] = uloc[3] = -1;
|
||||
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
|
||||
for (j = 0; match && j < c_w; j += bsizex) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsizey, c_h - i);
|
||||
const int sj = mmin(j + bsizex, c_w - j);
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(img1->planes[VPX_PLANE_U] +
|
||||
(i + k) * img1->stride[VPX_PLANE_U] + j + l) !=
|
||||
*(img2->planes[VPX_PLANE_U] +
|
||||
(i + k) * img2->stride[VPX_PLANE_U] + j + l)) {
|
||||
uloc[0] = i + k;
|
||||
uloc[1] = j + l;
|
||||
uloc[2] = *(img1->planes[VPX_PLANE_U] +
|
||||
(i + k) * img1->stride[VPX_PLANE_U] + j + l);
|
||||
uloc[3] = *(img2->planes[VPX_PLANE_U] +
|
||||
(i + k) * img2->stride[VPX_PLANE_U] + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
vloc[0] = vloc[1] = vloc[2] = vloc[3] = -1;
|
||||
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
|
||||
for (j = 0; match && j < c_w; j += bsizex) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsizey, c_h - i);
|
||||
const int sj = mmin(j + bsizex, c_w - j);
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(img1->planes[VPX_PLANE_V] +
|
||||
(i + k) * img1->stride[VPX_PLANE_V] + j + l) !=
|
||||
*(img2->planes[VPX_PLANE_V] +
|
||||
(i + k) * img2->stride[VPX_PLANE_V] + j + l)) {
|
||||
vloc[0] = i + k;
|
||||
vloc[1] = j + l;
|
||||
vloc[2] = *(img1->planes[VPX_PLANE_V] +
|
||||
(i + k) * img1->stride[VPX_PLANE_V] + j + l);
|
||||
vloc[3] = *(img2->planes[VPX_PLANE_V] +
|
||||
(i + k) * img2->stride[VPX_PLANE_V] + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void testing_decode(vpx_codec_ctx_t *encoder, vpx_codec_ctx_t *decoder,
|
||||
unsigned int frame_out, int *mismatch_seen) {
|
||||
vpx_image_t enc_img, dec_img;
|
||||
|
||||
118
libs/libvpx/examples/vpx_dec_fuzzer.cc
Normal file
118
libs/libvpx/examples/vpx_dec_fuzzer.cc
Normal file
@ -0,0 +1,118 @@
|
||||
/*
|
||||
* Copyright (c) 2018 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Fuzzer for libvpx decoders
|
||||
* ==========================
|
||||
* Requirements
|
||||
* --------------
|
||||
* Requires Clang 6.0 or above as -fsanitize=fuzzer is used as a linker
|
||||
* option.
|
||||
|
||||
* Steps to build
|
||||
* --------------
|
||||
* Clone libvpx repository
|
||||
$git clone https://chromium.googlesource.com/webm/libvpx
|
||||
|
||||
* Create a directory in parallel to libvpx and change directory
|
||||
$mkdir vpx_dec_fuzzer
|
||||
$cd vpx_dec_fuzzer/
|
||||
|
||||
* Enable sanitizers (Supported: address integer memory thread undefined)
|
||||
$source ../libvpx/tools/set_analyzer_env.sh address
|
||||
|
||||
* Configure libvpx.
|
||||
* Note --size-limit and VPX_MAX_ALLOCABLE_MEMORY are defined to avoid
|
||||
* Out of memory errors when running generated fuzzer binary
|
||||
$../libvpx/configure --disable-unit-tests --size-limit=12288x12288 \
|
||||
--extra-cflags="-fsanitize=fuzzer-no-link \
|
||||
-DVPX_MAX_ALLOCABLE_MEMORY=1073741824" \
|
||||
--disable-webm-io --enable-debug --disable-vp8-encoder \
|
||||
--disable-vp9-encoder --disable-examples
|
||||
|
||||
* Build libvpx
|
||||
$make -j32
|
||||
|
||||
* Build vp9 fuzzer
|
||||
$ $CXX $CXXFLAGS -std=c++11 -DDECODER=vp9 \
|
||||
-fsanitize=fuzzer -I../libvpx -I. -Wl,--start-group \
|
||||
../libvpx/examples/vpx_dec_fuzzer.cc -o ./vpx_dec_fuzzer_vp9 \
|
||||
./libvpx.a -Wl,--end-group
|
||||
|
||||
* DECODER should be defined as vp9 or vp8 to enable vp9/vp8
|
||||
*
|
||||
* create a corpus directory and copy some ivf files there.
|
||||
* Based on which codec (vp8/vp9) is being tested, it is recommended to
|
||||
* have corresponding ivf files in corpus directory
|
||||
* Empty corpus directoy also is acceptable, though not recommended
|
||||
$mkdir CORPUS && cp some-files CORPUS
|
||||
|
||||
* Run fuzzing:
|
||||
$./vpx_dec_fuzzer_vp9 CORPUS
|
||||
|
||||
* References:
|
||||
* http://llvm.org/docs/LibFuzzer.html
|
||||
* https://github.com/google/oss-fuzz
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
|
||||
#include "vpx/vp8dx.h"
|
||||
#include "vpx/vpx_decoder.h"
|
||||
#include "vpx_ports/mem_ops.h"
|
||||
|
||||
#define IVF_FRAME_HDR_SZ (4 + 8) /* 4 byte size + 8 byte timestamp */
|
||||
#define IVF_FILE_HDR_SZ 32
|
||||
|
||||
#define VPXD_INTERFACE(name) VPXD_INTERFACE_(name)
|
||||
#define VPXD_INTERFACE_(name) vpx_codec_##name##_dx()
|
||||
|
||||
extern "C" void usage_exit(void) { exit(EXIT_FAILURE); }
|
||||
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
if (size <= IVF_FILE_HDR_SZ) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
vpx_codec_ctx_t codec;
|
||||
// Set thread count in the range [1, 64].
|
||||
const unsigned int threads = (data[IVF_FILE_HDR_SZ] & 0x3f) + 1;
|
||||
vpx_codec_dec_cfg_t cfg = { threads, 0, 0 };
|
||||
if (vpx_codec_dec_init(&codec, VPXD_INTERFACE(DECODER), &cfg, 0)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
data += IVF_FILE_HDR_SZ;
|
||||
size -= IVF_FILE_HDR_SZ;
|
||||
|
||||
while (size > IVF_FRAME_HDR_SZ) {
|
||||
size_t frame_size = mem_get_le32(data);
|
||||
size -= IVF_FRAME_HDR_SZ;
|
||||
data += IVF_FRAME_HDR_SZ;
|
||||
frame_size = std::min(size, frame_size);
|
||||
|
||||
const vpx_codec_err_t err =
|
||||
vpx_codec_decode(&codec, data, frame_size, nullptr, 0);
|
||||
static_cast<void>(err);
|
||||
vpx_codec_iter_t iter = nullptr;
|
||||
vpx_image_t *img = nullptr;
|
||||
while ((img = vpx_codec_get_frame(&codec, &iter)) != nullptr) {
|
||||
}
|
||||
data += frame_size;
|
||||
size -= frame_size;
|
||||
}
|
||||
vpx_codec_destroy(&codec);
|
||||
return 0;
|
||||
}
|
||||
@ -19,14 +19,18 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "./vpx_config.h"
|
||||
#include "./y4minput.h"
|
||||
#include "../vpx_ports/vpx_timer.h"
|
||||
#include "vpx/vp8cx.h"
|
||||
#include "vpx/vpx_encoder.h"
|
||||
#include "vpx_ports/bitops.h"
|
||||
|
||||
#include "../tools_common.h"
|
||||
#include "../video_writer.h"
|
||||
|
||||
#define VP8_ROI_MAP 0
|
||||
#define ROI_MAP 0
|
||||
|
||||
#define zero(Dest) memset(&(Dest), 0, sizeof(Dest));
|
||||
|
||||
static const char *exec_name;
|
||||
|
||||
@ -89,19 +93,21 @@ struct RateControlMetrics {
|
||||
// in the stream.
|
||||
static void set_rate_control_metrics(struct RateControlMetrics *rc,
|
||||
vpx_codec_enc_cfg_t *cfg) {
|
||||
unsigned int i = 0;
|
||||
int i = 0;
|
||||
// Set the layer (cumulative) framerate and the target layer (non-cumulative)
|
||||
// per-frame-bandwidth, for the rate control encoding stats below.
|
||||
const double framerate = cfg->g_timebase.den / cfg->g_timebase.num;
|
||||
const int ts_number_layers = cfg->ts_number_layers;
|
||||
rc->layer_framerate[0] = framerate / cfg->ts_rate_decimator[0];
|
||||
rc->layer_pfb[0] =
|
||||
1000.0 * rc->layer_target_bitrate[0] / rc->layer_framerate[0];
|
||||
for (i = 0; i < cfg->ts_number_layers; ++i) {
|
||||
for (i = 0; i < ts_number_layers; ++i) {
|
||||
if (i > 0) {
|
||||
rc->layer_framerate[i] = framerate / cfg->ts_rate_decimator[i];
|
||||
rc->layer_pfb[i] = 1000.0 * (rc->layer_target_bitrate[i] -
|
||||
rc->layer_target_bitrate[i - 1]) /
|
||||
(rc->layer_framerate[i] - rc->layer_framerate[i - 1]);
|
||||
rc->layer_pfb[i] =
|
||||
1000.0 *
|
||||
(rc->layer_target_bitrate[i] - rc->layer_target_bitrate[i - 1]) /
|
||||
(rc->layer_framerate[i] - rc->layer_framerate[i - 1]);
|
||||
}
|
||||
rc->layer_input_frames[i] = 0;
|
||||
rc->layer_enc_frames[i] = 0;
|
||||
@ -114,6 +120,9 @@ static void set_rate_control_metrics(struct RateControlMetrics *rc,
|
||||
rc->window_size = 15;
|
||||
rc->avg_st_encoding_bitrate = 0.0;
|
||||
rc->variance_st_encoding_bitrate = 0.0;
|
||||
// Target bandwidth for the whole stream.
|
||||
// Set to layer_target_bitrate for highest layer (total bitrate).
|
||||
cfg->rc_target_bitrate = rc->layer_target_bitrate[ts_number_layers - 1];
|
||||
}
|
||||
|
||||
static void printout_rate_control_summary(struct RateControlMetrics *rc,
|
||||
@ -164,38 +173,60 @@ static void printout_rate_control_summary(struct RateControlMetrics *rc,
|
||||
die("Error: Number of input frames not equal to output! \n");
|
||||
}
|
||||
|
||||
#if VP8_ROI_MAP
|
||||
static void vp8_set_roi_map(vpx_codec_enc_cfg_t *cfg, vpx_roi_map_t *roi) {
|
||||
#if ROI_MAP
|
||||
static void set_roi_map(const char *enc_name, vpx_codec_enc_cfg_t *cfg,
|
||||
vpx_roi_map_t *roi) {
|
||||
unsigned int i, j;
|
||||
memset(roi, 0, sizeof(*roi));
|
||||
int block_size = 0;
|
||||
uint8_t is_vp8 = strncmp(enc_name, "vp8", 3) == 0 ? 1 : 0;
|
||||
uint8_t is_vp9 = strncmp(enc_name, "vp9", 3) == 0 ? 1 : 0;
|
||||
if (!is_vp8 && !is_vp9) {
|
||||
die("unsupported codec.");
|
||||
}
|
||||
zero(*roi);
|
||||
|
||||
block_size = is_vp9 && !is_vp8 ? 8 : 16;
|
||||
|
||||
// ROI is based on the segments (4 for vp8, 8 for vp9), smallest unit for
|
||||
// segment is 16x16 for vp8, 8x8 for vp9.
|
||||
roi->rows = (cfg->g_h + 15) / 16;
|
||||
roi->cols = (cfg->g_w + 15) / 16;
|
||||
roi->rows = (cfg->g_h + block_size - 1) / block_size;
|
||||
roi->cols = (cfg->g_w + block_size - 1) / block_size;
|
||||
|
||||
// Applies delta QP on the segment blocks, varies from -63 to 63.
|
||||
// Setting to negative means lower QP (better quality).
|
||||
// Below we set delta_q to the extreme (-63) to show strong effect.
|
||||
roi->delta_q[0] = 0;
|
||||
// VP8 uses the first 4 segments. VP9 uses all 8 segments.
|
||||
zero(roi->delta_q);
|
||||
roi->delta_q[1] = -63;
|
||||
roi->delta_q[2] = 0;
|
||||
roi->delta_q[3] = 0;
|
||||
|
||||
// Applies delta loopfilter strength on the segment blocks, varies from -63 to
|
||||
// 63. Setting to positive means stronger loopfilter.
|
||||
roi->delta_lf[0] = 0;
|
||||
roi->delta_lf[1] = 0;
|
||||
roi->delta_lf[2] = 0;
|
||||
roi->delta_lf[3] = 0;
|
||||
// 63. Setting to positive means stronger loopfilter. VP8 uses the first 4
|
||||
// segments. VP9 uses all 8 segments.
|
||||
zero(roi->delta_lf);
|
||||
|
||||
// Applies skip encoding threshold on the segment blocks, varies from 0 to
|
||||
// UINT_MAX. Larger value means more skipping of encoding is possible.
|
||||
// This skip threshold only applies on delta frames.
|
||||
roi->static_threshold[0] = 0;
|
||||
roi->static_threshold[1] = 0;
|
||||
roi->static_threshold[2] = 0;
|
||||
roi->static_threshold[3] = 0;
|
||||
if (is_vp8) {
|
||||
// Applies skip encoding threshold on the segment blocks, varies from 0 to
|
||||
// UINT_MAX. Larger value means more skipping of encoding is possible.
|
||||
// This skip threshold only applies on delta frames.
|
||||
zero(roi->static_threshold);
|
||||
}
|
||||
|
||||
if (is_vp9) {
|
||||
// Apply skip segment. Setting to 1 means this block will be copied from
|
||||
// previous frame.
|
||||
zero(roi->skip);
|
||||
}
|
||||
|
||||
if (is_vp9) {
|
||||
// Apply ref frame segment.
|
||||
// -1 : Do not apply this segment.
|
||||
// 0 : Froce using intra.
|
||||
// 1 : Force using last.
|
||||
// 2 : Force using golden.
|
||||
// 3 : Force using alfref but not used in non-rd pickmode for 0 lag.
|
||||
memset(roi->ref_frame, -1, sizeof(roi->ref_frame));
|
||||
roi->ref_frame[1] = 1;
|
||||
}
|
||||
|
||||
// Use 2 states: 1 is center square, 0 is the rest.
|
||||
roi->roi_map =
|
||||
@ -563,12 +594,12 @@ int main(int argc, char **argv) {
|
||||
int layering_mode = 0;
|
||||
int layer_flags[VPX_TS_MAX_PERIODICITY] = { 0 };
|
||||
int flag_periodicity = 1;
|
||||
#if VP8_ROI_MAP
|
||||
#if ROI_MAP
|
||||
vpx_roi_map_t roi;
|
||||
#endif
|
||||
vpx_svc_layer_id_t layer_id = { 0, 0 };
|
||||
vpx_svc_layer_id_t layer_id;
|
||||
const VpxInterface *encoder = NULL;
|
||||
FILE *infile = NULL;
|
||||
struct VpxInputContext input_ctx;
|
||||
struct RateControlMetrics rc;
|
||||
int64_t cx_time = 0;
|
||||
const int min_args_base = 13;
|
||||
@ -583,6 +614,15 @@ int main(int argc, char **argv) {
|
||||
double sum_bitrate2 = 0.0;
|
||||
double framerate = 30.0;
|
||||
|
||||
zero(rc.layer_target_bitrate);
|
||||
memset(&layer_id, 0, sizeof(vpx_svc_layer_id_t));
|
||||
memset(&input_ctx, 0, sizeof(input_ctx));
|
||||
/* Setup default input stream settings */
|
||||
input_ctx.framerate.numerator = 30;
|
||||
input_ctx.framerate.denominator = 1;
|
||||
input_ctx.only_i420 = 1;
|
||||
input_ctx.bit_depth = 0;
|
||||
|
||||
exec_name = argv[0];
|
||||
// Check usage and arguments.
|
||||
if (argc < min_args) {
|
||||
@ -621,6 +661,9 @@ int main(int argc, char **argv) {
|
||||
die("Invalid number of arguments");
|
||||
}
|
||||
|
||||
input_ctx.filename = argv[1];
|
||||
open_input_file(&input_ctx);
|
||||
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
switch (strtol(argv[argc - 1], NULL, 0)) {
|
||||
case 8:
|
||||
@ -637,14 +680,22 @@ int main(int argc, char **argv) {
|
||||
break;
|
||||
default: die("Invalid bit depth (8, 10, 12) %s", argv[argc - 1]);
|
||||
}
|
||||
if (!vpx_img_alloc(
|
||||
&raw, bit_depth == VPX_BITS_8 ? VPX_IMG_FMT_I420 : VPX_IMG_FMT_I42016,
|
||||
width, height, 32)) {
|
||||
die("Failed to allocate image", width, height);
|
||||
|
||||
// Y4M reader has its own allocation.
|
||||
if (input_ctx.file_type != FILE_TYPE_Y4M) {
|
||||
if (!vpx_img_alloc(
|
||||
&raw,
|
||||
bit_depth == VPX_BITS_8 ? VPX_IMG_FMT_I420 : VPX_IMG_FMT_I42016,
|
||||
width, height, 32)) {
|
||||
die("Failed to allocate image", width, height);
|
||||
}
|
||||
}
|
||||
#else
|
||||
if (!vpx_img_alloc(&raw, VPX_IMG_FMT_I420, width, height, 32)) {
|
||||
die("Failed to allocate image", width, height);
|
||||
// Y4M reader has its own allocation.
|
||||
if (input_ctx.file_type != FILE_TYPE_Y4M) {
|
||||
if (!vpx_img_alloc(&raw, VPX_IMG_FMT_I420, width, height, 32)) {
|
||||
die("Failed to allocate image", width, height);
|
||||
}
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
@ -675,6 +726,9 @@ int main(int argc, char **argv) {
|
||||
if (speed < 0) {
|
||||
die("Invalid speed setting: must be positive");
|
||||
}
|
||||
if (strncmp(encoder->name, "vp9", 3) == 0 && speed > 9) {
|
||||
warn("Mapping speed %d to speed 9.\n", speed);
|
||||
}
|
||||
|
||||
for (i = min_args_base;
|
||||
(int)i < min_args_base + mode_to_num_layers[layering_mode]; ++i) {
|
||||
@ -722,13 +776,15 @@ int main(int argc, char **argv) {
|
||||
|
||||
set_rate_control_metrics(&rc, &cfg);
|
||||
|
||||
// Target bandwidth for the whole stream.
|
||||
// Set to layer_target_bitrate for highest layer (total bitrate).
|
||||
cfg.rc_target_bitrate = rc.layer_target_bitrate[cfg.ts_number_layers - 1];
|
||||
|
||||
// Open input file.
|
||||
if (!(infile = fopen(argv[1], "rb"))) {
|
||||
die("Failed to open %s for reading", argv[1]);
|
||||
if (input_ctx.file_type == FILE_TYPE_Y4M) {
|
||||
if (input_ctx.width != cfg.g_w || input_ctx.height != cfg.g_h) {
|
||||
die("Incorrect width or height: %d x %d", cfg.g_w, cfg.g_h);
|
||||
}
|
||||
if (input_ctx.framerate.numerator != cfg.g_timebase.den ||
|
||||
input_ctx.framerate.denominator != cfg.g_timebase.num) {
|
||||
die("Incorrect framerate: numerator %d denominator %d",
|
||||
cfg.g_timebase.num, cfg.g_timebase.den);
|
||||
}
|
||||
}
|
||||
|
||||
framerate = cfg.g_timebase.den / cfg.g_timebase.num;
|
||||
@ -766,8 +822,8 @@ int main(int argc, char **argv) {
|
||||
vpx_codec_control(&codec, VP8E_SET_NOISE_SENSITIVITY, kVp8DenoiserOff);
|
||||
vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 1);
|
||||
vpx_codec_control(&codec, VP8E_SET_GF_CBR_BOOST_PCT, 0);
|
||||
#if VP8_ROI_MAP
|
||||
vp8_set_roi_map(&cfg, &roi);
|
||||
#if ROI_MAP
|
||||
set_roi_map(encoder->name, &cfg, &roi);
|
||||
if (vpx_codec_control(&codec, VP8E_SET_ROI_MAP, &roi))
|
||||
die_codec(&codec, "Failed to set ROI map");
|
||||
#endif
|
||||
@ -783,7 +839,13 @@ int main(int argc, char **argv) {
|
||||
vpx_codec_control(&codec, VP9E_SET_NOISE_SENSITIVITY, kVp9DenoiserOff);
|
||||
vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 1);
|
||||
vpx_codec_control(&codec, VP9E_SET_TUNE_CONTENT, 0);
|
||||
vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, (cfg.g_threads >> 1));
|
||||
vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, get_msb(cfg.g_threads));
|
||||
#if ROI_MAP
|
||||
set_roi_map(encoder->name, &cfg, &roi);
|
||||
if (vpx_codec_control(&codec, VP9E_SET_ROI_MAP, &roi))
|
||||
die_codec(&codec, "Failed to set ROI map");
|
||||
vpx_codec_control(&codec, VP9E_SET_AQ_MODE, 0);
|
||||
#endif
|
||||
// TODO(marpan/jianj): There is an issue with row-mt for low resolutons at
|
||||
// high speed settings, disable its use for those cases for now.
|
||||
if (cfg.g_threads > 1 && ((cfg.g_w > 320 && cfg.g_h > 240) || speed < 7))
|
||||
@ -822,6 +884,7 @@ int main(int argc, char **argv) {
|
||||
layer_id.spatial_layer_id = 0;
|
||||
layer_id.temporal_layer_id =
|
||||
cfg.ts_layer_id[frame_cnt % cfg.ts_periodicity];
|
||||
layer_id.temporal_layer_id_per_spatial[0] = layer_id.temporal_layer_id;
|
||||
if (strncmp(encoder->name, "vp9", 3) == 0) {
|
||||
vpx_codec_control(&codec, VP9E_SET_SVC_LAYER_ID, &layer_id);
|
||||
} else if (strncmp(encoder->name, "vp8", 3) == 0) {
|
||||
@ -830,7 +893,7 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
flags = layer_flags[frame_cnt % flag_periodicity];
|
||||
if (layering_mode == 0) flags = 0;
|
||||
frame_avail = vpx_img_read(&raw, infile);
|
||||
frame_avail = read_frame(&input_ctx, &raw);
|
||||
if (frame_avail) ++rc.layer_input_frames[layer_id.temporal_layer_id];
|
||||
vpx_usec_timer_start(&timer);
|
||||
if (vpx_codec_encode(&codec, frame_avail ? &raw : NULL, pts, 1, flags,
|
||||
@ -898,7 +961,7 @@ int main(int argc, char **argv) {
|
||||
++frame_cnt;
|
||||
pts += frame_duration;
|
||||
}
|
||||
fclose(infile);
|
||||
close_input_file(&input_ctx);
|
||||
printout_rate_control_summary(&rc, &cfg, frame_cnt);
|
||||
printf("\n");
|
||||
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
||||
@ -910,6 +973,12 @@ int main(int argc, char **argv) {
|
||||
// Try to rewrite the output file headers with the actual frame count.
|
||||
for (i = 0; i < cfg.ts_number_layers; ++i) vpx_video_writer_close(outfile[i]);
|
||||
|
||||
vpx_img_free(&raw);
|
||||
if (input_ctx.file_type != FILE_TYPE_Y4M) {
|
||||
vpx_img_free(&raw);
|
||||
}
|
||||
|
||||
#if ROI_MAP
|
||||
free(roi.roi_map);
|
||||
#endif
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
@ -76,12 +76,12 @@ int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
size_t frame_size = 0;
|
||||
|
||||
if (fread(raw_header, IVF_FRAME_HDR_SZ, 1, infile) != 1) {
|
||||
if (!feof(infile)) warn("Failed to read frame size\n");
|
||||
if (!feof(infile)) warn("Failed to read frame size");
|
||||
} else {
|
||||
frame_size = mem_get_le32(raw_header);
|
||||
|
||||
if (frame_size > 256 * 1024 * 1024) {
|
||||
warn("Read invalid frame size (%u)\n", (unsigned int)frame_size);
|
||||
warn("Read invalid frame size (%u)", (unsigned int)frame_size);
|
||||
frame_size = 0;
|
||||
}
|
||||
|
||||
@ -92,7 +92,7 @@ int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
*buffer = new_buffer;
|
||||
*buffer_size = 2 * frame_size;
|
||||
} else {
|
||||
warn("Failed to allocate compressed data buffer\n");
|
||||
warn("Failed to allocate compressed data buffer");
|
||||
frame_size = 0;
|
||||
}
|
||||
}
|
||||
@ -100,7 +100,7 @@ int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
|
||||
if (!feof(infile)) {
|
||||
if (fread(*buffer, 1, frame_size, infile) != frame_size) {
|
||||
warn("Failed to read full frame\n");
|
||||
warn("Failed to read full frame");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef IVFDEC_H_
|
||||
#define IVFDEC_H_
|
||||
#ifndef VPX_IVFDEC_H_
|
||||
#define VPX_IVFDEC_H_
|
||||
|
||||
#include "./tools_common.h"
|
||||
|
||||
@ -25,4 +25,4 @@ int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif // IVFDEC_H_
|
||||
#endif // VPX_IVFDEC_H_
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef IVFENC_H_
|
||||
#define IVFENC_H_
|
||||
#ifndef VPX_IVFENC_H_
|
||||
#define VPX_IVFENC_H_
|
||||
|
||||
#include "./tools_common.h"
|
||||
|
||||
@ -30,4 +30,4 @@ void ivf_write_frame_size(FILE *outfile, size_t frame_size);
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif // IVFENC_H_
|
||||
#endif // VPX_IVFENC_H_
|
||||
|
||||
@ -943,18 +943,6 @@ GENERATE_XML = NO
|
||||
|
||||
XML_OUTPUT = xml
|
||||
|
||||
# The XML_SCHEMA tag can be used to specify an XML schema,
|
||||
# which can be used by a validating XML parser to check the
|
||||
# syntax of the XML files.
|
||||
|
||||
XML_SCHEMA =
|
||||
|
||||
# The XML_DTD tag can be used to specify an XML DTD,
|
||||
# which can be used by a validating XML parser to check the
|
||||
# syntax of the XML files.
|
||||
|
||||
XML_DTD =
|
||||
|
||||
# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
|
||||
# dump the program listings (including syntax highlighting
|
||||
# and cross-referencing information) to the XML output. Note that
|
||||
|
||||
@ -88,7 +88,6 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
|
||||
CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS))
|
||||
CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
|
||||
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
|
||||
INSTALL-LIBS-$(CONFIG_SPATIAL_SVC) += include/vpx/svc_context.h
|
||||
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
|
||||
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
|
||||
CODEC_DOC_SECTIONS += vp9 vp9_encoder
|
||||
@ -113,13 +112,6 @@ ifeq ($(CONFIG_DECODERS),yes)
|
||||
CODEC_DOC_SECTIONS += decoder
|
||||
endif
|
||||
|
||||
# Suppress -Wextra warnings in third party code.
|
||||
$(BUILD_PFX)third_party/googletest/%.cc.o: CXXFLAGS += -Wno-missing-field-initializers
|
||||
# Suppress -Wextra warnings in first party code pending investigation.
|
||||
# https://bugs.chromium.org/p/webm/issues/detail?id=1069
|
||||
$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered
|
||||
$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered
|
||||
|
||||
ifeq ($(CONFIG_MSVS),yes)
|
||||
CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)
|
||||
GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd)
|
||||
@ -153,9 +145,6 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += vpx_dsp/x86/bitdepth_conversion_sse2.asm
|
||||
endif
|
||||
CODEC_EXPORTS-yes += vpx/exports_com
|
||||
CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc
|
||||
ifeq ($(CONFIG_SPATIAL_SVC),yes)
|
||||
CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_spatial_svc
|
||||
endif
|
||||
CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec
|
||||
|
||||
INSTALL-LIBS-yes += include/vpx/vpx_codec.h
|
||||
@ -206,6 +195,8 @@ vpx.def: $(call enabled,CODEC_EXPORTS)
|
||||
--out=$@ $^
|
||||
CLEAN-OBJS += vpx.def
|
||||
|
||||
vpx.$(VCPROJ_SFX): VCPROJ_SRCS=$(filter-out $(addprefix %, $(ASM_INCLUDES)), $^)
|
||||
|
||||
vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def
|
||||
@echo " [CREATE] $@"
|
||||
$(qexec)$(GEN_VCPROJ) \
|
||||
@ -218,7 +209,15 @@ vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def
|
||||
--ver=$(CONFIG_VS_VERSION) \
|
||||
--src-path-bare="$(SRC_PATH_BARE)" \
|
||||
--out=$@ $(CFLAGS) \
|
||||
$(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \
|
||||
$(filter $(SRC_PATH_BARE)/vp8/%.c, $(VCPROJ_SRCS)) \
|
||||
$(filter $(SRC_PATH_BARE)/vp8/%.h, $(VCPROJ_SRCS)) \
|
||||
$(filter $(SRC_PATH_BARE)/vp9/%.c, $(VCPROJ_SRCS)) \
|
||||
$(filter $(SRC_PATH_BARE)/vp9/%.h, $(VCPROJ_SRCS)) \
|
||||
$(filter $(SRC_PATH_BARE)/vpx/%, $(VCPROJ_SRCS)) \
|
||||
$(filter $(SRC_PATH_BARE)/vpx_dsp/%, $(VCPROJ_SRCS)) \
|
||||
$(filter-out $(addprefix $(SRC_PATH_BARE)/, \
|
||||
vp8/%.c vp8/%.h vp9/%.c vp9/%.h vpx/% vpx_dsp/%), \
|
||||
$(VCPROJ_SRCS)) \
|
||||
--src-path-bare="$(SRC_PATH_BARE)" \
|
||||
|
||||
PROJECTS-yes += vpx.$(VCPROJ_SFX)
|
||||
@ -233,8 +232,8 @@ OBJS-yes += $(LIBVPX_OBJS)
|
||||
LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
|
||||
$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
|
||||
|
||||
SO_VERSION_MAJOR := 5
|
||||
SO_VERSION_MINOR := 0
|
||||
SO_VERSION_MAJOR := 6
|
||||
SO_VERSION_MINOR := 1
|
||||
SO_VERSION_PATCH := 0
|
||||
ifeq ($(filter darwin%,$(TGT_OS)),$(TGT_OS))
|
||||
LIBVPX_SO := libvpx.$(SO_VERSION_MAJOR).dylib
|
||||
@ -274,18 +273,6 @@ $(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
|
||||
$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR)
|
||||
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
|
||||
|
||||
libvpx.ver: $(call enabled,CODEC_EXPORTS)
|
||||
@echo " [CREATE] $@"
|
||||
$(qexec)echo "{ global:" > $@
|
||||
$(qexec)for f in $?; do awk '{print $$2";"}' < $$f >>$@; done
|
||||
$(qexec)echo "local: *; };" >> $@
|
||||
CLEAN-OBJS += libvpx.ver
|
||||
|
||||
libvpx.syms: $(call enabled,CODEC_EXPORTS)
|
||||
@echo " [CREATE] $@"
|
||||
$(qexec)awk '{print "_"$$2}' $^ >$@
|
||||
CLEAN-OBJS += libvpx.syms
|
||||
|
||||
libvpx.def: $(call enabled,CODEC_EXPORTS)
|
||||
@echo " [CREATE] $@"
|
||||
$(qexec)echo LIBRARY $(LIBVPX_SO:.dll=) INITINSTANCE TERMINSTANCE > $@
|
||||
@ -345,6 +332,18 @@ INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
|
||||
CLEAN-OBJS += vpx.pc
|
||||
endif
|
||||
|
||||
libvpx.ver: $(call enabled,CODEC_EXPORTS)
|
||||
@echo " [CREATE] $@"
|
||||
$(qexec)echo "{ global:" > $@
|
||||
$(qexec)for f in $?; do awk '{print $$2";"}' < $$f >>$@; done
|
||||
$(qexec)echo "local: *; };" >> $@
|
||||
CLEAN-OBJS += libvpx.ver
|
||||
|
||||
libvpx.syms: $(call enabled,CODEC_EXPORTS)
|
||||
@echo " [CREATE] $@"
|
||||
$(qexec)awk '{print "_"$$2}' $^ >$@
|
||||
CLEAN-OBJS += libvpx.syms
|
||||
|
||||
#
|
||||
# Rule to make assembler configuration file from C configuration file
|
||||
#
|
||||
|
||||
@ -25,8 +25,10 @@
|
||||
release.
|
||||
- The \ref readme contains instructions on recompiling the sample applications.
|
||||
- Read the \ref usage "usage" for a narrative on codec usage.
|
||||
\if samples
|
||||
- Read the \ref samples "sample code" for examples of how to interact with the
|
||||
codec.
|
||||
\endif
|
||||
- \ref codec reference
|
||||
\if encoder
|
||||
- \ref encoder reference
|
||||
|
||||
@ -163,7 +163,7 @@ void MD5Final(md5byte digest[16], struct MD5Context *ctx) {
|
||||
*/
|
||||
VPX_NO_UNSIGNED_OVERFLOW_CHECK void MD5Transform(UWORD32 buf[4],
|
||||
UWORD32 const in[16]) {
|
||||
register UWORD32 a, b, c, d;
|
||||
UWORD32 a, b, c, d;
|
||||
|
||||
a = buf[0];
|
||||
b = buf[1];
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
* Still in the public domain.
|
||||
*/
|
||||
|
||||
#ifndef MD5_UTILS_H_
|
||||
#define MD5_UTILS_H_
|
||||
#ifndef VPX_MD5_UTILS_H_
|
||||
#define VPX_MD5_UTILS_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -46,4 +46,4 @@ void MD5Transform(UWORD32 buf[4], UWORD32 const in[16]);
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif // MD5_UTILS_H_
|
||||
#endif // VPX_MD5_UTILS_H_
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef RATE_HIST_H_
|
||||
#define RATE_HIST_H_
|
||||
#ifndef VPX_RATE_HIST_H_
|
||||
#define VPX_RATE_HIST_H_
|
||||
|
||||
#include "vpx/vpx_encoder.h"
|
||||
|
||||
@ -37,4 +37,4 @@ void show_rate_histogram(struct rate_hist *hist, const vpx_codec_enc_cfg_t *cfg,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif // RATE_HIST_H_
|
||||
#endif // VPX_RATE_HIST_H_
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef TEST_ACM_RANDOM_H_
|
||||
#define TEST_ACM_RANDOM_H_
|
||||
#ifndef VPX_TEST_ACM_RANDOM_H_
|
||||
#define VPX_TEST_ACM_RANDOM_H_
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
@ -34,6 +34,24 @@ class ACMRandom {
|
||||
return (value >> 15) & 0xffff;
|
||||
}
|
||||
|
||||
int32_t Rand20Signed(void) {
|
||||
// Use 20 bits: values between 524287 and -524288.
|
||||
const uint32_t value = random_.Generate(1048576);
|
||||
return static_cast<int32_t>(value) - 524288;
|
||||
}
|
||||
|
||||
int16_t Rand16Signed(void) {
|
||||
// Use 16 bits: values between 32767 and -32768.
|
||||
const uint32_t value = random_.Generate(65536);
|
||||
return static_cast<int16_t>(value) - 32768;
|
||||
}
|
||||
|
||||
int16_t Rand13Signed(void) {
|
||||
// Use 13 bits: values between 4095 and -4096.
|
||||
const uint32_t value = random_.Generate(8192);
|
||||
return static_cast<int16_t>(value) - 4096;
|
||||
}
|
||||
|
||||
int16_t Rand9Signed(void) {
|
||||
// Use 9 bits: values between 255 (0x0FF) and -256 (0x100).
|
||||
const uint32_t value = random_.Generate(512);
|
||||
@ -73,4 +91,4 @@ class ACMRandom {
|
||||
|
||||
} // namespace libvpx_test
|
||||
|
||||
#endif // TEST_ACM_RANDOM_H_
|
||||
#endif // VPX_TEST_ACM_RANDOM_H_
|
||||
|
||||
@ -74,7 +74,7 @@ class ActiveMapRefreshTest
|
||||
::libvpx_test::Encoder *encoder) {
|
||||
::libvpx_test::Y4mVideoSource *y4m_video =
|
||||
static_cast<libvpx_test::Y4mVideoSource *>(video);
|
||||
if (video->frame() == 1) {
|
||||
if (video->frame() == 0) {
|
||||
encoder->Control(VP8E_SET_CPUUSED, cpu_used_);
|
||||
encoder->Control(VP9E_SET_AQ_MODE, kAqModeCyclicRefresh);
|
||||
} else if (video->frame() >= 2 && video->img()) {
|
||||
|
||||
@ -35,7 +35,7 @@ class ActiveMapTest
|
||||
|
||||
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
|
||||
::libvpx_test::Encoder *encoder) {
|
||||
if (video->frame() == 1) {
|
||||
if (video->frame() == 0) {
|
||||
encoder->Control(VP8E_SET_CPUUSED, cpu_used_);
|
||||
} else if (video->frame() == 3) {
|
||||
vpx_active_map_t map = vpx_active_map_t();
|
||||
|
||||
@ -8,8 +8,11 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#include <math.h>
|
||||
#include <tuple>
|
||||
|
||||
#include "test/clear_system_state.h"
|
||||
#include "test/register_state_check.h"
|
||||
#include "test/util.h"
|
||||
#include "third_party/googletest/src/include/gtest/gtest.h"
|
||||
#include "./vpx_dsp_rtcd.h"
|
||||
#include "vpx/vpx_integer.h"
|
||||
@ -25,7 +28,10 @@ typedef void (*AddNoiseFunc)(uint8_t *start, const int8_t *noise,
|
||||
int blackclamp, int whiteclamp, int width,
|
||||
int height, int pitch);
|
||||
|
||||
class AddNoiseTest : public ::testing::TestWithParam<AddNoiseFunc> {
|
||||
typedef std::tuple<double, AddNoiseFunc> AddNoiseTestFPParam;
|
||||
|
||||
class AddNoiseTest : public ::testing::Test,
|
||||
public ::testing::WithParamInterface<AddNoiseTestFPParam> {
|
||||
public:
|
||||
virtual void TearDown() { libvpx_test::ClearSystemState(); }
|
||||
virtual ~AddNoiseTest() {}
|
||||
@ -44,14 +50,14 @@ TEST_P(AddNoiseTest, CheckNoiseAdded) {
|
||||
const int height = 64;
|
||||
const int image_size = width * height;
|
||||
int8_t noise[kNoiseSize];
|
||||
const int clamp = vpx_setup_noise(4.4, noise, kNoiseSize);
|
||||
const int clamp = vpx_setup_noise(GET_PARAM(0), noise, kNoiseSize);
|
||||
uint8_t *const s =
|
||||
reinterpret_cast<uint8_t *>(vpx_calloc(image_size, sizeof(*s)));
|
||||
ASSERT_TRUE(s != NULL);
|
||||
memset(s, 99, image_size * sizeof(*s));
|
||||
|
||||
ASM_REGISTER_STATE_CHECK(
|
||||
GetParam()(s, noise, clamp, clamp, width, height, width));
|
||||
GET_PARAM(1)(s, noise, clamp, clamp, width, height, width));
|
||||
|
||||
// Check to make sure we don't end up having either the same or no added
|
||||
// noise either vertically or horizontally.
|
||||
@ -70,7 +76,7 @@ TEST_P(AddNoiseTest, CheckNoiseAdded) {
|
||||
memset(s, 255, image_size);
|
||||
|
||||
ASM_REGISTER_STATE_CHECK(
|
||||
GetParam()(s, noise, clamp, clamp, width, height, width));
|
||||
GET_PARAM(1)(s, noise, clamp, clamp, width, height, width));
|
||||
|
||||
// Check to make sure don't roll over.
|
||||
for (int i = 0; i < image_size; ++i) {
|
||||
@ -81,7 +87,7 @@ TEST_P(AddNoiseTest, CheckNoiseAdded) {
|
||||
memset(s, 0, image_size);
|
||||
|
||||
ASM_REGISTER_STATE_CHECK(
|
||||
GetParam()(s, noise, clamp, clamp, width, height, width));
|
||||
GET_PARAM(1)(s, noise, clamp, clamp, width, height, width));
|
||||
|
||||
// Check to make sure don't roll under.
|
||||
for (int i = 0; i < image_size; ++i) {
|
||||
@ -108,7 +114,7 @@ TEST_P(AddNoiseTest, CheckCvsAssembly) {
|
||||
|
||||
srand(0);
|
||||
ASM_REGISTER_STATE_CHECK(
|
||||
GetParam()(s, noise, clamp, clamp, width, height, width));
|
||||
GET_PARAM(1)(s, noise, clamp, clamp, width, height, width));
|
||||
srand(0);
|
||||
ASM_REGISTER_STATE_CHECK(
|
||||
vpx_plane_add_noise_c(d, noise, clamp, clamp, width, height, width));
|
||||
@ -121,16 +127,24 @@ TEST_P(AddNoiseTest, CheckCvsAssembly) {
|
||||
vpx_free(s);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(C, AddNoiseTest,
|
||||
::testing::Values(vpx_plane_add_noise_c));
|
||||
using std::make_tuple;
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
C, AddNoiseTest,
|
||||
::testing::Values(make_tuple(3.25, vpx_plane_add_noise_c),
|
||||
make_tuple(4.4, vpx_plane_add_noise_c)));
|
||||
|
||||
#if HAVE_SSE2
|
||||
INSTANTIATE_TEST_CASE_P(SSE2, AddNoiseTest,
|
||||
::testing::Values(vpx_plane_add_noise_sse2));
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
SSE2, AddNoiseTest,
|
||||
::testing::Values(make_tuple(3.25, vpx_plane_add_noise_sse2),
|
||||
make_tuple(4.4, vpx_plane_add_noise_sse2)));
|
||||
#endif
|
||||
|
||||
#if HAVE_MSA
|
||||
INSTANTIATE_TEST_CASE_P(MSA, AddNoiseTest,
|
||||
::testing::Values(vpx_plane_add_noise_msa));
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
MSA, AddNoiseTest,
|
||||
::testing::Values(make_tuple(3.25, vpx_plane_add_noise_msa),
|
||||
make_tuple(4.4, vpx_plane_add_noise_msa)));
|
||||
#endif
|
||||
} // namespace
|
||||
|
||||
@ -32,7 +32,7 @@ class AltRefAqSegmentTest
|
||||
|
||||
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
|
||||
::libvpx_test::Encoder *encoder) {
|
||||
if (video->frame() == 1) {
|
||||
if (video->frame() == 0) {
|
||||
encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);
|
||||
encoder->Control(VP9E_SET_ALT_REF_AQ, alt_ref_aq_mode_);
|
||||
encoder->Control(VP9E_SET_AQ_MODE, aq_mode_);
|
||||
|
||||
@ -35,7 +35,7 @@ class AltRefTest : public ::libvpx_test::EncoderTest,
|
||||
|
||||
virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
|
||||
libvpx_test::Encoder *encoder) {
|
||||
if (video->frame() == 1) {
|
||||
if (video->frame() == 0) {
|
||||
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
|
||||
encoder->Control(VP8E_SET_CPUUSED, 3);
|
||||
}
|
||||
|
||||
@ -3,12 +3,12 @@ Android.mk will build vpx unittests on android.
|
||||
./libvpx/configure --target=armv7-android-gcc --enable-external-build \
|
||||
--enable-postproc --disable-install-srcs --enable-multi-res-encoding \
|
||||
--enable-temporal-denoising --disable-unit-tests --disable-install-docs \
|
||||
--disable-examples --disable-runtime-cpu-detect --sdk-path=$NDK
|
||||
--disable-examples --disable-runtime-cpu-detect
|
||||
|
||||
2) From the parent directory, invoke ndk-build:
|
||||
NDK_PROJECT_PATH=. ndk-build APP_BUILD_SCRIPT=./libvpx/test/android/Android.mk \
|
||||
APP_ABI=armeabi-v7a APP_PLATFORM=android-18 APP_OPTIM=release \
|
||||
APP_STL=gnustl_static
|
||||
APP_STL=c++_static
|
||||
|
||||
Note: Both adb and ndk-build are available prebuilt at:
|
||||
https://chromium.googlesource.com/android_tools
|
||||
|
||||
@ -31,7 +31,7 @@ class AqSegmentTest
|
||||
|
||||
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
|
||||
::libvpx_test::Encoder *encoder) {
|
||||
if (video->frame() == 1) {
|
||||
if (video->frame() == 0) {
|
||||
encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);
|
||||
encoder->Control(VP9E_SET_AQ_MODE, aq_mode_);
|
||||
encoder->Control(VP8E_SET_MAX_INTRA_BITRATE_PCT, 100);
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <tuple>
|
||||
|
||||
#include "third_party/googletest/src/include/gtest/gtest.h"
|
||||
|
||||
@ -22,40 +23,43 @@
|
||||
#include "test/clear_system_state.h"
|
||||
#include "test/register_state_check.h"
|
||||
#include "test/util.h"
|
||||
#include "vpx/vpx_codec.h"
|
||||
#include "vpx_mem/vpx_mem.h"
|
||||
#include "vpx_ports/vpx_timer.h"
|
||||
|
||||
using libvpx_test::ACMRandom;
|
||||
|
||||
namespace {
|
||||
|
||||
template <typename Pixel>
|
||||
class AverageTestBase : public ::testing::Test {
|
||||
public:
|
||||
AverageTestBase(int width, int height) : width_(width), height_(height) {}
|
||||
AverageTestBase(int width, int height)
|
||||
: width_(width), height_(height), source_data_(NULL), source_stride_(0),
|
||||
bit_depth_(8) {}
|
||||
|
||||
static void SetUpTestCase() {
|
||||
source_data_ = reinterpret_cast<uint8_t *>(
|
||||
vpx_memalign(kDataAlignment, kDataBlockSize));
|
||||
}
|
||||
|
||||
static void TearDownTestCase() {
|
||||
virtual void TearDown() {
|
||||
vpx_free(source_data_);
|
||||
source_data_ = NULL;
|
||||
libvpx_test::ClearSystemState();
|
||||
}
|
||||
|
||||
virtual void TearDown() { libvpx_test::ClearSystemState(); }
|
||||
|
||||
protected:
|
||||
// Handle blocks up to 4 blocks 64x64 with stride up to 128
|
||||
static const int kDataAlignment = 16;
|
||||
static const int kDataBlockSize = 64 * 128;
|
||||
|
||||
virtual void SetUp() {
|
||||
source_data_ = reinterpret_cast<Pixel *>(
|
||||
vpx_memalign(kDataAlignment, kDataBlockSize * sizeof(source_data_[0])));
|
||||
ASSERT_TRUE(source_data_ != NULL);
|
||||
source_stride_ = (width_ + 31) & ~31;
|
||||
bit_depth_ = 8;
|
||||
rnd_.Reset(ACMRandom::DeterministicSeed());
|
||||
}
|
||||
|
||||
// Sum Pixels
|
||||
static unsigned int ReferenceAverage8x8(const uint8_t *source, int pitch) {
|
||||
static unsigned int ReferenceAverage8x8(const Pixel *source, int pitch) {
|
||||
unsigned int average = 0;
|
||||
for (int h = 0; h < 8; ++h) {
|
||||
for (int w = 0; w < 8; ++w) average += source[h * pitch + w];
|
||||
@ -63,7 +67,7 @@ class AverageTestBase : public ::testing::Test {
|
||||
return ((average + 32) >> 6);
|
||||
}
|
||||
|
||||
static unsigned int ReferenceAverage4x4(const uint8_t *source, int pitch) {
|
||||
static unsigned int ReferenceAverage4x4(const Pixel *source, int pitch) {
|
||||
unsigned int average = 0;
|
||||
for (int h = 0; h < 4; ++h) {
|
||||
for (int w = 0; w < 4; ++w) average += source[h * pitch + w];
|
||||
@ -71,7 +75,7 @@ class AverageTestBase : public ::testing::Test {
|
||||
return ((average + 8) >> 4);
|
||||
}
|
||||
|
||||
void FillConstant(uint8_t fill_constant) {
|
||||
void FillConstant(Pixel fill_constant) {
|
||||
for (int i = 0; i < width_ * height_; ++i) {
|
||||
source_data_[i] = fill_constant;
|
||||
}
|
||||
@ -79,21 +83,22 @@ class AverageTestBase : public ::testing::Test {
|
||||
|
||||
void FillRandom() {
|
||||
for (int i = 0; i < width_ * height_; ++i) {
|
||||
source_data_[i] = rnd_.Rand8();
|
||||
source_data_[i] = rnd_.Rand16() & ((1 << bit_depth_) - 1);
|
||||
}
|
||||
}
|
||||
|
||||
int width_, height_;
|
||||
static uint8_t *source_data_;
|
||||
Pixel *source_data_;
|
||||
int source_stride_;
|
||||
int bit_depth_;
|
||||
|
||||
ACMRandom rnd_;
|
||||
};
|
||||
typedef unsigned int (*AverageFunction)(const uint8_t *s, int pitch);
|
||||
|
||||
typedef std::tr1::tuple<int, int, int, int, AverageFunction> AvgFunc;
|
||||
typedef std::tuple<int, int, int, int, AverageFunction> AvgFunc;
|
||||
|
||||
class AverageTest : public AverageTestBase,
|
||||
class AverageTest : public AverageTestBase<uint8_t>,
|
||||
public ::testing::WithParamInterface<AvgFunc> {
|
||||
public:
|
||||
AverageTest() : AverageTestBase(GET_PARAM(0), GET_PARAM(1)) {}
|
||||
@ -119,12 +124,40 @@ class AverageTest : public AverageTestBase,
|
||||
}
|
||||
};
|
||||
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
class AverageTestHBD : public AverageTestBase<uint16_t>,
|
||||
public ::testing::WithParamInterface<AvgFunc> {
|
||||
public:
|
||||
AverageTestHBD() : AverageTestBase(GET_PARAM(0), GET_PARAM(1)) {}
|
||||
|
||||
protected:
|
||||
void CheckAverages() {
|
||||
const int block_size = GET_PARAM(3);
|
||||
unsigned int expected = 0;
|
||||
if (block_size == 8) {
|
||||
expected =
|
||||
ReferenceAverage8x8(source_data_ + GET_PARAM(2), source_stride_);
|
||||
} else if (block_size == 4) {
|
||||
expected =
|
||||
ReferenceAverage4x4(source_data_ + GET_PARAM(2), source_stride_);
|
||||
}
|
||||
|
||||
ASM_REGISTER_STATE_CHECK(GET_PARAM(4)(
|
||||
CONVERT_TO_BYTEPTR(source_data_ + GET_PARAM(2)), source_stride_));
|
||||
unsigned int actual = GET_PARAM(4)(
|
||||
CONVERT_TO_BYTEPTR(source_data_ + GET_PARAM(2)), source_stride_);
|
||||
|
||||
EXPECT_EQ(expected, actual);
|
||||
}
|
||||
};
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
typedef void (*IntProRowFunc)(int16_t hbuf[16], uint8_t const *ref,
|
||||
const int ref_stride, const int height);
|
||||
|
||||
typedef std::tr1::tuple<int, IntProRowFunc, IntProRowFunc> IntProRowParam;
|
||||
typedef std::tuple<int, IntProRowFunc, IntProRowFunc> IntProRowParam;
|
||||
|
||||
class IntProRowTest : public AverageTestBase,
|
||||
class IntProRowTest : public AverageTestBase<uint8_t>,
|
||||
public ::testing::WithParamInterface<IntProRowParam> {
|
||||
public:
|
||||
IntProRowTest()
|
||||
@ -135,6 +168,10 @@ class IntProRowTest : public AverageTestBase,
|
||||
|
||||
protected:
|
||||
virtual void SetUp() {
|
||||
source_data_ = reinterpret_cast<uint8_t *>(
|
||||
vpx_memalign(kDataAlignment, kDataBlockSize * sizeof(source_data_[0])));
|
||||
ASSERT_TRUE(source_data_ != NULL);
|
||||
|
||||
hbuf_asm_ = reinterpret_cast<int16_t *>(
|
||||
vpx_memalign(kDataAlignment, sizeof(*hbuf_asm_) * 16));
|
||||
hbuf_c_ = reinterpret_cast<int16_t *>(
|
||||
@ -142,6 +179,8 @@ class IntProRowTest : public AverageTestBase,
|
||||
}
|
||||
|
||||
virtual void TearDown() {
|
||||
vpx_free(source_data_);
|
||||
source_data_ = NULL;
|
||||
vpx_free(hbuf_c_);
|
||||
hbuf_c_ = NULL;
|
||||
vpx_free(hbuf_asm_);
|
||||
@ -164,9 +203,9 @@ class IntProRowTest : public AverageTestBase,
|
||||
|
||||
typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width);
|
||||
|
||||
typedef std::tr1::tuple<int, IntProColFunc, IntProColFunc> IntProColParam;
|
||||
typedef std::tuple<int, IntProColFunc, IntProColFunc> IntProColParam;
|
||||
|
||||
class IntProColTest : public AverageTestBase,
|
||||
class IntProColTest : public AverageTestBase<uint8_t>,
|
||||
public ::testing::WithParamInterface<IntProColParam> {
|
||||
public:
|
||||
IntProColTest() : AverageTestBase(GET_PARAM(0), 1), sum_asm_(0), sum_c_(0) {
|
||||
@ -189,7 +228,7 @@ class IntProColTest : public AverageTestBase,
|
||||
};
|
||||
|
||||
typedef int (*SatdFunc)(const tran_low_t *coeffs, int length);
|
||||
typedef std::tr1::tuple<int, SatdFunc> SatdTestParam;
|
||||
typedef std::tuple<int, SatdFunc> SatdTestParam;
|
||||
|
||||
class SatdTest : public ::testing::Test,
|
||||
public ::testing::WithParamInterface<SatdTestParam> {
|
||||
@ -212,12 +251,7 @@ class SatdTest : public ::testing::Test,
|
||||
for (int i = 0; i < satd_size_; ++i) src_[i] = val;
|
||||
}
|
||||
|
||||
void FillRandom() {
|
||||
for (int i = 0; i < satd_size_; ++i) {
|
||||
const int16_t tmp = rnd_.Rand16();
|
||||
src_[i] = (tran_low_t)tmp;
|
||||
}
|
||||
}
|
||||
virtual void FillRandom() = 0;
|
||||
|
||||
void Check(const int expected) {
|
||||
int total;
|
||||
@ -225,17 +259,29 @@ class SatdTest : public ::testing::Test,
|
||||
EXPECT_EQ(expected, total);
|
||||
}
|
||||
|
||||
tran_low_t *GetCoeff() const { return src_; }
|
||||
|
||||
int satd_size_;
|
||||
ACMRandom rnd_;
|
||||
tran_low_t *src_;
|
||||
|
||||
private:
|
||||
tran_low_t *src_;
|
||||
SatdFunc satd_func_;
|
||||
ACMRandom rnd_;
|
||||
};
|
||||
|
||||
class SatdLowbdTest : public SatdTest {
|
||||
protected:
|
||||
virtual void FillRandom() {
|
||||
for (int i = 0; i < satd_size_; ++i) {
|
||||
const int16_t tmp = rnd_.Rand16Signed();
|
||||
src_[i] = (tran_low_t)tmp;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
typedef int64_t (*BlockErrorFunc)(const tran_low_t *coeff,
|
||||
const tran_low_t *dqcoeff, int block_size);
|
||||
typedef std::tr1::tuple<int, BlockErrorFunc> BlockErrorTestFPParam;
|
||||
typedef std::tuple<int, BlockErrorFunc> BlockErrorTestFPParam;
|
||||
|
||||
class BlockErrorTestFP
|
||||
: public ::testing::Test,
|
||||
@ -279,6 +325,10 @@ class BlockErrorTestFP
|
||||
EXPECT_EQ(expected, total);
|
||||
}
|
||||
|
||||
tran_low_t *GetCoeff() const { return coeff_; }
|
||||
|
||||
tran_low_t *GetDQCoeff() const { return dqcoeff_; }
|
||||
|
||||
int txfm_size_;
|
||||
|
||||
private:
|
||||
@ -288,8 +338,6 @@ class BlockErrorTestFP
|
||||
ACMRandom rnd_;
|
||||
};
|
||||
|
||||
uint8_t *AverageTestBase::source_data_ = NULL;
|
||||
|
||||
TEST_P(AverageTest, MinValue) {
|
||||
FillConstant(0);
|
||||
CheckAverages();
|
||||
@ -308,6 +356,27 @@ TEST_P(AverageTest, Random) {
|
||||
CheckAverages();
|
||||
}
|
||||
}
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
TEST_P(AverageTestHBD, MinValue) {
|
||||
FillConstant(0);
|
||||
CheckAverages();
|
||||
}
|
||||
|
||||
TEST_P(AverageTestHBD, MaxValue) {
|
||||
FillConstant((1 << VPX_BITS_12) - 1);
|
||||
CheckAverages();
|
||||
}
|
||||
|
||||
TEST_P(AverageTestHBD, Random) {
|
||||
bit_depth_ = VPX_BITS_12;
|
||||
// The reference frame, but not the source frame, may be unaligned for
|
||||
// certain types of searches.
|
||||
for (int i = 0; i < 1000; i++) {
|
||||
FillRandom();
|
||||
CheckAverages();
|
||||
}
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
TEST_P(IntProRowTest, MinValue) {
|
||||
FillConstant(0);
|
||||
@ -339,27 +408,27 @@ TEST_P(IntProColTest, Random) {
|
||||
RunComparison();
|
||||
}
|
||||
|
||||
TEST_P(SatdTest, MinValue) {
|
||||
TEST_P(SatdLowbdTest, MinValue) {
|
||||
const int kMin = -32640;
|
||||
const int expected = -kMin * satd_size_;
|
||||
FillConstant(kMin);
|
||||
Check(expected);
|
||||
}
|
||||
|
||||
TEST_P(SatdTest, MaxValue) {
|
||||
TEST_P(SatdLowbdTest, MaxValue) {
|
||||
const int kMax = 32640;
|
||||
const int expected = kMax * satd_size_;
|
||||
FillConstant(kMax);
|
||||
Check(expected);
|
||||
}
|
||||
|
||||
TEST_P(SatdTest, Random) {
|
||||
TEST_P(SatdLowbdTest, Random) {
|
||||
int expected;
|
||||
switch (satd_size_) {
|
||||
case 16: expected = 205298; break;
|
||||
case 64: expected = 1113950; break;
|
||||
case 256: expected = 4268415; break;
|
||||
case 1024: expected = 16954082; break;
|
||||
case 16: expected = 263252; break;
|
||||
case 64: expected = 1105420; break;
|
||||
case 256: expected = 4252250; break;
|
||||
case 1024: expected = 16876840; break;
|
||||
default:
|
||||
FAIL() << "Invalid satd size (" << satd_size_
|
||||
<< ") valid: 16/64/256/1024";
|
||||
@ -368,11 +437,12 @@ TEST_P(SatdTest, Random) {
|
||||
Check(expected);
|
||||
}
|
||||
|
||||
TEST_P(SatdTest, DISABLED_Speed) {
|
||||
TEST_P(SatdLowbdTest, DISABLED_Speed) {
|
||||
const int kCountSpeedTestBlock = 20000;
|
||||
vpx_usec_timer timer;
|
||||
DECLARE_ALIGNED(16, tran_low_t, coeff[1024]);
|
||||
const int blocksize = GET_PARAM(0);
|
||||
FillRandom();
|
||||
tran_low_t *coeff = GetCoeff();
|
||||
|
||||
vpx_usec_timer_start(&timer);
|
||||
for (int i = 0; i < kCountSpeedTestBlock; ++i) {
|
||||
@ -383,6 +453,62 @@ TEST_P(SatdTest, DISABLED_Speed) {
|
||||
printf("blocksize: %4d time: %4d us\n", blocksize, elapsed_time);
|
||||
}
|
||||
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
class SatdHighbdTest : public SatdTest {
|
||||
protected:
|
||||
virtual void FillRandom() {
|
||||
for (int i = 0; i < satd_size_; ++i) {
|
||||
src_[i] = rnd_.Rand20Signed();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
TEST_P(SatdHighbdTest, MinValue) {
|
||||
const int kMin = -524280;
|
||||
const int expected = -kMin * satd_size_;
|
||||
FillConstant(kMin);
|
||||
Check(expected);
|
||||
}
|
||||
|
||||
TEST_P(SatdHighbdTest, MaxValue) {
|
||||
const int kMax = 524280;
|
||||
const int expected = kMax * satd_size_;
|
||||
FillConstant(kMax);
|
||||
Check(expected);
|
||||
}
|
||||
|
||||
TEST_P(SatdHighbdTest, Random) {
|
||||
int expected;
|
||||
switch (satd_size_) {
|
||||
case 16: expected = 5249712; break;
|
||||
case 64: expected = 18362120; break;
|
||||
case 256: expected = 66100520; break;
|
||||
case 1024: expected = 266094734; break;
|
||||
default:
|
||||
FAIL() << "Invalid satd size (" << satd_size_
|
||||
<< ") valid: 16/64/256/1024";
|
||||
}
|
||||
FillRandom();
|
||||
Check(expected);
|
||||
}
|
||||
|
||||
TEST_P(SatdHighbdTest, DISABLED_Speed) {
|
||||
const int kCountSpeedTestBlock = 20000;
|
||||
vpx_usec_timer timer;
|
||||
const int blocksize = GET_PARAM(0);
|
||||
FillRandom();
|
||||
tran_low_t *coeff = GetCoeff();
|
||||
|
||||
vpx_usec_timer_start(&timer);
|
||||
for (int i = 0; i < kCountSpeedTestBlock; ++i) {
|
||||
GET_PARAM(1)(coeff, blocksize);
|
||||
}
|
||||
vpx_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(vpx_usec_timer_elapsed(&timer));
|
||||
printf("blocksize: %4d time: %4d us\n", blocksize, elapsed_time);
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
TEST_P(BlockErrorTestFP, MinValue) {
|
||||
const int64_t kMin = -32640;
|
||||
const int64_t expected = kMin * kMin * txfm_size_;
|
||||
@ -415,9 +541,10 @@ TEST_P(BlockErrorTestFP, Random) {
|
||||
TEST_P(BlockErrorTestFP, DISABLED_Speed) {
|
||||
const int kCountSpeedTestBlock = 20000;
|
||||
vpx_usec_timer timer;
|
||||
DECLARE_ALIGNED(16, tran_low_t, coeff[1024]);
|
||||
DECLARE_ALIGNED(16, tran_low_t, dqcoeff[1024]);
|
||||
const int blocksize = GET_PARAM(0);
|
||||
FillRandom();
|
||||
tran_low_t *coeff = GetCoeff();
|
||||
tran_low_t *dqcoeff = GetDQCoeff();
|
||||
|
||||
vpx_usec_timer_start(&timer);
|
||||
for (int i = 0; i < kCountSpeedTestBlock; ++i) {
|
||||
@ -428,14 +555,34 @@ TEST_P(BlockErrorTestFP, DISABLED_Speed) {
|
||||
printf("blocksize: %4d time: %4d us\n", blocksize, elapsed_time);
|
||||
}
|
||||
|
||||
using std::tr1::make_tuple;
|
||||
using std::make_tuple;
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
C, AverageTest,
|
||||
::testing::Values(make_tuple(16, 16, 1, 8, &vpx_avg_8x8_c),
|
||||
make_tuple(16, 16, 1, 4, &vpx_avg_4x4_c)));
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(C, SatdTest,
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
C, AverageTestHBD,
|
||||
::testing::Values(make_tuple(16, 16, 1, 8, &vpx_highbd_avg_8x8_c),
|
||||
make_tuple(16, 16, 1, 4, &vpx_highbd_avg_4x4_c)));
|
||||
|
||||
#if HAVE_SSE2
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
SSE2, AverageTestHBD,
|
||||
::testing::Values(make_tuple(16, 16, 1, 8, &vpx_highbd_avg_8x8_sse2),
|
||||
make_tuple(16, 16, 1, 4, &vpx_highbd_avg_4x4_sse2)));
|
||||
#endif // HAVE_SSE2
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(C, SatdHighbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_satd_c),
|
||||
make_tuple(64, &vpx_satd_c),
|
||||
make_tuple(256, &vpx_satd_c),
|
||||
make_tuple(1024, &vpx_satd_c)));
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(C, SatdLowbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_satd_c),
|
||||
make_tuple(64, &vpx_satd_c),
|
||||
make_tuple(256, &vpx_satd_c),
|
||||
@ -472,7 +619,7 @@ INSTANTIATE_TEST_CASE_P(
|
||||
make_tuple(64, &vpx_int_pro_col_sse2,
|
||||
&vpx_int_pro_col_c)));
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(SSE2, SatdTest,
|
||||
INSTANTIATE_TEST_CASE_P(SSE2, SatdLowbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_satd_sse2),
|
||||
make_tuple(64, &vpx_satd_sse2),
|
||||
make_tuple(256, &vpx_satd_sse2),
|
||||
@ -487,12 +634,21 @@ INSTANTIATE_TEST_CASE_P(
|
||||
#endif // HAVE_SSE2
|
||||
|
||||
#if HAVE_AVX2
|
||||
INSTANTIATE_TEST_CASE_P(AVX2, SatdTest,
|
||||
INSTANTIATE_TEST_CASE_P(AVX2, SatdLowbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_satd_avx2),
|
||||
make_tuple(64, &vpx_satd_avx2),
|
||||
make_tuple(256, &vpx_satd_avx2),
|
||||
make_tuple(1024, &vpx_satd_avx2)));
|
||||
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
AVX2, SatdHighbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_highbd_satd_avx2),
|
||||
make_tuple(64, &vpx_highbd_satd_avx2),
|
||||
make_tuple(256, &vpx_highbd_satd_avx2),
|
||||
make_tuple(1024, &vpx_highbd_satd_avx2)));
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
AVX2, BlockErrorTestFP,
|
||||
::testing::Values(make_tuple(16, &vp9_block_error_fp_avx2),
|
||||
@ -525,7 +681,7 @@ INSTANTIATE_TEST_CASE_P(
|
||||
make_tuple(64, &vpx_int_pro_col_neon,
|
||||
&vpx_int_pro_col_c)));
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(NEON, SatdTest,
|
||||
INSTANTIATE_TEST_CASE_P(NEON, SatdLowbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_satd_neon),
|
||||
make_tuple(64, &vpx_satd_neon),
|
||||
make_tuple(256, &vpx_satd_neon),
|
||||
@ -570,7 +726,7 @@ INSTANTIATE_TEST_CASE_P(
|
||||
// TODO(jingning): Remove the highbitdepth flag once the SIMD functions are
|
||||
// in place.
|
||||
#if !CONFIG_VP9_HIGHBITDEPTH
|
||||
INSTANTIATE_TEST_CASE_P(MSA, SatdTest,
|
||||
INSTANTIATE_TEST_CASE_P(MSA, SatdLowbdTest,
|
||||
::testing::Values(make_tuple(16, &vpx_satd_msa),
|
||||
make_tuple(64, &vpx_satd_msa),
|
||||
make_tuple(256, &vpx_satd_msa),
|
||||
|
||||
38
libs/libvpx/test/bench.cc
Normal file
38
libs/libvpx/test/bench.cc
Normal file
@ -0,0 +1,38 @@
|
||||
/*
|
||||
* Copyright (c) 2018 The WebM project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <algorithm>
|
||||
|
||||
#include "test/bench.h"
|
||||
#include "vpx_ports/vpx_timer.h"
|
||||
|
||||
void AbstractBench::RunNTimes(int n) {
|
||||
for (int r = 0; r < VPX_BENCH_ROBUST_ITER; r++) {
|
||||
vpx_usec_timer timer;
|
||||
vpx_usec_timer_start(&timer);
|
||||
for (int j = 0; j < n; ++j) {
|
||||
Run();
|
||||
}
|
||||
vpx_usec_timer_mark(&timer);
|
||||
times_[r] = static_cast<int>(vpx_usec_timer_elapsed(&timer));
|
||||
}
|
||||
}
|
||||
|
||||
void AbstractBench::PrintMedian(const char *title) {
|
||||
std::sort(times_, times_ + VPX_BENCH_ROBUST_ITER);
|
||||
const int med = times_[VPX_BENCH_ROBUST_ITER >> 1];
|
||||
int sad = 0;
|
||||
for (int t = 0; t < VPX_BENCH_ROBUST_ITER; t++) {
|
||||
sad += abs(times_[t] - med);
|
||||
}
|
||||
printf("[%10s] %s %.1f ms ( ±%.1f ms )\n", "BENCH ", title, med / 1000.0,
|
||||
sad / (VPX_BENCH_ROBUST_ITER * 1000.0));
|
||||
}
|
||||
30
libs/libvpx/test/bench.h
Normal file
30
libs/libvpx/test/bench.h
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Copyright (c) 2018 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 VPX_TEST_BENCH_H_
|
||||
#define VPX_TEST_BENCH_H_
|
||||
|
||||
// Number of iterations used to compute median run time.
|
||||
#define VPX_BENCH_ROBUST_ITER 15
|
||||
|
||||
class AbstractBench {
|
||||
public:
|
||||
void RunNTimes(int n);
|
||||
void PrintMedian(const char *title);
|
||||
|
||||
protected:
|
||||
// Implement this method and put the code to benchmark in it.
|
||||
virtual void Run() = 0;
|
||||
|
||||
private:
|
||||
int times_[VPX_BENCH_ROBUST_ITER];
|
||||
};
|
||||
|
||||
#endif // VPX_TEST_BENCH_H_
|
||||
@ -11,6 +11,7 @@
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <tuple>
|
||||
|
||||
#include "third_party/googletest/src/include/gtest/gtest.h"
|
||||
|
||||
@ -25,10 +26,7 @@
|
||||
#include "test/util.h"
|
||||
|
||||
#include "vpx_mem/vpx_mem.h"
|
||||
|
||||
extern "C" double vp9_get_blockiness(const unsigned char *img1, int img1_pitch,
|
||||
const unsigned char *img2, int img2_pitch,
|
||||
int width, int height);
|
||||
#include "vp9/encoder/vp9_blockiness.h"
|
||||
|
||||
using libvpx_test::ACMRandom;
|
||||
|
||||
@ -141,7 +139,7 @@ class BlockinessTestBase : public ::testing::Test {
|
||||
};
|
||||
|
||||
#if CONFIG_VP9_ENCODER
|
||||
typedef std::tr1::tuple<int, int> BlockinessParam;
|
||||
typedef std::tuple<int, int> BlockinessParam;
|
||||
class BlockinessVP9Test
|
||||
: public BlockinessTestBase,
|
||||
public ::testing::WithParamInterface<BlockinessParam> {
|
||||
@ -208,15 +206,15 @@ TEST_P(BlockinessVP9Test, WorstCaseBlockiness) {
|
||||
}
|
||||
#endif // CONFIG_VP9_ENCODER
|
||||
|
||||
using std::tr1::make_tuple;
|
||||
using std::make_tuple;
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// C functions
|
||||
|
||||
#if CONFIG_VP9_ENCODER
|
||||
const BlockinessParam c_vp9_tests[] = {
|
||||
make_tuple(320, 240), make_tuple(318, 242), make_tuple(318, 238),
|
||||
};
|
||||
const BlockinessParam c_vp9_tests[] = { make_tuple(320, 240),
|
||||
make_tuple(318, 242),
|
||||
make_tuple(318, 238) };
|
||||
INSTANTIATE_TEST_CASE_P(C, BlockinessVP9Test, ::testing::ValuesIn(c_vp9_tests));
|
||||
#endif
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ class BordersTest
|
||||
|
||||
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
|
||||
::libvpx_test::Encoder *encoder) {
|
||||
if (video->frame() == 1) {
|
||||
if (video->frame() == 0) {
|
||||
encoder->Control(VP8E_SET_CPUUSED, 1);
|
||||
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
|
||||
encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef TEST_BUFFER_H_
|
||||
#define TEST_BUFFER_H_
|
||||
#ifndef VPX_TEST_BUFFER_H_
|
||||
#define VPX_TEST_BUFFER_H_
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@ -379,4 +379,4 @@ bool Buffer<T>::BufferSizesMatch(const Buffer<T> &a) const {
|
||||
return true;
|
||||
}
|
||||
} // namespace libvpx_test
|
||||
#endif // TEST_BUFFER_H_
|
||||
#endif // VPX_TEST_BUFFER_H_
|
||||
|
||||
@ -171,8 +171,9 @@ TEST_F(ByteAlignmentTest, SwitchByteAlignment) {
|
||||
TEST_P(ByteAlignmentTest, TestAlignment) {
|
||||
const ByteAlignmentTestParam t = GetParam();
|
||||
SetByteAlignment(t.byte_alignment, t.expected_value);
|
||||
if (t.decode_remaining)
|
||||
if (t.decode_remaining) {
|
||||
ASSERT_EQ(VPX_CODEC_OK, DecodeRemainingFrames(t.byte_alignment));
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(Alignments, ByteAlignmentTest,
|
||||
|
||||
@ -7,23 +7,17 @@
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef TEST_CLEAR_SYSTEM_STATE_H_
|
||||
#define TEST_CLEAR_SYSTEM_STATE_H_
|
||||
#ifndef VPX_TEST_CLEAR_SYSTEM_STATE_H_
|
||||
#define VPX_TEST_CLEAR_SYSTEM_STATE_H_
|
||||
|
||||
#include "./vpx_config.h"
|
||||
#if ARCH_X86 || ARCH_X86_64
|
||||
#include "vpx_ports/x86.h"
|
||||
#endif
|
||||
#include "vpx_ports/system_state.h"
|
||||
|
||||
namespace libvpx_test {
|
||||
|
||||
// Reset system to a known state. This function should be used for all non-API
|
||||
// test cases.
|
||||
inline void ClearSystemState() {
|
||||
#if ARCH_X86 || ARCH_X86_64
|
||||
vpx_reset_mmx_state();
|
||||
#endif
|
||||
}
|
||||
inline void ClearSystemState() { vpx_clear_system_state(); }
|
||||
|
||||
} // namespace libvpx_test
|
||||
#endif // TEST_CLEAR_SYSTEM_STATE_H_
|
||||
#endif // VPX_TEST_CLEAR_SYSTEM_STATE_H_
|
||||
|
||||
@ -7,8 +7,10 @@
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef TEST_CODEC_FACTORY_H_
|
||||
#define TEST_CODEC_FACTORY_H_
|
||||
#ifndef VPX_TEST_CODEC_FACTORY_H_
|
||||
#define VPX_TEST_CODEC_FACTORY_H_
|
||||
|
||||
#include <tuple>
|
||||
|
||||
#include "./vpx_config.h"
|
||||
#include "vpx/vpx_decoder.h"
|
||||
@ -53,23 +55,22 @@ class CodecFactory {
|
||||
template <class T1>
|
||||
class CodecTestWithParam
|
||||
: public ::testing::TestWithParam<
|
||||
std::tr1::tuple<const libvpx_test::CodecFactory *, T1> > {};
|
||||
std::tuple<const libvpx_test::CodecFactory *, T1> > {};
|
||||
|
||||
template <class T1, class T2>
|
||||
class CodecTestWith2Params
|
||||
: public ::testing::TestWithParam<
|
||||
std::tr1::tuple<const libvpx_test::CodecFactory *, T1, T2> > {};
|
||||
std::tuple<const libvpx_test::CodecFactory *, T1, T2> > {};
|
||||
|
||||
template <class T1, class T2, class T3>
|
||||
class CodecTestWith3Params
|
||||
: public ::testing::TestWithParam<
|
||||
std::tr1::tuple<const libvpx_test::CodecFactory *, T1, T2, T3> > {};
|
||||
std::tuple<const libvpx_test::CodecFactory *, T1, T2, T3> > {};
|
||||
|
||||
template <class T1, class T2, class T3, class T4>
|
||||
class CodecTestWith4Params
|
||||
: public ::testing::TestWithParam<
|
||||
std::tr1::tuple<const libvpx_test::CodecFactory *, T1, T2, T3, T4> > {
|
||||
};
|
||||
std::tuple<const libvpx_test::CodecFactory *, T1, T2, T3, T4> > {};
|
||||
|
||||
/*
|
||||
* VP8 Codec Definitions
|
||||
@ -264,4 +265,4 @@ const libvpx_test::VP9CodecFactory kVP9;
|
||||
#endif // CONFIG_VP9
|
||||
|
||||
} // namespace libvpx_test
|
||||
#endif // TEST_CODEC_FACTORY_H_
|
||||
#endif // VPX_TEST_CODEC_FACTORY_H_
|
||||
|
||||
@ -29,6 +29,10 @@ uint8_t avg_with_rounding(uint8_t a, uint8_t b) { return (a + b + 1) >> 1; }
|
||||
|
||||
void reference_pred(const Buffer<uint8_t> &pred, const Buffer<uint8_t> &ref,
|
||||
int width, int height, Buffer<uint8_t> *avg) {
|
||||
ASSERT_TRUE(avg->TopLeftPixel() != NULL);
|
||||
ASSERT_TRUE(pred.TopLeftPixel() != NULL);
|
||||
ASSERT_TRUE(ref.TopLeftPixel() != NULL);
|
||||
|
||||
for (int y = 0; y < height; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
avg->TopLeftPixel()[y * avg->stride() + x] =
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user