OLD | NEW |
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 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 // TODO(skvlad): Combine parameters_ and rtp_parameters_ once we have only | 399 // TODO(skvlad): Combine parameters_ and rtp_parameters_ once we have only |
400 // one stream per MediaChannel. | 400 // one stream per MediaChannel. |
401 webrtc::RtpParameters rtp_parameters_ GUARDED_BY(lock_); | 401 webrtc::RtpParameters rtp_parameters_ GUARDED_BY(lock_); |
402 bool pending_encoder_reconfiguration_ GUARDED_BY(lock_); | 402 bool pending_encoder_reconfiguration_ GUARDED_BY(lock_); |
403 VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_); | 403 VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_); |
404 AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_); | 404 AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_); |
405 VideoFrameInfo last_frame_info_ GUARDED_BY(lock_); | 405 VideoFrameInfo last_frame_info_ GUARDED_BY(lock_); |
406 | 406 |
407 bool sending_ GUARDED_BY(lock_); | 407 bool sending_ GUARDED_BY(lock_); |
408 | 408 |
409 // The timestamp of the first frame received | |
410 // Used to generate the timestamps of subsequent frames | |
411 rtc::Optional<int64_t> first_frame_timestamp_ms_ GUARDED_BY(lock_); | |
412 | |
413 // The timestamp of the last frame received | 409 // The timestamp of the last frame received |
414 // Used to generate timestamp for the black frame when source is removed | 410 // Used to generate timestamp for the black frame when source is removed |
415 int64_t last_frame_timestamp_ms_ GUARDED_BY(lock_); | 411 int64_t last_frame_timestamp_us_ GUARDED_BY(lock_); |
416 }; | 412 }; |
417 | 413 |
418 // Wrapper for the receiver part, contains configs etc. that are needed to | 414 // Wrapper for the receiver part, contains configs etc. that are needed to |
419 // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper | 415 // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper |
420 // between rtc::VideoSinkInterface<webrtc::VideoFrame> and | 416 // between rtc::VideoSinkInterface<webrtc::VideoFrame> and |
421 // rtc::VideoSinkInterface<cricket::VideoFrame>. | 417 // rtc::VideoSinkInterface<cricket::VideoFrame>. |
422 class WebRtcVideoReceiveStream | 418 class WebRtcVideoReceiveStream |
423 : public rtc::VideoSinkInterface<webrtc::VideoFrame> { | 419 : public rtc::VideoSinkInterface<webrtc::VideoFrame> { |
424 public: | 420 public: |
425 WebRtcVideoReceiveStream( | 421 WebRtcVideoReceiveStream( |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 VideoSendParameters send_params_; | 554 VideoSendParameters send_params_; |
559 VideoOptions default_send_options_; | 555 VideoOptions default_send_options_; |
560 VideoRecvParameters recv_params_; | 556 VideoRecvParameters recv_params_; |
561 bool red_disabled_by_remote_side_; | 557 bool red_disabled_by_remote_side_; |
562 int64_t last_stats_log_ms_; | 558 int64_t last_stats_log_ms_; |
563 }; | 559 }; |
564 | 560 |
565 } // namespace cricket | 561 } // namespace cricket |
566 | 562 |
567 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ | 563 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ |
OLD | NEW |