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