Index: media/gpu/android/media_codec_video_decoder.h |
diff --git a/media/gpu/android/media_codec_video_decoder.h b/media/gpu/android/media_codec_video_decoder.h |
index dccd4a3a3208c57080415de55454bdcfa7e4a146..8a5f9ef326b9604484958b59e7c090a1a30c4f94 100644 |
--- a/media/gpu/android/media_codec_video_decoder.h |
+++ b/media/gpu/android/media_codec_video_decoder.h |
@@ -5,250 +5,34 @@ |
#ifndef MEDIA_GPU_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
#define MEDIA_GPU_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
-#include <stdint.h> |
- |
-#include <list> |
-#include <map> |
-#include <queue> |
-#include <vector> |
- |
-#include "base/compiler_specific.h" |
-#include "base/optional.h" |
#include "base/threading/thread_checker.h" |
-#include "base/timer/timer.h" |
-#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
-#include "gpu/command_buffer/service/gpu_preferences.h" |
-#include "media/base/android/media_drm_bridge_cdm_context.h" |
-#include "media/base/android/sdk_media_codec_bridge.h" |
-#include "media/base/media_keys.h" |
-#include "media/gpu/avda_codec_allocator.h" |
-#include "media/gpu/avda_picture_buffer_manager.h" |
-#include "media/gpu/gpu_video_decode_accelerator_helpers.h" |
+#include "media/base/video_decoder.h" |
#include "media/gpu/media_gpu_export.h" |
-#include "media/video/video_decode_accelerator.h" |
-#include "ui/gl/android/scoped_java_surface.h" |
namespace media { |
// An Android VideoDecoder that delegates to MediaCodec. |
-class MEDIA_GPU_EXPORT MediaCodecVideoDecoder |
- : public AVDACodecAllocatorClient { |
+class MEDIA_GPU_EXPORT MediaCodecVideoDecoder : public VideoDecoder { |
public: |
- MediaCodecVideoDecoder( |
- const MakeGLContextCurrentCallback& make_context_current_cb, |
- const GetGLES2DecoderCallback& get_gles2_decoder_cb); |
- |
+ MediaCodecVideoDecoder(); |
~MediaCodecVideoDecoder() override; |
- // VideoDecodeAccelerator implementation: |
- bool Initialize(const Config& config, Client* client) override; |
- void Decode(const BitstreamBuffer& bitstream_buffer) override; |
- void Flush() override; |
- void Reset() override; |
- void SetSurface(int32_t surface_id) override; |
- void Destroy() override; |
- |
- // AVDACodecAllocatorClient implementation: |
- void OnSurfaceAvailable(bool success) override; |
- void OnSurfaceDestroyed() override; |
- void OnCodecConfigured( |
- std::unique_ptr<VideoCodecBridge> media_codec) override; |
+ // VideoDecoder implementation: |
+ std::string GetDisplayName() const override; |
+ void Initialize(const VideoDecoderConfig& config, |
+ bool low_delay, |
+ CdmContext* cdm_context, |
+ const InitCB& init_cb, |
+ const OutputCB& output_cb) override; |
+ void Decode(const scoped_refptr<DecoderBuffer>& buffer, |
+ const DecodeCB& decode_cb) override; |
+ void Reset(const base::Closure& closure) override; |
+ bool NeedsBitstreamConversion() const override; |
+ bool CanReadWithoutStalling() const override; |
+ int GetMaxDecodeRequests() const override; |
private: |
- friend class MCVDManager; |
- |
- enum State { |
- NO_ERROR, |
- ERROR, |
- // Set when we are asynchronously constructing the codec. Will transition |
- // to NO_ERROR or ERROR depending on success. |
- WAITING_FOR_CODEC, |
- // Set when we have a codec, but it doesn't yet have a key. |
- WAITING_FOR_KEY, |
- // The output surface was destroyed. We must not configure a new MediaCodec |
- // with the destroyed surface. |
- SURFACE_DESTROYED, |
- }; |
- |
- enum DrainType { |
- DRAIN_TYPE_NONE, |
- DRAIN_FOR_FLUSH, |
- DRAIN_FOR_RESET, |
- DRAIN_FOR_DESTROY, |
- }; |
- |
- // Initialize of the picture buffer manager. This is to be called when the |
- // SurfaceView in |surface_id_|, if any, is no longer busy. It will return |
- // false on failure, and true if initialization was successful. This includes |
- // synchronous and asynchronous init; the MCVD might not yet have a codec on |
- // success, but async init will at least be in progress. |
- bool InitializePictureBufferManager(); |
- |
- // A part of destruction process that is sometimes postponed after the drain. |
- void ActualDestroy(); |
- |
- // Configures |media_codec_| with the given codec parameters from the client. |
- // This configuration will (probably) not be complete before this call |
- // returns. Multiple calls before completion will be ignored. |state_| |
- // must be NO_ERROR or WAITING_FOR_CODEC. Note that, once you call this, |
- // you should be careful to avoid modifying members of |codec_config_| until |
- // |state_| is no longer WAITING_FOR_CODEC. |
- void ConfigureMediaCodecAsynchronously(); |
- |
- // Sends the decoded frame specified by |codec_buffer_index| to the client. |
- void SendDecodedFrameToClient(int32_t codec_buffer_index, |
- int32_t bitstream_id); |
- |
- // Does pending IO tasks if any. Once this is called, it polls |media_codec_| |
- // until it finishes pending tasks. For the polling, |kDecodePollDelay| is |
- // used. |
- void DoIOTask(bool start_timer); |
- |
- // Feeds input data to |media_codec_|. This checks |
- // |pending_bitstream_buffers_| and queues a buffer to |media_codec_|. |
- // Returns true if any input was processed. |
- bool QueueInput(); |
- |
- // Dequeues output from |media_codec_| and feeds the decoded frame to the |
- // client. Returns a hint about whether calling again might produce |
- // more output. |
- bool DequeueOutput(); |
- |
- // Decode the content in the |bitstream_buffer|. Note that a |
- // |bitstream_buffer| of id as -1 indicates a flush command. |
- void DecodeBuffer(const BitstreamBuffer& bitstream_buffer); |
- |
- // Called during Initialize() for encrypted streams to set up the CDM. |
- void InitializeCdm(); |
- |
- // Called after the CDM obtains a MediaCrypto object. |
- void OnMediaCryptoReady(MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto, |
- bool needs_protected_surface); |
- |
- // Called when a new key is added to the CDM. |
- void OnKeyAdded(); |
- |
- // Notifies the client about the error and sets |state_| to |ERROR|. |
- void NotifyError(Error error); |
- |
- // Start or stop our work-polling timer based on whether we did any work, and |
- // how long it has been since we've done work. Calling this with true will |
- // start the timer. Calling it with false may stop the timer. |
- void ManageTimer(bool did_work); |
- |
- // Start the MediaCodec drain process by adding end_of_stream() buffer to the |
- // encoded buffers queue. When we receive EOS from the output buffer the drain |
- // process completes and we perform the action depending on the |drain_type|. |
- void StartCodecDrain(DrainType drain_type); |
- |
- // Returns true if we are currently draining the codec and doing that as part |
- // of Reset() or Destroy() VP8 workaround. (http://crbug.com/598963). We won't |
- // display any frames and disable normal errors handling. |
- bool IsDrainingForResetOrDestroy() const; |
- |
- // A helper method that performs the operation required after the drain |
- // completion (usually when we receive EOS in the output). The operation |
- // itself depends on the |drain_type_|. |
- void OnDrainCompleted(); |
- |
- // Resets MediaCodec and buffers/containers used for storing output. These |
- // components need to be reset upon EOS to decode a later stream. Input state |
- // (e.g. queued BitstreamBuffers) is not reset, as input following an EOS |
- // is still valid and should be processed. |
- void ResetCodecState(); |
- |
- // Indicates if MediaCodec should not be used for software decoding since we |
- // have safer versions elsewhere. |
- bool IsMediaCodecSoftwareDecodingForbidden() const; |
- |
- // On platforms which support seamless surface changes, this will reinitialize |
- // the picture buffer manager with the new surface. This function reads and |
- // clears the surface id from |pending_surface_id_|. It will issue a decode |
- // error if the surface change fails. Returns false on failure. |
- bool UpdateSurface(); |
- |
- // Used to DCHECK that we are called on the correct thread. |
- base::ThreadChecker thread_checker_; |
- |
- // Callback to set the correct gl context. |
- MakeGLContextCurrentCallback make_context_current_cb_; |
- |
- // Callback to get the GLES2Decoder instance. |
- GetGLES2DecoderCallback get_gles2_decoder_cb_; |
- |
- State state_; |
- |
- // The low-level decoder which Android SDK provides. |
- std::unique_ptr<VideoCodecBridge> media_codec_; |
- |
- // The resolution of the stream. |
- gfx::Size size_; |
- |
- // Encoded bitstream buffers to be passed to media codec, queued until an |
- // input buffer is available. |
- std::queue<BitstreamRecord> pending_bitstream_records_; |
- |
- // A map of presentation timestamp to bitstream buffer id for the bitstream |
- // buffers that have been submitted to the decoder but haven't yet produced an |
- // output frame with the same timestamp. Note: there will only be one entry |
- // for multiple bitstream buffers that have the same presentation timestamp. |
- std::map<base::TimeDelta, int32_t> bitstream_buffers_in_decoder_; |
- |
- // Keeps track of bitstream ids notified to the client with |
- // NotifyEndOfBitstreamBuffer() before getting output from the bitstream. |
- std::list<int32_t> bitstreams_notified_in_advance_; |
- |
- AVDAPictureBufferManager picture_buffer_manager_; |
- |
- // Time at which we last did useful work on io_timer_. |
- base::TimeTicks most_recent_work_; |
- |
- // Type of a drain request. We need to distinguish between DRAIN_FOR_FLUSH |
- // and other types, see IsDrainingForResetOrDestroy(). |
- DrainType drain_type_; |
- |
- // Holds a ref-count to the CDM to avoid using the CDM after it's destroyed. |
- scoped_refptr<MediaKeys> cdm_for_reference_holding_only_; |
- |
- MediaDrmBridgeCdmContext* media_drm_bridge_cdm_context_; |
- |
- // MediaDrmBridge requires registration/unregistration of the player, this |
- // registration id is used for this. |
- int cdm_registration_id_; |
- |
- // Configuration that we use for MediaCodec. |
- // Do not update any of its members while |state_| is WAITING_FOR_CODEC. |
- scoped_refptr<CodecConfig> codec_config_; |
- |
- // Index of the dequeued and filled buffer that we keep trying to enqueue. |
- // Such buffer appears in MEDIA_CODEC_NO_KEY processing. |
- int pending_input_buf_index_; |
- |
- // True if and only if VDA initialization is deferred, and we have not yet |
- // called NotifyInitializationComplete. |
- bool deferred_initialization_pending_; |
- |
- // Indicates if ResetCodecState() should be called upon the next call to |
- // Decode(). Allows us to avoid trashing the last few frames of a playback |
- // when the EOS buffer is received. |
- bool codec_needs_reset_; |
- |
- // True if surface creation and |picture_buffer_manager_| initialization has |
- // been defered until the first Decode() call. |
- bool defer_surface_creation_; |
- |
- // Has a value if a SetSurface() call has occurred and a new surface should be |
- // switched to when possible. Cleared during OnSurfaceDestroyed() and if all |
- // pictures have been rendered in DequeueOutput(). |
- base::Optional<int32_t> pending_surface_id_; |
- |
- // Copy of the VDA::Config we were given. |
- Config config_; |
- |
- // WeakPtrFactory for posting tasks back to |this|. |
- base::WeakPtrFactory<MediaCodecVideoDecoder> weak_this_factory_; |
- |
- friend class MediaCodecVideoDecoderTest; |
+ DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder); |
}; |
} // namespace media |