Make more VideoDecoders reinitializable.

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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 58 matching lines @@
 VpxVideoDecoder::~VpxVideoDecoder() {
   DCHECK_EQ(kUninitialized, state_);
   CloseDecoder();
 }
 
 void VpxVideoDecoder::Initialize(
     DemuxerStream* stream,
     const PipelineStatusCB& status_cb,
     const StatisticsCB& statistics_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
-  DCHECK(!demuxer_stream_) << "Already initialized.";
+  DCHECK(stream);
+  DCHECK(read_cb_.is_null());
+  DCHECK(reset_cb_.is_null());
+
   weak_this_ = weak_factory_.GetWeakPtr();
 
-  if (!stream) {
-    status_cb.Run(PIPELINE_ERROR_DECODE);
-    return;
-  }
-
   demuxer_stream_ = stream;
   statistics_cb_ = statistics_cb;
 
   if (!ConfigureDecoder()) {
     status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
   // Success!
   state_ = kNormal;
@@ skipping 17 matching lines @@
   if (status != VPX_CODEC_OK) {
     LOG(ERROR) << "vpx_codec_dec_init failed, status=" << status;
     delete context;
     return NULL;
   }
   return context;
 }
 
 bool VpxVideoDecoder::ConfigureDecoder() {
   const VideoDecoderConfig& config = demuxer_stream_->video_decoder_config();
-  if (!config.IsValidConfig()) {
-    DLOG(ERROR) << "Invalid video stream config: "
-                << config.AsHumanReadableString();
-    return false;
-  }
+  DCHECK(config.IsValidConfig());
 
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   bool can_handle = false;
   if (cmd_line->HasSwitch(switches::kEnableVp9Playback) &&
       config.codec() == kCodecVP9) {
     can_handle = true;
   }
   if (cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback) &&
       config.codec() == kCodecVP8 && config.format() == VideoFrame::YV12A) {
     can_handle = true;
@@ skipping 288 matching lines @@
                      *video_frame);
     return;
   }
   CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
              vpx_image->stride[VPX_PLANE_Y],
              vpx_image->d_h,
              *video_frame);
 }
 
 }  // namespace media