cc452e1179
Reason for revert: Fix the problem. Original issue's description: > Revert of Add QP sum stats for received streams. (patchset #10 id:180001 of https://codereview.webrtc.org/2649133005/ ) > > Reason for revert: > Breaks downstream build. > > Original issue's description: > > Add QP sum stats for received streams. > > > > This is not implemented yet in any of the decoders. > > > > BUG=webrtc:6541 > > > > Review-Url: https://codereview.webrtc.org/2649133005 > > Cr-Commit-Position: refs/heads/master@{#16475} > > Committed:ff0e72fd16> > TBR=hta@webrtc.org,hbos@webrtc.org,sprang@webrtc.org,magjed@webrtc.org,stefan@webrtc.org,sakal@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6541 > > Review-Url: https://codereview.webrtc.org/2680893002 . > Cr-Commit-Position: refs/heads/master@{#16480} > Committed:69fb2cca4dTBR=hta@webrtc.org,hbos@webrtc.org,sprang@webrtc.org,magjed@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org BUG=webrtc:6541 Review-Url: https://codereview.webrtc.org/2681663005 Cr-Commit-Position: refs/heads/master@{#16511}
109 lines
3.3 KiB
C++
109 lines
3.3 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_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
|
|
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
|
|
#include "webrtc/modules/video_coding/encoded_frame.h"
|
|
#include "webrtc/modules/video_coding/timestamp_map.h"
|
|
#include "webrtc/modules/video_coding/timing.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VCMReceiveCallback;
|
|
|
|
enum { kDecoderFrameMemoryLength = 10 };
|
|
|
|
struct VCMFrameInformation {
|
|
int64_t renderTimeMs;
|
|
int64_t decodeStartTimeMs;
|
|
void* userData;
|
|
VideoRotation rotation;
|
|
};
|
|
|
|
class VCMDecodedFrameCallback : public DecodedImageCallback {
|
|
public:
|
|
VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock);
|
|
virtual ~VCMDecodedFrameCallback();
|
|
void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback);
|
|
VCMReceiveCallback* UserReceiveCallback();
|
|
|
|
int32_t Decoded(VideoFrame& decodedImage) override;
|
|
int32_t Decoded(VideoFrame& decodedImage, int64_t decode_time_ms) override;
|
|
void Decoded(VideoFrame& decodedImage,
|
|
rtc::Optional<int32_t> decode_time_ms,
|
|
rtc::Optional<uint8_t> qp) override;
|
|
int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) override;
|
|
int32_t ReceivedDecodedFrame(const uint64_t pictureId) override;
|
|
|
|
uint64_t LastReceivedPictureID() const;
|
|
void OnDecoderImplementationName(const char* implementation_name);
|
|
|
|
void Map(uint32_t timestamp, VCMFrameInformation* frameInfo);
|
|
int32_t Pop(uint32_t timestamp);
|
|
|
|
private:
|
|
// Protect |_receiveCallback| and |_timestampMap|.
|
|
CriticalSectionWrapper* _critSect;
|
|
Clock* _clock;
|
|
VCMReceiveCallback* _receiveCallback GUARDED_BY(_critSect);
|
|
VCMTiming* _timing;
|
|
VCMTimestampMap _timestampMap GUARDED_BY(_critSect);
|
|
uint64_t _lastReceivedPictureID;
|
|
};
|
|
|
|
class VCMGenericDecoder {
|
|
friend class VCMCodecDataBase;
|
|
|
|
public:
|
|
explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false);
|
|
~VCMGenericDecoder();
|
|
|
|
/**
|
|
* Initialize the decoder with the information from the VideoCodec
|
|
*/
|
|
int32_t InitDecode(const VideoCodec* settings, int32_t numberOfCores);
|
|
|
|
/**
|
|
* Decode to a raw I420 frame,
|
|
*
|
|
* inputVideoBuffer reference to encoded video frame
|
|
*/
|
|
int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs);
|
|
|
|
/**
|
|
* Free the decoder memory
|
|
*/
|
|
int32_t Release();
|
|
|
|
/**
|
|
* Set decode callback. Deregistering while decoding is illegal.
|
|
*/
|
|
int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
|
|
|
|
bool External() const;
|
|
bool PrefersLateDecoding() const;
|
|
|
|
private:
|
|
VCMDecodedFrameCallback* _callback;
|
|
VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength];
|
|
uint32_t _nextFrameInfoIdx;
|
|
VideoDecoder* const _decoder;
|
|
VideoCodecType _codecType;
|
|
bool _isExternal;
|
|
bool _keyFrameDecoded;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
|