Merge 32455 - Check for null frame pointers and do nothing to avoid a crash....

media/filters/ffmpeg_video_decoder.cc

 // Copyright (c) 2009 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/base/limits.h"
 #include "media/base/video_frame_impl.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 
@@ skipping 177 matching lines @@
     if (state_ == kFlushCodec) {
       state_ = kDecodeFinished;
       EnqueueEmptyFrame();
     }
   }
 }
 
 bool FFmpegVideoDecoder::EnqueueVideoFrame(VideoSurface::Format surface_format,
                                            const TimeTuple& time,
                                            const AVFrame* frame) {
+  // TODO(fbarchard): Work around for FFmpeg http://crbug.com/27675
+  // The decoder is in a bad state and not decoding correctly.
+  // Checking for NULL avoids a crash in CopyPlane().
+  if (!frame->data[VideoSurface::kYPlane] ||
+      !frame->data[VideoSurface::kUPlane] ||
+      !frame->data[VideoSurface::kVPlane]) {
+    return true;
+  }
+
   scoped_refptr<VideoFrame> video_frame;
   VideoFrameImpl::CreateFrame(surface_format, width_, height_,
                               time.timestamp, time.duration, &video_frame);
   if (!video_frame) {
     return false;
   }
 
   // Copy the frame data since FFmpeg reuses internal buffers for AVFrame
   // output, meaning the data is only valid until the next
   // avcodec_decode_video() call.
@@ skipping 144 matching lines @@
 // static
 bool FFmpegVideoDecoder::PtsHeapOrdering::operator()(
     const base::TimeDelta& lhs,
     const base::TimeDelta& rhs) const {
   // std::priority_queue is a max-heap. We want lower timestamps to show up
   // first so reverse the natural less-than comparison.
   return rhs < lhs;
 }
 
 }  // namespace