370f93a34a
This is a reland of 11dfff0878c949f2e19d95a0ddc209cdad94b3b4 Now that I am sure that WebRTC code is not calling the obsolete versions, I will just remove the NOT_REACHED and call the new version from the old ones, so as not to trip up downstream projects. Original change's description: > 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} TBR=sakal@webrtc.org,kwiberg@webrtc.org,sprang@webrtc.org Bug: webrtc:10720 Change-Id: I46c69e45c190805c07f7e51acbe277d7eebd1600 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141412 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Elad Alon <eladalon@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28236}
96 lines
3.0 KiB
C++
96 lines
3.0 KiB
C++
/*
|
|
* Copyright (c) 2013 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 "test/configurable_frame_size_encoder.h"
|
|
|
|
#include <string.h>
|
|
#include <cstdint>
|
|
#include <type_traits>
|
|
#include <utility>
|
|
|
|
#include "api/video/encoded_image.h"
|
|
#include "modules/include/module_common_types.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
#include "modules/video_coding/include/video_error_codes.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
ConfigurableFrameSizeEncoder::ConfigurableFrameSizeEncoder(
|
|
size_t max_frame_size)
|
|
: callback_(NULL),
|
|
max_frame_size_(max_frame_size),
|
|
current_frame_size_(max_frame_size),
|
|
buffer_(new uint8_t[max_frame_size]),
|
|
codec_type_(kVideoCodecGeneric) {
|
|
memset(buffer_.get(), 0, max_frame_size);
|
|
}
|
|
|
|
ConfigurableFrameSizeEncoder::~ConfigurableFrameSizeEncoder() {}
|
|
|
|
int32_t ConfigurableFrameSizeEncoder::InitEncode(
|
|
const VideoCodec* codec_settings,
|
|
const Settings& settings) {
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
int32_t ConfigurableFrameSizeEncoder::Encode(
|
|
const VideoFrame& inputImage,
|
|
const std::vector<VideoFrameType>* frame_types) {
|
|
EncodedImage encodedImage(buffer_.get(), current_frame_size_,
|
|
max_frame_size_);
|
|
encodedImage._completeFrame = true;
|
|
encodedImage._encodedHeight = inputImage.height();
|
|
encodedImage._encodedWidth = inputImage.width();
|
|
encodedImage._frameType = VideoFrameType::kVideoFrameKey;
|
|
encodedImage.SetTimestamp(inputImage.timestamp());
|
|
encodedImage.capture_time_ms_ = inputImage.render_time_ms();
|
|
RTPFragmentationHeader* fragmentation = NULL;
|
|
CodecSpecificInfo specific{};
|
|
specific.codecType = codec_type_;
|
|
callback_->OnEncodedImage(encodedImage, &specific, fragmentation);
|
|
if (post_encode_callback_) {
|
|
(*post_encode_callback_)();
|
|
}
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
int32_t ConfigurableFrameSizeEncoder::RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) {
|
|
callback_ = callback;
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
int32_t ConfigurableFrameSizeEncoder::Release() {
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
void ConfigurableFrameSizeEncoder::SetRates(
|
|
const RateControlParameters& parameters) {}
|
|
|
|
int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) {
|
|
RTC_DCHECK_LE(size, max_frame_size_);
|
|
current_frame_size_ = size;
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
void ConfigurableFrameSizeEncoder::SetCodecType(VideoCodecType codec_type) {
|
|
codec_type_ = codec_type;
|
|
}
|
|
|
|
void ConfigurableFrameSizeEncoder::RegisterPostEncodeCallback(
|
|
std::function<void(void)> post_encode_callback) {
|
|
post_encode_callback_ = std::move(post_encode_callback);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|