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

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

Issue 1229283003: Refactor the relationship between BaseChannel and MediaChannel so that we send over all the paramet… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: merge Created 5 years, 4 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/mediachannel.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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 WebRtcVoiceEngine* voice_engine, 180 WebRtcVoiceEngine* voice_engine,
181 WebRtcVoiceMediaChannel* voice_channel, 181 WebRtcVoiceMediaChannel* voice_channel,
182 const VideoOptions& options, 182 const VideoOptions& options,
183 WebRtcVideoEncoderFactory* external_encoder_factory, 183 WebRtcVideoEncoderFactory* external_encoder_factory,
184 WebRtcVideoDecoderFactory* external_decoder_factory); 184 WebRtcVideoDecoderFactory* external_decoder_factory);
185 ~WebRtcVideoChannel2(); 185 ~WebRtcVideoChannel2();
186 bool Init(); 186 bool Init();
187 187
188 // VideoMediaChannel implementation 188 // VideoMediaChannel implementation
189 void DetachVoiceChannel() override; 189 void DetachVoiceChannel() override;
190 bool SetSendParameters(const VideoSendParameters& params) override;
191 bool SetRecvParameters(const VideoRecvParameters& params) override;
190 bool SetRecvCodecs(const std::vector<VideoCodec>& codecs) override; 192 bool SetRecvCodecs(const std::vector<VideoCodec>& codecs) override;
191 bool SetSendCodecs(const std::vector<VideoCodec>& codecs) override; 193 bool SetSendCodecs(const std::vector<VideoCodec>& codecs) override;
192 bool GetSendCodec(VideoCodec* send_codec) override; 194 bool GetSendCodec(VideoCodec* send_codec) override;
193 bool SetSendStreamFormat(uint32 ssrc, const VideoFormat& format) override; 195 bool SetSendStreamFormat(uint32 ssrc, const VideoFormat& format) override;
194 bool SetRender(bool render) override; 196 bool SetRender(bool render) override;
195 bool SetSend(bool send) override; 197 bool SetSend(bool send) override;
196 198
197 bool AddSendStream(const StreamParams& sp) override; 199 bool AddSendStream(const StreamParams& sp) override;
198 bool RemoveSendStream(uint32 ssrc) override; 200 bool RemoveSendStream(uint32 ssrc) override;
199 bool AddRecvStream(const StreamParams& sp) override; 201 bool AddRecvStream(const StreamParams& sp) override;
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 WebRtcVideoDecoderFactory* const external_decoder_factory_; 537 WebRtcVideoDecoderFactory* const external_decoder_factory_;
536 std::vector<VideoCodecSettings> recv_codecs_; 538 std::vector<VideoCodecSettings> recv_codecs_;
537 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 539 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
538 webrtc::Call::Config::BitrateConfig bitrate_config_; 540 webrtc::Call::Config::BitrateConfig bitrate_config_;
539 VideoOptions options_; 541 VideoOptions options_;
540 }; 542 };
541 543
542 } // namespace cricket 544 } // namespace cricket
543 545
544 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 546 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « talk/media/base/mediachannel.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698