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

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

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Deleted a newline. 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
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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 const std::string& content_name, 535 const std::string& content_name,
536 bool rtcp); 536 bool rtcp);
537 ~VideoChannel(); 537 ~VideoChannel();
538 bool Init_w(const std::string* bundle_transport_name); 538 bool Init_w(const std::string* bundle_transport_name);
539 539
540 // downcasts a MediaChannel 540 // downcasts a MediaChannel
541 VideoMediaChannel* media_channel() const override { 541 VideoMediaChannel* media_channel() const override {
542 return static_cast<VideoMediaChannel*>(BaseChannel::media_channel()); 542 return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
543 } 543 }
544 544
545 bool SetSink(uint32_t ssrc, rtc::VideoSinkInterface<VideoFrame>* sink); 545 bool SetSink(uint32_t ssrc,
546 rtc::VideoSinkInterface<webrtc::VideoFrame>* sink);
546 // Get statistics about the current media session. 547 // Get statistics about the current media session.
547 bool GetStats(VideoMediaInfo* stats); 548 bool GetStats(VideoMediaInfo* stats);
548 549
549 sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&> 550 sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&>
550 SignalConnectionMonitor; 551 SignalConnectionMonitor;
551 552
552 void StartMediaMonitor(int cms); 553 void StartMediaMonitor(int cms);
553 void StopMediaMonitor(); 554 void StopMediaMonitor();
554 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor; 555 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor;
555 556
556 // Register a source and set options. 557 // Register a source and set options.
557 // The |ssrc| must correspond to a registered send stream. 558 // The |ssrc| must correspond to a registered send stream.
558 bool SetVideoSend(uint32_t ssrc, 559 bool SetVideoSend(uint32_t ssrc,
559 bool enable, 560 bool enable,
560 const VideoOptions* options, 561 const VideoOptions* options,
561 rtc::VideoSourceInterface<cricket::VideoFrame>* source); 562 rtc::VideoSourceInterface<webrtc::VideoFrame>* source);
562 webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const; 563 webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const;
563 bool SetRtpSendParameters(uint32_t ssrc, 564 bool SetRtpSendParameters(uint32_t ssrc,
564 const webrtc::RtpParameters& parameters); 565 const webrtc::RtpParameters& parameters);
565 webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const; 566 webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const;
566 bool SetRtpReceiveParameters(uint32_t ssrc, 567 bool SetRtpReceiveParameters(uint32_t ssrc,
567 const webrtc::RtpParameters& parameters); 568 const webrtc::RtpParameters& parameters);
568 cricket::MediaType media_type() override { return cricket::MEDIA_TYPE_VIDEO; } 569 cricket::MediaType media_type() override { return cricket::MEDIA_TYPE_VIDEO; }
569 570
570 private: 571 private:
571 // overrides from BaseChannel 572 // overrides from BaseChannel
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 // SetSendParameters. 722 // SetSendParameters.
722 DataSendParameters last_send_params_; 723 DataSendParameters last_send_params_;
723 // Last DataRecvParameters sent down to the media_channel() via 724 // Last DataRecvParameters sent down to the media_channel() via
724 // SetRecvParameters. 725 // SetRecvParameters.
725 DataRecvParameters last_recv_params_; 726 DataRecvParameters last_recv_params_;
726 }; 727 };
727 728
728 } // namespace cricket 729 } // namespace cricket
729 730
730 #endif // WEBRTC_PC_CHANNEL_H_ 731 #endif // WEBRTC_PC_CHANNEL_H_
OLDNEW
« webrtc/media/media.gyp ('K') | « webrtc/media/media.gyp ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698