Commit Graph

382 Commits

Author SHA1 Message Date
minyue@webrtc.org
5f73a37597 Revert 7563 "before rebase" due to wrong submission
> before rebase

TBR=minyue@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31859004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7566 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-30 07:49:58 +00:00
minyue@webrtc.org
c11cc8d947 Revert 7564 "to submit" due to wrong submission
> to submit

TBR=minyue@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/23289004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7565 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-30 07:46:47 +00:00
minyue@webrtc.org
de386bf67b to submit
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7564 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-30 07:20:09 +00:00
minyue@webrtc.org
c673bb9f29 before rebase
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7563 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-30 07:19:57 +00:00
minyue@webrtc.org
0b62672576 adding default rates
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7562 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-30 07:19:49 +00:00
pbos@webrtc.org
776e6f289c Use external VideoDecoders in VideoReceiveStream.
Removes direct VideoCodec use from the new API, exposes VideoDecoders
through webrtc/video_decoder.h similar to VideoEncoders.

Also includes some preparation for wiring up external decoders in
WebRtcVideoEngine2 by adding AllocatedDecoders that specify whether they
were allocated internally or externally.

Additionally addresses a data race in VideoReceiver that was exposed with this change.

R=mflodman@webrtc.org, stefan@webrtc.org
TBR=pthatcher@webrtc.org
BUG=2854,1667

Review URL: https://webrtc-codereview.appspot.com/27829004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7560 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-29 15:28:39 +00:00
buildbot@webrtc.org
1abc146aa5 (Auto)update libjingle 78738075-> 78738103
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7554 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-29 08:14:14 +00:00
minyue@webrtc.org
2623695dfb Renaming bandwidth to bitrate in webrtcvoiceengine.
"bandwidth" is usually a misleading mentioning. It can mean network throughput, audio frequency contents, etc.

This is to remove the confusion inside webrtcvoiceengine

BUG=
R=juberti@webrtc.org, pbos@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/28799004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7551 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-29 02:27:08 +00:00
henrike@webrtc.org
269fb4bc90 move xmpp and p2p to webrtc
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.

BUG=3379

Review URL: https://webrtc-codereview.appspot.com/26999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-28 22:20:11 +00:00
buildbot@webrtc.org
ae694effd8 (Auto)update libjingle 78642371-> 78680406
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7545 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-28 17:37:17 +00:00
buildbot@webrtc.org
fbd55cb27d (Auto)update libjingle 78616359-> 78642371
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7540 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-28 05:35:35 +00:00
buildbot@webrtc.org
068b529f46 (Auto)update libjingle 78583324-> 78583691
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7532 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-27 16:20:42 +00:00
pbos@webrtc.org
efc82c2c73 Implement screencast settings for WebRtcVideoEngine2.
Adds support for screencast_min_bitrate and sets content type
corresponding to the capture type.

R=stefan@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/29959004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7529 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-27 13:58:00 +00:00
buildbot@webrtc.org
3f7bcc126d (Auto)update libjingle 78430441-> 78445452
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7522 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-24 17:26:28 +00:00
buildbot@webrtc.org
c7ed8db7fd (Auto)update libjingle 78427027-> 78430441
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7521 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-24 12:59:08 +00:00
buildbot@webrtc.org
8fe75ee234 (Auto)update libjingle 78381351-> 78389679
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7516 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-23 23:07:23 +00:00
buildbot@webrtc.org
fb5e9fc44e (Auto)update libjingle 78344087-> 78381351
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7515 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-23 21:36:17 +00:00
buildbot@webrtc.org
9d446f2e16 (Auto)update libjingle 78296920-> 78342456
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7507 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-23 12:22:06 +00:00
buildbot@webrtc.org
a9f0898e7d (Auto)update libjingle 78273470-> 78296920
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7501 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-22 22:02:00 +00:00
buildbot@webrtc.org
fb5410a8b7 (Auto)update libjingle 78262388-> 78262615
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7496 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-22 15:45:17 +00:00
pbos@webrtc.org
eacc6e4657 Remove some disabled tests in WebRtcVideoEngine2.
Removes some tests that shouldn't have to be implemented or have already
been through other tests.

