FileVideoCaptureDevice: better error mgmt if !File.IsValid()

media/video/capture/file_video_capture_device.cc

 // Copyright 2013 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/video/capture/file_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 106 matching lines @@
   ParseY4MTags(header, video_format);
   return header_end + kY4MSimpleFrameDelimiterSize;
 }
 
 // Opens a given file for reading, and returns the file to the caller, who is
 // responsible for closing it.
 // static
 base::File FileVideoCaptureDevice::OpenFileForRead(
     const base::FilePath& file_path) {
   base::File file(file_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
-  DVLOG_IF(1, file.IsValid()) << file_path.value() << ", error: "
-                        << base::File::ErrorToString(file.error_details());
-  CHECK(file.IsValid());
+  DLOG_IF(ERROR, file.IsValid())
+      << file_path.value()
+      << ", error: " << base::File::ErrorToString(file.error_details());
   return file.Pass();
 }
 
 FileVideoCaptureDevice::FileVideoCaptureDevice(const base::FilePath& file_path)
     : capture_thread_("CaptureThread"),
       file_path_(file_path),
       frame_size_(0),
       current_byte_index_(0),
       first_frame_byte_index_(0) {}
 
@@ skipping 39 matching lines @@
 void FileVideoCaptureDevice::OnAllocateAndStart(
     const VideoCaptureParams& params,
     scoped_ptr<VideoCaptureDevice::Client> client) {
   DCHECK_EQ(capture_thread_.message_loop(), base::MessageLoop::current());
 
   client_ = client.Pass();
 
   // Open the file and parse the header. Get frame size and format.
   DCHECK(!file_.IsValid());
   file_ = OpenFileForRead(file_path_);
+  if (!file_.IsValid()) {
+    client_->OnError("Could not open Video file");
+    return;
+  }
   first_frame_byte_index_ =
       ParseFileAndExtractVideoFormat(&file_, &capture_format_);
   current_byte_index_ = first_frame_byte_index_;
   DVLOG(1) << "Opened video file " << capture_format_.frame_size.ToString()
            << ", fps: " << capture_format_.frame_rate;
 
   frame_size_ = CalculateFrameSize();
   video_frame_.reset(new uint8[frame_size_]);
 
   capture_thread_.message_loop()->PostTask(
@@ skipping 50 matching lines @@
     next_on_capture_timedelta = frame_interval;
   }
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&FileVideoCaptureDevice::OnCaptureTask,
                  base::Unretained(this)),
       next_on_capture_timedelta);
 }
 
 }  // namespace media