| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/decrypting_audio_decoder.h" | 5 #include "media/filters/decrypting_audio_decoder.h" |
| 6 | 6 |
| 7 #include <cstdlib> | 7 #include <cstdlib> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "media/base/audio_buffer.h" | 14 #include "media/base/audio_buffer.h" |
| 15 #include "media/base/audio_decoder_config.h" | 15 #include "media/base/audio_decoder_config.h" |
| 16 #include "media/base/audio_timestamp_helper.h" | 16 #include "media/base/audio_timestamp_helper.h" |
| 17 #include "media/base/bind_to_current_loop.h" | 17 #include "media/base/bind_to_current_loop.h" |
| 18 #include "media/base/buffers.h" | 18 #include "media/base/buffers.h" |
| 19 #include "media/base/decoder_buffer.h" | 19 #include "media/base/decoder_buffer.h" |
| 20 #include "media/base/decryptor.h" | 20 #include "media/base/decryptor.h" |
| 21 #include "media/base/demuxer_stream.h" | 21 #include "media/base/demuxer_stream.h" |
| 22 #include "media/base/pipeline.h" | 22 #include "media/base/pipeline.h" |
| 23 | 23 |
| 24 namespace media { | 24 namespace media { |
| 25 | 25 |
| 26 const int DecryptingAudioDecoder::kSupportedBitsPerChannel = 16; | |
| 27 | |
| 28 static inline bool IsOutOfSync(const base::TimeDelta& timestamp_1, | 26 static inline bool IsOutOfSync(const base::TimeDelta& timestamp_1, |
| 29 const base::TimeDelta& timestamp_2) { | 27 const base::TimeDelta& timestamp_2) { |
| 30 // Out of sync of 100ms would be pretty noticeable and we should keep any | 28 // Out of sync of 100ms would be pretty noticeable and we should keep any |
| 31 // drift below that. | 29 // drift below that. |
| 32 const int64 kOutOfSyncThresholdInMilliseconds = 100; | 30 const int64 kOutOfSyncThresholdInMilliseconds = 100; |
| 33 return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) > | 31 return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) > |
| 34 kOutOfSyncThresholdInMilliseconds; | 32 kOutOfSyncThresholdInMilliseconds; |
| 35 } | 33 } |
| 36 | 34 |
| 37 DecryptingAudioDecoder::DecryptingAudioDecoder( | 35 DecryptingAudioDecoder::DecryptingAudioDecoder( |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 } | 356 } |
| 359 | 357 |
| 360 frame->set_timestamp(current_time); | 358 frame->set_timestamp(current_time); |
| 361 timestamp_helper_->AddFrames(frame->frame_count()); | 359 timestamp_helper_->AddFrames(frame->frame_count()); |
| 362 | 360 |
| 363 output_cb_.Run(frame); | 361 output_cb_.Run(frame); |
| 364 } | 362 } |
| 365 } | 363 } |
| 366 | 364 |
| 367 } // namespace media | 365 } // namespace media |
| OLD | NEW |