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

media/mojo/services/mojo_decryptor_service.cc

 // 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.
 
 #include "media/mojo/services/mojo_decryptor_service.h"
 
-#include <stdint.h>
-
 #include <utility>
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/cdm_context.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_keys.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/mojo/common/media_type_converters.h"
+#include "media/mojo/common/mojo_shared_buffer_video_frame.h"
 #include "media/mojo/interfaces/demuxer_stream.mojom.h"
 
 namespace media {
 
 MojoDecryptorService::MojoDecryptorService(
     const scoped_refptr<MediaKeys>& cdm,
     mojo::InterfaceRequest<interfaces::Decryptor> request,
     const mojo::Closure& error_handler)
     : binding_(this, std::move(request)), cdm_(cdm), weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
@@ skipping 74 matching lines @@
       static_cast<media::Decryptor::StreamType>(stream_type));
 }
 
 void MojoDecryptorService::DeinitializeDecoder(
     interfaces::DemuxerStream::Type stream_type) {
   DVLOG(1) << __FUNCTION__;
   decryptor_->DeinitializeDecoder(
       static_cast<media::Decryptor::StreamType>(stream_type));
 }
 
+void MojoDecryptorService::ReleaseSharedBuffer(
+    mojo::ScopedSharedBufferHandle buffer,
+    uint64_t buffer_size) {
+  in_use_video_frames_.erase(buffer.get().value());
+}
+
 void MojoDecryptorService::OnDecryptDone(
     const DecryptCallback& callback,
     media::Decryptor::Status status,
     const scoped_refptr<DecoderBuffer>& buffer) {
   DVLOG_IF(1, status != media::Decryptor::kSuccess) << __FUNCTION__ << "("
                                                     << status << ")";
   DVLOG_IF(3, status == media::Decryptor::kSuccess) << __FUNCTION__;
 
   if (!buffer) {
     DCHECK_NE(status, media::Decryptor::kSuccess);
@@ skipping 42 matching lines @@
   DVLOG_IF(1, status != media::Decryptor::kSuccess) << __FUNCTION__ << "("
                                                     << status << ")";
   DVLOG_IF(3, status == media::Decryptor::kSuccess) << __FUNCTION__;
 
   if (!frame) {
     DCHECK_NE(status, media::Decryptor::kSuccess);
     callback.Run(static_cast<Decryptor::Status>(status), nullptr);
     return;
   }
 
+  // If |frame| has shared memory that will be passed back, keep a reference
+  // to it until the other side is done with the memory.
+  if (frame->storage_type() == VideoFrame::STORAGE_MOJO_SHARED_BUFFER) {
+    MojoSharedBufferVideoFrame* mojo_frame =
+        static_cast<MojoSharedBufferVideoFrame*>(frame.get());
+    in_use_video_frames_.insert(
+        std::make_pair(mojo_frame->Handle().value(), frame));
+  }
+
   callback.Run(static_cast<Decryptor::Status>(status),
                interfaces::VideoFrame::From(frame));
 }
 
 interfaces::DecoderBufferPtr MojoDecryptorService::TransferDecoderBuffer(
     const scoped_refptr<DecoderBuffer>& encrypted) {
   interfaces::DecoderBufferPtr buffer =
       interfaces::DecoderBuffer::From(encrypted);
   if (encrypted->end_of_stream())
     return buffer;
@@ skipping 30 matching lines @@
   DCHECK_GT(bytes_to_read, 0u);
   uint32_t bytes_read = bytes_to_read;
   CHECK_EQ(ReadDataRaw(consumer_handle_.get(), media_buffer->writable_data(),
                        &bytes_read, MOJO_READ_DATA_FLAG_ALL_OR_NONE),
            MOJO_RESULT_OK);
   CHECK_EQ(bytes_to_read, bytes_read);
   return media_buffer;
 }
 
 }  // namespace media