OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
547 | 547 |
548 ObserverExpectations answeringExpectations = | 548 ObserverExpectations answeringExpectations = |
549 new ObserverExpectations("PCTest:answerer"); | 549 new ObserverExpectations("PCTest:answerer"); |
550 PeerConnection answeringPC = factory.createPeerConnection( | 550 PeerConnection answeringPC = factory.createPeerConnection( |
551 iceServers, pcConstraints, answeringExpectations); | 551 iceServers, pcConstraints, answeringExpectations); |
552 assertNotNull(answeringPC); | 552 assertNotNull(answeringPC); |
553 | 553 |
554 // We want to use the same camera for offerer & answerer, so create it here | 554 // We want to use the same camera for offerer & answerer, so create it here |
555 // instead of in addTracksToPC. | 555 // instead of in addTracksToPC. |
556 VideoSource videoSource = factory.createVideoSource( | 556 VideoSource videoSource = factory.createVideoSource( |
557 VideoCapturer.create(""), new MediaConstraints()); | 557 VideoCapturerAndroid.create("", null), new MediaConstraints()); |
phoglund
2016/02/02 08:04:43
You should be able to merge this test with PeerCon
perkj_webrtc
2016/02/03 17:00:03
Done.
| |
558 | 558 |
559 offeringExpectations.expectRenegotiationNeeded(); | 559 offeringExpectations.expectRenegotiationNeeded(); |
560 WeakReference<MediaStream> oLMS = addTracksToPC( | 560 WeakReference<MediaStream> oLMS = addTracksToPC( |
561 factory, offeringPC, videoSource, "offeredMediaStream", | 561 factory, offeringPC, videoSource, "offeredMediaStream", |
562 "offeredVideoTrack", "offeredAudioTrack", offeringExpectations); | 562 "offeredVideoTrack", "offeredAudioTrack", offeringExpectations); |
563 | 563 |
564 offeringExpectations.expectRenegotiationNeeded(); | 564 offeringExpectations.expectRenegotiationNeeded(); |
565 DataChannel offeringDC = offeringPC.createDataChannel( | 565 DataChannel offeringDC = offeringPC.createDataChannel( |
566 "offeringDC", new DataChannel.Init()); | 566 "offeringDC", new DataChannel.Init()); |
567 assertEquals("offeringDC", offeringDC.label()); | 567 assertEquals("offeringDC", offeringDC.label()); |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
773 TreeSet<String> threads = new TreeSet<String>(); | 773 TreeSet<String> threads = new TreeSet<String>(); |
774 // This pokes at /proc instead of using the Java APIs because we're also | 774 // This pokes at /proc instead of using the Java APIs because we're also |
775 // looking for libjingle/webrtc native threads, most of which won't have | 775 // looking for libjingle/webrtc native threads, most of which won't have |
776 // attached to the JVM. | 776 // attached to the JVM. |
777 for (String threadId : (new File("/proc/self/task")).list()) { | 777 for (String threadId : (new File("/proc/self/task")).list()) { |
778 threads.add(threadId); | 778 threads.add(threadId); |
779 } | 779 } |
780 return threads; | 780 return threads; |
781 } | 781 } |
782 } | 782 } |
OLD | NEW |