| 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 #ifndef MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ | 5 #ifndef MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ |
| 6 #define MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ | 6 #define MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 // Helper method to set the audio output volume. | 55 // Helper method to set the audio output volume. |
| 56 void SetVolumeInternal(); | 56 void SetVolumeInternal(); |
| 57 | 57 |
| 58 void ResetTimestampHelper(); | 58 void ResetTimestampHelper(); |
| 59 | 59 |
| 60 // Audio configs from the demuxer. | 60 // Audio configs from the demuxer. |
| 61 AudioCodec audio_codec_; | 61 AudioCodec audio_codec_; |
| 62 int num_channels_; | 62 int num_channels_; |
| 63 int config_sampling_rate_; | 63 int config_sampling_rate_; |
| 64 std::vector<uint8> audio_extra_data_; | 64 std::vector<uint8> audio_extra_data_; |
| 65 int64 audio_codec_delay_ns_; | |
| 66 int64 audio_seek_preroll_ns_; | |
| 67 double volume_; | 65 double volume_; |
| 68 int bytes_per_frame_; | 66 int bytes_per_frame_; |
| 69 | 67 |
| 70 // Audio output sample rate | 68 // Audio output sample rate |
| 71 int output_sampling_rate_; | 69 int output_sampling_rate_; |
| 72 | 70 |
| 73 // Frame count to sync with audio codec output | 71 // Frame count to sync with audio codec output |
| 74 int64 frame_count_; | 72 int64 frame_count_; |
| 75 | 73 |
| 76 // Base timestamp for the |audio_timestamp_helper_|. | 74 // Base timestamp for the |audio_timestamp_helper_|. |
| 77 base::TimeDelta base_timestamp_; | 75 base::TimeDelta base_timestamp_; |
| 78 | 76 |
| 79 // Object to calculate the current audio timestamp for A/V sync. | 77 // Object to calculate the current audio timestamp for A/V sync. |
| 80 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; | 78 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; |
| 81 | 79 |
| 82 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); | 80 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); |
| 83 }; | 81 }; |
| 84 | 82 |
| 85 } // namespace media | 83 } // namespace media |
| 86 | 84 |
| 87 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ | 85 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ |
| OLD | NEW |