Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: media/filters/renderer_impl.cc

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/filters/frame_processor_unittest.cc ('k') | media/filters/renderer_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/renderer_impl.h" 5 #include "media/filters/renderer_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 base::Bind(&RendererImpl::OnVideoRendererInitializeDone, weak_this_); 246 base::Bind(&RendererImpl::OnVideoRendererInitializeDone, weak_this_);
247 247
248 if (!demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO)) { 248 if (!demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO)) {
249 video_renderer_.reset(); 249 video_renderer_.reset();
250 task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK)); 250 task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK));
251 return; 251 return;
252 } 252 }
253 253
254 video_renderer_->Initialize( 254 video_renderer_->Initialize(
255 demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO), 255 demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO),
256 demuxer_stream_provider_->GetLiveness() ==
257 DemuxerStreamProvider::LIVENESS_LIVE,
258 done_cb, 256 done_cb,
259 base::Bind(&RendererImpl::OnUpdateStatistics, weak_this_), 257 base::Bind(&RendererImpl::OnUpdateStatistics, weak_this_),
260 base::Bind(&RendererImpl::OnBufferingStateChanged, 258 base::Bind(&RendererImpl::OnBufferingStateChanged,
261 weak_this_, 259 weak_this_,
262 &video_buffering_state_), 260 &video_buffering_state_),
263 base::ResetAndReturn(&paint_cb_), 261 base::ResetAndReturn(&paint_cb_),
264 base::Bind(&RendererImpl::OnVideoRendererEnded, weak_this_), 262 base::Bind(&RendererImpl::OnVideoRendererEnded, weak_this_),
265 base::Bind(&RendererImpl::OnError, weak_this_), 263 base::Bind(&RendererImpl::OnError, weak_this_),
266 base::Bind(&RendererImpl::GetMediaTimeForSyncingVideo, 264 base::Bind(&RendererImpl::GetMediaTimeForSyncingVideo,
267 base::Unretained(this))); 265 base::Unretained(this)));
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 DCHECK(task_runner_->BelongsToCurrentThread()); 522 DCHECK(task_runner_->BelongsToCurrentThread());
525 523
526 if (!init_cb_.is_null()) 524 if (!init_cb_.is_null())
527 base::ResetAndReturn(&init_cb_).Run(); 525 base::ResetAndReturn(&init_cb_).Run();
528 526
529 if (!flush_cb_.is_null()) 527 if (!flush_cb_.is_null())
530 base::ResetAndReturn(&flush_cb_).Run(); 528 base::ResetAndReturn(&flush_cb_).Run();
531 } 529 }
532 530
533 } // namespace media 531 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/frame_processor_unittest.cc ('k') | media/filters/renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698