Handle MJPEG HW Decode case in VideoCaptureImpl

content/renderer/media/video_capture_impl.cc

 // Copyright (c) 2012 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.
 //
 // Notes about usage of this object by VideoCaptureImplManager.
 //
 // VideoCaptureImplManager access this object by using a Unretained()
 // binding and tasks on the IO thread. It is then important that
 // VideoCaptureImpl never post task to itself. All operations must be
 // synchronous.
@@ skipping 341 matching lines @@
         handles[media::VideoFrame::kYPlane],
         handles[media::VideoFrame::kUPlane],
         handles[media::VideoFrame::kVPlane],
         timestamp - first_frame_timestamp_);
     DCHECK(frame);
     buffer_finished_callback = media::BindToCurrentLoop(
         base::Bind(&VideoCaptureImpl::OnClientBufferFinished2,
                    weak_factory_.GetWeakPtr(), buffer_id, buffer));
   } else {
     scoped_refptr<ClientBuffer> buffer;
-    if (storage_type == media::VideoFrame::STORAGE_UNOWNED_MEMORY) {
+    if (storage_type == media::VideoFrame::STORAGE_OPAQUE) {
+      DCHECK(mailbox_holder.mailbox.Verify());
+      DCHECK_EQ(media::PIXEL_FORMAT_ARGB, pixel_format);
+      frame = media::VideoFrame::WrapNativeTexture(
+          pixel_format,
+          mailbox_holder,
+          base::Bind(&SaveReleaseSyncToken, release_sync_token.get()),
+          coded_size,
+          gfx::Rect(coded_size),
+          coded_size,
+          timestamp - first_frame_timestamp_);
+    }
+    else {
+      DCHECK(storage_type == media::VideoFrame::STORAGE_UNOWNED_MEMORY ||
+             storage_type == media::VideoFrame::STORAGE_SHMEM);
       DCHECK_EQ(media::PIXEL_FORMAT_I420, pixel_format);
       const auto& iter = client_buffers_.find(buffer_id);
       DCHECK(iter != client_buffers_.end());
       buffer = iter->second;
       frame = media::VideoFrame::WrapExternalSharedMemory(
           pixel_format,
           coded_size,
           visible_rect,
           gfx::Size(visible_rect.width(),
                     visible_rect.height()),
           reinterpret_cast<uint8*>(buffer->buffer()->memory()),
           buffer->buffer_size(),
           buffer->buffer()->handle(),
           0 /* shared_memory_offset */,
           timestamp - first_frame_timestamp_);
-    } else {
-      DCHECK_EQ(storage_type, media::VideoFrame::STORAGE_OPAQUE);
-      DCHECK(mailbox_holder.mailbox.Verify());
-      DCHECK_EQ(media::PIXEL_FORMAT_ARGB, pixel_format);
-      frame = media::VideoFrame::WrapNativeTexture(
-          pixel_format, mailbox_holder,
-          base::Bind(&SaveReleaseSyncToken, release_sync_token.get()),
-          coded_size, gfx::Rect(coded_size), coded_size,
-          timestamp - first_frame_timestamp_);
     }
+    DCHECK(frame);

[Pawel Osciak, 2015/11/05 23:49:26]

nullptr is a valid return value from Wrap*() methods. We should use if() to
verify frame is not nullptr please.

     buffer_finished_callback = media::BindToCurrentLoop(
         base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
                    weak_factory_.GetWeakPtr(), buffer_id, buffer));
   }
   frame->metadata()->SetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
                                   timestamp);
   frame->AddDestructionObserver(
       base::Bind(&VideoCaptureImpl::DidFinishConsumingFrame, frame->metadata(),
                  base::Passed(&release_sync_token), buffer_finished_callback));
 
@@ skipping 162 matching lines @@
   double consumer_resource_utilization = -1.0;
   if (!metadata->GetDouble(media::VideoFrameMetadata::RESOURCE_UTILIZATION,
                            &consumer_resource_utilization)) {
     consumer_resource_utilization = -1.0;
   }
 
   callback_to_io_thread.Run(*release_sync_token, consumer_resource_utilization);
 }
 
 }  // namespace content