media: Delete VDA specific code from MCVD

media/gpu/android/media_codec_video_decoder.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_GPU_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
 #define MEDIA_GPU_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 11 matching lines @@
 #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/gpu/media_gpu_export.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
 namespace media {
-class SharedMemoryRegion;
 
-// A VideoDecodeAccelerator implementation for Android. This class decodes the
-// encded input stream using Android's MediaCodec. It handles the work of
-// transferring data to and from MediaCodec, and delegates attaching MediaCodec
-// output buffers to PictureBuffers to AVDAPictureBufferManager.
+// An Android VideoDecoder that delegates to MediaCodec.
 class MEDIA_GPU_EXPORT MediaCodecVideoDecoder
-    : public VideoDecodeAccelerator,
-      public AVDACodecAllocatorClient {
+    : public AVDACodecAllocatorClient {
  public:
   static VideoDecodeAccelerator::Capabilities GetCapabilities(
       const gpu::GpuPreferences& gpu_preferences);
 
   MediaCodecVideoDecoder(
       const MakeGLContextCurrentCallback& make_context_current_cb,
       const GetGLES2DecoderCallback& get_gles2_decoder_cb);
 
   ~MediaCodecVideoDecoder() override;
 
   // VideoDecodeAccelerator implementation:
   bool Initialize(const Config& config, Client* client) override;
   void Decode(const BitstreamBuffer& bitstream_buffer) override;
-  void AssignPictureBuffers(const std::vector<PictureBuffer>& buffers) override;
-  void ReusePictureBuffer(int32_t picture_buffer_id) override;
   void Flush() override;
   void Reset() override;
   void SetSurface(int32_t surface_id) override;
   void Destroy() override;
-  bool TryToSetupDecodeOnSeparateThread(
-      const base::WeakPtr<Client>& decode_client,
-      const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner)
-      override;
 
   // AVDACodecAllocatorClient implementation:
   void OnSurfaceAvailable(bool success) override;
   void OnSurfaceDestroyed() override;
   void OnCodecConfigured(
       std::unique_ptr<VideoCodecBridge> media_codec) override;
 
  private:
   friend class MCVDManager;
 
-  // TODO(timav): evaluate the need for more states in the MCVD state machine.
   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.
@@ skipping 18 matching lines @@
   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();
 
-  // Like ConfigureMediaCodecAsynchronously, but synchronous.  Returns true if
-  // and only if |media_codec_| is non-null.  Since all configuration is done
-  // synchronously, there is no concern with modifying |codec_config_| after
-  // this returns.
-  bool ConfigureMediaCodecSynchronously();
-
-  // Instantiate a media codec using |codec_config|.
-  // This may be called on any thread.
-  static std::unique_ptr<VideoCodecBridge> ConfigureMediaCodecOnAnyThread(
-      scoped_refptr<CodecConfig> codec_config);
-
   // 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();
 
-  // Requests picture buffers from the client.
-  void RequestPictureBuffers();
-
   // 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 of the result of deferred initialization.
-  void NotifyInitializationComplete(bool success);
-
-  // Notifies the client about the availability of a picture.
-  void NotifyPictureReady(const Picture& picture);
-
-  // Notifies the client that the input buffer identifed by input_buffer_id has
-  // been processed.
-  void NotifyEndOfBitstreamBuffer(int input_buffer_id);
-
-  // Notifies the client that the decoder was flushed.
-  void NotifyFlushDone();
-
-  // Notifies the client that the decoder was reset.
-  void NotifyResetDone();
-
   // 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
@@ skipping 22 matching lines @@
 
   // 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_;
 
-  // To expose client callbacks from VideoDecodeAccelerator.
-  Client* client_;
-
   // Callback to set the correct gl context.
   MakeGLContextCurrentCallback make_context_current_cb_;
 
   // Callback to get the GLES2Decoder instance.
   GetGLES2DecoderCallback get_gles2_decoder_cb_;
 
-  // The current state of this class. For now, this is used only for setting
-  // error state.
   State state_;
 
-  // The assigned picture buffers by picture buffer id.
-  AVDAPictureBufferManager::PictureBufferMap output_picture_buffers_;
-
-  // This keeps the free picture buffer ids which can be used for sending
-  // decoded frames to the client.
-  std::queue<int32_t> free_picture_ids_;
-
   // The low-level decoder which Android SDK provides.
   std::unique_ptr<VideoCodecBridge> media_codec_;
 
-  // Set to true after requesting picture buffers to the client.
-  bool picturebuffers_requested_;
-
   // The resolution of the stream.
   gfx::Size size_;
 
-  // Handy structure to remember a BitstreamBuffer and also its shared memory,
-  // if any.  The goal is to prevent leaving a BitstreamBuffer's shared memory
-  // handle open.
-  struct BitstreamRecord {
-    BitstreamRecord(const BitstreamBuffer&);
-    BitstreamRecord(BitstreamRecord&& other);
-    ~BitstreamRecord();
-
-    BitstreamBuffer buffer;
-
-    // |memory| is not mapped, and may be null if buffer has no data.
-    std::unique_ptr<SharedMemoryRegion> memory;
-  };
-
   // 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_;
 
@@ skipping 20 matching lines @@
   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_;
 
-  // Monotonically increasing value that is used to prevent old, delayed errors
-  // from being sent after a reset.
-  int error_sequence_token_;
-
   // 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
@@ skipping 10 matching lines @@
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<MediaCodecVideoDecoder> weak_this_factory_;
 
   friend class MediaCodecVideoDecoderTest;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_