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

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

Issue 1658533003: Remove unimplemented VideoChannel code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 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 1689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 } 1700 }
1701 1701
1702 bool VideoChannel::RemoveScreencast(uint32_t ssrc) { 1702 bool VideoChannel::RemoveScreencast(uint32_t ssrc) {
1703 return InvokeOnWorker(Bind(&VideoChannel::RemoveScreencast_w, this, ssrc)); 1703 return InvokeOnWorker(Bind(&VideoChannel::RemoveScreencast_w, this, ssrc));
1704 } 1704 }
1705 1705
1706 bool VideoChannel::IsScreencasting() { 1706 bool VideoChannel::IsScreencasting() {
1707 return InvokeOnWorker(Bind(&VideoChannel::IsScreencasting_w, this)); 1707 return InvokeOnWorker(Bind(&VideoChannel::IsScreencasting_w, this));
1708 } 1708 }
1709 1709
1710 bool VideoChannel::SendIntraFrame() {
1711 worker_thread()->Invoke<void>(Bind(
1712 &VideoMediaChannel::SendIntraFrame, media_channel()));
1713 return true;
1714 }
1715
1716 bool VideoChannel::RequestIntraFrame() {
1717 worker_thread()->Invoke<void>(Bind(
1718 &VideoMediaChannel::RequestIntraFrame, media_channel()));
1719 return true;
1720 }
1721
1722 bool VideoChannel::SetVideoSend(uint32_t ssrc, 1710 bool VideoChannel::SetVideoSend(uint32_t ssrc,
1723 bool mute, 1711 bool mute,
1724 const VideoOptions* options) { 1712 const VideoOptions* options) {
1725 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(), 1713 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
1726 ssrc, mute, options)); 1714 ssrc, mute, options));
1727 } 1715 }
1728 1716
1729 void VideoChannel::ChangeState() { 1717 void VideoChannel::ChangeState() {
1730 // Send outgoing data if we're the active call, we have the remote content, 1718 // Send outgoing data if we're the active call, we have the remote content,
1731 // and we have had some form of connectivity. 1719 // and we have had some form of connectivity.
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2318 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2306 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2319 } 2307 }
2320 2308
2321 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2309 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2322 rtc::TypedMessageData<uint32_t>* message = 2310 rtc::TypedMessageData<uint32_t>* message =
2323 new rtc::TypedMessageData<uint32_t>(sid); 2311 new rtc::TypedMessageData<uint32_t>(sid);
2324 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2312 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2325 } 2313 }
2326 2314
2327 } // namespace cricket 2315 } // namespace cricket
OLDNEW
« talk/media/webrtc/webrtcvideoengine2_unittest.cc ('K') | « talk/session/media/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698