Commit Graph

142 Commits

Author SHA1 Message Date
pbos@webrtc.org
75c3ec1763 Fix data races during VideoAdapterTest tear-down.
Explicitly disconnect the VideoCapturer to avoid frames being
delivered during listener destruction. This manifested only on DrMemory
Full on Windows which I was able to repro locally.

BUG=3671
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6991 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-27 18:16:13 +00:00
pbos@webrtc.org
f21ac1fd46 Fix Win64 compile of videoadapter_unittest.cc.
Missed an typecast in videoadapter_unittest.cc in r6979 due to
tryservers being clogged and me waiting for a windows, linux, mac and
tsanv2 bot to finish was not enough. Committing fix straight away to
un-break tree.

TBR=tommi@webrtc.org
BUG=3671

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6980 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-26 12:46:57 +00:00
pbos@webrtc.org
c9b3f77e65 Fix data races in VideoAdapterTest.
Adressing clear races between the test thread and capturer thread shown
as heap-use-after-free in vpx_codec_destroy in
WebRtcVideoMediaChannelTest.SetSend (way later in the rest run).

When capturing a frame the test copied it to a separate frame that would
then be read by the test without synchronization, if the test didn't
manage to examine the frame in between captures the adapted frame would
be overwritten by the following frame during accesses to it.

The actual races are suppressed by race:webrtc/base/messagequeue.cc and
race:webrtc/base/thread.cc. These fixes reduce the suppression count
locally from around 3000 to 30 for VideoAdapterTest.*.

Also removing tsan suppressions for talk/base as it's been moved to
webrtc/base.

R=tommi@webrtc.org
BUG=3671

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6979 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-26 12:33:18 +00:00
buildbot@webrtc.org
b4c7b09c13 (Auto)update libjingle 73927775-> 74032598
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6965 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-25 12:11:58 +00:00
buildbot@webrtc.org
3740d74106 (Auto)update libjingle 73927658-> 73927775
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6958 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-22 22:27:04 +00:00
buildbot@webrtc.org
2b0554f0e7 (Auto)update libjingle 73794259-> 73891518
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6955 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-22 14:08:15 +00:00
henrike@webrtc.org
0481f15f02 (Auto)update libjingle 73399579-> 73626167
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6928 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-19 14:56:59 +00:00
buildbot@webrtc.org
c3df61e351 (Auto)update libjingle 73256845-> 73260148
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6898 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 23:57:23 +00:00
pbos@webrtc.org
ef8bb8d9b0 Make sure that muting muted streams succeeds.
We don't want to report an error here, and PeerConnection relies on
being able to mute already-muted streams (I hit an assert when testing
manually).

BUG=1788
R=pthatcher@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6895 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 21:36:18 +00:00
buildbot@webrtc.org
a09a99950e (Auto)update libjingle 73222930-> 73226398
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 17:26:08 +00:00
buildbot@webrtc.org
2c0fb05f16 (Auto)update libjingle 73221069-> 73222930
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6889 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 16:47:12 +00:00
buildbot@webrtc.org
67f849575c (Auto)update libjingle 73215194-> 73221069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6888 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 16:22:04 +00:00
henrike@webrtc.org
4eeeefebb2 (Auto)update libjingle 73072800 -> 73215194
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6887 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 14:57:30 +00:00
buildbot@webrtc.org
65b98d12c3 (Auto)update libjingle 72839629-> 72847605
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6854 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 22:09:08 +00:00
buildbot@webrtc.org
5b1ebacca2 (Auto)update libjingle 72820109-> 72822008
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6850 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 17:18:00 +00:00
buildbot@webrtc.org
d509678a4e (Auto)update libjingle 72819313-> 72820109
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6849 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 16:57:07 +00:00
buildbot@webrtc.org
94b996cc18 (Auto)update libjingle 72785516-> 72819313
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6848 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 16:47:14 +00:00
buildbot@webrtc.org
476efa2031 (Auto)update libjingle 72785180-> 72785516
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6842 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 04:55:21 +00:00
buildbot@webrtc.org
4f0d401fae (Auto)update libjingle 72682155-> 72785180
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6841 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 04:47:36 +00:00
buildbot@webrtc.org
8e885990ae (Auto)update libjingle 72566057-> 72591796
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6824 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-04 23:56:14 +00:00
buildbot@webrtc.org
e0d03f13e4 (Auto)update libjingle 72443101-> 72446860
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6815 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-02 03:04:01 +00:00
buildbot@webrtc.org
6e203d50a3 (Auto)update libjingle 72442050-> 72443101
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6814 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-02 01:13:04 +00:00
buildbot@webrtc.org
52148c2f74 (Auto)update libjingle 72430895-> 72442050
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6813 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-02 00:56:56 +00:00
buildbot@webrtc.org
7cb60ccae1 (Auto)update libjingle 72407428-> 72430895
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6812 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-01 22:03:36 +00:00
buildbot@webrtc.org
3bc48247b7 (Auto)update libjingle 72403605-> 72407428
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6811 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-01 16:53:32 +00:00
buildbot@webrtc.org
d4e598d57a (Auto)update libjingle 72097588-> 72159069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-29 17:36:52 +00:00
buildbot@webrtc.org
89c833cd9d (Auto)update libjingle 71726409-> 71726772
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6762 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-23 07:11:58 +00:00
buildbot@webrtc.org
e69b061926 (Auto)update libjingle 71575585-> 71599033
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6750 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-21 20:38:58 +00:00
buildbot@webrtc.org
99f6308a2d (Auto)update libjingle 71460499-> 71464449
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6741 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 23:31:30 +00:00
buildbot@webrtc.org
196ae6d667 (Auto)update libjingle 71456344-> 71456420
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6739 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 21:41:41 +00:00
buildbot@webrtc.org
3dec81a736 (Auto)update libjingle 71456173-> 71456344
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6738 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 21:39:56 +00:00
buildbot@webrtc.org
60e65b11c1 (Auto)update libjingle 71452608-> 71453580
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6735 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 21:07:50 +00:00
buildbot@webrtc.org
c31651d847 (Auto)update libjingle 71378257-> 71410012
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 08:22:39 +00:00
pbos@webrtc.org
5301b0f1fc Move additional state into WebRtcVideoSendStream.
Prevents having two places where codecs etc. are set up and allows us to
avoid creating the underlying VideoSendStream before send codecs are
set up.

