Chromecast: fixes crash in AvPipelineImpl teardown.

chromecast/media/cma/pipeline/av_pipeline_impl.cc

 // Copyright 2014 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 "chromecast/media/cma/pipeline/av_pipeline_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 33 matching lines @@
       pending_push_(false),
       enable_time_update_(false),
       pending_time_update_task_(false),
       media_keys_(NULL),
       media_keys_callback_id_(kNoCallbackId) {
   DCHECK(media_component_device);
   thread_checker_.DetachFromThread();
 }
 
 AvPipelineImpl::~AvPipelineImpl() {
-  // If there are weak pointers in the wild, they must be invalidated
-  // on the right thread.
-  DCHECK(thread_checker_.CalledOnValidThread());
-  media_component_device_->SetClient(MediaComponentDevice::Client());
-
-  {
-    base::AutoLock lock(media_keys_lock_);
-    if (media_keys_ && media_keys_callback_id_ != kNoCallbackId)
-      media_keys_->UnregisterPlayer(media_keys_callback_id_);
-  }
 }
 
 void AvPipelineImpl::TransitionToState(State state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   state_ = state;
 }
 
 void AvPipelineImpl::SetCodedFrameProvider(
     scoped_ptr<CodedFrameProvider> frame_provider,
     size_t max_buffer_size,
@@ skipping 22 matching lines @@
 
   MediaComponentDevice::Client client;
   client.eos_cb = base::Bind(&AvPipelineImpl::OnEos, this);
   media_component_device_->SetClient(client);
   if (!media_component_device_->SetState(MediaComponentDevice::kStateIdle))
     return false;
 
   return true;
 }
 
+void AvPipelineImpl::Finalize() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  media_component_device_->SetClient(MediaComponentDevice::Client());
+
+  enable_feeding_ = false;
+  media_component_device_ = NULL;
+
+  {
+    base::AutoLock lock(media_keys_lock_);
+    if (media_keys_ && media_keys_callback_id_ != kNoCallbackId)
+      media_keys_->UnregisterPlayer(media_keys_callback_id_);
+  }
+}
+
 bool AvPipelineImpl::StartPlayingFrom(
     base::TimeDelta time,
     const scoped_refptr<BufferingState>& buffering_state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(state_, kFlushed);
 
   // Media time where rendering should start
   // and switch to a state where the audio device accepts incoming buffers.
   if (!media_component_device_->SetStartPts(time) ||
       !media_component_device_->SetState(MediaComponentDevice::kStatePaused)) {
@@ skipping 276 matching lines @@
       }
     }
 
     // The frame is playable: remove it from the list of non playable frames.
     non_playable_frames_.pop_front();
   }
 }
 
 }  // namespace media
 }  // namespace chromecast