Chromium Code Reviews| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 : public webrtc::VideoEncoderConfig::VideoStreamFactoryInterface { | 92 : public webrtc::VideoEncoderConfig::VideoStreamFactoryInterface { |
| 93 public: | 93 public: |
| 94 explicit VideoStreamFactory(const std::vector<webrtc::VideoStream>& streams) | 94 explicit VideoStreamFactory(const std::vector<webrtc::VideoStream>& streams) |
| 95 : streams_(streams) {} | 95 : streams_(streams) {} |
| 96 | 96 |
| 97 private: | 97 private: |
| 98 std::vector<webrtc::VideoStream> CreateEncoderStreams( | 98 std::vector<webrtc::VideoStream> CreateEncoderStreams( |
| 99 int width, | 99 int width, |
| 100 int height, | 100 int height, |
| 101 const webrtc::VideoEncoderConfig& encoder_config) override { | 101 const webrtc::VideoEncoderConfig& encoder_config) override { |
| 102 // The highest layer must match the incoming resolution. | |
| 103 std::vector<webrtc::VideoStream> streams = streams_; | |
| 104 streams[streams_.size() - 1].height = height; | |
| 105 streams[streams_.size() - 1].width = width; | |
| 102 return streams_; | 106 return streams_; |
|
mflodman
2016/12/15 14:33:35
You need to return 'streams', not 'streams_'.
| |
| 103 } | 107 } |
| 104 | 108 |
| 105 std::vector<webrtc::VideoStream> streams_; | 109 std::vector<webrtc::VideoStream> streams_; |
| 106 }; | 110 }; |
| 107 | 111 |
| 108 } // namespace | 112 } // namespace |
| 109 | 113 |
| 110 namespace webrtc { | 114 namespace webrtc { |
| 111 | 115 |
| 112 class VideoAnalyzer : public PacketReceiver, | 116 class VideoAnalyzer : public PacketReceiver, |
| (...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1445 std::ostringstream str; | 1449 std::ostringstream str; |
| 1446 str << receive_logs_++; | 1450 str << receive_logs_++; |
| 1447 std::string path = | 1451 std::string path = |
| 1448 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; | 1452 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; |
| 1449 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), | 1453 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), |
| 1450 10000000); | 1454 10000000); |
| 1451 } | 1455 } |
| 1452 } | 1456 } |
| 1453 | 1457 |
| 1454 } // namespace webrtc | 1458 } // namespace webrtc |
| OLD | NEW |