Reland "Update mojo Decryptor interface to support reusing shared memory"

media/mojo/services/mojo_decryptor_service.h

 // Copyright 2015 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_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include <unordered_map>
+
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/decryptor.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 
 namespace media {
@@ skipping 28 matching lines @@
       interfaces::VideoDecoderConfigPtr config,
       const InitializeVideoDecoderCallback& callback) final;
   void DecryptAndDecodeAudio(
       interfaces::DecoderBufferPtr encrypted,
       const DecryptAndDecodeAudioCallback& callback) final;
   void DecryptAndDecodeVideo(
       interfaces::DecoderBufferPtr encrypted,
       const DecryptAndDecodeVideoCallback& callback) final;
   void ResetDecoder(interfaces::DemuxerStream::Type stream_type) final;
   void DeinitializeDecoder(interfaces::DemuxerStream::Type stream_type) final;
+  void ReleaseSharedBuffer(mojo::ScopedSharedBufferHandle buffer,
+                           uint64_t buffer_size) final;
 
  private:
   // Callback executed once Decrypt() is done.
   void OnDecryptDone(const DecryptCallback& callback,
                      media::Decryptor::Status status,
                      const scoped_refptr<DecoderBuffer>& buffer);
 
   // Callbacks executed once decoder initialized.
   void OnAudioDecoderInitialized(const InitializeAudioDecoderCallback& callback,
                                  bool success);
@@ skipping 19 matching lines @@
 
   // DataPipes for serializing the data section of DecoderBuffer into/from.
   mojo::ScopedDataPipeProducerHandle producer_handle_;
   mojo::ScopedDataPipeConsumerHandle consumer_handle_;
 
   // Keep ownership of |cdm_| while it is being used. |decryptor_| is the actual
   // Decryptor referenced by |cdm_|.
   scoped_refptr<MediaKeys> cdm_;
   media::Decryptor* decryptor_;
 
+  // Keep a reference to VideoFrames until ReleaseSharedBuffer() is called
+  // to release it.
+  std::unordered_map<MojoHandle, scoped_refptr<VideoFrame>>
+      in_use_video_frames_;
+
   base::WeakPtr<MojoDecryptorService> weak_this_;
   base::WeakPtrFactory<MojoDecryptorService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoDecryptorService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_