Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Side by Side Diff: media/base/android/audio_decoder_job.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 #include <memory>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "media/base/android/media_decoder_job.h" 16 #include "media/base/android/media_decoder_job.h"
16 17
17 namespace media { 18 namespace media {
18 19
19 class AudioCodecBridge; 20 class AudioCodecBridge;
20 class AudioTimestampHelper; 21 class AudioTimestampHelper;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // Audio output sample rate 75 // Audio output sample rate
75 int output_sampling_rate_; 76 int output_sampling_rate_;
76 77
77 // Frame count to sync with audio codec output 78 // Frame count to sync with audio codec output
78 int64_t frame_count_; 79 int64_t frame_count_;
79 80
80 // Base timestamp for the |audio_timestamp_helper_|. 81 // Base timestamp for the |audio_timestamp_helper_|.
81 base::TimeDelta base_timestamp_; 82 base::TimeDelta base_timestamp_;
82 83
83 // Object to calculate the current audio timestamp for A/V sync. 84 // Object to calculate the current audio timestamp for A/V sync.
84 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; 85 std::unique_ptr<AudioTimestampHelper> audio_timestamp_helper_;
85 86
86 // The time limit for the next frame to avoid underrun. 87 // The time limit for the next frame to avoid underrun.
87 base::TimeTicks next_frame_time_limit_; 88 base::TimeTicks next_frame_time_limit_;
88 89
89 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); 90 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob);
90 }; 91 };
91 92
92 } // namespace media 93 } // namespace media
93 94
94 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ 95 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
OLDNEW
« no previous file with comments | « media/base/android/android_cdm_factory.h ('k') | media/base/android/audio_media_codec_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698