media: Discard the previous decoder immediately on fallback

media/filters/video_frame_stream_unittest.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 <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 959 matching lines @@
             video_frame_stream_->get_pending_buffers_size_for_testing());
 
   decoder2_->SatisfyDecode();
   base::RunLoop().RunUntilIdle();
 
   // Make sure all buffers consumed by |decoder2_| have come from the fallback.
   // Pending buffers should not have been cleared yet.
   EXPECT_EQ(0, video_frame_stream_->get_fallback_buffers_size_for_testing());
   EXPECT_EQ(demuxer_reads_satisfied,
             video_frame_stream_->get_pending_buffers_size_for_testing());
-  EXPECT_EQ(video_frame_stream_->get_previous_decoder_for_testing(), decoder1_);
   EXPECT_TRUE(pending_read_);
 
   // Give the decoder one more buffer, enough to release a frame.
   demuxer_stream_->SatisfyReadAndHoldNext();
   base::RunLoop().RunUntilIdle();
 
   // New buffers should not have been added after the frame was released.
   EXPECT_EQ(video_frame_stream_->get_pending_buffers_size_for_testing(), 0);
   EXPECT_FALSE(pending_read_);
 
@@ skipping 85 matching lines @@
     ReadOneFrame();
     base::RunLoop().RunUntilIdle();
     EXPECT_FALSE(pending_read_);
   }
   EXPECT_EQ(VideoFrameStream::DECODE_ERROR, last_read_status_);
 }
 
 TEST_P(VideoFrameStreamTest, FallbackDecoderSelectedOnFailureToReinitialize) {
   Initialize();
   decoder1_->SimulateFailureToInit();
-  // Holding decode, because large decoder delays might cause us to get rid of
-  // |previous_decoder_| before we are in a pending state again.
-  decoder2_->HoldDecode();
   ReadUntilDecoderReinitialized(decoder1_);
-  ASSERT_TRUE(video_frame_stream_->get_previous_decoder_for_testing());
-  decoder2_->SatisfyDecode();
-  base::RunLoop().RunUntilIdle();
   ReadAllFrames();
-  ASSERT_FALSE(video_frame_stream_->get_previous_decoder_for_testing());
+  ASSERT_GT(decoder2_->total_bytes_decoded(), 0);
 }
 
 TEST_P(VideoFrameStreamTest,
        FallbackDecoderSelectedOnFailureToReinitialize_Twice) {
   Initialize();
   decoder1_->SimulateFailureToInit();
   ReadUntilDecoderReinitialized(decoder1_);
   ReadOneFrame();
   decoder2_->SimulateFailureToInit();
   ReadUntilDecoderReinitialized(decoder2_);
@@ skipping 17 matching lines @@
 
 TEST_P(VideoFrameStreamTest, Destroy_DuringFallbackDecoderSelection) {
   Initialize();
   decoder1_->SimulateFailureToInit();
   EnterPendingState(DECODER_REINIT);
   decoder2_->HoldNextInit();
   SatisfyPendingCallback(DECODER_REINIT);
 }
 
 }  // namespace media