R=stefan@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/25929004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7495 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-22 15:36:54 +00:00
buildbot@webrtc.org
a5c36b397a (Auto)update libjingle 78193292-> 78199328
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7485 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-21 20:44:16 +00:00
buildbot@webrtc.org
1288cbb704 (Auto)update libjingle 78106439-> 78193292
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7482 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-21 19:29:16 +00:00
pbos@webrtc.org
fa553ef605 Set up start bitrate in WebRtcVideoEngine2.
R=stefan@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/27789004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7476 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-20 11:07:07 +00:00
henrike@webrtc.org
28100cb388 Reverts r7459 "Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p."
BUG=N/A
TBR=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29829004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7472 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-17 22:03:39 +00:00
buildbot@webrtc.org
7992b40994 (Auto)update libjingle 77953038-> 77970462
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7471 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-17 21:20:28 +00:00
henrike@webrtc.org
d1ba6d9cbf Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p.
BUG=3379
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/27709005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7459 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-15 17:30:28 +00:00
buildbot@webrtc.org
81ddc78536 (Auto)update libjingle 77701902-> 77709729
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7450 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-14 22:39:24 +00:00
buildbot@webrtc.org
1ecbe45c7e (Auto)update libjingle 77689511-> 77696841
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7449 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-14 20:29:28 +00:00
pbos@webrtc.org
43336b6b9f Remove unused (no-op) VideoOptions.
Removing VideoOptions: adapt_input_to_encoder, adapt_view_switch,
video_one_layer_screencast and video_high_bitrate.

R=pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/23079004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7448 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-14 19:12:06 +00:00
pbos@webrtc.org
7fe1e03dd6 Wire up external encoders.
R=pthatcher@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/30649005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7440 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-14 04:25:33 +00:00
buildbot@webrtc.org
3c16d8bd1c (Auto)update libjingle 77414393-> 77554188
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7428 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-13 06:35:10 +00:00
xians@webrtc.org
3cefbc99f4 Mark all virtual overrides in the hierarchy of Transport as virtual + OVERRIDE.
This also marks all virtual overrides of other classes in the same files. 

This will make a subsequent change I intend to do safer, where I'll change the 
argument types of the base Transport functions, by breaking the compile if I 
miss any overrides. 

This also highlighted a number of unused functions. I've removed some of these. 

TBR=mflodman@webrtc.org, pkasting@chromium.org
BUG=none 
TEST=none

Review URL: https://webrtc-codereview.appspot.com/28709004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7421 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-10 09:42:53 +00:00
buildbot@webrtc.org
97abeee282 (Auto)update libjingle 77263371-> 77296420
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7400 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-08 22:24:30 +00:00
pbos@webrtc.org
575d126a3d Protect send_/recv_streams_ in WebRtcVideoEngine2.
Important as OnLoadUpdate() won't be called on the worker thread and the
list of streams can't be concurrently modified while delivering this
callback to all send streams.

R=stefan@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/22959004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7395 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-08 14:48:08 +00:00
pbos@webrtc.org
d6bda09503 Initialize sctp_paddrparams in OpenSctpSocket().
Addresses 'use-of-uninitialized-value' detected with MemorySanitizer.
params.spp_address.sa_family was used without being initialized before
when calling usrsctp_setsockopt with SCTP_PEER_ADDR_PARAMS.

R=jiayl@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/23909004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7389 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-07 19:23:43 +00:00
pbos@webrtc.org
963b979510 Remove potential deadlock in WebRtcVideoEngine2.
Fixes lock-order inversions between capturer's SignalVideoFrame and
WebRtcVideoSendStream. Additionally also removes all deadlock
suppressions for WebRtcVideoEngine2.

R=stefan@webrtc.org
TBR=kjellander@webrtc.org
BUG=1788,2999

