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

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

Issue 2280903002: Remove last_width_/last_height_ from WebRtcVideoReceiveStream. Used in GetStats. Get dimensions fro… (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | webrtc/media/engine/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 * 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 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 webrtc::VideoReceiveStream* stream_; 487 webrtc::VideoReceiveStream* stream_;
488 const bool default_stream_; 488 const bool default_stream_;
489 webrtc::VideoReceiveStream::Config config_; 489 webrtc::VideoReceiveStream::Config config_;
490 bool red_disabled_by_remote_side_; 490 bool red_disabled_by_remote_side_;
491 491
492 WebRtcVideoDecoderFactory* const external_decoder_factory_; 492 WebRtcVideoDecoderFactory* const external_decoder_factory_;
493 std::vector<AllocatedDecoder> allocated_decoders_; 493 std::vector<AllocatedDecoder> allocated_decoders_;
494 494
495 rtc::CriticalSection sink_lock_; 495 rtc::CriticalSection sink_lock_;
496 rtc::VideoSinkInterface<cricket::VideoFrame>* sink_ GUARDED_BY(sink_lock_); 496 rtc::VideoSinkInterface<cricket::VideoFrame>* sink_ GUARDED_BY(sink_lock_);
497 int last_width_ GUARDED_BY(sink_lock_);
498 int last_height_ GUARDED_BY(sink_lock_);
499 // Expands remote RTP timestamps to int64_t to be able to estimate how long 497 // Expands remote RTP timestamps to int64_t to be able to estimate how long
500 // the stream has been running. 498 // the stream has been running.
501 rtc::TimestampWrapAroundHandler timestamp_wraparound_handler_ 499 rtc::TimestampWrapAroundHandler timestamp_wraparound_handler_
502 GUARDED_BY(sink_lock_); 500 GUARDED_BY(sink_lock_);
503 int64_t first_frame_timestamp_ GUARDED_BY(sink_lock_); 501 int64_t first_frame_timestamp_ GUARDED_BY(sink_lock_);
504 // Start NTP time is estimated as current remote NTP time (estimated from 502 // Start NTP time is estimated as current remote NTP time (estimated from
505 // RTCP) minus the elapsed time, as soon as remote NTP time is available. 503 // RTCP) minus the elapsed time, as soon as remote NTP time is available.
506 int64_t estimated_remote_start_ntp_time_ms_ GUARDED_BY(sink_lock_); 504 int64_t estimated_remote_start_ntp_time_ms_ GUARDED_BY(sink_lock_);
507 }; 505 };
508 506
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 VideoSendParameters send_params_; 556 VideoSendParameters send_params_;
559 VideoOptions default_send_options_; 557 VideoOptions default_send_options_;
560 VideoRecvParameters recv_params_; 558 VideoRecvParameters recv_params_;
561 bool red_disabled_by_remote_side_; 559 bool red_disabled_by_remote_side_;
562 int64_t last_stats_log_ms_; 560 int64_t last_stats_log_ms_;
563 }; 561 };
564 562
565 } // namespace cricket 563 } // namespace cricket
566 564
567 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 565 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698