| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 #include "webrtc/test/frame_generator.h" | 10 #include "webrtc/test/frame_generator.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 Random random_generator_; | 101 Random random_generator_; |
| 102 int x_; | 102 int x_; |
| 103 int y_; | 103 int y_; |
| 104 const int length_; | 104 const int length_; |
| 105 const uint8_t yuv_y_; | 105 const uint8_t yuv_y_; |
| 106 const uint8_t yuv_u_; | 106 const uint8_t yuv_u_; |
| 107 const uint8_t yuv_v_; | 107 const uint8_t yuv_v_; |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 rtc::CriticalSection crit_; | 110 rtc::CriticalSection crit_; |
| 111 int width_ GUARDED_BY(&crit_); | 111 int width_ RTC_GUARDED_BY(&crit_); |
| 112 int height_ GUARDED_BY(&crit_); | 112 int height_ RTC_GUARDED_BY(&crit_); |
| 113 std::vector<std::unique_ptr<Square>> squares_ GUARDED_BY(&crit_); | 113 std::vector<std::unique_ptr<Square>> squares_ RTC_GUARDED_BY(&crit_); |
| 114 std::unique_ptr<VideoFrame> frame_ GUARDED_BY(&crit_); | 114 std::unique_ptr<VideoFrame> frame_ RTC_GUARDED_BY(&crit_); |
| 115 }; | 115 }; |
| 116 | 116 |
| 117 class YuvFileGenerator : public FrameGenerator { | 117 class YuvFileGenerator : public FrameGenerator { |
| 118 public: | 118 public: |
| 119 YuvFileGenerator(std::vector<FILE*> files, | 119 YuvFileGenerator(std::vector<FILE*> files, |
| 120 size_t width, | 120 size_t width, |
| 121 size_t height, | 121 size_t height, |
| 122 int frame_repeat_count) | 122 int frame_repeat_count) |
| 123 : file_index_(0), | 123 : file_index_(0), |
| 124 files_(files), | 124 files_(files), |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 files.push_back(file); | 441 files.push_back(file); |
| 442 } | 442 } |
| 443 | 443 |
| 444 return std::unique_ptr<FrameGenerator>(new ScrollingImageFrameGenerator( | 444 return std::unique_ptr<FrameGenerator>(new ScrollingImageFrameGenerator( |
| 445 clock, files, source_width, source_height, target_width, target_height, | 445 clock, files, source_width, source_height, target_width, target_height, |
| 446 scroll_time_ms, pause_time_ms)); | 446 scroll_time_ms, pause_time_ms)); |
| 447 } | 447 } |
| 448 | 448 |
| 449 } // namespace test | 449 } // namespace test |
| 450 } // namespace webrtc | 450 } // namespace webrtc |
| OLD | NEW |