| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 |
| 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ | 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ |
| 12 #define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ | 12 #define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ |
| 13 | 13 |
| 14 #include <list> | 14 #include <list> |
| 15 #include <memory> | 15 #include <memory> |
| 16 | 16 |
| 17 #include "webrtc/base/criticalsection.h" |
| 17 #include "webrtc/modules/include/module_common_types.h" | 18 #include "webrtc/modules/include/module_common_types.h" |
| 18 #include "webrtc/modules/video_coding/include/video_coding.h" | 19 #include "webrtc/modules/video_coding/include/video_coding.h" |
| 19 #include "webrtc/modules/video_coding/media_opt_util.h" | 20 #include "webrtc/modules/video_coding/media_opt_util.h" |
| 20 #include "webrtc/rtc_base/criticalsection.h" | |
| 21 | 21 |
| 22 namespace webrtc { | 22 namespace webrtc { |
| 23 | 23 |
| 24 // Forward declarations. | 24 // Forward declarations. |
| 25 class Clock; | 25 class Clock; |
| 26 class FrameDropper; | 26 class FrameDropper; |
| 27 class VCMContentMetricsProcessing; | 27 class VCMContentMetricsProcessing; |
| 28 | 28 |
| 29 namespace media_optimization { | 29 namespace media_optimization { |
| 30 | 30 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 int64_t incoming_frame_times_[kFrameCountHistorySize] GUARDED_BY(crit_sect_); | 117 int64_t incoming_frame_times_[kFrameCountHistorySize] GUARDED_BY(crit_sect_); |
| 118 std::list<EncodedFrameSample> encoded_frame_samples_ GUARDED_BY(crit_sect_); | 118 std::list<EncodedFrameSample> encoded_frame_samples_ GUARDED_BY(crit_sect_); |
| 119 uint32_t avg_sent_bit_rate_bps_ GUARDED_BY(crit_sect_); | 119 uint32_t avg_sent_bit_rate_bps_ GUARDED_BY(crit_sect_); |
| 120 uint32_t avg_sent_framerate_ GUARDED_BY(crit_sect_); | 120 uint32_t avg_sent_framerate_ GUARDED_BY(crit_sect_); |
| 121 int num_layers_ GUARDED_BY(crit_sect_); | 121 int num_layers_ GUARDED_BY(crit_sect_); |
| 122 }; | 122 }; |
| 123 } // namespace media_optimization | 123 } // namespace media_optimization |
| 124 } // namespace webrtc | 124 } // namespace webrtc |
| 125 | 125 |
| 126 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ | 126 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ |
| OLD | NEW |