| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/base/android/media_codec_video_decoder.h" | 5 #include "media/base/android/media_codec_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "media/base/android/media_codec_bridge.h" | |
| 10 #include "media/base/android/media_statistics.h" | 9 #include "media/base/android/media_statistics.h" |
| 10 #include "media/base/android/sdk_media_codec_bridge.h" |
| 11 #include "media/base/demuxer_stream.h" | 11 #include "media/base/demuxer_stream.h" |
| 12 #include "media/base/timestamp_constants.h" | 12 #include "media/base/timestamp_constants.h" |
| 13 | 13 |
| 14 namespace media { | 14 namespace media { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 const int kDelayForStandAloneEOS = 2; // milliseconds | 17 const int kDelayForStandAloneEOS = 2; // milliseconds |
| 18 } | 18 } |
| 19 | 19 |
| 20 MediaCodecVideoDecoder::MediaCodecVideoDecoder( | 20 MediaCodecVideoDecoder::MediaCodecVideoDecoder( |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 | 349 |
| 350 // |update_current_time_cb_| might be null if there is audio stream. | 350 // |update_current_time_cb_| might be null if there is audio stream. |
| 351 // Do not update current time for stand-alone EOS frames. | 351 // Do not update current time for stand-alone EOS frames. |
| 352 if (!update_current_time_cb_.is_null() && update_time) { | 352 if (!update_current_time_cb_.is_null() && update_time) { |
| 353 media_task_runner_->PostTask( | 353 media_task_runner_->PostTask( |
| 354 FROM_HERE, base::Bind(update_current_time_cb_, pts, pts, false)); | 354 FROM_HERE, base::Bind(update_current_time_cb_, pts, pts, false)); |
| 355 } | 355 } |
| 356 } | 356 } |
| 357 | 357 |
| 358 } // namespace media | 358 } // namespace media |
| OLD | NEW |