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 | 55 |
56 // Helper method to set the audio output volume. | 56 // Helper method to set the audio output volume. |
57 void SetVolumeInternal(); | 57 void SetVolumeInternal(); |
58 | 58 |
59 void ResetTimestampHelper(); | 59 void ResetTimestampHelper(); |
60 | 60 |
61 // Audio configs from the demuxer. | 61 // Audio configs from the demuxer. |
62 AudioCodec audio_codec_; | 62 AudioCodec audio_codec_; |
63 int num_channels_; | 63 int num_channels_; |
64 int config_sampling_rate_; | 64 int config_sampling_rate_; |
65 std::vector<uint8> audio_extra_data_; | 65 std::vector<uint8_t> audio_extra_data_; |
66 int64 audio_codec_delay_ns_; | 66 int64_t audio_codec_delay_ns_; |
67 int64 audio_seek_preroll_ns_; | 67 int64_t audio_seek_preroll_ns_; |
68 double volume_; | 68 double volume_; |
69 int bytes_per_frame_; | 69 int bytes_per_frame_; |
70 | 70 |
71 // Audio output sample rate | 71 // Audio output sample rate |
72 int output_sampling_rate_; | 72 int output_sampling_rate_; |
73 | 73 |
74 // Frame count to sync with audio codec output | 74 // Frame count to sync with audio codec output |
75 int64 frame_count_; | 75 int64_t frame_count_; |
76 | 76 |
77 // Base timestamp for the |audio_timestamp_helper_|. | 77 // Base timestamp for the |audio_timestamp_helper_|. |
78 base::TimeDelta base_timestamp_; | 78 base::TimeDelta base_timestamp_; |
79 | 79 |
80 // Object to calculate the current audio timestamp for A/V sync. | 80 // Object to calculate the current audio timestamp for A/V sync. |
81 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; | 81 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; |
82 | 82 |
83 // The time limit for the next frame to avoid underrun. | 83 // The time limit for the next frame to avoid underrun. |
84 base::TimeTicks next_frame_time_limit_; | 84 base::TimeTicks next_frame_time_limit_; |
85 | 85 |
86 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); | 86 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); |
87 }; | 87 }; |
88 | 88 |
89 } // namespace media | 89 } // namespace media |
90 | 90 |
91 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ | 91 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ |
OLD | NEW |