Commit Graph

47 Commits

Author SHA1 Message Date
7433a088d2 Revert 5444 "Revert 5421 "Fix deadlock on register/unregister ob..."
We reverted the r5421 to allow us roll webrtc to chrome without any modifications
to libjingle. Since webrtc is rolled with r5444, we can add back the original CL
and changes to libjingle will be upstreamed in the next roll.

TBR=andresp@webrtc.org

> Revert 5421 "Fix deadlock on register/unregister observer while ..."
> 
> Failure to compile on Chromium Internal bots, because of API changes.
> 
> http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Mac/builds/2805/steps/compile/logs/stdio
> 
> You need to follow the steps mentioned in 
> https://docs.google.com/a/google.com/document/d/1aHrmXECnu3-Jovc2-zYI267EaQCYz-IclYyBp9iA9Fc/edit that of a API changer.
> 
> Since I will be rolling the libjingle this week, I can push your changes along with libjingle roll, if you prepare the CLs
> as mentioned in the doc.
> 
> > Fix deadlock on register/unregister observer while there is a an going callback.
> > 
> > BUG=2835
> > R=mallinath@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/7119005
> 
> TBR=andresp@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/7679004

TBR=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5453 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-29 00:56:02 +00:00
0dac5378e5 Revert 5447 "Update talk to 60420316."
> Update talk to 60420316.
> 
> TBR=wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/7719005

TBR=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5448 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-28 06:58:42 +00:00
752a017809 Update talk to 60420316.
TBR=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5447 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-28 06:45:52 +00:00
18586d38bc Revert 5421 "Fix deadlock on register/unregister observer while ..."
Failure to compile on Chromium Internal bots, because of API changes.

http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Mac/builds/2805/steps/compile/logs/stdio

You need to follow the steps mentioned in 
https://docs.google.com/a/google.com/document/d/1aHrmXECnu3-Jovc2-zYI267EaQCYz-IclYyBp9iA9Fc/edit that of a API changer.

Since I will be rolling the libjingle this week, I can push your changes along with libjingle roll, if you prepare the CLs
as mentioned in the doc.

> Fix deadlock on register/unregister observer while there is a an going callback.
> 
> BUG=2835
> R=mallinath@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/7119005

TBR=andresp@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5444 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-27 22:00:57 +00:00
256d0ada35 Remove the check for audio codec num in WebRtcVoiceEngineTest.HasCorrectCodecs.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5430 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-24 18:58:51 +00:00
8d375c95b7 Fix deadlock on register/unregister observer while there is a an going callback.
BUG=2835
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5421 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-23 23:09:25 +00:00
a8910d2f88 Update talk to 60094938.
Review URL: https://webrtc-codereview.appspot.com/7489005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5420 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-23 22:12:45 +00:00
4b26e2eee3 Update libjingle to 59676287
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5390 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-15 23:15:54 +00:00
aebb1ade9d pRevert 5371 "Revert 5367 "Update talk to 59410372.""
> Revert 5367 "Update talk to 59410372."
> 
> > Update talk to 59410372.
> > 
> > R=jiayl@webrtc.org, wu@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/6929004
> 
> TBR=mallinath@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6999004

TBR=henrika@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5381 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-14 10:00:58 +00:00
44461fa5cb Revert 5367 "Update talk to 59410372."
> Update talk to 59410372.
> 
> R=jiayl@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6929004

TBR=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5371 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-13 09:35:02 +00:00
0f3356e20b Update talk to 59410372.
R=jiayl@webrtc.org, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5367 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-11 01:26:23 +00:00
f6d6ed0c66 Update talk to 59039880.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5339 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-03 22:08:47 +00:00
24301a67c6 Update talk to 58174641 together with http://review.webrtc.org/4319005/.
R=turaj@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5287 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-13 19:17:43 +00:00
a9890800e0 Update talk to 58127566 together with
https://webrtc-codereview.appspot.com/5309005/.

R=mallinath@webrtc.org, niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5277 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-13 00:21:03 +00:00
2018269dc3 Revert 5274 "Update talk to 58113193 together with https://webrt..."
> Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/.
> 
> R=mallinath@webrtc.org, niklas.enbom@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/5719004

