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

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

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: objc: Add missing include of video_frame_buffer.h. 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
« no previous file with comments | « webrtc/pc/channel.h ('k') | webrtc/sdk/objc/Framework/Classes/RTCVideoFrame+Private.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 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 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 VideoChannel::~VideoChannel() { 1858 VideoChannel::~VideoChannel() {
1859 TRACE_EVENT0("webrtc", "VideoChannel::~VideoChannel"); 1859 TRACE_EVENT0("webrtc", "VideoChannel::~VideoChannel");
1860 StopMediaMonitor(); 1860 StopMediaMonitor();
1861 // this can't be done in the base class, since it calls a virtual 1861 // this can't be done in the base class, since it calls a virtual
1862 DisableMedia_w(); 1862 DisableMedia_w();
1863 1863
1864 Deinit(); 1864 Deinit();
1865 } 1865 }
1866 1866
1867 bool VideoChannel::SetSink(uint32_t ssrc, 1867 bool VideoChannel::SetSink(uint32_t ssrc,
1868 rtc::VideoSinkInterface<VideoFrame>* sink) { 1868 rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) {
1869 worker_thread()->Invoke<void>( 1869 worker_thread()->Invoke<void>(
1870 RTC_FROM_HERE, 1870 RTC_FROM_HERE,
1871 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink)); 1871 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
1872 return true; 1872 return true;
1873 } 1873 }
1874 1874
1875 bool VideoChannel::SetVideoSend( 1875 bool VideoChannel::SetVideoSend(
1876 uint32_t ssrc, 1876 uint32_t ssrc,
1877 bool mute, 1877 bool mute,
1878 const VideoOptions* options, 1878 const VideoOptions* options,
1879 rtc::VideoSourceInterface<cricket::VideoFrame>* source) { 1879 rtc::VideoSourceInterface<webrtc::VideoFrame>* source) {
1880 return InvokeOnWorker(RTC_FROM_HERE, 1880 return InvokeOnWorker(RTC_FROM_HERE,
1881 Bind(&VideoMediaChannel::SetVideoSend, media_channel(), 1881 Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
1882 ssrc, mute, options, source)); 1882 ssrc, mute, options, source));
1883 } 1883 }
1884 1884
1885 webrtc::RtpParameters VideoChannel::GetRtpSendParameters(uint32_t ssrc) const { 1885 webrtc::RtpParameters VideoChannel::GetRtpSendParameters(uint32_t ssrc) const {
1886 return worker_thread()->Invoke<webrtc::RtpParameters>( 1886 return worker_thread()->Invoke<webrtc::RtpParameters>(
1887 RTC_FROM_HERE, Bind(&VideoChannel::GetRtpSendParameters_w, this, ssrc)); 1887 RTC_FROM_HERE, Bind(&VideoChannel::GetRtpSendParameters_w, this, ssrc));
1888 } 1888 }
1889 1889
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
2414 } 2414 }
2415 2415
2416 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2416 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2417 rtc::TypedMessageData<uint32_t>* message = 2417 rtc::TypedMessageData<uint32_t>* message =
2418 new rtc::TypedMessageData<uint32_t>(sid); 2418 new rtc::TypedMessageData<uint32_t>(sid);
2419 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_STREAMCLOSEDREMOTELY, 2419 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_STREAMCLOSEDREMOTELY,
2420 message); 2420 message);
2421 } 2421 }
2422 2422
2423 } // namespace cricket 2423 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/channel.h ('k') | webrtc/sdk/objc/Framework/Classes/RTCVideoFrame+Private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698