Merge branch 'master' into Basilisk-release

8 files changed, 7 insertions, 48 deletions

diff --git a/media/libopus/silk/NLSF_stabilize.c b/media/libopus/silk/NLSF_stabilize.c
index 1fa1ea379..8f3426b91 100644
--- a/media/libopus/silk/NLSF_stabilize.c
+++ b/media/libopus/silk/NLSF_stabilize.c
@@ -130,7 +130,7 @@ void silk_NLSF_stabilize(
 
         /* Keep delta_min distance between the NLSFs */
         for( i = 1; i < L; i++ )
-            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], NLSF_Q15[i-1] + NDeltaMin_Q15[i] );
+            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) );
 
         /* Last NLSF should be no higher than 1 - NDeltaMin[L] */
         NLSF_Q15[L-1] = silk_min_int( NLSF_Q15[L-1], (1<<15) - NDeltaMin_Q15[L] );
diff --git a/media/mtransport/third_party/nICEr/nicer.gyp b/media/mtransport/third_party/nICEr/nicer.gyp
index 9df4a4b28..470fa8eb6 100644
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@@ -231,18 +231,6 @@
 		 'sources': [
 		 ],
               }],
-              ['moz_widget_toolkit_gonk==1', {
-                'defines' : [
-                  'WEBRTC_GONK',
-                  'NO_REG_RPC',
-                ],
-             }],
-             # Gonk has its own nr_stun_get_addrs implementation.
-             ['build_with_gonk==1', {
-               'defines': [
-                  "USE_PLATFORM_NR_STUN_GET_ADDRS",
-               ]
-             }],
              ['have_ethtool_cmd_speed_hi==0', {
                'defines': [
                   "DONT_HAVE_ETHTOOL_SPEED_HI",
diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp
index ee1941151..0fcf2ac5d 100644
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -41,11 +41,6 @@
 
   'target_defaults': {
     'conditions': [
-      ['moz_widget_toolkit_gonk==1', {
-        'defines' : [
-          'WEBRTC_GONK',
-       ],
-      }],
     ],
   },
 
@@ -316,7 +311,7 @@
           'cflags_mozilla': [
           ],
         }],
-        ['OS=="android" or moz_widget_toolkit_gonk==1', {
+        ['OS=="android"', {
           'cflags_mozilla': [
             # This warning complains about important MOZ_EXPORT attributes
             # on forward declarations for Android API types.
diff --git a/media/webrtc/trunk/build/common.gypi b/media/webrtc/trunk/build/common.gypi
index 5382cdf41..68003ba06 100644
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -428,7 +428,7 @@
         }],
 
         # Flags to use X11 on non-Mac POSIX platforms
-        ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or moz_widget_toolkit_gonk==1', {
+        ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
           'use_glib%': 0,
           'use_x11%': 0,
         }, {
diff --git a/media/webrtc/trunk/webrtc/build/common.gypi b/media/webrtc/trunk/webrtc/build/common.gypi
index 5c26c98e3..97bf78628 100644
--- a/media/webrtc/trunk/webrtc/build/common.gypi
+++ b/media/webrtc/trunk/webrtc/build/common.gypi
@@ -196,11 +196,6 @@
   },
   'target_defaults': {
     'conditions': [
-      ['moz_widget_toolkit_gonk==1', {
-        'defines' : [
-          'WEBRTC_GONK',
-        ],
-      }],
       ['restrict_webrtc_logging==1', {
         'defines': ['WEBRTC_RESTRICT_LOGGING',],
       }],
@@ -417,7 +412,7 @@
         'msvs_disabled_warnings!': [4189,],
       }],
       # used on GONK as well
-      ['enable_android_opensl==1 and (OS=="android" or moz_widget_toolkit_gonk==1)', {
+      ['enable_android_opensl==1 and OS=="android"', {
         'defines': [
           'WEBRTC_ANDROID_OPENSLES',
         ],
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
index f6ad9cbd7..495ff23b7 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
@@ -92,18 +92,6 @@
             'android',
           ],
         }], # OS==android
-        ['moz_widget_toolkit_gonk==1', {
-          'cflags_mozilla': [
-            '-I$(ANDROID_SOURCE)/frameworks/wilhelm/include',
-            '-I$(ANDROID_SOURCE)/frameworks/av/include',
-            '-I$(ANDROID_SOURCE)/system/media/wilhelm/include',
-            '-I$(ANDROID_SOURCE)/system/media/audio_effects/include',
-            '-I$(ANDROID_SOURCE)/frameworks/native/include',
-          ],
-          'include_dirs': [
-            'android',
-          ],
-        }], # moz_widget_toolkit_gonk==1
         ['enable_android_opensl==1', {
           'include_dirs': [
             'opensl',
@@ -162,14 +150,7 @@
             'android/audio_track_jni.h',
           ],
           'conditions': [
-	    ['moz_widget_toolkit_gonk==1', {
-              'sources': [
-                # references to android/audio_manager to avoid platform-specific limits
-	        'gonk/audio_manager.cc',
-                'gonk/audio_manager.h',
-	      ],
-	    }],
-            ['OS=="android" or moz_widget_toolkit_gonk==1', {
+            ['OS=="android"', {
               'link_settings': {
                 'libraries': [
                   '-llog',
diff --git a/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp b/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp
index 91d268048..8064f280e 100644
--- a/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp
+++ b/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp
@@ -11,7 +11,7 @@
     'include_ndk_cpu_features%': 0,
   },
   'conditions': [
-    ['OS=="android" or moz_widget_toolkit_gonk==1', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'cpu_features_android',
diff --git a/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp b/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp
index 68164b38a..fb76f34a5 100644
--- a/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp
+++ b/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp
@@ -119,7 +119,7 @@
             'source/metrics_default.cc',
           ],
         }],
-        ['OS=="android" or moz_widget_toolkit_gonk==1', {
+        ['OS=="android"', {
           'defines': [
             'WEBRTC_THREAD_RR',
             # TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC