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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.h

Issue 1602283003: Delete GetRenderer method, used only by the tests. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Deleted testcases which become useless without GetRenderer 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 unified diff | Download patch
« no previous file with comments | « talk/media/base/videoengine_unittest.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('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 * 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 void SetInterface(NetworkInterface* iface) override; 186 void SetInterface(NetworkInterface* iface) override;
187 void UpdateAspectRatio(int ratio_w, int ratio_h) override; 187 void UpdateAspectRatio(int ratio_w, int ratio_h) override;
188 188
189 void OnMessage(rtc::Message* msg) override; 189 void OnMessage(rtc::Message* msg) override;
190 190
191 void OnLoadUpdate(Load load) override; 191 void OnLoadUpdate(Load load) override;
192 192
193 // Implemented for VideoMediaChannelTest. 193 // Implemented for VideoMediaChannelTest.
194 bool sending() const { return sending_; } 194 bool sending() const { return sending_; }
195 uint32_t GetDefaultSendChannelSsrc() { return default_send_ssrc_; } 195 uint32_t GetDefaultSendChannelSsrc() { return default_send_ssrc_; }
196 bool GetRenderer(uint32_t ssrc, VideoRenderer** renderer);
197 196
198 private: 197 private:
199 bool MuteStream(uint32_t ssrc, bool mute); 198 bool MuteStream(uint32_t ssrc, bool mute);
200 class WebRtcVideoReceiveStream; 199 class WebRtcVideoReceiveStream;
201 200
202 bool SetSendCodecs(const std::vector<VideoCodec>& codecs); 201 bool SetSendCodecs(const std::vector<VideoCodec>& codecs);
203 bool SetSendRtpHeaderExtensions( 202 bool SetSendRtpHeaderExtensions(
204 const std::vector<RtpHeaderExtension>& extensions); 203 const std::vector<RtpHeaderExtension>& extensions);
205 bool SetMaxSendBandwidth(int bps); 204 bool SetMaxSendBandwidth(int bps);
206 bool SetOptions(const VideoOptions& options); 205 bool SetOptions(const VideoOptions& options);
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // into this method. Currently this method only sets the RTCP mode. 407 // into this method. Currently this method only sets the RTCP mode.
409 void SetRecvParameters(const VideoRecvParameters& recv_params); 408 void SetRecvParameters(const VideoRecvParameters& recv_params);
410 409
411 void RenderFrame(const webrtc::VideoFrame& frame, 410 void RenderFrame(const webrtc::VideoFrame& frame,
412 int time_to_render_ms) override; 411 int time_to_render_ms) override;
413 bool IsTextureSupported() const override; 412 bool IsTextureSupported() const override;
414 bool SmoothsRenderedFrames() const override; 413 bool SmoothsRenderedFrames() const override;
415 bool IsDefaultStream() const; 414 bool IsDefaultStream() const;
416 415
417 void SetRenderer(cricket::VideoRenderer* renderer); 416 void SetRenderer(cricket::VideoRenderer* renderer);
418 cricket::VideoRenderer* GetRenderer();
419 417
420 VideoReceiverInfo GetVideoReceiverInfo(); 418 VideoReceiverInfo GetVideoReceiverInfo();
421 419
422 private: 420 private:
423 struct AllocatedDecoder { 421 struct AllocatedDecoder {
424 AllocatedDecoder(webrtc::VideoDecoder* decoder, 422 AllocatedDecoder(webrtc::VideoDecoder* decoder,
425 webrtc::VideoCodecType type, 423 webrtc::VideoCodecType type,
426 bool external); 424 bool external);
427 webrtc::VideoDecoder* decoder; 425 webrtc::VideoDecoder* decoder;
428 // Decoder wrapped into a fallback decoder to permit software fallback. 426 // Decoder wrapped into a fallback decoder to permit software fallback.
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 VideoOptions options_; 526 VideoOptions options_;
529 // TODO(deadbeef): Don't duplicate information between 527 // TODO(deadbeef): Don't duplicate information between
530 // send_params/recv_params, rtp_extensions, options, etc. 528 // send_params/recv_params, rtp_extensions, options, etc.
531 VideoSendParameters send_params_; 529 VideoSendParameters send_params_;
532 VideoRecvParameters recv_params_; 530 VideoRecvParameters recv_params_;
533 }; 531 };
534 532
535 } // namespace cricket 533 } // namespace cricket
536 534
537 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 535 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « talk/media/base/videoengine_unittest.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698