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

Side by Side Diff: webrtc/pc/channel.h

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: objc: Add missing include of video_frame_buffer.h. Created 4 years, 1 month 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 | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/pc/channel.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 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 const std::string& content_name, 541 const std::string& content_name,
542 bool rtcp); 542 bool rtcp);
543 ~VideoChannel(); 543 ~VideoChannel();
544 bool Init_w(const std::string* bundle_transport_name); 544 bool Init_w(const std::string* bundle_transport_name);
545 545
546 // downcasts a MediaChannel 546 // downcasts a MediaChannel
547 VideoMediaChannel* media_channel() const override { 547 VideoMediaChannel* media_channel() const override {
548 return static_cast<VideoMediaChannel*>(BaseChannel::media_channel()); 548 return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
549 } 549 }
550 550
551 bool SetSink(uint32_t ssrc, rtc::VideoSinkInterface<VideoFrame>* sink); 551 bool SetSink(uint32_t ssrc,
552 rtc::VideoSinkInterface<webrtc::VideoFrame>* sink);
552 // Get statistics about the current media session. 553 // Get statistics about the current media session.
553 bool GetStats(VideoMediaInfo* stats); 554 bool GetStats(VideoMediaInfo* stats);
554 555
555 sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&> 556 sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&>
556 SignalConnectionMonitor; 557 SignalConnectionMonitor;
557 558
558 void StartMediaMonitor(int cms); 559 void StartMediaMonitor(int cms);
559 void StopMediaMonitor(); 560 void StopMediaMonitor();
560 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor; 561 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor;
561 562
562 // Register a source and set options. 563 // Register a source and set options.
563 // The |ssrc| must correspond to a registered send stream. 564 // The |ssrc| must correspond to a registered send stream.
564 bool SetVideoSend(uint32_t ssrc, 565 bool SetVideoSend(uint32_t ssrc,
565 bool enable, 566 bool enable,
566 const VideoOptions* options, 567 const VideoOptions* options,
567 rtc::VideoSourceInterface<cricket::VideoFrame>* source); 568 rtc::VideoSourceInterface<webrtc::VideoFrame>* source);
568 webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const; 569 webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const;
569 bool SetRtpSendParameters(uint32_t ssrc, 570 bool SetRtpSendParameters(uint32_t ssrc,
570 const webrtc::RtpParameters& parameters); 571 const webrtc::RtpParameters& parameters);
571 webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const; 572 webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const;
572 bool SetRtpReceiveParameters(uint32_t ssrc, 573 bool SetRtpReceiveParameters(uint32_t ssrc,
573 const webrtc::RtpParameters& parameters); 574 const webrtc::RtpParameters& parameters);
574 cricket::MediaType media_type() override { return cricket::MEDIA_TYPE_VIDEO; } 575 cricket::MediaType media_type() override { return cricket::MEDIA_TYPE_VIDEO; }
575 576
576 private: 577 private:
577 // overrides from BaseChannel 578 // overrides from BaseChannel
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 // SetSendParameters. 728 // SetSendParameters.
728 DataSendParameters last_send_params_; 729 DataSendParameters last_send_params_;
729 // Last DataRecvParameters sent down to the media_channel() via 730 // Last DataRecvParameters sent down to the media_channel() via
730 // SetRecvParameters. 731 // SetRecvParameters.
731 DataRecvParameters last_recv_params_; 732 DataRecvParameters last_recv_params_;
732 }; 733 };
733 734
734 } // namespace cricket 735 } // namespace cricket
735 736
736 #endif // WEBRTC_PC_CHANNEL_H_ 737 #endif // WEBRTC_PC_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698