04926b8264
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:f20dd0014dTBR=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}
107 lines
3.7 KiB
C++
107 lines
3.7 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
|
|
#define WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
|
|
|
|
#include <list>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/platform_thread.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/media/base/videosinkinterface.h"
|
|
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
|
|
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class CallStatsObserver;
|
|
class ChannelStatsObserver;
|
|
class EncodedImageCallback;
|
|
class I420FrameCallback;
|
|
class ReceiveStatisticsProxy;
|
|
class VideoRenderCallback;
|
|
|
|
namespace vcm {
|
|
class VideoReceiver;
|
|
} // namespace vcm
|
|
|
|
enum StreamType {
|
|
kViEStreamTypeNormal = 0, // Normal media stream
|
|
kViEStreamTypeRtx = 1 // Retransmission media stream
|
|
};
|
|
|
|
class VideoStreamDecoder : public VCMReceiveCallback,
|
|
public VCMReceiveStatisticsCallback,
|
|
public VCMDecoderTimingCallback,
|
|
public CallStatsObserver {
|
|
public:
|
|
friend class ChannelStatsObserver;
|
|
|
|
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);
|
|
~VideoStreamDecoder();
|
|
|
|
// Implements VCMReceiveCallback.
|
|
int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT
|
|
int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
|
|
void OnIncomingPayloadType(int payload_type) override;
|
|
void OnDecoderImplementationName(const char* implementation_name) override;
|
|
|
|
// Implements VCMReceiveStatisticsCallback.
|
|
void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override;
|
|
void OnDiscardedPacketsUpdated(int discarded_packets) override;
|
|
void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
|
|
|
|
// Implements VCMDecoderTimingCallback.
|
|
void 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) override;
|
|
|
|
void RegisterReceiveStatisticsProxy(
|
|
ReceiveStatisticsProxy* receive_statistics_proxy);
|
|
|
|
// Implements StatsObserver.
|
|
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
|
|
|
|
private:
|
|
// Used for all registered callbacks except rendering.
|
|
rtc::CriticalSection crit_;
|
|
|
|
vcm::VideoReceiver* const video_receiver_;
|
|
|
|
ReceiveStatisticsProxy* const receive_stats_callback_;
|
|
rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_;
|
|
|
|
// TODO(tommi): This callback is basically the same thing as the one above.
|
|
// We shouldn't need to support both.
|
|
I420FrameCallback* const pre_render_callback_;
|
|
|
|
int64_t last_rtt_ms_ GUARDED_BY(crit_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
|