| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/android/media_codec_audio_decoder.h" | 5 #include "media/filters/android/media_codec_audio_decoder.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/callback_helpers.h" | 11 #include "base/callback_helpers.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/single_thread_task_runner.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "media/base/android/media_codec_bridge_impl.h" | 15 #include "media/base/android/media_codec_bridge_impl.h" |
| 15 #include "media/base/android/media_codec_util.h" | 16 #include "media/base/android/media_codec_util.h" |
| 16 #include "media/base/audio_timestamp_helper.h" | 17 #include "media/base/audio_timestamp_helper.h" |
| 17 #include "media/base/bind_to_current_loop.h" | 18 #include "media/base/bind_to_current_loop.h" |
| 18 #include "media/base/timestamp_constants.h" | 19 #include "media/base/timestamp_constants.h" |
| 19 #include "media/formats/ac3/ac3_util.h" | 20 #include "media/formats/ac3/ac3_util.h" |
| 20 | 21 |
| 21 namespace media { | 22 namespace media { |
| 22 | 23 |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 RETURN_STRING(STATE_READY); | 513 RETURN_STRING(STATE_READY); |
| 513 RETURN_STRING(STATE_ERROR); | 514 RETURN_STRING(STATE_ERROR); |
| 514 } | 515 } |
| 515 NOTREACHED() << "Unknown state " << state; | 516 NOTREACHED() << "Unknown state " << state; |
| 516 return nullptr; | 517 return nullptr; |
| 517 } | 518 } |
| 518 | 519 |
| 519 #undef RETURN_STRING | 520 #undef RETURN_STRING |
| 520 | 521 |
| 521 } // namespace media | 522 } // namespace media |
| OLD | NEW |