Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove x264 compilation by default + boolean to disable H264/MPEG4

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-20 15:34:01 +01:00
parent 2c948e96ef
commit 5101fdc213
6 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -7,7 +7,7 @@ PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
LINPHONE_VERSION=$(shell cd submodules/linphone && git describe) LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
BUILD_X264=1 BUILD_X264=0
BUILD_AMRNB=full # 0, light or full BUILD_AMRNB=full # 0, light or full
BUILD_AMRWB=0 BUILD_AMRWB=0
BUILD_GPLV3_ZRTP=0 BUILD_GPLV3_ZRTP=0

3
res/values-FR/strings.xml
View file

@ -183,6 +183,9 @@
<string name="pref_media_encryption">Encryption</string> <string name="pref_media_encryption">Encryption</string>
<string name="media_encryption_none">Aucune</string> <string name="media_encryption_none">Aucune</string>
<string name="pref_video_codec_h264_unavailable">Codec supporté uniquement si compilé depuis les sources</string>
<string name="pref_video_codec_mpeg4_unavailable">Codec supporté uniquement si compilé depuis les sources</string>
<string name="pref_sipaccounts">Comptes SIP</string> <string name="pref_sipaccounts">Comptes SIP</string>
<string name="pref_wifi_only">Wi-Fi uniquement</string> <string name="pref_wifi_only">Wi-Fi uniquement</string>
<string name="pref_push_notification">Activer les notifications poussées</string> <string name="pref_push_notification">Activer les notifications poussées</string>

4
res/values/non_localizable_custom.xml
View file

@ -49,7 +49,9 @@
<bool name="allow_edit_in_dialer">true</bool> <bool name="allow_edit_in_dialer">true</bool>
<bool name="forbid_self_call">false</bool> <bool name="forbid_self_call">false</bool>
<bool name="disable_chat">false</bool> <bool name="disable_chat">false</bool>
<bool name="disable_all_security_features_for_markets">false</bool>
<bool name="disable_all_security_features_for_markets">true</bool> <!-- Disable TLS/SRTP/ZRTP -->
<bool name="disable_all_patented_codecs_for_markets">true</bool> <!-- Disable MPEG4/H264 -->
<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string> <string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
<string name="temp_photo_name">linphone-android-photo-temp.jpg</string> <string name="temp_photo_name">linphone-android-photo-temp.jpg</string>

3
res/values/strings.xml
View file

@ -230,6 +230,9 @@
<string name="media_encryption_srtp">SRTP</string> <string name="media_encryption_srtp">SRTP</string>
<string name="media_encryption_zrtp">ZRTP</string> <string name="media_encryption_zrtp">ZRTP</string>
<string name="pref_video_codec_h264_unavailable">Codec only supported if build from sources</string>
<string name="pref_video_codec_mpeg4_unavailable">Codec only supported if build from sources</string>
<string name="pref_sipaccounts">SIP Accounts</string> <string name="pref_sipaccounts">SIP Accounts</string>
<string name="pref_wifi_only">Use wifi only</string> <string name="pref_wifi_only">Use wifi only</string>
<string name="pref_push_notification">Enable push notifications</string> <string name="pref_push_notification">Enable push notifications</string>

3
src/org/linphone/LinphoneActivity.java
View file

@ -721,8 +721,7 @@ public class LinphoneActivity extends FragmentActivity implements
} }
@Override @Override
public void onMessageReceived(LinphoneAddress from, public void onMessageReceived(LinphoneAddress from, LinphoneChatMessage message) {
LinphoneChatMessage message) {
if (getResources().getBoolean(R.bool.disable_chat)) { if (getResources().getBoolean(R.bool.disable_chat)) {
return; return;
} }

24
src/org/linphone/PreferencesFragment.java
View file

@ -164,13 +164,23 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
} }
detectVideoCodec(R.string.pref_video_codec_h264_key, "H264"); if (getResources().getBoolean(R.bool.disable_all_patented_codecs_for_markets)) {
if (!Version.hasNeon()) Preference prefH264 = findPreference(R.string.pref_video_codec_h264_key);
{ prefH264.setEnabled(false);
// Android without neon doesn't support H264 prefH264.setSummary(R.string.pref_video_codec_h264_unavailable);
Log.w("No NEON available, disabling H264");
findPreference(R.string.pref_video_codec_h264_key).setEnabled(false); Preference prefMPEG4 = findPreference(R.string.pref_video_codec_mpeg4_key);
findPreference(R.string.pref_video_codec_h264_key).setDefaultValue(false); prefMPEG4.setEnabled(false);
prefMPEG4.setSummary(R.string.pref_video_codec_mpeg4_unavailable);
} else {
detectVideoCodec(R.string.pref_video_codec_h264_key, "H264");
if (!Version.hasNeon())
{
// Android without neon doesn't support H264
Log.w("No NEON available, disabling H264");
findPreference(R.string.pref_video_codec_h264_key).setEnabled(false);
findPreference(R.string.pref_video_codec_h264_key).setDefaultValue(false);
}
} }
if (Hacks.needSoftvolume()) { if (Hacks.needSoftvolume()) {