| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_); | 388 VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_); |
| 389 AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_); | 389 AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_); |
| 390 Dimensions last_dimensions_ GUARDED_BY(lock_); | 390 Dimensions last_dimensions_ GUARDED_BY(lock_); |
| 391 webrtc::VideoRotation last_rotation_ GUARDED_BY(lock_) = | 391 webrtc::VideoRotation last_rotation_ GUARDED_BY(lock_) = |
| 392 webrtc::kVideoRotation_0; | 392 webrtc::kVideoRotation_0; |
| 393 | 393 |
| 394 bool sending_ GUARDED_BY(lock_); | 394 bool sending_ GUARDED_BY(lock_); |
| 395 | 395 |
| 396 // The timestamp of the first frame received | 396 // The timestamp of the first frame received |
| 397 // Used to generate the timestamps of subsequent frames | 397 // Used to generate the timestamps of subsequent frames |
| 398 int64_t first_frame_timestamp_ms_ GUARDED_BY(lock_); | 398 rtc::Optional<int64_t> first_frame_timestamp_ms_ GUARDED_BY(lock_); |
| 399 | 399 |
| 400 // The timestamp of the last frame received | 400 // The timestamp of the last frame received |
| 401 // Used to generate timestamp for the black frame when source is removed | 401 // Used to generate timestamp for the black frame when source is removed |
| 402 int64_t last_frame_timestamp_ms_ GUARDED_BY(lock_); | 402 int64_t last_frame_timestamp_ms_ GUARDED_BY(lock_); |
| 403 }; | 403 }; |
| 404 | 404 |
| 405 // Wrapper for the receiver part, contains configs etc. that are needed to | 405 // Wrapper for the receiver part, contains configs etc. that are needed to |
| 406 // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper | 406 // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper |
| 407 // between rtc::VideoSinkInterface<webrtc::VideoFrame> and | 407 // between rtc::VideoSinkInterface<webrtc::VideoFrame> and |
| 408 // rtc::VideoSinkInterface<cricket::VideoFrame>. | 408 // rtc::VideoSinkInterface<cricket::VideoFrame>. |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 // TODO(deadbeef): Don't duplicate information between | 533 // TODO(deadbeef): Don't duplicate information between |
| 534 // send_params/recv_params, rtp_extensions, options, etc. | 534 // send_params/recv_params, rtp_extensions, options, etc. |
| 535 VideoSendParameters send_params_; | 535 VideoSendParameters send_params_; |
| 536 VideoOptions default_send_options_; | 536 VideoOptions default_send_options_; |
| 537 VideoRecvParameters recv_params_; | 537 VideoRecvParameters recv_params_; |
| 538 }; | 538 }; |
| 539 | 539 |
| 540 } // namespace cricket | 540 } // namespace cricket |
| 541 | 541 |
| 542 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ | 542 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |