This reverts commit 0eba415fb40cc4e3958546a8ee53c698940df0a1. Reason for revert: previously unknown lock recursion occurring downstream. Original change's description: > Migrate video/ except video/end_to_end_tests and video/adaptation to webrtc::Mutex. > > Also migrates test/ partly. > > Bug: webrtc:11567 > Change-Id: I4203919615c087e5faca3b2fa1d54cba9f171e07 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178813 > Reviewed-by: Erik Språng <sprang@webrtc.org> > Commit-Queue: Markus Handell <handellm@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31653} TBR=sprang@webrtc.org,handellm@webrtc.org Change-Id: I13f337e0de5b8f0eb19deb57cb5623444460ec4d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:11567 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178842 Reviewed-by: Markus Handell <handellm@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31656}
64 lines
2.0 KiB
C++
64 lines
2.0 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 VIDEO_VIDEO_STREAM_DECODER_H_
|
|
#define VIDEO_VIDEO_STREAM_DECODER_H_
|
|
|
|
#include <list>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/video/video_sink_interface.h"
|
|
#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
|
|
#include "modules/video_coding/include/video_coding_defines.h"
|
|
#include "rtc_base/critical_section.h"
|
|
#include "rtc_base/platform_thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class ReceiveStatisticsProxy;
|
|
class VideoReceiver2;
|
|
|
|
class VideoStreamDecoder : public VCMReceiveCallback {
|
|
public:
|
|
VideoStreamDecoder(
|
|
VideoReceiver2* video_receiver,
|
|
ReceiveStatisticsProxy* receive_statistics_proxy,
|
|
rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream);
|
|
~VideoStreamDecoder() override;
|
|
|
|
// Implements VCMReceiveCallback.
|
|
int32_t FrameToRender(VideoFrame& video_frame,
|
|
absl::optional<uint8_t> qp,
|
|
int32_t decode_time_ms,
|
|
VideoContentType content_type) override;
|
|
void OnDroppedFrames(uint32_t frames_dropped) override;
|
|
void OnIncomingPayloadType(int payload_type) override;
|
|
void OnDecoderImplementationName(const char* implementation_name) override;
|
|
|
|
void RegisterReceiveStatisticsProxy(
|
|
ReceiveStatisticsProxy* receive_statistics_proxy);
|
|
|
|
private:
|
|
// Used for all registered callbacks except rendering.
|
|
rtc::CriticalSection crit_;
|
|
|
|
VideoReceiver2* const video_receiver_;
|
|
|
|
ReceiveStatisticsProxy* const receive_stats_callback_;
|
|
rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // VIDEO_VIDEO_STREAM_DECODER_H_
|