| Index: chromecast/media/cma/base/buffering_controller.cc
|
| diff --git a/chromecast/media/cma/base/buffering_controller.cc b/chromecast/media/cma/base/buffering_controller.cc
|
| index 5d6ccc4e5c8a479ef868d106934e513d24f72917..0d9a1b86ef35cb1dc74bda661868fa4ecb04959f 100644
|
| --- a/chromecast/media/cma/base/buffering_controller.cc
|
| +++ b/chromecast/media/cma/base/buffering_controller.cc
|
| @@ -97,14 +97,14 @@ void BufferingController::SetMediaTime(base::TimeDelta time) {
|
| }
|
|
|
| base::TimeDelta BufferingController::GetMaxRenderingTime() const {
|
| - base::TimeDelta max_rendering_time(::media::kNoTimestamp());
|
| + base::TimeDelta max_rendering_time(::media::kNoTimestamp);
|
| for (StreamList::const_iterator it = stream_list_.begin();
|
| it != stream_list_.end(); ++it) {
|
| base::TimeDelta max_stream_rendering_time =
|
| (*it)->GetMaxRenderingTime();
|
| - if (max_stream_rendering_time == ::media::kNoTimestamp())
|
| - return ::media::kNoTimestamp();
|
| - if (max_rendering_time == ::media::kNoTimestamp() ||
|
| + if (max_stream_rendering_time == ::media::kNoTimestamp)
|
| + return ::media::kNoTimestamp;
|
| + if (max_rendering_time == ::media::kNoTimestamp ||
|
| max_stream_rendering_time < max_rendering_time) {
|
| max_rendering_time = max_stream_rendering_time;
|
| }
|
|
|