media: Introduce DemuxerStreamProvider interface.

media: Introduce DemuxerStreamProvider interface.

Now RendererImpl only takes DemuxerStreamProvider (minimal interface it needs)
instead of the full Demuxer. Also, this makes other Renderer implementations
easier since they don't necessarily have access to a full Demuxer.

BUG=392236
TEST=No functionality change and all existing tests pass.

Committed: https://crrev.com/1c5668ece2d095df3f33d0fe8c63a5fce45d3573
Cr-Commit-Position: refs/heads/master@{#294081}

[xhwang, 2014-08-29 23:59:48]

xhwang@chromium.org changed reviewers:
+ scherkus@chromium.org

[xhwang, 2014-08-30 00:01:04]

here's a trivial one. PTAL

[tim (not reviewing), 2014-09-03 22:43:02]

tim@chromium.org changed reviewers:
+ tim@chromium.org

[tim (not reviewing), 2014-09-03 22:43:02]

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer_stream_pr...
File media/base/demuxer_stream_provider.h (right):

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer_stream_pr...
media/base/demuxer_stream_provider.h:24: // Returns the first stream of the
given stream type (which is not allowed
OOC as someone using DemuxerStreamProvider, when do I have to worry about
multiple streams?  Is the notion of "streams other than the first stream"
something this layer can even deal with?

[xhwang, 2014-09-03 23:45:25]

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer_stream_pr...
File media/base/demuxer_stream_provider.h (right):

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer_stream_pr...
media/base/demuxer_stream_provider.h:24: // Returns the first stream of the
given stream type (which is not allowed
On 2014/09/03 22:43:02, timsteele wrote:
> OOC as someone using DemuxerStreamProvider, when do I have to worry about
> multiple streams?  Is the notion of "streams other than the first stream"
> something this layer can even deal with?

This is moved from the old Demuxer code. Basically we don't support multiple
audio or multiple video streams. But we do support one audio stream and one
video stream.

Currently you only need to worry about a DemuxerStreamProvider that provides
only one audio stream.

In the future, we need to think about how to support audio + video. I imagine
we'll have a DataPipe for each stream we support.

[xhwang, 2014-09-05 23:04:08]

scherkus: kindly ping...

[scherkus (not reviewing), 2014-09-05 23:23:22]

sorry for delay -- this was completely off my radar

lgtm w/ questions

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer.h
File media/base/demuxer.h (right):

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer.h#newcode46
media/base/demuxer.h:46: class MEDIA_EXPORT Demuxer : public
DemuxerStreamProvider {
alternatively we can go the composition route and have Demuxer() provide a
DemuxerStreamProvider* getter, similar to what I did with TimeSource* from
AudioRenderer

but I suppose we'd only really want to do that if it'd make sense for there to
be stand alone DSP implementations (similar to how I have WallClockTimeSource
vs. AudioRendererImpl).

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer.h#newcode81
media/base/demuxer.h:81: // DemuxerStreamProvider implementation.
I forget this part of C++ -- but do we need to duplicate these definitions here?

[xhwang, 2014-09-09 21:25:02]

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer.h
File media/base/demuxer.h (right):

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer.h#newcode46
media/base/demuxer.h:46: class MEDIA_EXPORT Demuxer : public
DemuxerStreamProvider {
On 2014/09/05 23:23:21, scherkus wrote:
> alternatively we can go the composition route and have Demuxer() provide a
> DemuxerStreamProvider* getter, similar to what I did with TimeSource* from
> AudioRenderer
> 
> but I suppose we'd only really want to do that if it'd make sense for there to
> be stand alone DSP implementations (similar to how I have WallClockTimeSource
> vs. AudioRendererImpl).

Yeah, currently both ChunkDemuxer and FFD provides the DS's directly. I don't
feel very necessary to add a DemuxerStreamProvider impl for them right now. So I
tend to land this right now and iterate on that later...

https://codereview.chromium.org/523283002/diff/1/media/base/demuxer.h#newcode81
media/base/demuxer.h:81: // DemuxerStreamProvider implementation.
On 2014/09/05 23:23:22, scherkus wrote:
> I forget this part of C++ -- but do we need to duplicate these definitions
here?

No, it's not needed. Removed.

[xhwang, 2014-09-09 21:25:10]

The CQ bit was checked by xhwang@chromium.org

[commit-bot: I haz the power, 2014-09-09 21:31:29]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/xhwang@chromium.org/523283002/20001

[commit-bot: I haz the power, 2014-09-09 23:55:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-09 23:55:44]

Failed to apply patch for media/filters/renderer_impl.cc:
While running git apply --index -p1;
  error: patch failed: media/filters/renderer_impl.cc:11
  error: media/filters/renderer_impl.cc: patch does not apply

Patch:       media/filters/renderer_impl.cc
Index: media/filters/renderer_impl.cc
diff --git a/media/filters/renderer_impl.cc b/media/filters/renderer_impl.cc
index
1e5cb18048d869a00340df0aded69d8aab232547..3658f3918db80fe9b4d5a6dbbc6c82fd2623116e
100644
--- a/media/filters/renderer_impl.cc
+++ b/media/filters/renderer_impl.cc
@@ -11,7 +11,7 @@
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "media/base/audio_renderer.h"
-#include "media/base/demuxer.h"
+#include "media/base/demuxer_stream_provider.h"
 #include "media/base/time_delta_interpolator.h"
 #include "media/base/time_source.h"
 #include "media/base/video_renderer.h"
@@ -20,12 +20,12 @@ namespace media {
 
 RendererImpl::RendererImpl(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
-    Demuxer* demuxer,
+    DemuxerStreamProvider* demuxer_stream_provider,
     scoped_ptr<AudioRenderer> audio_renderer,
     scoped_ptr<VideoRenderer> video_renderer)
     : state_(STATE_UNINITIALIZED),
       task_runner_(task_runner),
-      demuxer_(demuxer),
+      demuxer_stream_provider_(demuxer_stream_provider),
       audio_renderer_(audio_renderer.Pass()),
       video_renderer_(video_renderer.Pass()),
       time_source_(NULL),
@@ -67,8 +67,8 @@ void RendererImpl::Initialize(const base::Closure& init_cb,
   DCHECK(!error_cb.is_null());
   DCHECK(!buffering_state_cb.is_null());
   DCHECK(!get_duration_cb.is_null());
-  DCHECK(demuxer_->GetStream(DemuxerStream::AUDIO) ||
-         demuxer_->GetStream(DemuxerStream::VIDEO));
+  DCHECK(demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO) ||
+         demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO));
 
   statistics_cb_ = statistics_cb;
   ended_cb_ = ended_cb;
@@ -196,14 +196,14 @@ void RendererImpl::InitializeAudioRenderer() {
   PipelineStatusCB done_cb =
       base::Bind(&RendererImpl::OnAudioRendererInitializeDone, weak_this_);
 
-  if (!demuxer_->GetStream(DemuxerStream::AUDIO)) {
+  if (!demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO)) {
     audio_renderer_.reset();
     task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK));
     return;
   }
 
   audio_renderer_->Initialize(
-      demuxer_->GetStream(DemuxerStream::AUDIO),
+      demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO),
       done_cb,
       base::Bind(&RendererImpl::OnUpdateStatistics, weak_this_),
       base::Bind(&RendererImpl::OnAudioTimeUpdate, weak_this_),
@@ -240,19 +240,21 @@ void RendererImpl::InitializeVideoRenderer() {
   PipelineStatusCB done_cb =
       base::Bind(&RendererImpl::OnVideoRendererInitializeDone, weak_this_);
 
-  if (!demuxer_->GetStream(DemuxerStream::VIDEO)) {
+  if (!demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO)) {
     video_renderer_.reset();
     task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK));
     return;
   }
 
   video_renderer_->Initialize(
-      demuxer_->GetStream(DemuxerStream::VIDEO),
-      demuxer_->GetLiveness() == Demuxer::LIVENESS_LIVE,
+      demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO),
+      demuxer_stream_provider_->GetLiveness() ==
+          DemuxerStreamProvider::LIVENESS_LIVE,
       done_cb,
       base::Bind(&RendererImpl::OnUpdateStatistics, weak_this_),
       base::Bind(&RendererImpl::OnVideoTimeUpdate, weak_this_),
-      base::Bind(&RendererImpl::OnBufferingStateChanged, weak_this_,
+      base::Bind(&RendererImpl::OnBufferingStateChanged,
+                 weak_this_,
                  &video_buffering_state_),
       base::Bind(&RendererImpl::OnVideoRendererEnded, weak_this_),
       base::Bind(&RendererImpl::OnError, weak_this_),

[xhwang, 2014-09-10 00:12:23]

rebase only

[xhwang, 2014-09-10 00:12:30]

The CQ bit was checked by xhwang@chromium.org

[commit-bot: I haz the power, 2014-09-10 00:14:22]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/xhwang@chromium.org/523283002/40001

[commit-bot: I haz the power, 2014-09-10 02:42:59]

Committed patchset #3 (id:40001) as 99b4b384fbbc6cd45ac5c211bfaffe98016c26dd

[commit-bot: I haz the power, 2014-09-10 03:58:27]

Patchset 3 (id:??) landed as
https://crrev.com/1c5668ece2d095df3f33d0fe8c63a5fce45d3573
Cr-Commit-Position: refs/heads/master@{#294081}