Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderers/video_renderer_impl.h" | 5 #include "media/renderers/video_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/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/metrics/field_trial.h" | 12 #include "base/metrics/field_trial.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 15 #include "base/threading/platform_thread.h" | 15 #include "base/threading/platform_thread.h" |
| 16 #include "base/time/default_tick_clock.h" | 16 #include "base/time/default_tick_clock.h" |
| 17 #include "base/trace_event/trace_event.h" | 17 #include "base/trace_event/trace_event.h" |
| 18 #include "media/base/bind_to_current_loop.h" | 18 #include "media/base/bind_to_current_loop.h" |
| 19 #include "media/base/buffers.h" | 19 #include "media/base/buffers.h" |
| 20 #include "media/base/limits.h" | 20 #include "media/base/limits.h" |
| 21 #include "media/base/media_switches.h" | 21 #include "media/base/media_switches.h" |
| 22 #include "media/base/pipeline.h" | 22 #include "media/base/pipeline.h" |
| 23 #include "media/base/video_frame.h" | 23 #include "media/base/video_frame.h" |
| 24 #include "media/renderers/gpu_video_accelerator_factories.h" | |
| 25 #include "media/video/gpu_memory_buffer_video_frame_pool.h" | |
| 24 | 26 |
| 25 namespace media { | 27 namespace media { |
| 26 | 28 |
| 27 // TODO(dalecurtis): This experiment is temporary and should be removed once we | 29 // TODO(dalecurtis): This experiment is temporary and should be removed once we |
| 28 // have enough data to support the primacy of the new video rendering path; see | 30 // have enough data to support the primacy of the new video rendering path; see |
| 29 // http://crbug.com/485699 for details. | 31 // http://crbug.com/485699 for details. |
| 30 static bool ShouldUseVideoRenderingPath() { | 32 static bool ShouldUseVideoRenderingPath() { |
| 31 // Note: It's important to query the field trial state first, to ensure that | 33 // Note: It's important to query the field trial state first, to ensure that |
| 32 // UMA reports the correct group. | 34 // UMA reports the correct group. |
| 33 const std::string group_name = | 35 const std::string group_name = |
| 34 base::FieldTrialList::FindFullName("NewVideoRendererTrial"); | 36 base::FieldTrialList::FindFullName("NewVideoRendererTrial"); |
| 35 const bool disabled_via_cli = | 37 const bool disabled_via_cli = |
| 36 base::CommandLine::ForCurrentProcess()->HasSwitch( | 38 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 37 switches::kDisableNewVideoRenderer); | 39 switches::kDisableNewVideoRenderer); |
| 38 return !disabled_via_cli && !StartsWithASCII(group_name, "Disabled", true); | 40 return !disabled_via_cli && !StartsWithASCII(group_name, "Disabled", true); |
| 39 } | 41 } |
| 40 | 42 |
| 41 VideoRendererImpl::VideoRendererImpl( | 43 VideoRendererImpl::VideoRendererImpl( |
| 42 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, | 44 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| 43 VideoRendererSink* sink, | 45 VideoRendererSink* sink, |
| 44 ScopedVector<VideoDecoder> decoders, | 46 ScopedVector<VideoDecoder> decoders, |
| 45 bool drop_frames, | 47 bool drop_frames, |
| 48 scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories, | |
| 46 const scoped_refptr<MediaLog>& media_log) | 49 const scoped_refptr<MediaLog>& media_log) |
| 47 : task_runner_(task_runner), | 50 : task_runner_(task_runner), |
| 48 use_new_video_renderering_path_(ShouldUseVideoRenderingPath()), | 51 use_new_video_renderering_path_(ShouldUseVideoRenderingPath()), |
| 49 sink_(sink), | 52 sink_(sink), |
| 50 sink_started_(false), | 53 sink_started_(false), |
| 51 video_frame_stream_( | 54 video_frame_stream_( |
| 52 new VideoFrameStream(task_runner, decoders.Pass(), media_log)), | 55 new VideoFrameStream(task_runner, decoders.Pass(), media_log)), |
| 56 gpu_memory_buffer_pool_( | |
| 57 new GpuMemoryBufferVideoFramePool(task_runner, gpu_factories)), | |
| 53 low_delay_(false), | 58 low_delay_(false), |
| 54 received_end_of_stream_(false), | 59 received_end_of_stream_(false), |
| 55 rendered_end_of_stream_(false), | 60 rendered_end_of_stream_(false), |
| 56 frame_available_(&lock_), | 61 frame_available_(&lock_), |
| 57 state_(kUninitialized), | 62 state_(kUninitialized), |
| 58 thread_(), | 63 thread_(), |
| 59 pending_read_(false), | 64 pending_read_(false), |
| 60 drop_frames_(drop_frames), | 65 drop_frames_(drop_frames), |
| 61 buffering_state_(BUFFERING_HAVE_NOTHING), | 66 buffering_state_(BUFFERING_HAVE_NOTHING), |
| 62 frames_decoded_(0), | 67 frames_decoded_(0), |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 492 if (use_new_video_renderering_path_) | 497 if (use_new_video_renderering_path_) |
| 493 MaybeFireEndedCallback(); | 498 MaybeFireEndedCallback(); |
| 494 } else { | 499 } else { |
| 495 // Maintain the latest frame decoded so the correct frame is displayed | 500 // Maintain the latest frame decoded so the correct frame is displayed |
| 496 // after prerolling has completed. | 501 // after prerolling has completed. |
| 497 if (frame->timestamp() <= start_timestamp_) { | 502 if (frame->timestamp() <= start_timestamp_) { |
| 498 if (use_new_video_renderering_path_) | 503 if (use_new_video_renderering_path_) |
| 499 algorithm_->Reset(); | 504 algorithm_->Reset(); |
| 500 ready_frames_.clear(); | 505 ready_frames_.clear(); |
| 501 } | 506 } |
| 507 // TODO(dcastagna): Enable GpuMemoryBuffer VideoFrames. | |
|
DaleCurtis
2015/05/12 17:23:20
Some notes:
- To avoid blocking the media thread w
Daniele Castagna
2015/05/12 21:21:29
Good point. In our tests we noticed that the copy
DaleCurtis
2015/05/13 02:52:14
Should be okay to do in a second pass, we can watc
Daniele Castagna
2015/05/13 04:29:45
Sounds good to me to do it in a second pass.
I'm g
| |
| 508 //AddReadyFrame_Locked( | |
| 509 // gpu_memory_buffer_pool_->MaybeCreateHardwareFrame(frame)); | |
| 502 AddReadyFrame_Locked(frame); | 510 AddReadyFrame_Locked(frame); |
| 503 } | 511 } |
| 504 | 512 |
| 505 // Signal buffering state if we've met our conditions for having enough | 513 // Signal buffering state if we've met our conditions for having enough |
| 506 // data. | 514 // data. |
| 507 if (buffering_state_ != BUFFERING_HAVE_ENOUGH && HaveEnoughData_Locked()) { | 515 if (buffering_state_ != BUFFERING_HAVE_ENOUGH && HaveEnoughData_Locked()) { |
| 508 TransitionToHaveEnough_Locked(); | 516 TransitionToHaveEnough_Locked(); |
| 509 if (use_new_video_renderering_path_ && !sink_started_ && | 517 if (use_new_video_renderering_path_ && !sink_started_ && |
| 510 !rendered_end_of_stream_) { | 518 !rendered_end_of_stream_) { |
| 511 start_sink = true; | 519 start_sink = true; |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 737 (algorithm_->frames_queued() == 1u && | 745 (algorithm_->frames_queued() == 1u && |
| 738 algorithm_->average_frame_duration() == base::TimeDelta())) { | 746 algorithm_->average_frame_duration() == base::TimeDelta())) { |
| 739 rendered_end_of_stream_ = true; | 747 rendered_end_of_stream_ = true; |
| 740 task_runner_->PostTask(FROM_HERE, ended_cb_); | 748 task_runner_->PostTask(FROM_HERE, ended_cb_); |
| 741 } | 749 } |
| 742 | 750 |
| 743 return effective_frames; | 751 return effective_frames; |
| 744 } | 752 } |
| 745 | 753 |
| 746 } // namespace media | 754 } // namespace media |
| OLD | NEW |