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

Side by Side Diff: webrtc/pc/trackmediainfomap_unittest.cc

Issue 2979493003: Revert: Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on wt (Closed)
Patch Set: Created 3 years, 5 months 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
« no previous file with comments | « webrtc/pc/statscollector_unittest.cc ('k') | webrtc/pc/videotrack.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2016 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 class TrackMediaInfoMapTest : public testing::Test { 79 class TrackMediaInfoMapTest : public testing::Test {
80 public: 80 public:
81 TrackMediaInfoMapTest() 81 TrackMediaInfoMapTest()
82 : voice_media_info_(new cricket::VoiceMediaInfo()), 82 : voice_media_info_(new cricket::VoiceMediaInfo()),
83 video_media_info_(new cricket::VideoMediaInfo()), 83 video_media_info_(new cricket::VideoMediaInfo()),
84 local_audio_track_(AudioTrack::Create("LocalAudioTrack", nullptr)), 84 local_audio_track_(AudioTrack::Create("LocalAudioTrack", nullptr)),
85 remote_audio_track_(AudioTrack::Create("RemoteAudioTrack", nullptr)), 85 remote_audio_track_(AudioTrack::Create("RemoteAudioTrack", nullptr)),
86 local_video_track_( 86 local_video_track_(
87 VideoTrack::Create("LocalVideoTrack", 87 VideoTrack::Create("LocalVideoTrack",
88 FakeVideoTrackSource::Create(false), 88 FakeVideoTrackSource::Create(false))),
89 rtc::Thread::Current())),
90 remote_video_track_( 89 remote_video_track_(
91 VideoTrack::Create("RemoteVideoTrack", 90 VideoTrack::Create("RemoteVideoTrack",
92 FakeVideoTrackSource::Create(false), 91 FakeVideoTrackSource::Create(false))) {}
93 rtc::Thread::Current())) {}
94 92
95 ~TrackMediaInfoMapTest() { 93 ~TrackMediaInfoMapTest() {
96 // If we have a map the ownership has been passed to the map, only delete if 94 // If we have a map the ownership has been passed to the map, only delete if
97 // |CreateMap| has not been called. 95 // |CreateMap| has not been called.
98 if (!map_) { 96 if (!map_) {
99 delete voice_media_info_; 97 delete voice_media_info_;
100 delete video_media_info_; 98 delete video_media_info_;
101 } 99 }
102 } 100 }
103 101
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 AddRtpReceiverWithSsrcs({1, 2}, remote_audio_track_); 401 AddRtpReceiverWithSsrcs({1, 2}, remote_audio_track_);
404 AddRtpReceiverWithSsrcs({3, 4}, remote_audio_track_); 402 AddRtpReceiverWithSsrcs({3, 4}, remote_audio_track_);
405 AddRtpReceiverWithSsrcs({5, 6}, remote_video_track_); 403 AddRtpReceiverWithSsrcs({5, 6}, remote_video_track_);
406 AddRtpReceiverWithSsrcs({7, 8}, remote_video_track_); 404 AddRtpReceiverWithSsrcs({7, 8}, remote_video_track_);
407 EXPECT_DEATH(CreateMap(), ""); 405 EXPECT_DEATH(CreateMap(), "");
408 } 406 }
409 407
410 #endif // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID) 408 #endif // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
411 409
412 } // namespace webrtc 410 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/statscollector_unittest.cc ('k') | webrtc/pc/videotrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698