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

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

Issue 1334793003: Remove VideoMediaChannel::SetRender(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove fake SetRender Created 5 years, 3 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 | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | no next file » | 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 * 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 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1709 1709
1710 bool VideoChannel::SetVideoSend(uint32 ssrc, bool mute, 1710 bool VideoChannel::SetVideoSend(uint32 ssrc, bool mute,
1711 const VideoOptions* options) { 1711 const VideoOptions* options) {
1712 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, 1712 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend,
1713 media_channel(), ssrc, mute, options)); 1713 media_channel(), ssrc, mute, options));
1714 } 1714 }
1715 1715
1716 void VideoChannel::ChangeState() { 1716 void VideoChannel::ChangeState() {
1717 // Render incoming data if we're the active call, and we have the local 1717 // Render incoming data if we're the active call, and we have the local
1718 // content. We receive data on the default channel and multiplexed streams. 1718 // content. We receive data on the default channel and multiplexed streams.
1719 bool recv = IsReadyToReceive(); 1719 bool recv = IsReadyToReceive();
pthatcher1 2015/09/16 22:18:22 Might as well remove |recv| and the LOG(LS_INFO) b
pbos-webrtc 2015/09/24 16:44:38 Done.
1720 if (!media_channel()->SetRender(recv)) {
1721 LOG(LS_ERROR) << "Failed to SetRender on video channel";
1722 // TODO(gangji): Report error back to server.
1723 }
1724 1720
1725 // Send outgoing data if we're the active call, we have the remote content, 1721 // Send outgoing data if we're the active call, we have the remote content,
1726 // and we have had some form of connectivity. 1722 // and we have had some form of connectivity.
1727 bool send = IsReadyToSend(); 1723 bool send = IsReadyToSend();
1728 if (!media_channel()->SetSend(send)) { 1724 if (!media_channel()->SetSend(send)) {
1729 LOG(LS_ERROR) << "Failed to SetSend on video channel"; 1725 LOG(LS_ERROR) << "Failed to SetSend on video channel";
1730 // TODO(gangji): Report error back to server. 1726 // TODO(gangji): Report error back to server.
1731 } 1727 }
1732 1728
1733 LOG(LS_INFO) << "Changing video state, recv=" << recv << " send=" << send; 1729 LOG(LS_INFO) << "Changing video state, recv=" << recv << " send=" << send;
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
2379 return (data_channel_type_ == DCT_RTP); 2375 return (data_channel_type_ == DCT_RTP);
2380 } 2376 }
2381 2377
2382 void DataChannel::OnStreamClosedRemotely(uint32 sid) { 2378 void DataChannel::OnStreamClosedRemotely(uint32 sid) {
2383 rtc::TypedMessageData<uint32>* message = 2379 rtc::TypedMessageData<uint32>* message =
2384 new rtc::TypedMessageData<uint32>(sid); 2380 new rtc::TypedMessageData<uint32>(sid);
2385 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2381 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2386 } 2382 }
2387 2383
2388 } // namespace cricket 2384 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698