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

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

Issue 1215713021: Reverted the code for the non-interactive audible tab notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notification
Patch Set: Fixed indent Created 5 years, 3 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
« no previous file with comments | « content/content_tests.gypi ('k') | media/base/android/media_codec_player_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <vector> 9 #include <vector>
10 10
(...skipping 16 matching lines...) Expand all
27 const base::Closure& on_demuxer_config_changed_cb); 27 const base::Closure& on_demuxer_config_changed_cb);
28 ~AudioDecoderJob() override; 28 ~AudioDecoderJob() override;
29 29
30 // MediaDecoderJob implementation. 30 // MediaDecoderJob implementation.
31 bool HasStream() const override; 31 bool HasStream() const override;
32 void Flush() override; 32 void Flush() override;
33 void SetDemuxerConfigs(const DemuxerConfigs& configs) override; 33 void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
34 34
35 // Sets the volume of the audio output. 35 // Sets the volume of the audio output.
36 void SetVolume(double volume); 36 void SetVolume(double volume);
37 double volume() const { return volume_; }
38 37
39 // Sets the base timestamp for |audio_timestamp_helper_|. 38 // Sets the base timestamp for |audio_timestamp_helper_|.
40 void SetBaseTimestamp(base::TimeDelta base_timestamp); 39 void SetBaseTimestamp(base::TimeDelta base_timestamp);
41 40
42 private: 41 private:
43 // MediaDecoderJob implementation. 42 // MediaDecoderJob implementation.
44 void ReleaseOutputBuffer( 43 void ReleaseOutputBuffer(
45 int output_buffer_index, 44 int output_buffer_index,
46 size_t offset, 45 size_t offset,
47 size_t size, 46 size_t size,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 78
80 // Object to calculate the current audio timestamp for A/V sync. 79 // Object to calculate the current audio timestamp for A/V sync.
81 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_; 80 scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;
82 81
83 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob); 82 DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob);
84 }; 83 };
85 84
86 } // namespace media 85 } // namespace media
87 86
88 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ 87 #endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | media/base/android/media_codec_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698