Make more VideoDecoders reinitializable.

media/filters/gpu_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/gpu_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/cpu.h"
 #include "base/message_loop.h"
@@ skipping 199 matching lines @@
   if (vda_)
     DestroyVDA();
   if (!pending_read_cb_.is_null())
     EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());
   if (!pending_reset_cb_.is_null())
     base::ResetAndReturn(&pending_reset_cb_).Run();
   demuxer_stream_ = NULL;
   BindToCurrentLoop(closure).Run();
 }
 
+static bool IsCodedSizeSupported(const gfx::Size& coded_size) {
+  // Only non-Windows, Ivy Bridge+ platforms can support more than 1920x1080.
+  // We test against 1088 to account for 16x16 macroblocks.
+  if (coded_size.width() <= 1920 && coded_size.height() <= 1088)
+    return true;
+
+  base::CPU cpu;
+  bool hw_large_video_support =
+      (cpu.vendor_name() == "GenuineIntel") && cpu.model() >= 58;
+  bool os_large_video_support = true;
+#if defined(OS_WIN)
+  os_large_video_support = false;
+#endif
+  return os_large_video_support && hw_large_video_support;
+}
+
 void GpuVideoDecoder::Initialize(DemuxerStream* stream,
                                  const PipelineStatusCB& orig_status_cb,
                                  const StatisticsCB& statistics_cb) {
   DCHECK(gvd_loop_proxy_->BelongsToCurrentThread());
+  DCHECK(stream);
+
   weak_this_ = weak_factory_.GetWeakPtr();
 
   PipelineStatusCB status_cb = CreateUMAReportingPipelineCB(
       "Media.GpuVideoDecoderInitializeStatus",
       BindToCurrentLoop(orig_status_cb));
-  DCHECK(!demuxer_stream_);
 
-  if (!stream) {
-    status_cb.Run(PIPELINE_ERROR_DECODE);
+  if (demuxer_stream_) {

[scherkus (not reviewing), 2013/04/26 01:53:25]

OOC once we move DemuxerStream out of video decoders what will we use to check
that we haven't already been initialized?

you don't have to make that change now -- I think it'll be clearer to do that
change in the CL that removes DemuxerStream :)

[xhwang, 2013/04/26 18:08:01]

That's a good point. Thanks for pointing it out. Will do it later as you
mentioned.

+    // TODO(xhwang): Make GpuVideoDecoder reinitializable.
+    // See http://crbug.com/233608
+    DVLOG(1) << "GpuVideoDecoder reinitialization not supported.";
+    status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
-  // TODO(scherkus): this check should go in Pipeline prior to creating
-  // decoder objects.
   const VideoDecoderConfig& config = stream->video_decoder_config();
-  if (!config.IsValidConfig() || config.is_encrypted()) {
-    DLOG(ERROR) << "Unsupported video stream - "
-                << config.AsHumanReadableString();
-    status_cb.Run(PIPELINE_ERROR_DECODE);
+  DCHECK(config.IsValidConfig() && !config.is_encrypted());

[scherkus (not reviewing), 2013/04/26 01:53:25]

nit: split DCHECKs so we know which one failed

[xhwang, 2013/04/26 18:08:01]

Done.

+
+  if (!IsCodedSizeSupported(config.coded_size())) {
+    status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
-  // Only non-Windows, Ivy Bridge+ platforms can support more than 1920x1080.
-  // We test against 1088 to account for 16x16 macroblocks.
-  if (config.coded_size().width() > 1920 ||
-      config.coded_size().height() > 1088) {
-    base::CPU cpu;
-    bool hw_large_video_support =
-        cpu.vendor_name() == "GenuineIntel" && cpu.model() >= 58;
-    bool os_large_video_support = true;
-#if defined(OS_WIN)
-    os_large_video_support = false;
-#endif
-    if (!(os_large_video_support && hw_large_video_support)) {
-      status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
-      return;
-    }
-  }
-
   client_proxy_ = new VDAClientProxy(this);
   VideoDecodeAccelerator* vda =
       factories_->CreateVideoDecodeAccelerator(config.profile(), client_proxy_);
   if (!vda) {
     status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
   if (config.codec() == kCodecH264)
     stream->EnableBitstreamConverter();
@@ skipping 436 matching lines @@
 
   state_ = kError;
 
   if (!pending_read_cb_.is_null()) {
     base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL);
     return;
   }
 }
 
 }  // namespace media