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

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

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Deleted a newline. Created 4 years, 1 month 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 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after
1854 VideoChannel::~VideoChannel() { 1854 VideoChannel::~VideoChannel() {
1855 TRACE_EVENT0("webrtc", "VideoChannel::~VideoChannel"); 1855 TRACE_EVENT0("webrtc", "VideoChannel::~VideoChannel");
1856 StopMediaMonitor(); 1856 StopMediaMonitor();
1857 // this can't be done in the base class, since it calls a virtual 1857 // this can't be done in the base class, since it calls a virtual
1858 DisableMedia_w(); 1858 DisableMedia_w();
1859 1859
1860 Deinit(); 1860 Deinit();
1861 } 1861 }
1862 1862
1863 bool VideoChannel::SetSink(uint32_t ssrc, 1863 bool VideoChannel::SetSink(uint32_t ssrc,
1864 rtc::VideoSinkInterface<VideoFrame>* sink) { 1864 rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) {
1865 worker_thread()->Invoke<void>( 1865 worker_thread()->Invoke<void>(
1866 RTC_FROM_HERE, 1866 RTC_FROM_HERE,
1867 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink)); 1867 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
1868 return true; 1868 return true;
1869 } 1869 }
1870 1870
1871 bool VideoChannel::SetVideoSend( 1871 bool VideoChannel::SetVideoSend(
1872 uint32_t ssrc, 1872 uint32_t ssrc,
1873 bool mute, 1873 bool mute,
1874 const VideoOptions* options, 1874 const VideoOptions* options,
1875 rtc::VideoSourceInterface<cricket::VideoFrame>* source) { 1875 rtc::VideoSourceInterface<webrtc::VideoFrame>* source) {
1876 return InvokeOnWorker(RTC_FROM_HERE, 1876 return InvokeOnWorker(RTC_FROM_HERE,
1877 Bind(&VideoMediaChannel::SetVideoSend, media_channel(), 1877 Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
1878 ssrc, mute, options, source)); 1878 ssrc, mute, options, source));
1879 } 1879 }
1880 1880
1881 webrtc::RtpParameters VideoChannel::GetRtpSendParameters(uint32_t ssrc) const { 1881 webrtc::RtpParameters VideoChannel::GetRtpSendParameters(uint32_t ssrc) const {
1882 return worker_thread()->Invoke<webrtc::RtpParameters>( 1882 return worker_thread()->Invoke<webrtc::RtpParameters>(
1883 RTC_FROM_HERE, Bind(&VideoChannel::GetRtpSendParameters_w, this, ssrc)); 1883 RTC_FROM_HERE, Bind(&VideoChannel::GetRtpSendParameters_w, this, ssrc));
1884 } 1884 }
1885 1885
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 } 2410 }
2411 2411
2412 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2412 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2413 rtc::TypedMessageData<uint32_t>* message = 2413 rtc::TypedMessageData<uint32_t>* message =
2414 new rtc::TypedMessageData<uint32_t>(sid); 2414 new rtc::TypedMessageData<uint32_t>(sid);
2415 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_STREAMCLOSEDREMOTELY, 2415 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_STREAMCLOSEDREMOTELY,
2416 message); 2416 message);
2417 } 2417 }
2418 2418
2419 } // namespace cricket 2419 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698