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

Side by Side Diff: talk/session/media/channel.h

Issue 1658533003: Remove unimplemented VideoChannel code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 2004 Google Inc. 3 * Copyright 2004 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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 bool GetStats(VideoMediaInfo* stats); 471 bool GetStats(VideoMediaInfo* stats);
472 472
473 sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&> 473 sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&>
474 SignalConnectionMonitor; 474 SignalConnectionMonitor;
475 475
476 void StartMediaMonitor(int cms); 476 void StartMediaMonitor(int cms);
477 void StopMediaMonitor(); 477 void StopMediaMonitor();
478 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor; 478 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor;
479 sigslot::signal2<uint32_t, rtc::WindowEvent> SignalScreencastWindowEvent; 479 sigslot::signal2<uint32_t, rtc::WindowEvent> SignalScreencastWindowEvent;
480 480
481 bool SendIntraFrame();
482 bool RequestIntraFrame();
483
484 bool SetVideoSend(uint32_t ssrc, bool enable, const VideoOptions* options); 481 bool SetVideoSend(uint32_t ssrc, bool enable, const VideoOptions* options);
485 482
486 private: 483 private:
487 typedef std::map<uint32_t, VideoCapturer*> ScreencastMap; 484 typedef std::map<uint32_t, VideoCapturer*> ScreencastMap;
488 485
489 // overrides from BaseChannel 486 // overrides from BaseChannel
490 virtual void ChangeState(); 487 virtual void ChangeState();
491 virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc); 488 virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc);
492 virtual bool SetLocalContent_w(const MediaContentDescription* content, 489 virtual bool SetLocalContent_w(const MediaContentDescription* content,
493 ContentAction action, 490 ContentAction action,
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 // SetSendParameters. 640 // SetSendParameters.
644 DataSendParameters last_send_params_; 641 DataSendParameters last_send_params_;
645 // Last DataRecvParameters sent down to the media_channel() via 642 // Last DataRecvParameters sent down to the media_channel() via
646 // SetRecvParameters. 643 // SetRecvParameters.
647 DataRecvParameters last_recv_params_; 644 DataRecvParameters last_recv_params_;
648 }; 645 };
649 646
650 } // namespace cricket 647 } // namespace cricket
651 648
652 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 649 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698