webrtc_m130/modules/video_coding/generic_decoder.h

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

114 lines
3.6 KiB
C
Raw Normal View History

/*
* 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 MODULES_VIDEO_CODING_GENERIC_DECODER_H_
#define MODULES_VIDEO_CODING_GENERIC_DECODER_H_
#include <memory>
#include "modules/include/module_common_types.h"
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/timestamp_map.h"
#include "modules/video_coding/timing.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/thread_checker.h"
namespace webrtc {
class VCMReceiveCallback;
enum { kDecoderFrameMemoryLength = 10 };
struct VCMFrameInformation {
int64_t renderTimeMs;
int64_t decodeStartTimeMs;
void* userData;
VideoRotation rotation;
VideoContentType content_type;
EncodedImage::Timing timing;
};
class VCMDecodedFrameCallback : public DecodedImageCallback {
public:
VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock);
~VCMDecodedFrameCallback() override;
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,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) override;
void OnDecoderImplementationName(const char* implementation_name);
void Map(uint32_t timestamp, VCMFrameInformation* frameInfo);
int32_t Pop(uint32_t timestamp);
private:
rtc::ThreadChecker construction_thread_;
Revert "VCMGenericDecoder threading updates for all but Android." This reverts commit a4e71b9e7e59be21b98d63cf8cb676096d9c74b0. Reason for revert: Breaking internal project Original change's description: > VCMGenericDecoder threading updates for all but Android. > > * All methods now have thread checks. > * Variable access associated with thread checkers. > * Remove need for |rtc::CriticalSection lock_| > > Since the android decoder is inherently asynchronous, and > FrameBuffer2's decoder doesn't support posting tasks to it > yet (for async decode completion), we need to tackle android > separately. Once FrameBuffer2 gets changed to use a TaskQueue > or ProcessThread, we can move Android over to delivering decoded > frames on the right thread/queue and delete generic_decoder_android.*. > > Note: This is a subset of code that was previously reviewed here: > - https://codereview.webrtc.org/2764573002/ > > Bug: webrtc:7361, webrtc:8907, chromium:695438 > Change-Id: I118609dfa5c0f0180287d8c2b6d62987b7473c5c > Reviewed-on: https://webrtc-review.googlesource.com/55060 > Commit-Queue: Tommi <tommi@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22119} TBR=sakal@webrtc.org,tommi@webrtc.org Change-Id: I3afe4671f9d06bb4a2b17e4f14c21d79f773e067 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7361, webrtc:8907, chromium:695438 Reviewed-on: https://webrtc-review.googlesource.com/56282 Reviewed-by: Lu Liu <lliuu@webrtc.org> Commit-Queue: Lu Liu <lliuu@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22143}
2018-02-21 19:38:59 +00:00
// Protect |_timestampMap|.
Clock* const _clock;
// This callback must be set before the decoder thread starts running
// and must only be unset when external threads (e.g decoder thread)
// have been stopped. Due to that, the variable should regarded as const
// while there are more than one threads involved, it must be set
// from the same thread, and therfore a lock is not required to access it.
VCMReceiveCallback* _receiveCallback = nullptr;
Revert "VCMGenericDecoder threading updates for all but Android." This reverts commit a4e71b9e7e59be21b98d63cf8cb676096d9c74b0. Reason for revert: Breaking internal project Original change's description: > VCMGenericDecoder threading updates for all but Android. > > * All methods now have thread checks. > * Variable access associated with thread checkers. > * Remove need for |rtc::CriticalSection lock_| > > Since the android decoder is inherently asynchronous, and > FrameBuffer2's decoder doesn't support posting tasks to it > yet (for async decode completion), we need to tackle android > separately. Once FrameBuffer2 gets changed to use a TaskQueue > or ProcessThread, we can move Android over to delivering decoded > frames on the right thread/queue and delete generic_decoder_android.*. > > Note: This is a subset of code that was previously reviewed here: > - https://codereview.webrtc.org/2764573002/ > > Bug: webrtc:7361, webrtc:8907, chromium:695438 > Change-Id: I118609dfa5c0f0180287d8c2b6d62987b7473c5c > Reviewed-on: https://webrtc-review.googlesource.com/55060 > Commit-Queue: Tommi <tommi@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22119} TBR=sakal@webrtc.org,tommi@webrtc.org Change-Id: I3afe4671f9d06bb4a2b17e4f14c21d79f773e067 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7361, webrtc:8907, chromium:695438 Reviewed-on: https://webrtc-review.googlesource.com/56282 Reviewed-by: Lu Liu <lliuu@webrtc.org> Commit-Queue: Lu Liu <lliuu@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22143}
2018-02-21 19:38:59 +00:00
VCMTiming* _timing;
rtc::CriticalSection lock_;
VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_);
int64_t ntp_offset_;
};
class VCMGenericDecoder {
public:
Reland "Update internal SW codecs to return unique_ptrs" This reverts commit 34c8e6bce8af0c31f2b0b31d691a6a931fa3cb7b. Reason for revert: Fix Android compilation Original change's description: > Revert "Update internal SW codecs to return unique_ptrs" > > This reverts commit 4fe6adc06a8524ac25f85260bfe392eb31dae6b4. > > Reason for revert: Breaks android compile. > > Original change's description: > > Update internal SW codecs to return unique_ptrs > > > > TBR=stefan@webrtc.org > > > > Bug: webrtc:7925 > > Change-Id: I84239b071a2608d928f09b06809090eec5eafb14 > > Reviewed-on: https://webrtc-review.googlesource.com/21165 > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20650} > > TBR=magjed@webrtc.org,sprang@webrtc.org,stefan@webrtc.org > > Change-Id: If33c3a0ee0dfce63d105558a2897a472f0633306 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7925 > Reviewed-on: https://webrtc-review.googlesource.com/22540 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20652} TBR=magjed@webrtc.org,sprang@webrtc.org,stefan@webrtc.org Change-Id: Ic8551af4687e927c9b605060155abdd5bc6208b2 Bug: webrtc:7925 Reviewed-on: https://webrtc-review.googlesource.com/22541 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20655}
2017-11-13 14:10:02 +01:00
explicit VCMGenericDecoder(std::unique_ptr<VideoDecoder> decoder);
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);
/**
* Set decode callback. Deregistering while decoding is illegal.
*/
int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
bool PrefersLateDecoding() const;
bool IsSameDecoder(VideoDecoder* decoder) const {
return decoder_.get() == decoder;
}
private:
Revert "VCMGenericDecoder threading updates for all but Android." This reverts commit a4e71b9e7e59be21b98d63cf8cb676096d9c74b0. Reason for revert: Breaking internal project Original change's description: > VCMGenericDecoder threading updates for all but Android. > > * All methods now have thread checks. > * Variable access associated with thread checkers. > * Remove need for |rtc::CriticalSection lock_| > > Since the android decoder is inherently asynchronous, and > FrameBuffer2's decoder doesn't support posting tasks to it > yet (for async decode completion), we need to tackle android > separately. Once FrameBuffer2 gets changed to use a TaskQueue > or ProcessThread, we can move Android over to delivering decoded > frames on the right thread/queue and delete generic_decoder_android.*. > > Note: This is a subset of code that was previously reviewed here: > - https://codereview.webrtc.org/2764573002/ > > Bug: webrtc:7361, webrtc:8907, chromium:695438 > Change-Id: I118609dfa5c0f0180287d8c2b6d62987b7473c5c > Reviewed-on: https://webrtc-review.googlesource.com/55060 > Commit-Queue: Tommi <tommi@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22119} TBR=sakal@webrtc.org,tommi@webrtc.org Change-Id: I3afe4671f9d06bb4a2b17e4f14c21d79f773e067 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7361, webrtc:8907, chromium:695438 Reviewed-on: https://webrtc-review.googlesource.com/56282 Reviewed-by: Lu Liu <lliuu@webrtc.org> Commit-Queue: Lu Liu <lliuu@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22143}
2018-02-21 19:38:59 +00:00
VCMDecodedFrameCallback* _callback;
VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength];
uint32_t _nextFrameInfoIdx;
std::unique_ptr<VideoDecoder> decoder_;
Revert "VCMGenericDecoder threading updates for all but Android." This reverts commit a4e71b9e7e59be21b98d63cf8cb676096d9c74b0. Reason for revert: Breaking internal project Original change's description: > VCMGenericDecoder threading updates for all but Android. > > * All methods now have thread checks. > * Variable access associated with thread checkers. > * Remove need for |rtc::CriticalSection lock_| > > Since the android decoder is inherently asynchronous, and > FrameBuffer2's decoder doesn't support posting tasks to it > yet (for async decode completion), we need to tackle android > separately. Once FrameBuffer2 gets changed to use a TaskQueue > or ProcessThread, we can move Android over to delivering decoded > frames on the right thread/queue and delete generic_decoder_android.*. > > Note: This is a subset of code that was previously reviewed here: > - https://codereview.webrtc.org/2764573002/ > > Bug: webrtc:7361, webrtc:8907, chromium:695438 > Change-Id: I118609dfa5c0f0180287d8c2b6d62987b7473c5c > Reviewed-on: https://webrtc-review.googlesource.com/55060 > Commit-Queue: Tommi <tommi@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22119} TBR=sakal@webrtc.org,tommi@webrtc.org Change-Id: I3afe4671f9d06bb4a2b17e4f14c21d79f773e067 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7361, webrtc:8907, chromium:695438 Reviewed-on: https://webrtc-review.googlesource.com/56282 Reviewed-by: Lu Liu <lliuu@webrtc.org> Commit-Queue: Lu Liu <lliuu@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22143}
2018-02-21 19:38:59 +00:00
VideoCodecType _codecType;
const bool _isExternal;
VideoContentType _last_keyframe_content_type;
};
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_GENERIC_DECODER_H_