Bug 830247: small changes resulting from Try build r=ted rs=me
authorRandell Jesup <rjesup@jesup.org>
Sat, 09 Feb 2013 23:16:10 -0500
changeset 121462 8f729db25fa065b0e5fd0ef3752ed16861753a70
parent 121461 54960ffc951b3af0b516a0e5065e6d7e0219c5a0
child 121463 ee270530f069dd5f95d68685f6f955abc51d485d
push id24287
push userryanvm@gmail.com
push dateSun, 10 Feb 2013 18:18:55 +0000
treeherdermozilla-central@5835bc763be7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, me
bugs830247
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 830247: small changes resulting from Try build r=ted rs=me
media/webrtc/signaling/test/mediapipeline_unittest.cpp
media/webrtc/trunk/peerconnection_client.target.mk
media/webrtc/trunk/third_party/opus/opus.gyp
media/webrtc/trunk/webrtc/build/common.gypi
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport.gypi
media/webrtc/trunk/webrtc/modules/video_render/video_render.gypi
--- a/media/webrtc/signaling/test/mediapipeline_unittest.cpp
+++ b/media/webrtc/signaling/test/mediapipeline_unittest.cpp
@@ -42,17 +42,17 @@ MtransportTestUtils *test_utils;
 
 namespace {
 class TestAgent {
  public:
   TestAgent() :
       audio_flow_(new TransportFlow()),
       audio_prsock_(new TransportLayerPrsock()),
       audio_dtls_(new TransportLayerDtls()),
-      audio_config_(109, "opus", 48000, 480, 1, 64000),
+      audio_config_(109, "opus", 48000, 960, 2, 64000),
       audio_conduit_(mozilla::AudioSessionConduit::Create(NULL)),
       audio_(),
       audio_pipeline_(),
       video_flow_(new TransportFlow()),
       video_prsock_(new TransportLayerPrsock()),
       video_config_(120, "VP8", 640, 480),
       video_conduit_(mozilla::VideoSessionConduit::Create()),
       video_(),
--- a/media/webrtc/trunk/peerconnection_client.target.mk
+++ b/media/webrtc/trunk/peerconnection_client.target.mk
@@ -1,14 +1,14 @@
 # This file is generated by gyp; do not edit.
 
 TOOLSET := target
 TARGET := peerconnection_client
 DEFS_Debug := \
-	'-DWEBRTC_SVNREVISION="Unavailable(issue687)"' \
+	'-DWEBRTC_SVNREVISION="Unavailable_issue687"' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DENABLE_ONE_CLICK_SIGNIN' \
 	'-DGTK_DISABLE_SINGLE_INCLUDES=1' \
 	'-DENABLE_REMOTING=1' \
 	'-DENABLE_WEBRTC=1' \
 	'-DENABLE_CONFIGURATION_POLICY' \
@@ -88,17 +88,17 @@ INCS_Debug := \
 	-Ithird_party \
 	-Ithird_party/libjingle/source \
 	-Ithird_party/jsoncpp/overrides/include \
 	-Ithird_party/jsoncpp/source/include \
 	-Ithird_party/libjingle/overrides \
 	-Itesting/gtest/include
 
 DEFS_Release := \
-	'-DWEBRTC_SVNREVISION="Unavailable(issue687)"' \
+	'-DWEBRTC_SVNREVISION="Unavailable_issue687"' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DENABLE_ONE_CLICK_SIGNIN' \
 	'-DGTK_DISABLE_SINGLE_INCLUDES=1' \
 	'-DENABLE_REMOTING=1' \
 	'-DENABLE_WEBRTC=1' \
 	'-DENABLE_CONFIGURATION_POLICY' \
--- a/media/webrtc/trunk/third_party/opus/opus.gyp
+++ b/media/webrtc/trunk/third_party/opus/opus.gyp
@@ -16,16 +16,19 @@
         'FLOATING_POINT',
         'VAR_ARRAYS',
       ],
       'conditions': [
         ['OS=="linux"', {
           'cflags': [
             '-std=c99',
           ],
+          'cflags_mozilla': [
+            '-std=c99',
+          ],
           'defines': [
             'HAVE_LRINTF',
           ],
         }]
       ],
 
       'include_dirs': [
         'source/include',
--- a/media/webrtc/trunk/webrtc/build/common.gypi
+++ b/media/webrtc/trunk/webrtc/build/common.gypi
@@ -141,17 +141,17 @@
     'include_dirs': [
       # TODO(andrew): Remove '..' when we've added webrtc/ to include paths.
       '..',
       '../..',
     ],
     'defines': [
       # TODO(leozwang): Run this as a gclient hook rather than at build-time:
       # http://code.google.com/p/webrtc/issues/detail?id=687
-      'WEBRTC_SVNREVISION="\\\"Unavailable(issue687)\\\""',
+      'WEBRTC_SVNREVISION="\\\"Unavailable_issue687\\\""',
       #'WEBRTC_SVNREVISION="<!(python <(webrtc_root)/build/version.py)"',
     ],
     'conditions': [
       ['enable_tracing==1', {
         'defines': ['WEBRTC_LOGGING',],
       }],
       ['build_with_mozilla==1', {
         'defines': [
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
@@ -147,16 +147,17 @@
         {
           'target_name': 'audio_processing_sse2',
           'type': 'static_library',
           'sources': [
             'aec/aec_core_sse2.c',
             'aec/aec_rdft_sse2.c',
           ],
           'cflags': ['-msse2',],
+          'cflags_mozilla': [ '-msse2', ],
           'xcode_settings': {
             'OTHER_CFLAGS': ['-msse2',],
           },
         },
       ],
     }],
     ['target_arch=="arm" and armv7==1', {
       'targets': [{
--- a/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport.gypi
+++ b/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport.gypi
@@ -66,16 +66,19 @@
             'traffic_control_windows.cc',
             'traffic_control_windows.h',
           ],
         }],
         ['OS=="linux"', {
           'cflags': [
             '-fno-strict-aliasing',
           ],
+          'cflags_mozilla': [
+            '-fno-strict-aliasing',
+          ],
         }],
         ['OS=="mac"', {
           'xcode_settings': {
             'OTHER_CPLUSPLUSFLAGS': [ '-fno-strict-aliasing' ],
           },
         }],
       ] # conditions
     },
--- a/media/webrtc/trunk/webrtc/modules/video_render/video_render.gypi
+++ b/media/webrtc/trunk/webrtc/modules/video_render/video_render.gypi
@@ -114,21 +114,16 @@
             'mac/cocoa_full_screen_window.mm',
           ],
         }],
         ['OS=="mac"', {
           'direct_dependent_settings': {
             'include_dirs': ['mac',],
           },
         }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(directx_sdk_path)/Include',
-          ],
-        }],
         ['OS!="win" or include_internal_video_render==0', {
           'sources!': [
             'windows/i_video_render_win.h',
             'windows/video_render_direct3d9.h',
             'windows/video_render_windows_impl.h',
             'windows/video_render_direct3d9.cc',
             'windows/video_render_windows_impl.cc',
           ],