3b703ede8b
Reason for revert: Fails on a content_browsertest (and also webrtc_perf?) https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/34336 https://build.chromium.org/p/client.webrtc/builders/Linux64%20Release%20%5Blarge%20tests%5D/builds/9091/steps/webrtc_perf_tests/logs/stdio [ FAILED ] FullStackTest.ParisQcifWithoutPacketLoss (59436 ms) Original issue's description: > Let ViEEncoder handle resolution changes. > > This cl move codec reconfiguration due to video frame size changes from WebRtcVideoSendStream to ViEEncoder. > > With this change, many variables in WebRtcVideoSendStream no longer need to be locked. > > BUG=webrtc:5687, webrtc:6371, webrtc:5332 > > Committed: https://crrev.com/26105b41b4f97642ee30cb067dc786c2737709ad > Cr-Commit-Position: refs/heads/master@{#14445} TBR=sprang@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5687, webrtc:6371, webrtc:5332 Review-Url: https://codereview.webrtc.org/2383493005 Cr-Commit-Position: refs/heads/master@{#14447}
74 lines
2.5 KiB
C++
74 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#include "webrtc/test/encoder_settings.h"
|
|
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
#include "webrtc/test/fake_decoder.h"
|
|
#include "webrtc/video_decoder.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
std::vector<VideoStream> CreateVideoStreams(size_t num_streams) {
|
|
assert(num_streams > 0);
|
|
|
|
// Add more streams to the settings above with reasonable values if required.
|
|
static const size_t kNumSettings = 3;
|
|
assert(num_streams <= kNumSettings);
|
|
|
|
std::vector<VideoStream> stream_settings(kNumSettings);
|
|
|
|
stream_settings[0].width = 320;
|
|
stream_settings[0].height = 180;
|
|
stream_settings[0].max_framerate = 30;
|
|
stream_settings[0].min_bitrate_bps = 50000;
|
|
stream_settings[0].target_bitrate_bps = stream_settings[0].max_bitrate_bps =
|
|
150000;
|
|
stream_settings[0].max_qp = 56;
|
|
|
|
stream_settings[1].width = 640;
|
|
stream_settings[1].height = 360;
|
|
stream_settings[1].max_framerate = 30;
|
|
stream_settings[1].min_bitrate_bps = 200000;
|
|
stream_settings[1].target_bitrate_bps = stream_settings[1].max_bitrate_bps =
|
|
450000;
|
|
stream_settings[1].max_qp = 56;
|
|
|
|
stream_settings[2].width = 1280;
|
|
stream_settings[2].height = 720;
|
|
stream_settings[2].max_framerate = 30;
|
|
stream_settings[2].min_bitrate_bps = 700000;
|
|
stream_settings[2].target_bitrate_bps = stream_settings[2].max_bitrate_bps =
|
|
1500000;
|
|
stream_settings[2].max_qp = 56;
|
|
stream_settings.resize(num_streams);
|
|
return stream_settings;
|
|
}
|
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
|
const VideoSendStream::Config::EncoderSettings& encoder_settings) {
|
|
VideoReceiveStream::Decoder decoder;
|
|
decoder.payload_type = encoder_settings.payload_type;
|
|
decoder.payload_name = encoder_settings.payload_name;
|
|
if (encoder_settings.payload_name == "H264") {
|
|
decoder.decoder = VideoDecoder::Create(VideoDecoder::kH264);
|
|
} else if (encoder_settings.payload_name == "VP8") {
|
|
decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8);
|
|
} else if (encoder_settings.payload_name == "VP9") {
|
|
decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9);
|
|
} else {
|
|
decoder.decoder = new FakeDecoder();
|
|
}
|
|
return decoder;
|
|
}
|
|
} // namespace test
|
|
} // namespace webrtc
|