Review URL: https://webrtc-codereview.appspot.com/26729004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7386 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-07 14:27:27 +00:00
pbos@webrtc.org
42684be21b Wire up CPU adaptation in WebRtcVideoEngine2.
Includes clean-up work to be able to use the webrtc::Call::Config that's
set up. This introduced a CallFactory to spawn a FakeCall with the
config used and allowed removal of FakeWebRtcVideoChannel2.

BUG=1788
R=mflodman@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/24779004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7370 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-03 11:25:45 +00:00
henrik.lundin@webrtc.org
4cebd84c79 Reland "Remove DTMF status methods from Voice Engine" r7276
This reverts r7277.

TBR=henrika@webrtc.org,pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29599004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7353 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-01 08:23:21 +00:00
xians@webrtc.org
7aad5e5cce Revert 7338 "Fixed the android build by making the interface pur..."
> Fixed the android build by making the interface pure virtual.
> 
> TBR=asapersson@webrtc.org, bjornv@webrtc.org,
> 
> Review URL: https://webrtc-codereview.appspot.com/24789004

TBR=xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/30579004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7341 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-30 15:26:15 +00:00
xians@webrtc.org
90d1979d77 Fixed the android build by making the interface pure virtual.
TBR=asapersson@webrtc.org, bjornv@webrtc.org,

Review URL: https://webrtc-codereview.appspot.com/24789004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7338 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-30 15:15:22 +00:00
pbos@webrtc.org
1795c358fc Add default implementation of Add/RemoveObserver.
Needed to remove Add/RemoveObserver from RTCVideoEncoderFactory in
Chromium before removing these completely. This is done to keep the
chromium.webrtc.fyi bots happy and to make rolling webrtc revisions
easier.

R=stefan@webrtc.org
BUG=3876

Review URL: https://webrtc-codereview.appspot.com/23839004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7332 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-30 09:45:25 +00:00
pbos@webrtc.org
34f2a9ea72 Initialize SSL in unittest_main.cc.
Instead of having each test individually initialize and tear down SSL
move this to unittest_main.cc so that all tests are properly
initialized and new tests "don't have to think about it".

R=pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/30549004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7316 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-28 11:36:45 +00:00
pbos@webrtc.org
d60d79a145 Thread annotation of rtc::CriticalSection.
Effectively re-lands r5516 which was reverted because talk/-only
checkouts existed. This now resides in webrtc/base/, so no talk/-only
checkouts should be possible.

This change also enables -Wthread-safety for talk/ and fixes a bug in
talk/media/webrtc/webrtcvideoengine2.cc where a guarded variable was
read without taking the corresponding lock.

R=andresp@webrtc.org, mflodman@webrtc.org, pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/27569004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7284 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-24 07:10:57 +00:00
pbos@webrtc.org
38344ed280 Move thread_annotations.h to webrtc/base/.
R=andresp@webrtc.org, mflodman@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/27579004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7283 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-24 06:05:00 +00:00
buildbot@webrtc.org
1b7dcc1647 (Auto)update libjingle 76169599-> 76176062
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7280 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-23 17:41:48 +00:00
henrik.lundin@webrtc.org
3987f10c11 Revert "Remove DTMF status methods from Voice Engine" r7276
This change caused some trouble.

TBR=henrika@webrtc.org,pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29569004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7277 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-23 13:15:14 +00:00
henrik.lundin@webrtc.org
bf7b9e0081 Remove DTMF status methods from Voice Engine
These methods are not used.

R=henrika@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/24689004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7276 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-23 12:54:04 +00:00
pbos@webrtc.org
0a2087a711 Skeleton for registering external encoders/decoders.
R=pthatcher@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/31429005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7270 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-23 09:40:22 +00:00
pbos@webrtc.org
83f95ba9a6 Remove engine-level SetOptions.
Already removed in WebRtcVideoEngine.

R=andresp@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/29549005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7265 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-22 16:07:18 +00:00