mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-28 09:09:20 +00:00
Merge branch 'master' of git.linphone.org:linphone-android into obiane_new
This commit is contained in:
Erwan Croze
commit
10c2a36908
16 changed files with 71 additions and 396 deletions
16
.classpath
16
.classpath
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="submodules/linphone/mediastreamer2/java/src"/>
|
||||
<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
|
||||
<classpathentry kind="src" path="submodules/linphone/java/common"/>
|
||||
<classpathentry kind="src" path="submodules/linphone/java/impl"/>
|
||||
<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="libs/gcm.jar"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="output" path="bin/classes"/>
|
||||
</classpath>
|
||||
76
.gitmodules
vendored
76
.gitmodules
vendored
|
|
@ -1,125 +1,125 @@
|
|||
[submodule "submodules/linphone"]
|
||||
path = submodules/linphone
|
||||
url = git://git.linphone.org/linphone.git
|
||||
url = https://gitlab.linphone.org/BC/public/linphone.git
|
||||
[submodule "submodules/externals/gsm"]
|
||||
path = submodules/externals/gsm
|
||||
url = git://git.linphone.org/gsm.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/gsm.git
|
||||
[submodule "submodules/externals/speex"]
|
||||
path = submodules/externals/speex
|
||||
url = git://git.linphone.org/speex.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/speex.git
|
||||
[submodule "submodules/externals/ffmpeg"]
|
||||
path = submodules/externals/ffmpeg
|
||||
url = git://git.linphone.org/ffmpeg.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/ffmpeg.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/externals/x264"]
|
||||
path = submodules/externals/x264
|
||||
url = git://git.linphone.org/x264.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/x264.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/msx264"]
|
||||
path = submodules/msx264
|
||||
url = git://git.linphone.org/msx264.git
|
||||
url = https://gitlab.linphone.org/BC/public/msx264.git
|
||||
[submodule "submodules/externals/opencore-amr"]
|
||||
path = submodules/externals/opencore-amr
|
||||
url = git://git.linphone.org/opencore-amr.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/msamr"]
|
||||
path = submodules/msamr
|
||||
url = git://git.linphone.org/msamr.git
|
||||
url = https://gitlab.linphone.org/BC/public/msamr.git
|
||||
[submodule "submodules/externals/libvpx"]
|
||||
path = submodules/externals/libvpx
|
||||
url = git://git.linphone.org/libvpx.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/libvpx.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/bzrtp"]
|
||||
path = submodules/bzrtp
|
||||
url = git://git.linphone.org/bzrtp.git
|
||||
url = https://gitlab.linphone.org/BC/public/bzrtp.git
|
||||
[submodule "submodules/externals/srtp"]
|
||||
path = submodules/externals/srtp
|
||||
url = git://git.linphone.org/srtp.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/srtp.git
|
||||
[submodule "submodules/mssilk"]
|
||||
path = submodules/mssilk
|
||||
url = git://git.linphone.org/mssilk.git
|
||||
url = https://gitlab.linphone.org/BC/public/mssilk.git
|
||||
[submodule "submodules/bcg729"]
|
||||
path = submodules/bcg729
|
||||
url = git://git.linphone.org/bcg729.git
|
||||
url = https://gitlab.linphone.org/BC/public/bcg729.git
|
||||
[submodule "submodules/belle-sip"]
|
||||
path = submodules/belle-sip
|
||||
url = git://git.linphone.org/belle-sip.git
|
||||
url = https://gitlab.linphone.org/BC/public/belle-sip.git
|
||||
[submodule "submodules/externals/libxml2"]
|
||||
path = submodules/externals/libxml2
|
||||
url = https://github.com/GNOME/libxml2.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/libxml2.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/externals/libupnp"]
|
||||
path = submodules/externals/libupnp
|
||||
url = git://git.linphone.org/libupnp.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/libupnp.git
|
||||
[submodule "submodules/externals/opus"]
|
||||
path = submodules/externals/opus
|
||||
url = git://git.linphone.org/opus.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/opus.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/mswebrtc"]
|
||||
path = submodules/mswebrtc
|
||||
url = git://git.linphone.org/mswebrtc.git
|
||||
url = https://gitlab.linphone.org/BC/public/mswebrtc.git
|
||||
[submodule "submodules/msopenh264"]
|
||||
path = submodules/msopenh264
|
||||
url = git://git.linphone.org/msopenh264.git
|
||||
url = https://gitlab.linphone.org/BC/public/msopenh264.git
|
||||
[submodule "submodules/externals/openh264"]
|
||||
path = submodules/externals/openh264
|
||||
url = https://github.com/cisco/openh264
|
||||
url = https://gitlab.linphone.org/BC/public/external/openh264.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/mscodec2"]
|
||||
path = submodules/mscodec2
|
||||
url = git://git.linphone.org/mscodec2.git
|
||||
url = https://gitlab.linphone.org/BC/public/mscodec2.git
|
||||
[submodule "submodules/bctoolbox"]
|
||||
path = submodules/bctoolbox
|
||||
url = git://git.linphone.org/bctoolbox.git
|
||||
url = https://gitlab.linphone.org/BC/public/bctoolbox.git
|
||||
[submodule "submodules/externals/mbedtls"]
|
||||
path = submodules/externals/mbedtls
|
||||
url = git://git.linphone.org/mbedtls.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/mbedtls.git
|
||||
ignore = dirty
|
||||
[submodule "submodules/cmake-builder"]
|
||||
path = submodules/cmake-builder
|
||||
url = git://git.linphone.org/linphone-cmake-builder.git
|
||||
url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
|
||||
[submodule "submodules/externals/bv16-floatingpoint"]
|
||||
path = submodules/externals/bv16-floatingpoint
|
||||
url = git://git.linphone.org/bv16-floatingpoint.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git
|
||||
[submodule "submodules/belr"]
|
||||
path = submodules/belr
|
||||
url = git://git.linphone.org/belr.git
|
||||
url = https://gitlab.linphone.org/BC/public/belr.git
|
||||
[submodule "submodules/belcard"]
|
||||
path = submodules/belcard
|
||||
url = git://git.linphone.org/belcard.git
|
||||
url = https://gitlab.linphone.org/BC/public/belcard.git
|
||||
[submodule "submodules/bcunit"]
|
||||
path = submodules/bcunit
|
||||
url = git://git.linphone.org/bcunit.git
|
||||
url = https://gitlab.linphone.org/BC/public/bcunit.git
|
||||
[submodule "submodules/externals/vo-amrwbenc"]
|
||||
path = submodules/externals/vo-amrwbenc
|
||||
url = git://git.linphone.org/vo-amrwbenc.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git
|
||||
[submodule "submodules/externals/codec2"]
|
||||
path = submodules/externals/codec2
|
||||
url = git://git.linphone.org/codec2
|
||||
url = https://gitlab.linphone.org/BC/public/external/codec2.git
|
||||
[submodule "submodules/externals/libjpeg-turbo"]
|
||||
path = submodules/externals/libjpeg-turbo
|
||||
url = git://git.linphone.org/libjpeg-turbo.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git
|
||||
[submodule "submodules/mediastreamer2"]
|
||||
path = submodules/mediastreamer2
|
||||
url = git://git.linphone.org/mediastreamer2.git
|
||||
url = https://gitlab.linphone.org/BC/public/mediastreamer2.git
|
||||
[submodule "submodules/oRTP"]
|
||||
path = submodules/oRTP
|
||||
url = git://git.linphone.org/ortp.git
|
||||
url = https://gitlab.linphone.org/BC/public/ortp.git
|
||||
[submodule "submodules/bcmatroska2"]
|
||||
path = submodules/bcmatroska2
|
||||
url = git://git.linphone.org/bcmatroska2.git
|
||||
url = https://gitlab.linphone.org/BC/public/bcmatroska2.git
|
||||
[submodule "submodules/externals/xerces-c"]
|
||||
path = submodules/externals/xerces-c
|
||||
url = git://git.linphone.org/xerces-c.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/xerces-c.git
|
||||
[submodule "submodules/externals/libxsd"]
|
||||
path = submodules/externals/libxsd
|
||||
url = git://git.linphone.org/libxsd
|
||||
url = https://gitlab.linphone.org/BC/public/external/libxsd.git
|
||||
[submodule "submodules/externals/soci"]
|
||||
path = submodules/externals/soci
|
||||
url = git://git.linphone.org/soci
|
||||
url = https://gitlab.linphone.org/BC/public/external/soci.git
|
||||
[submodule "submodules/externals/zxing-cpp"]
|
||||
path = submodules/externals/zxing-cpp
|
||||
url = git://git.linphone.org/zxing-cpp.git
|
||||
url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git
|
||||
[submodule "submodules/lime"]
|
||||
path = submodules/lime
|
||||
url = gitosis@git.linphone.org:lime.git
|
||||
|
|
|
|||
33
.project
33
.project
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>linphone-android</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
@ -11,6 +11,14 @@ Group changes to describe their impact on the project, as follows:
|
|||
Security to invite users to upgrade in case of vulnerabilities.
|
||||
|
||||
## [Incomming]
|
||||
- feature: support of H265 codec.
|
||||
|
||||
## [4.0.1] - 2018-06-26
|
||||
|
||||
### Fixed
|
||||
- fix loading of plugins
|
||||
- fix issue with video stream, not started when receiving an incoming call just after the app is launched
|
||||
- fix issue with TURN
|
||||
|
||||
## [4.0.0] - 2018-06-15
|
||||
|
||||
|
|
|
|||
48
bsed.sh
48
bsed.sh
|
|
@ -1,48 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Script found at http://everydaywithlinux.blogspot.fr/2012/11/patch-strings-in-binary-files-with-sed.html
|
||||
|
||||
function patch_strings_in_file() {
|
||||
local FILE="$1"
|
||||
local PATTERN="$2"
|
||||
local REPLACEMENT="$3"
|
||||
|
||||
# Find all unique strings in FILE that contain the pattern
|
||||
STRINGS=$(strings ${FILE} | grep ${PATTERN} | sort -u -r)
|
||||
|
||||
if [ "${STRINGS}" != "" ] ; then
|
||||
echo "File '${FILE}' contain strings with '${PATTERN}' in them:"
|
||||
|
||||
for OLD_STRING in ${STRINGS} ; do
|
||||
# Create the new string with a simple bash-replacement
|
||||
NEW_STRING=${OLD_STRING//${PATTERN}/${REPLACEMENT}}
|
||||
|
||||
# Create null terminated ASCII HEX representations of the strings
|
||||
OLD_STRING_HEX="$(echo -n ${OLD_STRING} | xxd -g 0 -u -ps -c 256)00"
|
||||
NEW_STRING_HEX="$(echo -n ${NEW_STRING} | xxd -g 0 -u -ps -c 256)00"
|
||||
|
||||
if [ ${#NEW_STRING_HEX} -le ${#OLD_STRING_HEX} ] ; then
|
||||
# Pad the replacement string with null terminations so the
|
||||
# length matches the original string
|
||||
while [ ${#NEW_STRING_HEX} -lt ${#OLD_STRING_HEX} ] ; do
|
||||
NEW_STRING_HEX="${NEW_STRING_HEX}00"
|
||||
done
|
||||
|
||||
# Now, replace every occurrence of OLD_STRING with NEW_STRING
|
||||
echo -n "Replacing ${OLD_STRING} with ${NEW_STRING}... "
|
||||
hexdump -ve '1/1 "%.2X"' ${FILE} | \
|
||||
sed "s/${OLD_STRING_HEX}/${NEW_STRING_HEX}/g" | \
|
||||
xxd -r -p > ${FILE}.tmp
|
||||
chmod --reference ${FILE} ${FILE}.tmp
|
||||
mv ${FILE}.tmp ${FILE}
|
||||
echo "Done!"
|
||||
else
|
||||
echo "New string '${NEW_STRING}' is longer than old" \
|
||||
"string '${OLD_STRING}'. Skipping."
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
patch_strings_in_file libs/armeabi-v7a/liblinphone-armeabi-v7a.so "./obj/local/armeabi-v7a/libffmpeg-linphone-arm.so" "libffmpeg-linphone-arm.so"
|
||||
patch_strings_in_file libs/x86/liblinphone-x86.so "./obj/local/x86/libffmpeg-linphone-x86.so" "libffmpeg-linphone-x86.so"
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
error_on_quit=0
|
||||
|
||||
echo_err() {
|
||||
echo "$@" >&2
|
||||
error_on_quit=1
|
||||
}
|
||||
|
||||
check_installed() {
|
||||
if [ -z "$(which $1)" ]; then
|
||||
echo_err "Could not find $1. Please install $2."
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
for prog in automake autoconf pkg-config java ant yasm nasm wget; do
|
||||
check_installed "$prog" "it"
|
||||
done
|
||||
if [ $(uname) = "Darwin" ]; then
|
||||
check_installed "libtool" "libtool"
|
||||
else
|
||||
check_installed "libtoolize" "libtool"
|
||||
fi
|
||||
check_installed "ndk-build" "android NDK"
|
||||
if check_installed "android" "android SDK"; then
|
||||
check_installed "adb" "android SDK platform tools"
|
||||
# check that at least one target is installed
|
||||
if [ -z "$(android list target -c)" ]; then
|
||||
echo_err "Install at least one android target in the android SDK"
|
||||
fi
|
||||
fi
|
||||
if nasm -f elf32 2>&1 | grep -q "fatal: unrecognised output format"; then
|
||||
echo_err "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly."
|
||||
fi
|
||||
if ! (find submodules/linphone/mediastreamer2 -mindepth 1 2>/dev/null | grep -q . \
|
||||
|| find submodules/linphone/oRTP -mindepth 1 2>/dev/null | grep -q .); then
|
||||
echo_err "Missing some git submodules. Did you run 'git submodule update --init --recursive'?"
|
||||
fi
|
||||
# Android NDK should NOT be simlinked!
|
||||
if [ -L "$ANDROID_NDK" ] && [ -d "$ANDROID_NDK" ]; then
|
||||
echo_err "ANDROID_NDK=$ANDROID_NDK must NOT be a symbolic link, please modify it accordingly"
|
||||
fi
|
||||
|
||||
if [ $error_on_quit = 0 ]; then
|
||||
rm -f check_tools.mk
|
||||
touch check_tools.mk
|
||||
echo "JAVA=\"$(which java)\"" >> check_tools.mk
|
||||
echo "ANTLR=\"$(which java)\" -jar \"submodules/externals/antlr3/antlr-3.2.jar\"" >> check_tools.mk
|
||||
else
|
||||
echo "Failed to detect required tools, aborting."
|
||||
fi
|
||||
|
||||
exit $error_on_quit
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
**********************************
|
||||
* LINPHONE customs parameters *
|
||||
**********************************
|
||||
|
||||
In res/values/non_localizable_custom.xml (filled with linphone default options):
|
||||
|
||||
1. Global
|
||||
|
||||
* Set the default domain used by the application:
|
||||
<string name="default_domain">sip.linphone.org</string
|
||||
|
||||
2. Assistant
|
||||
|
||||
* Server xmlrpc url for accounts
|
||||
<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string>
|
||||
|
||||
* In CreateAccount, allow username instead of phone number for creating a new account
|
||||
<bool name="assistant_allow_username">true</bool>
|
||||
|
||||
* Hide buttons in assistant menu
|
||||
<bool name="hide_linphone_accounts_in_assistant">false</bool>
|
||||
<bool name="hide_generic_accounts_in_assistant">false</bool>
|
||||
<bool name="hide_remote_provisioning_in_assistant">false</bool>
|
||||
|
||||
|
||||
3. Inapp
|
||||
|
||||
* Enabled inapp purchase
|
||||
<bool name="enable_in_app_purchase">true</bool>
|
||||
|
||||
* Days before end of trial period that launch daily notification to remind user to buy an account
|
||||
<integer name="days_notification_shown">5</integer>
|
||||
|
||||
* Time between two inapp notifications in seconds
|
||||
<integer name="time_between_inapp_notification">86400</integer>
|
||||
|
||||
* Hide username field in purchase view (automatically get from default account)
|
||||
<bool name="hide_username_in_inapp">true</bool>
|
||||
|
||||
|
||||
In res/raw/linphonerc_factory sections:
|
||||
|
||||
[in-app-purchase]
|
||||
* Server xmlrpc url for inapp
|
||||
server_url=https://sip3.linphone.org:444/inapp.php
|
||||
|
||||
* Item ids from the google play store
|
||||
purchasable_items_ids=test_account_subscription
|
||||
|
||||
[app]
|
||||
|
||||
* Numbers of digits to enter for validation/recover account
|
||||
activation_code_length=4
|
||||
|
||||
|
||||
[assistant]
|
||||
|
||||
* Set the default domain used for account creation :
|
||||
domain=sip.linphone.org
|
||||
|
||||
* Set the default password length (min-max) :
|
||||
password_max_length=-1
|
||||
password_min_length=1
|
||||
|
||||
* Set the default username length (min-max) :
|
||||
username_length=-1
|
||||
username_max_length=64
|
||||
username_min_length=1
|
||||
username_regex=^[a-z0-9_.\-]*$
|
||||
|
||||
* Server xmlrpc url for accounts
|
||||
xmlrpc_url=https://sip3.linphone.org:444/inapp.php
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- submodules/externals/ffmpeg/library.mak.orig 2013-09-26 10:58:19.000000000 +0200
|
||||
+++ submodules/externals/ffmpeg/library.mak 2013-09-26 10:58:13.000000000 +0200
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
|
||||
$(SLIB_CREATE_DEF_CMD)
|
||||
- $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
|
||||
+ $$(LD) $(subst $$(@F),$(SLIBNAME),$(SHFLAGS)) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
|
||||
$(SLIB_EXTRA_CMD)
|
||||
|
||||
ifdef SUBDIR
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
||||
index c592b63..e4998d7 100644
|
||||
--- a/build/make/configure.sh
|
||||
+++ b/build/make/configure.sh
|
||||
@@ -1132,6 +1132,32 @@ EOF
|
||||
AS=${AS:-nasm}
|
||||
add_ldflags -Zhigh-mem
|
||||
;;
|
||||
+ android*)
|
||||
+ SDK_PATH=${sdk_path}
|
||||
+ COMPILER_LOCATION=`find "${SDK_PATH}" \
|
||||
+ -name "i686-linux-android-gcc*" -print -quit`
|
||||
+ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android-
|
||||
+ CC=${TOOLCHAIN_PATH}gcc
|
||||
+ CXX=${TOOLCHAIN_PATH}g++
|
||||
+ AR=${TOOLCHAIN_PATH}ar
|
||||
+ LD=${TOOLCHAIN_PATH}gcc
|
||||
+ STRIP=${TOOLCHAIN_PATH}strip
|
||||
+ NM=${TOOLCHAIN_PATH}nm
|
||||
+
|
||||
+ if [ -z "${alt_libc}" ]; then
|
||||
+ alt_libc=`find "${SDK_PATH}" -name arch-x86 -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
|
||||
+
|
||||
+ add_cflags "--sysroot=${alt_libc}"
|
||||
+ add_ldflags "--sysroot=${alt_libc}"
|
||||
+
|
||||
+ soft_enable realtime_only
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
AS="${alt_as:-${AS:-auto}}"
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
commit 6b3de978d928b6c0baec3305c9803c21a4367d0c
|
||||
Author: Simon Morlat <simon.morlat@linphone.org>
|
||||
Date: Tue Apr 15 15:19:37 2014 +0200
|
||||
|
||||
permissive mode: allow reference frames to be used even if there were lost slices.
|
||||
|
||||
diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp
|
||||
index dcf61ca..5582ec9 100644
|
||||
--- a/codec/decoder/core/src/manage_dec_ref.cpp
|
||||
+++ b/codec/decoder/core/src/manage_dec_ref.cpp
|
||||
@@ -165,6 +165,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) {
|
||||
&& (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) { //check;
|
||||
WelsLog (pCtx, WELS_LOG_WARNING, "WelsReorderRefList()-1::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n",
|
||||
pSliceHeader->iSpsId, ppRefList[i]->iSpsId);
|
||||
+ return ERR_NONE;
|
||||
pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.--
|
||||
return ERR_INFO_REFERENCE_PIC_LOST;
|
||||
} else {
|
||||
|
||||
commit a1f3b95ad18d0788c2c803fac80e78d6365673ce
|
||||
Author: Simon Morlat <simon.morlat@linphone.org>
|
||||
Date: Tue Apr 15 17:54:58 2014 +0200
|
||||
|
||||
permissive mode (2)
|
||||
|
||||
diff --git a/codec/decoder/core/src/decoder_core.cpp b/codec/decoder/core/src/decoder_core.cpp
|
||||
index a14e971..e742dbf 100644
|
||||
--- a/codec/decoder/core/src/decoder_core.cpp
|
||||
+++ b/codec/decoder/core/src/decoder_core.cpp
|
||||
@@ -1738,8 +1738,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, int3
|
||||
if ((iLastIdD < 0) || //case 1: first layer
|
||||
(iLastIdD == iCurrIdD)) { //case 2: same uiDId
|
||||
InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec);
|
||||
-
|
||||
- if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {
|
||||
+ if (0){
|
||||
+ //if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {
|
||||
const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
|
||||
|| (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR);
|
||||
// Subclause 8.2.5.2 Decoding process for gaps in frame_num
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
diff -urN submodules/externals/x264/common/osdep.h.orig submodules/externals/x264/common/osdep.h
|
||||
--- submodules/externals/x264/common/osdep.h.orig 2014-02-06 13:56:59.243663951 +0100
|
||||
+++ submodules/externals/x264/common/osdep.h 2014-02-06 13:57:17.215685078 +0100
|
||||
@@ -35,11 +35,6 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
-#if !HAVE_LOG2F
|
||||
-#define log2f(x) (logf(x)/0.693147180559945f)
|
||||
-#define log2(x) (log(x)/0.693147180559945)
|
||||
-#endif
|
||||
-
|
||||
#ifdef _WIN32
|
||||
#include <io.h> // _setmode()
|
||||
#include <fcntl.h> // _O_BINARY
|
||||
@@ -55,6 +60,11 @@
|
||||
#include <math.h>
|
||||
#endif
|
||||
|
||||
+#if !HAVE_LOG2F
|
||||
+#define log2f(x) (logf(x)/0.693147180559945f)
|
||||
+#define log2(x) (log(x)/0.693147180559945)
|
||||
+#endif
|
||||
+
|
||||
#if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && (ARCH_X86 || ARCH_X86_64)
|
||||
#define HAVE_X86_INLINE_ASM 1
|
||||
#endif
|
||||
diff -urN submodules/externals/x264/configure.orig submodules/externals/x264/configure
|
||||
--- submodules/externals/x264/configure.orig 2014-02-06 13:56:59.231663937 +0100
|
||||
+++ submodules/externals/x264/configure 2014-02-06 13:57:17.219685083 +0100
|
||||
@@ -816,10 +816,6 @@
|
||||
fi
|
||||
[ "$thread" != "no" ] && define HAVE_THREAD
|
||||
|
||||
-if cc_check "math.h" "-Werror" "return log2f(2);" ; then
|
||||
- define HAVE_LOG2F
|
||||
-fi
|
||||
-
|
||||
if [ "$vis" = "yes" ] ; then
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I/usr/X11R6/include"
|
||||
22
prepare.py
22
prepare.py
|
|
@ -267,6 +267,9 @@ copy-libs:
|
|||
\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\
|
||||
\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\
|
||||
\tfi
|
||||
\tif test -f "liblinphone-sdk/android-arm/lib/wrap.sh"; then \\
|
||||
\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh libs/armeabi; \\
|
||||
\tfi
|
||||
\trm -rf libs-debug/armeabi-v7a
|
||||
\trm -rf libs/armeabi-v7a
|
||||
\tif test -d "liblinphone-sdk/android-armv7"; then \\
|
||||
|
|
@ -284,6 +287,9 @@ copy-libs:
|
|||
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\
|
||||
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
|
||||
\tfi
|
||||
\tif test -f "liblinphone-sdk/android-armv7/lib/wrap.sh"; then \\
|
||||
\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh libs/armeabi-v7a; \\
|
||||
\tfi
|
||||
\trm -rf libs-debug/arm64-v8a
|
||||
\trm -rf libs/arm64-v8a
|
||||
\tif test -d "liblinphone-sdk/android-arm64"; then \\
|
||||
|
|
@ -301,6 +307,9 @@ copy-libs:
|
|||
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs/arm64-v8a && \\
|
||||
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\
|
||||
\tfi
|
||||
\tif test -f "liblinphone-sdk/android-arm64/lib/wrap.sh"; then \\
|
||||
\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh libs/arm64-v8a; \\
|
||||
\tfi
|
||||
\trm -rf libs-debug/x86
|
||||
\trm -rf libs/x86
|
||||
\tif test -d "liblinphone-sdk/android-x86"; then \\
|
||||
|
|
@ -318,6 +327,9 @@ copy-libs:
|
|||
\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\
|
||||
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
|
||||
\tfi
|
||||
\tif test -f "liblinphone-sdk/android-x86/lib/wrap.sh"; then \\
|
||||
\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh libs/x86; \\
|
||||
\tfi
|
||||
|
||||
copy-libs-mediastreamer:
|
||||
\trm -rf submodules/mediastreamer2/java/libs/armeabi
|
||||
|
|
@ -362,7 +374,9 @@ release: java-clean build copy-libs
|
|||
unsigned: java-clean build copy-libs
|
||||
\t./gradlew assemblePackaged
|
||||
|
||||
generate-sdk: liblinphone-android-sdk
|
||||
generate-release-sdk: liblinphone-android-sdk-release
|
||||
|
||||
generate-sdk: liblinphone-android-sdk-debug
|
||||
|
||||
generate-javadoc:
|
||||
\t./gradlew -q androidJavadocsJar
|
||||
|
|
@ -377,9 +391,15 @@ liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release
|
|||
linphone-android-sdk: java-clean build copy-libs
|
||||
\t./gradlew -b linphoneAndroidSdk.gradle androidJavadocsJar
|
||||
\t./gradlew -b linphoneAndroidSdk.gradle sourcesJar
|
||||
|
||||
linphone-android-sdk-release: linphone-android-sdk
|
||||
\t./gradlew -b linphoneAndroidSdk.gradle assembleRelease
|
||||
\t./gradlew -b linphoneAndroidSdk.gradle sdkZip
|
||||
|
||||
linphone-android-sdk-debug: linphone-android-sdk
|
||||
\t./gradlew -b linphoneAndroidSdk.gradle debugRelease
|
||||
\t./gradlew -b linphoneAndroidSdk.gradle sdkZip
|
||||
|
||||
mediastreamer2-sdk: build copy-libs-mediastreamer
|
||||
\t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\
|
||||
\t./gradlew -b mediastreamerSdk.gradle assembleRelease
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 672d045e6a11ad723fca735879debad59ff9fb69
|
||||
Subproject commit 456993eddd5f4724ff2b59487fb57aa5a85d782a
|
||||
2
submodules/externals/openh264
vendored
2
submodules/externals/openh264
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit 9e75838c8638c48a32b15c73c9da7b1fe942fd5f
|
||||
Subproject commit 852d23c72acd537b75e4b95af93b866925d31bda
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 4a677d8a0feb43369b94b690306a1f4c12741b70
|
||||
Subproject commit 5eb2cbfab2f87b6d58cda339d6a726166881e87a
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 3afc47570a1c9f34bd2f1a759ae00fb7ecd26a0e
|
||||
Subproject commit a88be02b93e2274ae3fcf80e1e0032adc43c0448
|
||||
Loading…
Add table
Reference in a new issue