Stop audio FFmpegDemuxerStreams if we get notified that audio rendering is disabled.

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2011 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 <deque>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/base/filters.h"
@@ skipping 473 matching lines @@
   message_loop_.RunAllPending();
 
   // Get our streams.
   scoped_refptr<DemuxerStream> video =
       demuxer_->GetStream(DemuxerStream::VIDEO);
   scoped_refptr<DemuxerStream> audio =
       demuxer_->GetStream(DemuxerStream::AUDIO);
   ASSERT_TRUE(video);
   ASSERT_TRUE(audio);
 
-  // Attempt a read from the video stream and run the message loop until done.
+  // Attempt a read from the video stream: it should return valid data.
   scoped_refptr<DemuxerStreamReader> reader(new DemuxerStreamReader());
   reader->Read(video);
   message_loop_.RunAllPending();
-  EXPECT_TRUE(reader->called());
+  ASSERT_TRUE(reader->called());
   ValidateBuffer(FROM_HERE, reader->buffer(), 22084, 0);
 
+  // We should have read a little bit into the file.
+  int64 position = 0;
+  int64 size = 0;
+  EXPECT_TRUE(demuxer_->GetPosition(&position));
+  EXPECT_TRUE(demuxer_->GetSize(&size));
+  EXPECT_LT(position, size);
+
+  // Attempt a read from the audio stream: it should immediately return end of
+  // stream without requiring the message loop to read data.
   reader->Reset();
   reader->Read(audio);
-  message_loop_.RunAllPending();
-  EXPECT_TRUE(reader->called());
+  ASSERT_TRUE(reader->called());
   EXPECT_TRUE(reader->buffer()->IsEndOfStream());
+
+  // As a sanity check, verify that while we're getting end of stream packets
+  // we aren't at the end of the file.
+  EXPECT_TRUE(demuxer_->GetPosition(&position));

[acolwell GONE FROM CHROMIUM, 2011/12/13 16:45:44]

This feels fragile & too indirect. What about just creating a testing helper
function on FFmpegDemuxer along the lines of bool IsStopped(Type type) or bool
AreAllStreamsStopped()?

[scherkus (not reviewing), 2011/12/13 17:24:56]

I'll give it a shot.

+  EXPECT_LT(position, size);
 }
 
 class MockFFmpegDemuxer : public FFmpegDemuxer {
  public:
   explicit MockFFmpegDemuxer(MessageLoop* message_loop)
       : FFmpegDemuxer(message_loop, true) {
   }
   virtual ~MockFFmpegDemuxer() {}
 
   MOCK_METHOD0(WaitForRead, size_t());
@@ skipping 180 matching lines @@
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ValidateBuffer(FROM_HERE, reader->buffer(), 1740, 2436000);
 
   // Manually release the last reference to the buffer and verify it was freed.
   reader->Reset();
   message_loop_.RunAllPending();
 }
 
 }  // namespace media