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

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

Issue 1364083002: Remove ChannelManager::GetCapabilities() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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/mediaengine.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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 // WebRtcVideoEngine2 is used for the new native WebRTC Video API (webrtc:1667). 106 // WebRtcVideoEngine2 is used for the new native WebRTC Video API (webrtc:1667).
107 class WebRtcVideoEngine2 { 107 class WebRtcVideoEngine2 {
108 public: 108 public:
109 WebRtcVideoEngine2(); 109 WebRtcVideoEngine2();
110 ~WebRtcVideoEngine2(); 110 ~WebRtcVideoEngine2();
111 111
112 // Basic video engine implementation. 112 // Basic video engine implementation.
113 void Init(); 113 void Init();
114 114
115 int GetCapabilities();
116 bool SetDefaultEncoderConfig(const VideoEncoderConfig& config); 115 bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
117 116
118 WebRtcVideoChannel2* CreateChannel(webrtc::Call* call, 117 WebRtcVideoChannel2* CreateChannel(webrtc::Call* call,
119 const VideoOptions& options); 118 const VideoOptions& options);
120 119
121 const std::vector<VideoCodec>& codecs() const; 120 const std::vector<VideoCodec>& codecs() const;
122 const std::vector<RtpHeaderExtension>& rtp_header_extensions() const; 121 const std::vector<RtpHeaderExtension>& rtp_header_extensions() const;
123 void SetLogging(int min_sev, const char* filter); 122 void SetLogging(int min_sev, const char* filter);
124 123
125 // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does 124 // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 WebRtcVideoDecoderFactory* const external_decoder_factory_; 517 WebRtcVideoDecoderFactory* const external_decoder_factory_;
519 std::vector<VideoCodecSettings> recv_codecs_; 518 std::vector<VideoCodecSettings> recv_codecs_;
520 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 519 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
521 webrtc::Call::Config::BitrateConfig bitrate_config_; 520 webrtc::Call::Config::BitrateConfig bitrate_config_;
522 VideoOptions options_; 521 VideoOptions options_;
523 }; 522 };
524 523
525 } // namespace cricket 524 } // namespace cricket
526 525
527 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 526 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « talk/media/base/mediaengine.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698