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

Side by Side Diff: talk/session/media/channel_unittest.cc

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Address comments 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 2009 Google Inc. 3 * Copyright 2009 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 "talk/media/base/fakemediaengine.h" 28 #include "talk/media/base/fakemediaengine.h"
29 #include "talk/media/base/fakertp.h" 29 #include "talk/media/base/fakertp.h"
30 #include "talk/media/base/fakescreencapturerfactory.h" 30 #include "talk/media/base/fakescreencapturerfactory.h"
31 #include "talk/media/base/fakevideocapturer.h" 31 #include "talk/media/base/fakevideocapturer.h"
32 #include "talk/media/base/mediachannel.h" 32 #include "talk/media/base/mediachannel.h"
33 #include "talk/media/base/rtpdump.h" 33 #include "talk/media/base/rtpdump.h"
34 #include "talk/media/base/screencastid.h" 34 #include "talk/media/base/screencastid.h"
35 #include "talk/media/base/testutils.h" 35 #include "talk/media/base/testutils.h"
36 #include "talk/session/media/channel.h" 36 #include "talk/session/media/channel.h"
37 #include "webrtc/p2p/base/faketransportcontroller.h"
38 #include "webrtc/base/arraysize.h" 37 #include "webrtc/base/arraysize.h"
39 #include "webrtc/base/fileutils.h" 38 #include "webrtc/base/fileutils.h"
40 #include "webrtc/base/gunit.h" 39 #include "webrtc/base/gunit.h"
41 #include "webrtc/base/helpers.h" 40 #include "webrtc/base/helpers.h"
42 #include "webrtc/base/logging.h" 41 #include "webrtc/base/logging.h"
43 #include "webrtc/base/pathutils.h" 42 #include "webrtc/base/pathutils.h"
44 #include "webrtc/base/signalthread.h" 43 #include "webrtc/base/signalthread.h"
45 #include "webrtc/base/ssladapter.h" 44 #include "webrtc/base/ssladapter.h"
46 #include "webrtc/base/sslidentity.h" 45 #include "webrtc/base/sslidentity.h"
47 #include "webrtc/base/window.h" 46 #include "webrtc/base/window.h"
47 #include "webrtc/p2p/base/faketransportcontroller.h"
48 48
49 #define MAYBE_SKIP_TEST(feature) \ 49 #define MAYBE_SKIP_TEST(feature) \
50 if (!(rtc::SSLStreamAdapter::feature())) { \ 50 if (!(rtc::SSLStreamAdapter::feature())) { \
51 LOG(LS_INFO) << "Feature disabled... skipping"; \ 51 LOG(LS_INFO) << "Feature disabled... skipping"; \
52 return; \ 52 return; \
53 } 53 }
54 54
55 using cricket::CA_OFFER; 55 using cricket::CA_OFFER;
56 using cricket::CA_PRANSWER; 56 using cricket::CA_PRANSWER;
57 using cricket::CA_ANSWER; 57 using cricket::CA_ANSWER;
(...skipping 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after
2770 }; 2770 };
2771 rtc::Buffer payload(data, 3); 2771 rtc::Buffer payload(data, 3);
2772 cricket::SendDataResult result; 2772 cricket::SendDataResult result;
2773 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result)); 2773 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
2774 EXPECT_EQ(params.ssrc, 2774 EXPECT_EQ(params.ssrc,
2775 media_channel1_->last_sent_data_params().ssrc); 2775 media_channel1_->last_sent_data_params().ssrc);
2776 EXPECT_EQ("foo", media_channel1_->last_sent_data()); 2776 EXPECT_EQ("foo", media_channel1_->last_sent_data());
2777 } 2777 }
2778 2778
2779 // TODO(pthatcher): TestSetReceiver? 2779 // TODO(pthatcher): TestSetReceiver?
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698