TBR=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5275 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-12 22:54:25 +00:00
a129b6cd13 Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/.
R=mallinath@webrtc.org, niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5274 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-12 22:40:39 +00:00
9caf2765b2 Update talk to 58037405.
R=sergeyu@chromium.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5267 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-11 18:25:07 +00:00
5bc25c41fc Update libjingle to 57692857
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5217 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-12-05 00:24:06 +00:00
364f204d16 Update talk to 56698267.
TBR=sergeyu@chromium.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5143 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-11-20 21:49:41 +00:00
a23f0ca4ba Update talk to 56619788
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5120 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-11-13 22:48:52 +00:00
16d6254e8c Update talk to 56183333.
TEST=try bots
R=sheu@chromium.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5087 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-11-05 23:45:14 +00:00
de305014c6 Update talk to 55906045.
Review URL: https://webrtc-codereview.appspot.com/3159005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5065 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-31 15:40:38 +00:00
cecfd1832d Update talk to 55821645.
TEST=try bots
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5053 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-30 05:18:12 +00:00
850bcbe855 Remove frame_callback.h include in webrtcvie.h.
This file is about to be moved and it's not really needed. The class
I420FrameCallback is forward declared inside vie_image_process.h and
only used in talk/ for a no-op implementation that doesn't access the
pointer.

BUG=
R=tommi@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5041 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-28 15:41:17 +00:00
97077a3ab2 Update libjingle to 55618622.
Update libyuv to r826.

TEST=try bots
R=niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5038 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-25 21:18:33 +00:00
1d1ffc9ad2 Update talk to 54898858.
TEST=try bots
TBR=mallinath

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4979 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-16 18:12:02 +00:00
40dfbc4d3d Update talk to 53984350.
TBR=mallinath

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4947 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-09 17:58:06 +00:00
4551b793de Update libjingle to 53920541.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4945 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-09 15:37:36 +00:00
7818752566 Update libjingle to 53856368.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4941 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-07 23:32:02 +00:00
7e809c323a Update libjingle to CL 53496343.
Review URL: https://webrtc-codereview.appspot.com/2323005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4882 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-30 18:59:08 +00:00
a27be8e4a1 Update libjingle to CL 53398036.
Review URL: https://webrtc-codereview.appspot.com/2323004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-27 23:04:10 +00:00
1112c30e1e Update libjingle to 53057474.
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4818 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-23 20:34:45 +00:00
967bfff54d Update talk to 52534915.
R=sergeyu@chromium.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4786 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-19 05:49:50 +00:00
a59696b2a5 Update libjingle to 52300956
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4744 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-13 23:48:58 +00:00
1b15f4226f Update talk to 51960985.
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4696 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-09-06 22:56:28 +00:00
cadf9040cb Update talk to 51664136.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4649 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-30 21:24:16 +00:00
d6fef9d380 Fixing SetDecodeErrorMode build error
- got introduced when reverting r4562

R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4624 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-26 23:59:38 +00:00
7666db79fa Update talk to 51242664.
TBR=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4594 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-22 14:45:42 +00:00
822fbd8b68 Update talk to 50918584.
Together with Stefan's http://review.webrtc.org/1960004/.

R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4556 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-15 23:38:54 +00:00
91053e7c5a Update libjingle to 50654631.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4519 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-10 07:18:04 +00:00
9dba525627 * Update libjingle to 50389769.
* Together with "Add texture support for i420 video frame." from
wuchengli@chromium.org.
https://webrtc-codereview.appspot.com/1413004

RISK=P1
TESTED=try bots
R=fischman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4489 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-05 20:36:57 +00:00
d64719d895 Update libjingle to 50191337.
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4461 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-01 00:00:07 +00:00
1e09a71126 Update talk folder to revision=49952949
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4413 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-26 19:17:59 +00:00
28654cbc22 Update talk folder to revision=49713299.
TBR=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4380 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-22 21:07:49 +00:00
9de257d00f Update talk folder to revision=49470012. Same as 375 in libjingle's google code repository.
TBR=wu@webrtc.org

BUG=N/A

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4364 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-17 14:42:53 +00:00
723d683ecb Update talk folder to revision=49260075. Same as 369 in libjingle's google code repository.
TBR=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4338 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-12 16:04:50 +00:00
28e2075280 Adds trunk/talk folder of revision 359 from libjingles google code to
trunk/talk


git-svn-id: http://webrtc.googlecode.com/svn/trunk@4318 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-10 00:45:36 +00:00