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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 virtual bool CreateMediaCodecBridgeInternal() override; | 51 virtual bool CreateMediaCodecBridgeInternal() override; |
52 | 52 |
53 // Helper method to set the audio output volume. | 53 // Helper method to set the audio output volume. |
54 void SetVolumeInternal(); | 54 void SetVolumeInternal(); |
55 | 55 |
56 // Audio configs from the demuxer. | 56 // Audio configs from the demuxer. |
57 AudioCodec audio_codec_; | 57 AudioCodec audio_codec_; |
58 int num_channels_; | 58 int num_channels_; |
59 int sampling_rate_; | 59 int sampling_rate_; |
60 std::vector<uint8> audio_extra_data_; | 60 std::vector<uint8> audio_extra_data_; |
| 61 int64 audio_codec_delay_ns_; |
| 62 int64 audio_seek_preroll_ns_; |
61 double volume_; | 63 double volume_; |
62 int bytes_per_frame_; | 64 int bytes_per_frame_; |
63 | 65 |
64 // Base timestamp for the |audio_timestamp_helper_|. | 66 // Base timestamp for the |audio_timestamp_helper_|. |
65 base::TimeDelta base_timestamp_; | 67 base::TimeDelta base_timestamp_; |
66 | 68 |
67 // Object to calculate the current audio timestamp for A/V sync. | 69 // Object to calculate the current audio timestamp for A/V sync. |
68 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; | 70 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; |
69 | 71 |
70 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); | 72 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); |
71 }; | 73 }; |
72 | 74 |
73 } // namespace media | 75 } // namespace media |
74 | 76 |
75 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ | 77 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ |
OLD | NEW |