Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Side by Side Diff: talk/app/webrtc/peerconnectioninterface_unittest.cc

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Change when we fire callbacks for external media Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 16 matching lines...) Expand all
27 27
28 #include <string> 28 #include <string>
29 29
30 #include "talk/app/webrtc/audiotrack.h" 30 #include "talk/app/webrtc/audiotrack.h"
31 #include "talk/app/webrtc/fakeportallocatorfactory.h" 31 #include "talk/app/webrtc/fakeportallocatorfactory.h"
32 #include "talk/app/webrtc/jsepsessiondescription.h" 32 #include "talk/app/webrtc/jsepsessiondescription.h"
33 #include "talk/app/webrtc/mediastream.h" 33 #include "talk/app/webrtc/mediastream.h"
34 #include "talk/app/webrtc/mediastreaminterface.h" 34 #include "talk/app/webrtc/mediastreaminterface.h"
35 #include "talk/app/webrtc/peerconnection.h" 35 #include "talk/app/webrtc/peerconnection.h"
36 #include "talk/app/webrtc/peerconnectioninterface.h" 36 #include "talk/app/webrtc/peerconnectioninterface.h"
37 #include "talk/app/webrtc/remoteaudiosource.h"
perkj_webrtc 2015/12/10 12:24:05 unused?
tommi 2015/12/10 22:37:25 ah, will remove.
37 #include "talk/app/webrtc/rtpreceiverinterface.h" 38 #include "talk/app/webrtc/rtpreceiverinterface.h"
38 #include "talk/app/webrtc/rtpsenderinterface.h" 39 #include "talk/app/webrtc/rtpsenderinterface.h"
39 #include "talk/app/webrtc/streamcollection.h" 40 #include "talk/app/webrtc/streamcollection.h"
40 #include "talk/app/webrtc/test/fakeconstraints.h" 41 #include "talk/app/webrtc/test/fakeconstraints.h"
41 #include "talk/app/webrtc/test/fakedtlsidentitystore.h" 42 #include "talk/app/webrtc/test/fakedtlsidentitystore.h"
42 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" 43 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
43 #include "talk/app/webrtc/test/testsdpstrings.h" 44 #include "talk/app/webrtc/test/testsdpstrings.h"
44 #include "talk/app/webrtc/videosource.h" 45 #include "talk/app/webrtc/videosource.h"
45 #include "talk/app/webrtc/videotrack.h" 46 #include "talk/app/webrtc/videotrack.h"
46 #include "talk/media/base/fakevideocapturer.h" 47 #include "talk/media/base/fakevideocapturer.h"
(...skipping 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2349 FakeConstraints updated_answer_c; 2350 FakeConstraints updated_answer_c;
2350 answer_c.SetMandatoryReceiveAudio(false); 2351 answer_c.SetMandatoryReceiveAudio(false);
2351 answer_c.SetMandatoryReceiveVideo(false); 2352 answer_c.SetMandatoryReceiveVideo(false);
2352 2353
2353 cricket::MediaSessionOptions updated_answer_options; 2354 cricket::MediaSessionOptions updated_answer_options;
2354 EXPECT_TRUE( 2355 EXPECT_TRUE(
2355 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); 2356 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
2356 EXPECT_TRUE(updated_answer_options.has_audio()); 2357 EXPECT_TRUE(updated_answer_options.has_audio());
2357 EXPECT_TRUE(updated_answer_options.has_video()); 2358 EXPECT_TRUE(updated_answer_options.has_video());
2358 } 2359 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698