[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() and OnFrameReadyInBuffer(

content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.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 "content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 104 matching lines @@
   }
   memcpy(in_shared_memory_->memory(), data, in_buffer_size);
 
   // No need to lock for |in_buffer_id_| since IsDecoding_Locked() is false.
   in_buffer_id_ = next_bitstream_buffer_id_;
   media::BitstreamBuffer in_buffer(in_buffer_id_, in_shared_memory_->handle(),
                                    in_buffer_size);
   // Mask against 30 bits, to avoid (undefined) wraparound on signed integer.
   next_bitstream_buffer_id_ = (next_bitstream_buffer_id_ + 1) & 0x3FFFFFFF;
 
-  // The APIs of |decoder_| and |decode_done_cb_| require us to wrap the
-  // |out_buffer| in a VideoFrame.
+  // The API of |decoder_| requires us to wrap the |out_buffer| in a VideoFrame.
   const gfx::Size dimensions = frame_format.frame_size;
   std::unique_ptr<media::VideoCaptureBufferHandle> out_buffer_access =
-      out_buffer.handle_provider()->GetHandleForInProcessAccess();
+      out_buffer.handle_provider->GetHandleForInProcessAccess();
   base::SharedMemoryHandle out_handle =
-      out_buffer.handle_provider()->GetNonOwnedSharedMemoryHandleForLegacyIPC();
+      out_buffer.handle_provider->GetNonOwnedSharedMemoryHandleForLegacyIPC();
   scoped_refptr<media::VideoFrame> out_frame =
       media::VideoFrame::WrapExternalSharedMemory(
           media::PIXEL_FORMAT_I420,          // format
           dimensions,                        // coded_size
           gfx::Rect(dimensions),             // visible_rect
           dimensions,                        // natural_size
           out_buffer_access->data(),         // data
           out_buffer_access->mapped_size(),  // data_size
           out_handle,                        // handle
           0,                                 // shared_memory_offset
           timestamp);                        // timestamp
   if (!out_frame) {
     base::AutoLock lock(lock_);
     decoder_status_ = FAILED;
     LOG(ERROR) << "DecodeCapturedData: WrapExternalSharedMemory failed";
     return;
   }
   out_frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE,
                                    frame_format.frame_rate);
 
   out_frame->metadata()->SetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
                                       reference_time);
 
+  media::mojom::VideoFrameInfoPtr out_frame_info =
+      media::mojom::VideoFrameInfo::New();
+  out_frame_info->timestamp = timestamp;
+  out_frame_info->pixel_format = media::PIXEL_FORMAT_I420;
+  out_frame_info->storage_type = media::PIXEL_STORAGE_CPU;
+  out_frame_info->coded_size = dimensions;
+  out_frame_info->visible_rect = gfx::Rect(dimensions);
+  out_frame_info->metadata = out_frame->metadata()->CopyInternalValues();
+
   {
     base::AutoLock lock(lock_);
     decode_done_closure_ =
-        base::Bind(decode_done_cb_, base::Passed(&out_buffer), out_frame);
+        base::Bind(decode_done_cb_, out_buffer.id, out_buffer.frame_feedback_id,
+                   base::Passed(&out_buffer.access_permission),
+                   base::Passed(&out_frame_info));
   }
   decoder_->Decode(in_buffer, std::move(out_frame));
 }
 
 void VideoCaptureGpuJpegDecoder::VideoFrameReady(int32_t bitstream_buffer_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   TRACE_EVENT0("jpeg", "VideoCaptureGpuJpegDecoder::VideoFrameReady");
   base::AutoLock lock(lock_);
 
   if (!IsDecoding_Locked()) {
@@ skipping 83 matching lines @@
   lock_.AssertAcquired();
   return !decode_done_closure_.is_null();
 }
 
 void VideoCaptureGpuJpegDecoder::RecordInitDecodeUMA_Locked() {
   UMA_HISTOGRAM_BOOLEAN("Media.VideoCaptureGpuJpegDecoder.InitDecodeSuccess",
                         decoder_status_ == INIT_PASSED);
 }
 
 }  // namespace content