Revert changes from r152523 and split bitstream converter creation and enabling.

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/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 97 matching lines @@
     closure.Run();
     return;
   }
   DestroyVDA();
   closure.Run();
 }
 
 void GpuVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,
                                  const PipelineStatusCB& orig_status_cb,
                                  const StatisticsCB& statistics_cb) {
-  const VideoDecoderConfig& config = stream->video_decoder_config();
   if (!gvd_loop_proxy_) {
-    // FFmpegDemuxer's destructor frees/clears the AVStream underpinnings of
-    // FFmpegDemuxerStream without notifying the stream, creating a race between
-    // initialization and teardown.  As a HACK until this is fixed, enable
-    // the bitstream converter before posting the Initialize() call to the video
-    // decoder thread since we know the DemuxerStream is valid at this point.
-    // See http://crbug.com/143460 for more detail.
-    // TODO(fischman): drop this hack!
-    if (config.IsValidConfig() && config.codec() == kCodecH264)
-      stream->EnableBitstreamConverter();
-
     gvd_loop_proxy_ = base::ResetAndReturn(&message_loop_factory_cb_).Run();
     gvd_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &GpuVideoDecoder::Initialize,
         this, stream, orig_status_cb, statistics_cb));
     return;
   }
 
   DCHECK(gvd_loop_proxy_->BelongsToCurrentThread());
   PipelineStatusCB status_cb = CreateUMAReportingPipelineCB(
       "Media.GpuVideoDecoderInitializeStatus", orig_status_cb);
 
   DCHECK(!demuxer_stream_);
   if (!stream) {
     status_cb.Run(PIPELINE_ERROR_DECODE);
     return;
   }
 
   // TODO(scherkus): this check should go in Pipeline prior to creating
   // decoder objects.
+  const VideoDecoderConfig& config = stream->video_decoder_config();
   if (!config.IsValidConfig()) {
     DLOG(ERROR) << "Invalid video stream - " << config.AsHumanReadableString();
     status_cb.Run(PIPELINE_ERROR_DECODE);
     return;
   }
 
   VideoDecodeAccelerator* vda =
       factories_->CreateVideoDecodeAccelerator(config.profile(), this);
   if (!vda) {
     status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
+  if (config.codec() == kCodecH264)
+    stream->EnableBitstreamConverter();
+
   demuxer_stream_ = stream;
   statistics_cb_ = statistics_cb;
 
   DVLOG(1) << "GpuVideoDecoder::Initialize() succeeded.";
   vda_loop_proxy_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GpuVideoDecoder::SetVDA, this, vda),
       base::Bind(status_cb, PIPELINE_OK));
 }
 
@@ skipping 397 matching lines @@
 
   error_occured_ = true;
 
   if (!pending_read_cb_.is_null()) {
     base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL);
     return;
   }
 }
 
 }  // namespace media