Reason for revert: Breaks downstream bots Original issue's description: > Reland of Make the new jitter buffer the default jitter buffer. (patchset #1 id:1 of https://codereview.webrtc.org/2638423003/ ) > > Reason for revert: > Bugfixes related to the new jitter buffer has landed. > > Original issue's description: > > Revert of Make the new jitter buffer the default jitter buffer. (patchset #2 id:230001 of https://codereview.webrtc.org/2642753002/ ) > > > > Reason for revert: > > Breaks tests downstream. > > > > Original issue's description: > > > Reland of Make the new jitter buffer the default jitter buffer. (patchset #1 id:1 of https://codereview.chromium.org/2632123005/ ) > > > > > > Reason for revert: > > > Fix in this CL: https://codereview.chromium.org/2640793003/ > > > > > > Original issue's description: > > > > Revert of Make the new jitter buffer the default jitter buffer. (patchset #7 id:120001 of https://codereview.chromium.org/2627463004/ ) > > > > > > > > Reason for revert: > > > > Breaks android bots. > > > > > > > > Original issue's description: > > > > > Make the new jitter buffer the default jitter buffer. > > > > > > > > > > This CL contains only the changes necessary to make the switch to the new jitter > > > > > buffer, clean up will be done in follow up CLs. > > > > > > > > > > In this CL: > > > > > - Removed the WebRTC-NewVideoJitterBuffer experiment and made the > > > > > new video jitter buffer the default one. > > > > > - Moved WebRTC.Video.KeyFramesReceivedInPermille and > > > > > WebRTC.Video.JitterBufferDelayInMs to the ReceiveStatisticsProxy. > > > > > > > > > > BUG=webrtc:5514 > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2627463004 > > > > > Cr-Commit-Position: refs/heads/master@{#16114} > > > > > Committed:0f0763d86d> > > > > > > > TBR=stefan@webrtc.org,terelius@webrtc.org > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > NOPRESUBMIT=true > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=webrtc:5514 > > > > > > > > Review-Url: https://codereview.webrtc.org/2632123005 > > > > Cr-Commit-Position: refs/heads/master@{#16117} > > > > Committed:c08c191f7d> > > > > > TBR=stefan@webrtc.org,terelius@webrtc.org > > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > > BUG=webrtc:5514 > > > > > > Review-Url: https://codereview.webrtc.org/2642753002 > > > Cr-Commit-Position: refs/heads/master@{#16149} > > > Committed:f20dd0014d> > > > TBR=stefan@webrtc.org,terelius@webrtc.org,philipel@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:5514 > > > > Review-Url: https://codereview.webrtc.org/2638423003 > > Cr-Commit-Position: refs/heads/master@{#16159} > > Committed:04926b8264> > TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@google.com > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:5514 > > Review-Url: https://codereview.webrtc.org/2652043005 > Cr-Commit-Position: refs/heads/master@{#16293} > Committed:09d6ef00fcTBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5514 Review-Url: https://codereview.webrtc.org/2656983002 Cr-Commit-Position: refs/heads/master@{#16316}
144 lines
5.4 KiB
C++
144 lines
5.4 KiB
C++
/*
|
|
* Copyright (c) 2012 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/video/video_stream_decoder.h"
|
|
|
|
#include <algorithm>
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/common_video/include/frame_callback.h"
|
|
#include "webrtc/modules/video_coding/video_coding_impl.h"
|
|
#include "webrtc/system_wrappers/include/metrics.h"
|
|
#include "webrtc/video/call_stats.h"
|
|
#include "webrtc/video/payload_router.h"
|
|
#include "webrtc/video/receive_statistics_proxy.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VideoStreamDecoder::VideoStreamDecoder(
|
|
vcm::VideoReceiver* video_receiver,
|
|
VCMFrameTypeCallback* vcm_frame_type_callback,
|
|
VCMPacketRequestCallback* vcm_packet_request_callback,
|
|
bool enable_nack,
|
|
bool enable_fec,
|
|
ReceiveStatisticsProxy* receive_statistics_proxy,
|
|
rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream,
|
|
I420FrameCallback* pre_render_callback)
|
|
: video_receiver_(video_receiver),
|
|
receive_stats_callback_(receive_statistics_proxy),
|
|
incoming_video_stream_(incoming_video_stream),
|
|
pre_render_callback_(pre_render_callback),
|
|
last_rtt_ms_(0) {
|
|
RTC_DCHECK(video_receiver_);
|
|
|
|
static const int kMaxPacketAgeToNack = 450;
|
|
static const int kMaxNackListSize = 250;
|
|
video_receiver_->SetNackSettings(kMaxNackListSize,
|
|
kMaxPacketAgeToNack, 0);
|
|
video_receiver_->RegisterReceiveCallback(this);
|
|
video_receiver_->RegisterFrameTypeCallback(vcm_frame_type_callback);
|
|
video_receiver_->RegisterReceiveStatisticsCallback(this);
|
|
video_receiver_->RegisterDecoderTimingCallback(this);
|
|
|
|
VCMVideoProtection video_protection =
|
|
enable_nack ? (enable_fec ? kProtectionNackFEC : kProtectionNack)
|
|
: kProtectionNone;
|
|
|
|
VCMDecodeErrorMode decode_error_mode = enable_nack ? kNoErrors : kWithErrors;
|
|
video_receiver_->SetVideoProtection(video_protection, true);
|
|
video_receiver_->SetDecodeErrorMode(decode_error_mode);
|
|
VCMPacketRequestCallback* packet_request_callback =
|
|
enable_nack ? vcm_packet_request_callback : nullptr;
|
|
video_receiver_->RegisterPacketRequestCallback(packet_request_callback);
|
|
}
|
|
|
|
VideoStreamDecoder::~VideoStreamDecoder() {
|
|
// Unset all the callback pointers that we set in the ctor.
|
|
video_receiver_->RegisterPacketRequestCallback(nullptr);
|
|
video_receiver_->RegisterDecoderTimingCallback(nullptr);
|
|
video_receiver_->RegisterReceiveStatisticsCallback(nullptr);
|
|
video_receiver_->RegisterFrameTypeCallback(nullptr);
|
|
video_receiver_->RegisterReceiveCallback(nullptr);
|
|
}
|
|
|
|
// Do not acquire the lock of |video_receiver_| in this function. Decode
|
|
// callback won't necessarily be called from the decoding thread. The decoding
|
|
// thread may have held the lock when calling VideoDecoder::Decode, Reset, or
|
|
// Release. Acquiring the same lock in the path of decode callback can deadlock.
|
|
int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT
|
|
if (pre_render_callback_) {
|
|
// Post processing is not supported if the frame is backed by a texture.
|
|
if (!video_frame.video_frame_buffer()->native_handle()) {
|
|
pre_render_callback_->FrameCallback(&video_frame);
|
|
}
|
|
}
|
|
|
|
incoming_video_stream_->OnFrame(video_frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame(
|
|
const uint64_t picture_id) {
|
|
RTC_NOTREACHED();
|
|
return 0;
|
|
}
|
|
|
|
void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) {
|
|
receive_stats_callback_->OnIncomingPayloadType(payload_type);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnDecoderImplementationName(
|
|
const char* implementation_name) {
|
|
receive_stats_callback_->OnDecoderImplementationName(implementation_name);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnReceiveRatesUpdated(uint32_t bit_rate,
|
|
uint32_t frame_rate) {
|
|
receive_stats_callback_->OnIncomingRate(frame_rate, bit_rate);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnDiscardedPacketsUpdated(int discarded_packets) {
|
|
receive_stats_callback_->OnDiscardedPacketsUpdated(discarded_packets);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) {
|
|
receive_stats_callback_->OnFrameCountsUpdated(frame_counts);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnDecoderTiming(int decode_ms,
|
|
int max_decode_ms,
|
|
int current_delay_ms,
|
|
int target_delay_ms,
|
|
int jitter_buffer_ms,
|
|
int min_playout_delay_ms,
|
|
int render_delay_ms) {
|
|
int last_rtt = -1;
|
|
{
|
|
rtc::CritScope lock(&crit_);
|
|
last_rtt = last_rtt_ms_;
|
|
}
|
|
|
|
receive_stats_callback_->OnDecoderTiming(
|
|
decode_ms, max_decode_ms, current_delay_ms, target_delay_ms,
|
|
jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
|
|
video_receiver_->SetReceiveChannelParameters(max_rtt_ms);
|
|
|
|
rtc::CritScope lock(&crit_);
|
|
last_rtt_ms_ = avg_rtt_ms;
|
|
}
|
|
} // namespace webrtc
|