Inform VideoEncoder of negotiated capabilities
After this CL lands, an announcement will be made to discuss-webrtc about the deprecation of one version of InitEncode(). Bug: webrtc:10720 Change-Id: Ib992af0272bbb16ae16ef7e69491f365702d179e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140884 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Elad Alon <eladalon@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28224}
This commit is contained in:
@ -10,6 +10,7 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include "api/video_codecs/video_encoder.h"
|
||||
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
||||
#include "modules/video_coding/codecs/test/video_codec_unittest.h"
|
||||
#include "modules/video_coding/include/video_error_codes.h"
|
||||
@ -25,6 +26,9 @@ static const int kHeight = 144; // Height of the input image.
|
||||
static const int kMaxFramerate = 30; // Arbitrary value.
|
||||
|
||||
namespace webrtc {
|
||||
namespace {
|
||||
const VideoEncoder::Capabilities kCapabilities(false);
|
||||
}
|
||||
|
||||
EncodedImageCallback::Result
|
||||
VideoCodecUnitTest::FakeEncodeCompleteCallback::OnEncodedImage(
|
||||
@ -78,8 +82,10 @@ void VideoCodecUnitTest::SetUp() {
|
||||
decoder_->RegisterDecodeCompleteCallback(&decode_complete_callback_);
|
||||
|
||||
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
|
||||
encoder_->InitEncode(&codec_settings_, 1 /* number of cores */,
|
||||
0 /* max payload size (unused) */));
|
||||
encoder_->InitEncode(
|
||||
&codec_settings_,
|
||||
VideoEncoder::Settings(kCapabilities, 1 /* number of cores */,
|
||||
0 /* max payload size (unused) */)));
|
||||
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
|
||||
decoder_->InitDecode(&codec_settings_, 1 /* number of cores */));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user