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 | 10 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 } | 71 } |
72 } | 72 } |
73 return res; | 73 return res; |
74 } | 74 } |
75 | 75 |
76 class EmptyFrameGenerator : public FrameGenerator { | 76 class EmptyFrameGenerator : public FrameGenerator { |
77 public: | 77 public: |
78 EmptyFrameGenerator(int width, int height) : width_(width), height_(height) {} | 78 EmptyFrameGenerator(int width, int height) : width_(width), height_(height) {} |
79 VideoFrame* NextFrame() override { | 79 VideoFrame* NextFrame() override { |
80 frame_.reset(new VideoFrame(I420Buffer::Create(width_, height_), | 80 frame_.reset(new VideoFrame(I420Buffer::Create(width_, height_), |
81 webrtc::kVideoRotation_0, 0)); | 81 webrtc::kVideoRotation_0, |
| 82 webrtc::kVideoContent_Default, 0)); |
82 return frame_.get(); | 83 return frame_.get(); |
83 } | 84 } |
84 | 85 |
85 private: | 86 private: |
86 const int width_; | 87 const int width_; |
87 const int height_; | 88 const int height_; |
88 std::unique_ptr<VideoFrame> frame_; | 89 std::unique_ptr<VideoFrame> frame_; |
89 }; | 90 }; |
90 | 91 |
91 class EncodedImageCallbackImpl : public EncodedImageCallback { | 92 class EncodedImageCallbackImpl : public EncodedImageCallback { |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 } | 485 } |
485 { | 486 { |
486 Vp8StreamInfo expected = {{3.75, 7.5, 15.0}, {low_b, mid_b, high_b}}; | 487 Vp8StreamInfo expected = {{3.75, 7.5, 15.0}, {low_b, mid_b, high_b}}; |
487 EXPECT_THAT(SimulateWithFramerate(15.0), MatchesVp8StreamInfo(expected)); | 488 EXPECT_THAT(SimulateWithFramerate(15.0), MatchesVp8StreamInfo(expected)); |
488 } | 489 } |
489 } | 490 } |
490 | 491 |
491 } // namespace | 492 } // namespace |
492 } // namespace vcm | 493 } // namespace vcm |
493 } // namespace webrtc | 494 } // namespace webrtc |
OLD | NEW |