Verify returned frames from media::VideoFrame::Wrap*() methods

media/filters/vpx_video_decoder.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.
 
 #include "media/filters/vpx_video_decoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 574 matching lines @@
     *video_frame = VideoFrame::WrapExternalYuvData(
         codec_format,
         coded_size, gfx::Rect(visible_size), config_.natural_size(),
         vpx_image->stride[VPX_PLANE_Y],
         vpx_image->stride[VPX_PLANE_U],
         vpx_image->stride[VPX_PLANE_V],
         vpx_image->planes[VPX_PLANE_Y],
         vpx_image->planes[VPX_PLANE_U],
         vpx_image->planes[VPX_PLANE_V],
         kNoTimestamp());
-    video_frame->get()->AddDestructionObserver(
-        memory_pool_->CreateFrameCallback(vpx_image->fb_priv));
+    if (video_frame) {

[Pawel Osciak, 2016/01/13 07:53:25]

Should this be if (*video_frame)?

[emircan, 2016/01/14 23:13:54]

I changed it after mcasas@ suggestion. But looking back at this (*video_frame)
would make more sense as video frame is a scoped_refptr<VideoFrame>*.

+      video_frame->get()->AddDestructionObserver(
+          memory_pool_->CreateFrameCallback(vpx_image->fb_priv));
+    }
 
     UMA_HISTOGRAM_COUNTS("Media.Vpx.VideoDecoderBuffersInUseByDecoder",
                          memory_pool_->NumberOfFrameBuffersInUseByDecoder());
     UMA_HISTOGRAM_COUNTS(
         "Media.Vpx.VideoDecoderBuffersInUseByDecoderAndVideoFrame",
         memory_pool_->NumberOfFrameBuffersInUseByDecoderAndVideoFrame());
 
     return true;
   }
 
   DCHECK(codec_format == PIXEL_FORMAT_YV12 ||
          codec_format == PIXEL_FORMAT_YV12A);
 
   *video_frame = frame_pool_.CreateFrame(
       codec_format, visible_size, gfx::Rect(visible_size),
       config_.natural_size(), kNoTimestamp());
+  if (!video_frame)

[Pawel Osciak, 2016/01/13 07:53:25]

Also if (*video_frame) I believe.

[emircan, 2016/01/14 23:13:53]

Done.

+    return false;
 
   libyuv::I420Copy(
       vpx_image->planes[VPX_PLANE_Y], vpx_image->stride[VPX_PLANE_Y],
       vpx_image->planes[VPX_PLANE_U], vpx_image->stride[VPX_PLANE_U],
       vpx_image->planes[VPX_PLANE_V], vpx_image->stride[VPX_PLANE_V],
       (*video_frame)->visible_data(VideoFrame::kYPlane),
       (*video_frame)->stride(VideoFrame::kYPlane),
       (*video_frame)->visible_data(VideoFrame::kUPlane),
       (*video_frame)->stride(VideoFrame::kUPlane),
       (*video_frame)->visible_data(VideoFrame::kVPlane),
       (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(),
       coded_size.height());
 
   return true;
 }
 
 }  // namespace media