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

121 lines
3.8 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 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/encoded_frame.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/timestamp_map.h"
#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/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,
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:
rtc::ThreadChecker construction_thread_;
Revert of Deliver video frames on Android, on the decode thread. (patchset #7 id:120001 of https://codereview.webrtc.org/2764573002/ ) Reason for revert: Breaks Chrome FYI Android bots. See: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus9%29/builds/20418 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus6%29/builds/14724 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus5%29/builds/20133 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/15111 Original issue's description: > Deliver video frames on Android, on the decode thread. > > VideoCoding > * Adding a method for polling for frames on Android only until the capture implementation takes care of this (longer term plan). > > CodecDatabase > * Add an accessor for the current decoder > * Use std::unique_ptr<> for ownership. > * Remove "Release()" and "ReleaseDecoder()". Instead just delete. > * Remove |friend| relationship between CodecDatabase and VCMGenericDecoder. > > VCMDecodedFrameCallback > * DCHECKs for thread correctness. > * Remove |lock_| now that a threading model has been established and verified. > > VCMGenericDecoder > * All methods now have thread checks. > * Variable access associated with thread checkers. > > VideoReceiver > * Added two notification methods, DecoderThreadStarting() and DecoderThreadStopped() > * Allows us to establish a period when the decoder thread is not running and it is safe to modify variables such as callbacks, that are only read when the decoder thread is running. > * Allows us to DCHECK thread guarantees. > * Allows synchronizing callbacks from the module process thread and have them only active while the decoder thread is running. > * The above, allows us to establish two modes for the thread, single-threaded-mutable and multi-threaded-const. > * Using that knowledge, we can remove |receive_crit_| as well as locking for a number of member variables. > > MediaCodecVideoDecoder > * Removed frame polling code from this class, since this is now done from the root thread function in VideoReceiveStream. > > VideoReceiveStream > * On Android: Polls for decoded frames every 10ms (same interval as previously in MediaCodecVideoDecoder) > * [Un]Registers the |video_receiver_| with the module thread only around the time the decoder thread is started/stopped. > * Notifies the receiver of start/stop events of the decoder thread. > * Changed the decoder thread to use the new PlatformThread callback type. > > BUG=webrtc:7361, 695438 > > Review-Url: https://codereview.webrtc.org/2764573002 > Cr-Commit-Position: refs/heads/master@{#17527} > Committed: https://chromium.googlesource.com/external/webrtc/+/e3aa88bbd5accadec73fa7e38584dfbf6aabe8a9 TBR=sakal@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7361, 695438 Review-Url: https://codereview.webrtc.org/2792033003 Cr-Commit-Position: refs/heads/master@{#17530}
2017-04-04 07:16:21 -07: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 of Deliver video frames on Android, on the decode thread. (patchset #7 id:120001 of https://codereview.webrtc.org/2764573002/ ) Reason for revert: Breaks Chrome FYI Android bots. See: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus9%29/builds/20418 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus6%29/builds/14724 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus5%29/builds/20133 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/15111 Original issue's description: > Deliver video frames on Android, on the decode thread. > > VideoCoding > * Adding a method for polling for frames on Android only until the capture implementation takes care of this (longer term plan). > > CodecDatabase > * Add an accessor for the current decoder > * Use std::unique_ptr<> for ownership. > * Remove "Release()" and "ReleaseDecoder()". Instead just delete. > * Remove |friend| relationship between CodecDatabase and VCMGenericDecoder. > > VCMDecodedFrameCallback > * DCHECKs for thread correctness. > * Remove |lock_| now that a threading model has been established and verified. > > VCMGenericDecoder > * All methods now have thread checks. > * Variable access associated with thread checkers. > > VideoReceiver > * Added two notification methods, DecoderThreadStarting() and DecoderThreadStopped() > * Allows us to establish a period when the decoder thread is not running and it is safe to modify variables such as callbacks, that are only read when the decoder thread is running. > * Allows us to DCHECK thread guarantees. > * Allows synchronizing callbacks from the module process thread and have them only active while the decoder thread is running. > * The above, allows us to establish two modes for the thread, single-threaded-mutable and multi-threaded-const. > * Using that knowledge, we can remove |receive_crit_| as well as locking for a number of member variables. > > MediaCodecVideoDecoder > * Removed frame polling code from this class, since this is now done from the root thread function in VideoReceiveStream. > > VideoReceiveStream > * On Android: Polls for decoded frames every 10ms (same interval as previously in MediaCodecVideoDecoder) > * [Un]Registers the |video_receiver_| with the module thread only around the time the decoder thread is started/stopped. > * Notifies the receiver of start/stop events of the decoder thread. > * Changed the decoder thread to use the new PlatformThread callback type. > > BUG=webrtc:7361, 695438 > > Review-Url: https://codereview.webrtc.org/2764573002 > Cr-Commit-Position: refs/heads/master@{#17527} > Committed: https://chromium.googlesource.com/external/webrtc/+/e3aa88bbd5accadec73fa7e38584dfbf6aabe8a9 TBR=sakal@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7361, 695438 Review-Url: https://codereview.webrtc.org/2792033003 Cr-Commit-Position: refs/heads/master@{#17530}
2017-04-04 07:16:21 -07:00
VCMTiming* _timing;
rtc::CriticalSection lock_;
VCMTimestampMap _timestampMap GUARDED_BY(lock_);
uint64_t _lastReceivedPictureID;
int64_t ntp_offset_;
};
class VCMGenericDecoder {
Revert of Deliver video frames on Android, on the decode thread. (patchset #7 id:120001 of https://codereview.webrtc.org/2764573002/ ) Reason for revert: Breaks Chrome FYI Android bots. See: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus9%29/builds/20418 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus6%29/builds/14724 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus5%29/builds/20133 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/15111 Original issue's description: > Deliver video frames on Android, on the decode thread. > > VideoCoding > * Adding a method for polling for frames on Android only until the capture implementation takes care of this (longer term plan). > > CodecDatabase > * Add an accessor for the current decoder > * Use std::unique_ptr<> for ownership. > * Remove "Release()" and "ReleaseDecoder()". Instead just delete. > * Remove |friend| relationship between CodecDatabase and VCMGenericDecoder. > > VCMDecodedFrameCallback > * DCHECKs for thread correctness. > * Remove |lock_| now that a threading model has been established and verified. > > VCMGenericDecoder > * All methods now have thread checks. > * Variable access associated with thread checkers. > > VideoReceiver > * Added two notification methods, DecoderThreadStarting() and DecoderThreadStopped() > * Allows us to establish a period when the decoder thread is not running and it is safe to modify variables such as callbacks, that are only read when the decoder thread is running. > * Allows us to DCHECK thread guarantees. > * Allows synchronizing callbacks from the module process thread and have them only active while the decoder thread is running. > * The above, allows us to establish two modes for the thread, single-threaded-mutable and multi-threaded-const. > * Using that knowledge, we can remove |receive_crit_| as well as locking for a number of member variables. > > MediaCodecVideoDecoder > * Removed frame polling code from this class, since this is now done from the root thread function in VideoReceiveStream. > > VideoReceiveStream > * On Android: Polls for decoded frames every 10ms (same interval as previously in MediaCodecVideoDecoder) > * [Un]Registers the |video_receiver_| with the module thread only around the time the decoder thread is started/stopped. > * Notifies the receiver of start/stop events of the decoder thread. > * Changed the decoder thread to use the new PlatformThread callback type. > > BUG=webrtc:7361, 695438 > > Review-Url: https://codereview.webrtc.org/2764573002 > Cr-Commit-Position: refs/heads/master@{#17527} > Committed: https://chromium.googlesource.com/external/webrtc/+/e3aa88bbd5accadec73fa7e38584dfbf6aabe8a9 TBR=sakal@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7361, 695438 Review-Url: https://codereview.webrtc.org/2792033003 Cr-Commit-Position: refs/heads/master@{#17530}
2017-04-04 07:16:21 -07:00
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);
Revert of Deliver video frames on Android, on the decode thread. (patchset #7 id:120001 of https://codereview.webrtc.org/2764573002/ ) Reason for revert: Breaks Chrome FYI Android bots. See: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus9%29/builds/20418 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus6%29/builds/14724 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus5%29/builds/20133 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/15111 Original issue's description: > Deliver video frames on Android, on the decode thread. > > VideoCoding > * Adding a method for polling for frames on Android only until the capture implementation takes care of this (longer term plan). > > CodecDatabase > * Add an accessor for the current decoder > * Use std::unique_ptr<> for ownership. > * Remove "Release()" and "ReleaseDecoder()". Instead just delete. > * Remove |friend| relationship between CodecDatabase and VCMGenericDecoder. > > VCMDecodedFrameCallback > * DCHECKs for thread correctness. > * Remove |lock_| now that a threading model has been established and verified. > > VCMGenericDecoder > * All methods now have thread checks. > * Variable access associated with thread checkers. > > VideoReceiver > * Added two notification methods, DecoderThreadStarting() and DecoderThreadStopped() > * Allows us to establish a period when the decoder thread is not running and it is safe to modify variables such as callbacks, that are only read when the decoder thread is running. > * Allows us to DCHECK thread guarantees. > * Allows synchronizing callbacks from the module process thread and have them only active while the decoder thread is running. > * The above, allows us to establish two modes for the thread, single-threaded-mutable and multi-threaded-const. > * Using that knowledge, we can remove |receive_crit_| as well as locking for a number of member variables. > > MediaCodecVideoDecoder > * Removed frame polling code from this class, since this is now done from the root thread function in VideoReceiveStream. > > VideoReceiveStream > * On Android: Polls for decoded frames every 10ms (same interval as previously in MediaCodecVideoDecoder) > * [Un]Registers the |video_receiver_| with the module thread only around the time the decoder thread is started/stopped. > * Notifies the receiver of start/stop events of the decoder thread. > * Changed the decoder thread to use the new PlatformThread callback type. > > BUG=webrtc:7361, 695438 > > Review-Url: https://codereview.webrtc.org/2764573002 > Cr-Commit-Position: refs/heads/master@{#17527} > Committed: https://chromium.googlesource.com/external/webrtc/+/e3aa88bbd5accadec73fa7e38584dfbf6aabe8a9 TBR=sakal@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7361, 695438 Review-Url: https://codereview.webrtc.org/2792033003 Cr-Commit-Position: refs/heads/master@{#17530}
2017-04-04 07:16:21 -07:00
/**
* Free the decoder memory
*/
int32_t Release();
/**
* Set decode callback. Deregistering while decoding is illegal.
*/
int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
Revert of Deliver video frames on Android, on the decode thread. (patchset #7 id:120001 of https://codereview.webrtc.org/2764573002/ ) Reason for revert: Breaks Chrome FYI Android bots. See: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus9%29/builds/20418 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus6%29/builds/14724 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus5%29/builds/20133 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/15111 Original issue's description: > Deliver video frames on Android, on the decode thread. > > VideoCoding > * Adding a method for polling for frames on Android only until the capture implementation takes care of this (longer term plan). > > CodecDatabase > * Add an accessor for the current decoder > * Use std::unique_ptr<> for ownership. > * Remove "Release()" and "ReleaseDecoder()". Instead just delete. > * Remove |friend| relationship between CodecDatabase and VCMGenericDecoder. > > VCMDecodedFrameCallback > * DCHECKs for thread correctness. > * Remove |lock_| now that a threading model has been established and verified. > > VCMGenericDecoder > * All methods now have thread checks. > * Variable access associated with thread checkers. > > VideoReceiver > * Added two notification methods, DecoderThreadStarting() and DecoderThreadStopped() > * Allows us to establish a period when the decoder thread is not running and it is safe to modify variables such as callbacks, that are only read when the decoder thread is running. > * Allows us to DCHECK thread guarantees. > * Allows synchronizing callbacks from the module process thread and have them only active while the decoder thread is running. > * The above, allows us to establish two modes for the thread, single-threaded-mutable and multi-threaded-const. > * Using that knowledge, we can remove |receive_crit_| as well as locking for a number of member variables. > > MediaCodecVideoDecoder > * Removed frame polling code from this class, since this is now done from the root thread function in VideoReceiveStream. > > VideoReceiveStream > * On Android: Polls for decoded frames every 10ms (same interval as previously in MediaCodecVideoDecoder) > * [Un]Registers the |video_receiver_| with the module thread only around the time the decoder thread is started/stopped. > * Notifies the receiver of start/stop events of the decoder thread. > * Changed the decoder thread to use the new PlatformThread callback type. > > BUG=webrtc:7361, 695438 > > Review-Url: https://codereview.webrtc.org/2764573002 > Cr-Commit-Position: refs/heads/master@{#17527} > Committed: https://chromium.googlesource.com/external/webrtc/+/e3aa88bbd5accadec73fa7e38584dfbf6aabe8a9 TBR=sakal@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7361, 695438 Review-Url: https://codereview.webrtc.org/2792033003 Cr-Commit-Position: refs/heads/master@{#17530}
2017-04-04 07:16:21 -07:00
bool External() const;
bool PrefersLateDecoding() const;
private:
Revert of Deliver video frames on Android, on the decode thread. (patchset #7 id:120001 of https://codereview.webrtc.org/2764573002/ ) Reason for revert: Breaks Chrome FYI Android bots. See: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus9%29/builds/20418 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus6%29/builds/14724 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28L%20Nexus5%29/builds/20133 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/15111 Original issue's description: > Deliver video frames on Android, on the decode thread. > > VideoCoding > * Adding a method for polling for frames on Android only until the capture implementation takes care of this (longer term plan). > > CodecDatabase > * Add an accessor for the current decoder > * Use std::unique_ptr<> for ownership. > * Remove "Release()" and "ReleaseDecoder()". Instead just delete. > * Remove |friend| relationship between CodecDatabase and VCMGenericDecoder. > > VCMDecodedFrameCallback > * DCHECKs for thread correctness. > * Remove |lock_| now that a threading model has been established and verified. > > VCMGenericDecoder > * All methods now have thread checks. > * Variable access associated with thread checkers. > > VideoReceiver > * Added two notification methods, DecoderThreadStarting() and DecoderThreadStopped() > * Allows us to establish a period when the decoder thread is not running and it is safe to modify variables such as callbacks, that are only read when the decoder thread is running. > * Allows us to DCHECK thread guarantees. > * Allows synchronizing callbacks from the module process thread and have them only active while the decoder thread is running. > * The above, allows us to establish two modes for the thread, single-threaded-mutable and multi-threaded-const. > * Using that knowledge, we can remove |receive_crit_| as well as locking for a number of member variables. > > MediaCodecVideoDecoder > * Removed frame polling code from this class, since this is now done from the root thread function in VideoReceiveStream. > > VideoReceiveStream > * On Android: Polls for decoded frames every 10ms (same interval as previously in MediaCodecVideoDecoder) > * [Un]Registers the |video_receiver_| with the module thread only around the time the decoder thread is started/stopped. > * Notifies the receiver of start/stop events of the decoder thread. > * Changed the decoder thread to use the new PlatformThread callback type. > > BUG=webrtc:7361, 695438 > > Review-Url: https://codereview.webrtc.org/2764573002 > Cr-Commit-Position: refs/heads/master@{#17527} > Committed: https://chromium.googlesource.com/external/webrtc/+/e3aa88bbd5accadec73fa7e38584dfbf6aabe8a9 TBR=sakal@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7361, 695438 Review-Url: https://codereview.webrtc.org/2792033003 Cr-Commit-Position: refs/heads/master@{#17530}
2017-04-04 07:16:21 -07:00
VCMDecodedFrameCallback* _callback;
VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength];
uint32_t _nextFrameInfoIdx;
VideoDecoder* const _decoder;
VideoCodecType _codecType;
bool _isExternal;
bool _keyFrameDecoded;
VideoContentType _last_keyframe_content_type;
};
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_