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