BUG=1788
R=pthatcher@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6716 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-17 08:51:46 +00:00
buildbot@webrtc.org
b92f6f9371 (Auto)update libjingle 71099685-> 71107853
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6674 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-14 18:22:37 +00:00
buildbot@webrtc.org
6335645400 (Auto)update libjingle 70329914-> 70330023
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6575 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-01 16:46:01 +00:00
buildbot@webrtc.org
71dffb76dc (Auto)update libjingle 69648312-> 69830415
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6527 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-24 07:24:49 +00:00
wu@webrtc.org
ff1b1bf094 When creating an answer, takes the codec preference from the offer.
This change is based on RFC3264:

"Although the answerer MAY list the formats in their desired order of preference, it is RECOMMENDED that unless there is a specific reason, the answerer list formats in the same relative order they were present in the offer."

BUG=2868
TEST=unit tests and manually with munge-sdp test
R=juberti@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6514 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-20 20:57:42 +00:00
buildbot@webrtc.org
bb2d65895b (Auto)update libjingle 69617317-> 69623266
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6508 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-20 14:58:56 +00:00
buildbot@webrtc.org
58e7c8660c (Auto)update libjingle 69588980-> 69589535
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6503 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-20 00:26:50 +00:00
buildbot@webrtc.org
1ef789d455 (Auto)update libjingle 69568113-> 69587333
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6500 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-19 23:54:12 +00:00
buildbot@webrtc.org
df9bbbee56 (Auto)update libjingle 69567902-> 69568113
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6498 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-19 19:54:33 +00:00
buildbot@webrtc.org
fbd13286dc (Auto)update libjingle 69555283-> 69567902
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6497 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-19 19:50:55 +00:00
buildbot@webrtc.org
d27d9ae644 (Auto)update libjingle 69506154-> 69515138
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6488 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-19 01:56:46 +00:00
buildbot@webrtc.org
44a317a698 (Auto)update libjingle 69337301-> 69359922
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6457 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-17 07:49:15 +00:00
buildbot@webrtc.org
53f57936c1 (Auto)update libjingle 69306183-> 69323802
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6454 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-16 21:08:51 +00:00
buildbot@webrtc.org
27626a6256 (Auto)update libjingle 69278008-> 69291002
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6448 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-16 13:39:40 +00:00
buildbot@webrtc.org
a6764ab869 (Auto)update libjingle 69144530-> 69164179
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6434 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-13 18:24:39 +00:00
buildbot@webrtc.org
db56390f7e (Auto)update libjingle 69143161-> 69144530
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6432 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-13 13:05:48 +00:00
buildbot@webrtc.org
c800c1cc40 (Auto)update libjingle 69131548-> 69132244
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6426 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-13 07:56:17 +00:00