mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
webrtc/resources/media
History
kjellander a96e2d77cb Move talk/media to webrtc/media 
I removed the 'libjingle' target in talk/libjingle.gyp and replaced
all users of it with base/base.gyp:rtc_base. It seems the jsoncpp
and expat dependencies were not used by it's previous references.

The files in talk/media/testdata were uploaded to Google Storage and
added .sha1 files in resources/media instead of simply moving them.

The previously disabled warnings that were inherited from
talk/build/common.gypi are now replaced by target-specific disabling
of only the failing warnings. Additional disabling was needed since the stricter
compilation warnings that applies to code in webrtc/.

License headers will be updated in a follow-up CL in order to not
break Git history.

Other modifications:
* Updated the header guards.
* Sorted the includes using chromium/src/tools/sort-headers.py
  except for these files:
  talk/app/webrtc/peerconnectionendtoend_unittest.cc
  talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
  talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
  webrtc/media/devices/win32devicemanager.cc.
* Unused GYP reference to libjingle_tests_additional_deps was removed.
* Removed duplicated GYP entries of
  webrtc/base/testutils.cc
  webrtc/base/testutils.h

The HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VOICE defines were used by only talk/media,
so they were moved to the media.gyp.

I also checked that none of
EXPAT_RELATIVE_PATH,
FEATURE_ENABLE_VOICEMAIL,
GTEST_RELATIVE_PATH,
JSONCPP_RELATIVE_PATH,
LOGGING=1,
SRTP_RELATIVE_PATH,
FEATURE_ENABLE_SSL,
FEATURE_ENABLE_VOICEMAIL,
FEATURE_ENABLE_PSTN,
HAVE_SCTP,
HAVE_SRTP,
are used by the talk/media code.

For Chromium, the following changes will need to be applied to the roll CL that updates the
DEPS for WebRTC and libjingle: https://codereview.chromium.org/1604303002/

BUG=webrtc:5420
NOPRESUBMIT=True
TBR=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1587193006

Cr-Commit-Position: refs/heads/master@{#11495}
2016-02-05 07:52:35 +00:00
..
1.frame_plus_1.byte.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
captured-320x240-2s-48.frames.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
faces.1280x720_P420.yuv.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
faces_I400.jpg.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
faces_I411.jpg.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
faces_I420.jpg.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
faces_I422.jpg.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
faces_I444.jpg.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
h264-svc-99-640x360.rtpdump.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
video.rtpdump.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00
voice.rtpdump.sha1 Move talk/media to webrtc/media 2016-02-05 07:52:35 +00:00