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

Unified Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1613433002: Remove SendStreamFormat and ViewRequests. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideoengine2.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index d2db434aae7a978fdc85c9465e00416bb82cd8e7..3ba77a7657b19017382e77345b498747ae25fae5 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -970,17 +970,6 @@ bool WebRtcVideoChannel2::GetSendCodec(VideoCodec* codec) {
return true;
}
-bool WebRtcVideoChannel2::SetSendStreamFormat(uint32_t ssrc,
- const VideoFormat& format) {
- LOG(LS_VERBOSE) << "SetSendStreamFormat:" << ssrc << " -> "
- << format.ToString();
- rtc::CritScope stream_lock(&stream_crit_);
- if (send_streams_.find(ssrc) == send_streams_.end()) {
- return false;
- }
- return send_streams_[ssrc]->SetVideoFormat(format);
-}
-
bool WebRtcVideoChannel2::SetSend(bool send) {
LOG(LS_VERBOSE) << "SetSend: " << (send ? "true" : "false");
if (send && !send_codec_) {
@@ -1692,32 +1681,6 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer(
return true;
}
-// TODO(pbos): Apply this on the VideoAdapter instead!
-bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoFormat(
- const VideoFormat& format) {
- if ((format.width == 0 || format.height == 0) &&
- format.width != format.height) {
- LOG(LS_ERROR) << "Can't set VideoFormat, width or height is zero (but not "
- "both, 0x0 drops frames).";
- return false;
- }
-
- rtc::CritScope cs(&lock_);
- if (format.width == 0 && format.height == 0) {
- LOG(LS_INFO)
- << "0x0 resolution selected. Captured frames will be dropped for ssrc: "
- << parameters_.config.rtp.ssrcs[0] << ".";
- } else {
- // TODO(pbos): Fix me, this only affects the last stream!
- parameters_.encoder_config.streams.back().max_framerate =
- VideoFormat::IntervalToFps(format.interval);
- SetDimensions(format.width, format.height, false);
- }
-
- format_ = format;
- return true;
-}
-
void WebRtcVideoChannel2::WebRtcVideoSendStream::MuteStream(bool mute) {
rtc::CritScope cs(&lock_);
muted_ = mute;
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698