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_; |
65 double volume_; | 67 double volume_; |
66 int bytes_per_frame_; | 68 int bytes_per_frame_; |
67 | 69 |
68 // Audio output sample rate | 70 // Audio output sample rate |
69 int output_sampling_rate_; | 71 int output_sampling_rate_; |
70 | 72 |
71 // Frame count to sync with audio codec output | 73 // Frame count to sync with audio codec output |
72 int64 frame_count_; | 74 int64 frame_count_; |
73 | 75 |
74 // Base timestamp for the |audio_timestamp_helper_|. | 76 // Base timestamp for the |audio_timestamp_helper_|. |
75 base::TimeDelta base_timestamp_; | 77 base::TimeDelta base_timestamp_; |
76 | 78 |
77 // Object to calculate the current audio timestamp for A/V sync. | 79 // Object to calculate the current audio timestamp for A/V sync. |
78 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; | 80 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; |
79 | 81 |
80 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); | 82 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); |
81 }; | 83 }; |
82 | 84 |
83 } // namespace media | 85 } // namespace media |
84 | 86 |
85 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ | 87 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ |
OLD | NEW |