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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 const VideoFormat& format) { 1067 const VideoFormat& format) {
1068 LOG(LS_VERBOSE) << "SetSendStreamFormat:" << ssrc << " -> " 1068 LOG(LS_VERBOSE) << "SetSendStreamFormat:" << ssrc << " -> "
1069 << format.ToString(); 1069 << format.ToString();
1070 rtc::CritScope stream_lock(&stream_crit_); 1070 rtc::CritScope stream_lock(&stream_crit_);
1071 if (send_streams_.find(ssrc) == send_streams_.end()) { 1071 if (send_streams_.find(ssrc) == send_streams_.end()) {
1072 return false; 1072 return false;
1073 } 1073 }
1074 return send_streams_[ssrc]->SetVideoFormat(format); 1074 return send_streams_[ssrc]->SetVideoFormat(format);
1075 } 1075 }
1076 1076
1077 bool WebRtcVideoChannel2::SetRender(bool render) {
1078 // TODO(pbos): Implement. Or refactor away as it shouldn't be needed.
1079 LOG(LS_VERBOSE) << "SetRender: " << (render ? "true" : "false");
1080 return true;
1081 }
1082
1083 bool WebRtcVideoChannel2::SetSend(bool send) { 1077 bool WebRtcVideoChannel2::SetSend(bool send) {
1084 LOG(LS_VERBOSE) << "SetSend: " << (send ? "true" : "false"); 1078 LOG(LS_VERBOSE) << "SetSend: " << (send ? "true" : "false");
1085 if (send && !send_codec_.IsSet()) { 1079 if (send && !send_codec_.IsSet()) {
1086 LOG(LS_ERROR) << "SetSend(true) called before setting codec."; 1080 LOG(LS_ERROR) << "SetSend(true) called before setting codec.";
1087 return false; 1081 return false;
1088 } 1082 }
1089 if (send) { 1083 if (send) {
1090 StartAllSendStreams(); 1084 StartAllSendStreams();
1091 } else { 1085 } else {
1092 StopAllSendStreams(); 1086 StopAllSendStreams();
(...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after
2788 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2782 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2789 } 2783 }
2790 } 2784 }
2791 2785
2792 return video_codecs; 2786 return video_codecs;
2793 } 2787 }
2794 2788
2795 } // namespace cricket 2789 } // namespace cricket
2796 2790
2797 #endif // HAVE_WEBRTC_VIDEO 2791 #endif // HAVE_WEBRTC_VIDEO
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698