2013-09-14 00:25:28 +00:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2018-11-28 16:47:49 +01:00
|
|
|
#include <stddef.h>
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
#include <vector>
|
2018-06-21 16:16:38 +02:00
|
|
|
|
2019-01-25 20:26:48 +01:00
|
|
|
#include "api/scoped_refptr.h"
|
2018-11-28 16:47:49 +01:00
|
|
|
#include "api/video/video_bitrate_allocation.h"
|
2018-07-20 15:49:43 -07:00
|
|
|
#include "api/video/video_bitrate_allocator.h"
|
2018-11-28 16:47:49 +01:00
|
|
|
#include "api/video/video_frame.h"
|
|
|
|
|
#include "api/video/video_frame_buffer.h"
|
|
|
|
|
#include "api/video_codecs/video_codec.h"
|
|
|
|
|
#include "api/video_codecs/video_encoder.h"
|
2017-09-15 13:58:09 +02:00
|
|
|
#include "common_types.h" // NOLINT(build/include)
|
2018-11-28 16:47:49 +01:00
|
|
|
#include "modules/video_coding/encoder_database.h"
|
|
|
|
|
#include "modules/video_coding/generic_encoder.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
2018-11-28 16:47:49 +01:00
|
|
|
#include "modules/video_coding/include/video_coding_defines.h"
|
|
|
|
|
#include "modules/video_coding/include/video_error_codes.h"
|
|
|
|
|
#include "modules/video_coding/internal_defines.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
|
|
|
|
|
#include "modules/video_coding/video_coding_impl.h"
|
|
|
|
|
#include "rtc_base/checks.h"
|
2019-01-11 09:11:00 -08:00
|
|
|
#include "rtc_base/critical_section.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/logging.h"
|
2018-11-28 16:47:49 +01:00
|
|
|
#include "rtc_base/sequenced_task_checker.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "system_wrappers/include/clock.h"
|
2018-09-03 13:30:46 +02:00
|
|
|
#include "system_wrappers/include/field_trial.h"
|
2013-09-14 00:25:28 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
namespace vcm {
|
|
|
|
|
|
2014-04-11 14:08:35 +00:00
|
|
|
VideoSender::VideoSender(Clock* clock,
|
2017-10-24 11:37:08 +02:00
|
|
|
EncodedImageCallback* post_encode_callback)
|
|
|
|
|
: _encoder(nullptr),
|
2019-01-11 11:11:10 +01:00
|
|
|
_encodedFrameCallback(post_encode_callback),
|
2016-07-05 08:34:04 -07:00
|
|
|
_codecDataBase(&_encodedFrameCallback),
|
2015-02-19 17:43:25 +00:00
|
|
|
current_codec_(),
|
2016-01-18 20:23:40 +01:00
|
|
|
encoder_has_internal_source_(false),
|
|
|
|
|
next_frame_types_(1, kVideoFrameDelta) {
|
2015-03-05 12:21:54 +00:00
|
|
|
// Allow VideoSender to be created on one thread but used on another, post
|
|
|
|
|
// construction. This is currently how this class is being used by at least
|
|
|
|
|
// one external project (diffractor).
|
2016-07-14 23:35:55 -07:00
|
|
|
sequenced_checker_.Detach();
|
2015-02-19 17:43:25 +00:00
|
|
|
}
|
2013-09-14 00:25:28 +00:00
|
|
|
|
2015-09-15 14:43:47 +02:00
|
|
|
VideoSender::~VideoSender() {}
|
2013-09-14 00:25:28 +00:00
|
|
|
|
|
|
|
|
// Register the send codec to be used.
|
|
|
|
|
int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
|
|
|
|
|
uint32_t numberOfCores,
|
|
|
|
|
uint32_t maxPayloadSize) {
|
2016-07-14 23:35:55 -07:00
|
|
|
RTC_DCHECK(sequenced_checker_.CalledSequentially());
|
2016-01-18 20:23:40 +01:00
|
|
|
rtc::CritScope lock(&encoder_crit_);
|
2015-04-14 21:28:08 +02:00
|
|
|
if (sendCodec == nullptr) {
|
2013-09-14 00:25:28 +00:00
|
|
|
return VCM_PARAMETER_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-29 16:53:59 +01:00
|
|
|
bool ret =
|
|
|
|
|
_codecDataBase.SetSendCodec(sendCodec, numberOfCores, maxPayloadSize);
|
2013-09-17 09:38:41 +00:00
|
|
|
|
|
|
|
|
// Update encoder regardless of result to make sure that we're not holding on
|
|
|
|
|
// to a deleted instance.
|
|
|
|
|
_encoder = _codecDataBase.GetEncoder();
|
2015-02-19 17:43:25 +00:00
|
|
|
// Cache the current codec here so they can be fetched from this thread
|
|
|
|
|
// without requiring the _sendCritSect lock.
|
|
|
|
|
current_codec_ = *sendCodec;
|
2013-09-17 09:38:41 +00:00
|
|
|
|
2013-09-14 00:25:28 +00:00
|
|
|
if (!ret) {
|
2018-02-23 15:41:13 +01:00
|
|
|
RTC_LOG(LS_ERROR) << "Failed to initialize set encoder with codec type '"
|
|
|
|
|
<< sendCodec->codecType << "'.";
|
2013-09-14 00:25:28 +00:00
|
|
|
return VCM_CODEC_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-18 20:23:40 +01:00
|
|
|
// SetSendCodec succeeded, _encoder should be set.
|
|
|
|
|
RTC_DCHECK(_encoder);
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
rtc::CritScope cs(¶ms_crit_);
|
|
|
|
|
next_frame_types_.clear();
|
|
|
|
|
next_frame_types_.resize(VCM_MAX(sendCodec->numberOfSimulcastStreams, 1),
|
|
|
|
|
kVideoFrameKey);
|
|
|
|
|
// Cache InternalSource() to have this available from IntraFrameRequest()
|
|
|
|
|
// without having to acquire encoder_crit_ (avoid blocking on encoder use).
|
|
|
|
|
encoder_has_internal_source_ = _encoder->InternalSource();
|
|
|
|
|
}
|
2013-09-14 00:25:28 +00:00
|
|
|
|
2017-11-09 11:09:25 +01:00
|
|
|
RTC_LOG(LS_VERBOSE) << " max bitrate " << sendCodec->maxBitrate
|
|
|
|
|
<< " start bitrate " << sendCodec->startBitrate
|
|
|
|
|
<< " max frame rate " << sendCodec->maxFramerate
|
|
|
|
|
<< " max payload size " << maxPayloadSize;
|
2013-09-14 00:25:28 +00:00
|
|
|
return VCM_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register an external decoder object.
|
|
|
|
|
// This can not be used together with external decoder callbacks.
|
2015-11-27 14:09:07 +01:00
|
|
|
void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder,
|
2015-12-21 08:23:20 -08:00
|
|
|
bool internalSource /*= false*/) {
|
2016-07-14 23:35:55 -07:00
|
|
|
RTC_DCHECK(sequenced_checker_.CalledSequentially());
|
2015-03-07 20:55:56 +00:00
|
|
|
|
2016-01-18 20:23:40 +01:00
|
|
|
rtc::CritScope lock(&encoder_crit_);
|
2013-09-14 00:25:28 +00:00
|
|
|
|
2015-04-14 21:28:08 +02:00
|
|
|
if (externalEncoder == nullptr) {
|
2018-03-16 13:38:46 +01:00
|
|
|
_codecDataBase.DeregisterExternalEncoder();
|
|
|
|
|
{
|
2013-09-14 00:25:28 +00:00
|
|
|
// Make sure the VCM doesn't use the de-registered codec
|
2016-01-18 20:23:40 +01:00
|
|
|
rtc::CritScope params_lock(¶ms_crit_);
|
2015-04-14 21:28:08 +02:00
|
|
|
_encoder = nullptr;
|
2016-01-18 20:23:40 +01:00
|
|
|
encoder_has_internal_source_ = false;
|
2013-09-14 00:25:28 +00:00
|
|
|
}
|
2015-11-27 14:09:07 +01:00
|
|
|
return;
|
2013-09-14 00:25:28 +00:00
|
|
|
}
|
2018-06-21 16:16:38 +02:00
|
|
|
_codecDataBase.RegisterExternalEncoder(externalEncoder,
|
|
|
|
|
internalSource);
|
2013-09-14 00:25:28 +00:00
|
|
|
}
|
|
|
|
|
|
2016-11-16 16:41:30 +01:00
|
|
|
int32_t VideoSender::SetChannelParameters(
|
2019-01-11 11:11:10 +01:00
|
|
|
const VideoBitrateAllocation& bitrate_allocation,
|
|
|
|
|
uint32_t framerate_fps) {
|
2016-04-13 14:59:48 -07:00
|
|
|
bool encoder_has_internal_source;
|
|
|
|
|
{
|
|
|
|
|
rtc::CritScope cs(¶ms_crit_);
|
|
|
|
|
encoder_has_internal_source = encoder_has_internal_source_;
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-11 11:11:10 +01:00
|
|
|
{
|
2016-04-13 14:59:48 -07:00
|
|
|
rtc::CritScope cs(&encoder_crit_);
|
|
|
|
|
if (_encoder) {
|
2019-01-11 11:11:10 +01:00
|
|
|
// |target_bitrate == 0 | means that the network is down or the send pacer
|
|
|
|
|
// is full. We currently only report this if the encoder has an internal
|
|
|
|
|
// source. If the encoder does not have an internal source, higher levels
|
|
|
|
|
// are expected to not call AddVideoFrame. We do this since its unclear
|
|
|
|
|
// how current encoder implementations behave when given a zero target
|
|
|
|
|
// bitrate.
|
|
|
|
|
// TODO(perkj): Make sure all known encoder implementations handle zero
|
|
|
|
|
// target bitrate and remove this check.
|
|
|
|
|
if (!encoder_has_internal_source &&
|
|
|
|
|
bitrate_allocation.get_sum_bps() == 0) {
|
|
|
|
|
return VCM_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (framerate_fps == 0) {
|
|
|
|
|
// No frame rate estimate available, use default.
|
|
|
|
|
framerate_fps = current_codec_.maxFramerate;
|
|
|
|
|
}
|
|
|
|
|
if (_encoder != nullptr)
|
|
|
|
|
_encoder->SetEncoderParameters(bitrate_allocation, framerate_fps);
|
2016-04-13 14:59:48 -07:00
|
|
|
}
|
|
|
|
|
}
|
2015-06-11 14:20:07 +02:00
|
|
|
|
|
|
|
|
return VCM_OK;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-14 00:25:28 +00:00
|
|
|
// Add one raw video frame to the encoder, blocking.
|
2018-11-15 17:52:43 +01:00
|
|
|
int32_t VideoSender::AddVideoFrame(
|
|
|
|
|
const VideoFrame& videoFrame,
|
|
|
|
|
const CodecSpecificInfo* codecSpecificInfo,
|
|
|
|
|
absl::optional<VideoEncoder::EncoderInfo> encoder_info) {
|
2016-01-18 20:23:40 +01:00
|
|
|
std::vector<FrameType> next_frame_types;
|
2016-06-17 07:27:16 -07:00
|
|
|
bool encoder_has_internal_source = false;
|
2015-09-15 14:43:47 +02:00
|
|
|
{
|
2016-01-18 20:23:40 +01:00
|
|
|
rtc::CritScope lock(¶ms_crit_);
|
|
|
|
|
next_frame_types = next_frame_types_;
|
2016-06-17 07:27:16 -07:00
|
|
|
encoder_has_internal_source = encoder_has_internal_source_;
|
2015-09-15 14:43:47 +02:00
|
|
|
}
|
2016-01-18 20:23:40 +01:00
|
|
|
rtc::CritScope lock(&encoder_crit_);
|
2015-10-29 16:30:23 +01:00
|
|
|
if (_encoder == nullptr)
|
2013-09-14 00:25:28 +00:00
|
|
|
return VCM_UNINITIALIZED;
|
2015-03-05 13:57:37 +00:00
|
|
|
// TODO(pbos): Make sure setting send codec is synchronized with video
|
|
|
|
|
// processing so frame size always matches.
|
|
|
|
|
if (!_codecDataBase.MatchesCurrentResolution(videoFrame.width(),
|
|
|
|
|
videoFrame.height())) {
|
2017-11-09 11:09:25 +01:00
|
|
|
RTC_LOG(LS_ERROR)
|
|
|
|
|
<< "Incoming frame doesn't match set resolution. Dropping.";
|
2015-03-05 13:57:37 +00:00
|
|
|
return VCM_PARAMETER_ERROR;
|
|
|
|
|
}
|
2015-06-05 11:08:03 +02:00
|
|
|
VideoFrame converted_frame = videoFrame;
|
Revert "Revert "Update video_coding/codecs to new VideoFrameBuffer interface""
This reverts commit 88f94fa36aa61f7904d30251205c544ada2c4301.
Chromium code has been updated.
Original change's description:
> Revert "Update video_coding/codecs to new VideoFrameBuffer interface"
>
> This reverts commit 20ebf4ede803cd4f628ef9378700f60b72f2eab0.
>
> Reason for revert:
>
> Suspect of breaking FYI bots.
> See https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win7%20Tester/builds/9036 and others.
>
> Sample logs:
> Backtrace:
> [5024:1036:0607/173649.857:FATAL:webrtc_video_frame_adapter.cc(98)] Check failed: false.
> Backtrace:
> base::debug::StackTrace::StackTrace [0x02D04A37+55]
> base::debug::StackTrace::StackTrace [0x02CCBB8A+10]
> content::WebRtcVideoFrameAdapter::NativeToI420Buffer [0x0508AD71+305]
> webrtc::VideoFrameBuffer::ToI420 [0x0230BF67+39]
> webrtc::H264EncoderImpl::Encode [0x057E8D0B+267]
> webrtc::VCMGenericEncoder::Encode [0x057E0E34+333]
> webrtc::vcm::VideoSender::AddVideoFrame [0x057DED9B+796]
> webrtc::ViEEncoder::EncodeVideoFrame [0x057C00F6+884]
> webrtc::ViEEncoder::EncodeTask::Run [0x057C12D7+215]
> rtc::TaskQueue::PostTask [0x03EE5CFB+194]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDCAA5+31]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDEE86+22]
> base::debug::TaskAnnotator::RunTask [0x02D08289+409]
> base::MessageLoop::RunTask [0x02C8CEC1+1233]
> base::MessageLoop::DoWork [0x02C8C1AD+765]
> base::MessagePumpDefault::Run [0x02D0A20B+219]
> base::MessageLoop::Run [0x02C8C9DB+107]
> base::RunLoop::Run [0x02C89583+147]
> base::Thread::Run [0x02CBEFCD+173]
> base::Thread::ThreadMain [0x02CBFADE+622]
> base::PlatformThread::Sleep [0x02C9E1A2+290]
> BaseThreadInitThunk [0x75C3338A+18]
> RtlInitializeExceptionChain [0x773A9902+99]
> RtlInitializeExceptionChain [0x773A98D5+54]
>
> Original change's description:
> > Update video_coding/codecs to new VideoFrameBuffer interface
> >
> > This is a follow-up cleanup for CL
> > https://codereview.webrtc.org/2847383002/.
> >
> > Bug: webrtc:7632
> > Change-Id: I47861d779968f2fee94db9c017102a8e87e67fb7
> > Reviewed-on: https://chromium-review.googlesource.com/524163
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#18477}
>
> TBR=magjed@webrtc.org,nisse@webrtc.org,brandtr@webrtc.org
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:7632
>
> Change-Id: I3b73fc7d16ff19ceba196e964dcb36a36510912c
> Reviewed-on: https://chromium-review.googlesource.com/527793
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#18489}
TBR=tterriberry@mozilla.com,mflodman@webrtc.org,magjed@webrtc.org,stefan@webrtc.org,guidou@chromium.org,nisse@webrtc.org,brandtr@webrtc.org,webrtc-reviews@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
No-Presubmit: true
Bug: webrtc:7632
Change-Id: I0962a704e8a9939d4364ce9069c863c9951654c9
Reviewed-on: https://chromium-review.googlesource.com/530684
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18527}
2017-06-10 17:03:37 +00:00
|
|
|
const VideoFrameBuffer::Type buffer_type =
|
|
|
|
|
converted_frame.video_frame_buffer()->type();
|
|
|
|
|
const bool is_buffer_type_supported =
|
|
|
|
|
buffer_type == VideoFrameBuffer::Type::kI420 ||
|
|
|
|
|
(buffer_type == VideoFrameBuffer::Type::kNative &&
|
2018-11-15 17:52:43 +01:00
|
|
|
encoder_info->supports_native_handle);
|
Revert "Revert "Update video_coding/codecs to new VideoFrameBuffer interface""
This reverts commit 88f94fa36aa61f7904d30251205c544ada2c4301.
Chromium code has been updated.
Original change's description:
> Revert "Update video_coding/codecs to new VideoFrameBuffer interface"
>
> This reverts commit 20ebf4ede803cd4f628ef9378700f60b72f2eab0.
>
> Reason for revert:
>
> Suspect of breaking FYI bots.
> See https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win7%20Tester/builds/9036 and others.
>
> Sample logs:
> Backtrace:
> [5024:1036:0607/173649.857:FATAL:webrtc_video_frame_adapter.cc(98)] Check failed: false.
> Backtrace:
> base::debug::StackTrace::StackTrace [0x02D04A37+55]
> base::debug::StackTrace::StackTrace [0x02CCBB8A+10]
> content::WebRtcVideoFrameAdapter::NativeToI420Buffer [0x0508AD71+305]
> webrtc::VideoFrameBuffer::ToI420 [0x0230BF67+39]
> webrtc::H264EncoderImpl::Encode [0x057E8D0B+267]
> webrtc::VCMGenericEncoder::Encode [0x057E0E34+333]
> webrtc::vcm::VideoSender::AddVideoFrame [0x057DED9B+796]
> webrtc::ViEEncoder::EncodeVideoFrame [0x057C00F6+884]
> webrtc::ViEEncoder::EncodeTask::Run [0x057C12D7+215]
> rtc::TaskQueue::PostTask [0x03EE5CFB+194]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDCAA5+31]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDEE86+22]
> base::debug::TaskAnnotator::RunTask [0x02D08289+409]
> base::MessageLoop::RunTask [0x02C8CEC1+1233]
> base::MessageLoop::DoWork [0x02C8C1AD+765]
> base::MessagePumpDefault::Run [0x02D0A20B+219]
> base::MessageLoop::Run [0x02C8C9DB+107]
> base::RunLoop::Run [0x02C89583+147]
> base::Thread::Run [0x02CBEFCD+173]
> base::Thread::ThreadMain [0x02CBFADE+622]
> base::PlatformThread::Sleep [0x02C9E1A2+290]
> BaseThreadInitThunk [0x75C3338A+18]
> RtlInitializeExceptionChain [0x773A9902+99]
> RtlInitializeExceptionChain [0x773A98D5+54]
>
> Original change's description:
> > Update video_coding/codecs to new VideoFrameBuffer interface
> >
> > This is a follow-up cleanup for CL
> > https://codereview.webrtc.org/2847383002/.
> >
> > Bug: webrtc:7632
> > Change-Id: I47861d779968f2fee94db9c017102a8e87e67fb7
> > Reviewed-on: https://chromium-review.googlesource.com/524163
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#18477}
>
> TBR=magjed@webrtc.org,nisse@webrtc.org,brandtr@webrtc.org
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:7632
>
> Change-Id: I3b73fc7d16ff19ceba196e964dcb36a36510912c
> Reviewed-on: https://chromium-review.googlesource.com/527793
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#18489}
TBR=tterriberry@mozilla.com,mflodman@webrtc.org,magjed@webrtc.org,stefan@webrtc.org,guidou@chromium.org,nisse@webrtc.org,brandtr@webrtc.org,webrtc-reviews@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
No-Presubmit: true
Bug: webrtc:7632
Change-Id: I0962a704e8a9939d4364ce9069c863c9951654c9
Reviewed-on: https://chromium-review.googlesource.com/530684
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18527}
2017-06-10 17:03:37 +00:00
|
|
|
if (!is_buffer_type_supported) {
|
2015-06-05 11:08:03 +02:00
|
|
|
// This module only supports software encoding.
|
|
|
|
|
// TODO(pbos): Offload conversion from the encoder thread.
|
Revert "Revert "Update video_coding/codecs to new VideoFrameBuffer interface""
This reverts commit 88f94fa36aa61f7904d30251205c544ada2c4301.
Chromium code has been updated.
Original change's description:
> Revert "Update video_coding/codecs to new VideoFrameBuffer interface"
>
> This reverts commit 20ebf4ede803cd4f628ef9378700f60b72f2eab0.
>
> Reason for revert:
>
> Suspect of breaking FYI bots.
> See https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win7%20Tester/builds/9036 and others.
>
> Sample logs:
> Backtrace:
> [5024:1036:0607/173649.857:FATAL:webrtc_video_frame_adapter.cc(98)] Check failed: false.
> Backtrace:
> base::debug::StackTrace::StackTrace [0x02D04A37+55]
> base::debug::StackTrace::StackTrace [0x02CCBB8A+10]
> content::WebRtcVideoFrameAdapter::NativeToI420Buffer [0x0508AD71+305]
> webrtc::VideoFrameBuffer::ToI420 [0x0230BF67+39]
> webrtc::H264EncoderImpl::Encode [0x057E8D0B+267]
> webrtc::VCMGenericEncoder::Encode [0x057E0E34+333]
> webrtc::vcm::VideoSender::AddVideoFrame [0x057DED9B+796]
> webrtc::ViEEncoder::EncodeVideoFrame [0x057C00F6+884]
> webrtc::ViEEncoder::EncodeTask::Run [0x057C12D7+215]
> rtc::TaskQueue::PostTask [0x03EE5CFB+194]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDCAA5+31]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDEE86+22]
> base::debug::TaskAnnotator::RunTask [0x02D08289+409]
> base::MessageLoop::RunTask [0x02C8CEC1+1233]
> base::MessageLoop::DoWork [0x02C8C1AD+765]
> base::MessagePumpDefault::Run [0x02D0A20B+219]
> base::MessageLoop::Run [0x02C8C9DB+107]
> base::RunLoop::Run [0x02C89583+147]
> base::Thread::Run [0x02CBEFCD+173]
> base::Thread::ThreadMain [0x02CBFADE+622]
> base::PlatformThread::Sleep [0x02C9E1A2+290]
> BaseThreadInitThunk [0x75C3338A+18]
> RtlInitializeExceptionChain [0x773A9902+99]
> RtlInitializeExceptionChain [0x773A98D5+54]
>
> Original change's description:
> > Update video_coding/codecs to new VideoFrameBuffer interface
> >
> > This is a follow-up cleanup for CL
> > https://codereview.webrtc.org/2847383002/.
> >
> > Bug: webrtc:7632
> > Change-Id: I47861d779968f2fee94db9c017102a8e87e67fb7
> > Reviewed-on: https://chromium-review.googlesource.com/524163
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#18477}
>
> TBR=magjed@webrtc.org,nisse@webrtc.org,brandtr@webrtc.org
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:7632
>
> Change-Id: I3b73fc7d16ff19ceba196e964dcb36a36510912c
> Reviewed-on: https://chromium-review.googlesource.com/527793
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#18489}
TBR=tterriberry@mozilla.com,mflodman@webrtc.org,magjed@webrtc.org,stefan@webrtc.org,guidou@chromium.org,nisse@webrtc.org,brandtr@webrtc.org,webrtc-reviews@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
No-Presubmit: true
Bug: webrtc:7632
Change-Id: I0962a704e8a9939d4364ce9069c863c9951654c9
Reviewed-on: https://chromium-review.googlesource.com/530684
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18527}
2017-06-10 17:03:37 +00:00
|
|
|
rtc::scoped_refptr<I420BufferInterface> converted_buffer(
|
|
|
|
|
converted_frame.video_frame_buffer()->ToI420());
|
2016-06-17 05:03:04 -07:00
|
|
|
|
|
|
|
|
if (!converted_buffer) {
|
2017-11-09 11:09:25 +01:00
|
|
|
RTC_LOG(LS_ERROR) << "Frame conversion failed, dropping frame.";
|
2016-06-17 05:03:04 -07:00
|
|
|
return VCM_PARAMETER_ERROR;
|
|
|
|
|
}
|
2019-01-03 23:49:37 +01:00
|
|
|
converted_frame = VideoFrame::Builder()
|
|
|
|
|
.set_video_frame_buffer(converted_buffer)
|
|
|
|
|
.set_timestamp_rtp(converted_frame.timestamp())
|
|
|
|
|
.set_timestamp_ms(converted_frame.render_time_ms())
|
|
|
|
|
.set_rotation(converted_frame.rotation())
|
|
|
|
|
.set_id(converted_frame.id())
|
|
|
|
|
.build();
|
2015-06-05 11:08:03 +02:00
|
|
|
}
|
2014-04-11 14:08:35 +00:00
|
|
|
int32_t ret =
|
2016-01-18 20:23:40 +01:00
|
|
|
_encoder->Encode(converted_frame, codecSpecificInfo, next_frame_types);
|
2014-04-11 14:08:35 +00:00
|
|
|
if (ret < 0) {
|
2017-11-09 11:09:25 +01:00
|
|
|
RTC_LOG(LS_ERROR) << "Failed to encode frame. Error code: " << ret;
|
2014-04-11 14:08:35 +00:00
|
|
|
return ret;
|
|
|
|
|
}
|
2016-05-02 11:35:24 -07:00
|
|
|
|
2016-01-18 20:23:40 +01:00
|
|
|
{
|
|
|
|
|
rtc::CritScope lock(¶ms_crit_);
|
2016-05-02 11:35:24 -07:00
|
|
|
// Change all keyframe requests to encode delta frames the next time.
|
2016-01-18 20:23:40 +01:00
|
|
|
for (size_t i = 0; i < next_frame_types_.size(); ++i) {
|
|
|
|
|
// Check for equality (same requested as before encoding) to not
|
|
|
|
|
// accidentally drop a keyframe request while encoding.
|
|
|
|
|
if (next_frame_types[i] == next_frame_types_[i])
|
|
|
|
|
next_frame_types_[i] = kVideoFrameDelta;
|
|
|
|
|
}
|
2013-09-14 00:25:28 +00:00
|
|
|
}
|
|
|
|
|
return VCM_OK;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-04 11:26:51 -07:00
|
|
|
int32_t VideoSender::IntraFrameRequest(size_t stream_index) {
|
2016-01-18 20:23:40 +01:00
|
|
|
{
|
|
|
|
|
rtc::CritScope lock(¶ms_crit_);
|
2016-05-04 11:26:51 -07:00
|
|
|
if (stream_index >= next_frame_types_.size()) {
|
2016-01-18 20:23:40 +01:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
next_frame_types_[stream_index] = kVideoFrameKey;
|
|
|
|
|
if (!encoder_has_internal_source_)
|
|
|
|
|
return VCM_OK;
|
2013-09-14 00:25:28 +00:00
|
|
|
}
|
2016-01-18 20:23:40 +01:00
|
|
|
// TODO(pbos): Remove when InternalSource() is gone. Both locks have to be
|
|
|
|
|
// held here for internal consistency, since _encoder could be removed while
|
|
|
|
|
// not holding encoder_crit_. Checks have to be performed again since
|
|
|
|
|
// params_crit_ was dropped to not cause lock-order inversions with
|
|
|
|
|
// encoder_crit_.
|
|
|
|
|
rtc::CritScope lock(&encoder_crit_);
|
|
|
|
|
rtc::CritScope params_lock(¶ms_crit_);
|
2016-05-04 11:26:51 -07:00
|
|
|
if (stream_index >= next_frame_types_.size())
|
2016-01-18 20:23:40 +01:00
|
|
|
return -1;
|
2015-04-14 21:28:08 +02:00
|
|
|
if (_encoder != nullptr && _encoder->InternalSource()) {
|
2013-09-14 00:25:28 +00:00
|
|
|
// Try to request the frame if we have an external encoder with
|
|
|
|
|
// internal source since AddVideoFrame never will be called.
|
2016-01-18 20:23:40 +01:00
|
|
|
if (_encoder->RequestFrame(next_frame_types_) == WEBRTC_VIDEO_CODEC_OK) {
|
|
|
|
|
// Try to remove just-performed keyframe request, if stream still exists.
|
|
|
|
|
next_frame_types_[stream_index] = kVideoFrameDelta;
|
2013-09-14 00:25:28 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return VCM_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace vcm
|
|
|
|
|
} // namespace webrtc
|