OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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/video/video_quality_test.h" | 10 #include "webrtc/video/video_quality_test.h" |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 : public webrtc::VideoEncoderConfig::VideoStreamFactoryInterface { | 96 : public webrtc::VideoEncoderConfig::VideoStreamFactoryInterface { |
97 public: | 97 public: |
98 explicit VideoStreamFactory(const std::vector<webrtc::VideoStream>& streams) | 98 explicit VideoStreamFactory(const std::vector<webrtc::VideoStream>& streams) |
99 : streams_(streams) {} | 99 : streams_(streams) {} |
100 | 100 |
101 private: | 101 private: |
102 std::vector<webrtc::VideoStream> CreateEncoderStreams( | 102 std::vector<webrtc::VideoStream> CreateEncoderStreams( |
103 int width, | 103 int width, |
104 int height, | 104 int height, |
105 const webrtc::VideoEncoderConfig& encoder_config) override { | 105 const webrtc::VideoEncoderConfig& encoder_config) override { |
106 return streams_; | 106 // The highest layer must match the incoming resolution. |
| 107 std::vector<webrtc::VideoStream> streams = streams_; |
| 108 streams[streams_.size() - 1].height = height; |
| 109 streams[streams_.size() - 1].width = width; |
| 110 return streams; |
107 } | 111 } |
108 | 112 |
109 std::vector<webrtc::VideoStream> streams_; | 113 std::vector<webrtc::VideoStream> streams_; |
110 }; | 114 }; |
111 | 115 |
112 } // namespace | 116 } // namespace |
113 | 117 |
114 namespace webrtc { | 118 namespace webrtc { |
115 | 119 |
116 class VideoAnalyzer : public PacketReceiver, | 120 class VideoAnalyzer : public PacketReceiver, |
(...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1485 std::ostringstream str; | 1489 std::ostringstream str; |
1486 str << receive_logs_++; | 1490 str << receive_logs_++; |
1487 std::string path = | 1491 std::string path = |
1488 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; | 1492 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; |
1489 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), | 1493 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), |
1490 10000000); | 1494 10000000); |
1491 } | 1495 } |
1492 } | 1496 } |
1493 | 1497 |
1494 } // namespace webrtc | 1498 } // namespace webrtc |
OLD | NEW |