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

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

Issue 1885473004: Adding codecs to the RtpParameters returned by an RtpSender. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Responding to review comments. Created 4 years, 8 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 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 WebRtcVideoEncoderFactory* const external_encoder_factory_ 373 WebRtcVideoEncoderFactory* const external_encoder_factory_
374 GUARDED_BY(lock_); 374 GUARDED_BY(lock_);
375 375
376 rtc::CriticalSection lock_; 376 rtc::CriticalSection lock_;
377 webrtc::VideoSendStream* stream_ GUARDED_BY(lock_); 377 webrtc::VideoSendStream* stream_ GUARDED_BY(lock_);
378 // Contains settings that are the same for all streams in the MediaChannel, 378 // Contains settings that are the same for all streams in the MediaChannel,
379 // such as codecs, header extensions, and the global bitrate limit for the 379 // such as codecs, header extensions, and the global bitrate limit for the
380 // entire channel. 380 // entire channel.
381 VideoSendStreamParameters parameters_ GUARDED_BY(lock_); 381 VideoSendStreamParameters parameters_ GUARDED_BY(lock_);
382 // Contains settings that are unique for each stream, such as max_bitrate. 382 // Contains settings that are unique for each stream, such as max_bitrate.
383 // Does *not* contain codecs, however.
383 // TODO(skvlad): Move ssrcs_ and ssrc_groups_ into rtp_parameters_. 384 // TODO(skvlad): Move ssrcs_ and ssrc_groups_ into rtp_parameters_.
384 // TODO(skvlad): Combine parameters_ and rtp_parameters_ once we have only 385 // TODO(skvlad): Combine parameters_ and rtp_parameters_ once we have only
385 // one stream per MediaChannel. 386 // one stream per MediaChannel.
386 webrtc::RtpParameters rtp_parameters_ GUARDED_BY(lock_); 387 webrtc::RtpParameters rtp_parameters_ GUARDED_BY(lock_);
387 bool pending_encoder_reconfiguration_ GUARDED_BY(lock_); 388 bool pending_encoder_reconfiguration_ GUARDED_BY(lock_);
388 VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_); 389 VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_);
389 AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_); 390 AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_);
390 Dimensions last_dimensions_ GUARDED_BY(lock_); 391 Dimensions last_dimensions_ GUARDED_BY(lock_);
391 webrtc::VideoRotation last_rotation_ GUARDED_BY(lock_) = 392 webrtc::VideoRotation last_rotation_ GUARDED_BY(lock_) =
392 webrtc::kVideoRotation_0; 393 webrtc::kVideoRotation_0;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 // TODO(deadbeef): Don't duplicate information between 534 // TODO(deadbeef): Don't duplicate information between
534 // send_params/recv_params, rtp_extensions, options, etc. 535 // send_params/recv_params, rtp_extensions, options, etc.
535 VideoSendParameters send_params_; 536 VideoSendParameters send_params_;
536 VideoOptions default_send_options_; 537 VideoOptions default_send_options_;
537 VideoRecvParameters recv_params_; 538 VideoRecvParameters recv_params_;
538 }; 539 };
539 540
540 } // namespace cricket 541 } // namespace cricket
541 542
542 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 543 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698