| Index: media/base/android/audio_decoder_job.h
|
| diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h
|
| deleted file mode 100644
|
| index 41e35d121b58efb16e6373b9f0512410505f1124..0000000000000000000000000000000000000000
|
| --- a/media/base/android/audio_decoder_job.h
|
| +++ /dev/null
|
| @@ -1,97 +0,0 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
|
| -#define MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
|
| -
|
| -#include <jni.h>
|
| -#include <stddef.h>
|
| -#include <stdint.h>
|
| -#include <memory>
|
| -#include <vector>
|
| -
|
| -#include "base/callback.h"
|
| -#include "base/macros.h"
|
| -#include "media/base/android/media_decoder_job.h"
|
| -
|
| -namespace media {
|
| -
|
| -class AudioCodecBridge;
|
| -class AudioTimestampHelper;
|
| -
|
| -// Class for managing audio decoding jobs.
|
| -class AudioDecoderJob : public MediaDecoderJob {
|
| - public:
|
| - // Creates a new AudioDecoderJob instance for decoding audio.
|
| - // |request_data_cb| - Callback used to request more data for the decoder.
|
| - // |on_demuxer_config_changed_cb| - Callback used to inform the caller that
|
| - // demuxer config has changed.
|
| - AudioDecoderJob(const base::Closure& request_data_cb,
|
| - const base::Closure& on_demuxer_config_changed_cb);
|
| - ~AudioDecoderJob() override;
|
| -
|
| - // MediaDecoderJob implementation.
|
| - bool HasStream() const override;
|
| - void Flush() override;
|
| - void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
|
| -
|
| - // Sets the volume of the audio output.
|
| - void SetVolume(double volume);
|
| -
|
| - // Sets the base timestamp for |audio_timestamp_helper_|.
|
| - void SetBaseTimestamp(base::TimeDelta base_timestamp);
|
| -
|
| - private:
|
| - // MediaDecoderJob implementation.
|
| - void ReleaseOutputBuffer(int output_buffer_index,
|
| - size_t offset,
|
| - size_t size,
|
| - bool render_output,
|
| - bool is_late_frame,
|
| - base::TimeDelta current_presentation_timestamp,
|
| - MediaCodecStatus status,
|
| - const DecoderCallback& callback) override;
|
| - bool ComputeTimeToRender() const override;
|
| - bool AreDemuxerConfigsChanged(const DemuxerConfigs& configs) const override;
|
| - MediaDecoderJobStatus CreateMediaCodecBridgeInternal() override;
|
| - bool OnOutputFormatChanged() override;
|
| -
|
| - // Helper method to set the audio output volume.
|
| - void SetVolumeInternal();
|
| -
|
| - void ResetTimestampHelper();
|
| -
|
| - // Audio configs from the demuxer.
|
| - AudioCodec audio_codec_;
|
| - int config_num_channels_;
|
| - int config_sampling_rate_;
|
| - std::vector<uint8_t> audio_extra_data_;
|
| - int64_t audio_codec_delay_ns_;
|
| - int64_t audio_seek_preroll_ns_;
|
| - double volume_;
|
| -
|
| - // Audio output sample rate.
|
| - int output_sampling_rate_;
|
| -
|
| - // Number of output audio channels.
|
| - int output_num_channels_;
|
| -
|
| - // Frame count to sync with audio codec output.
|
| - int64_t frame_count_;
|
| -
|
| - // Base timestamp for the |audio_timestamp_helper_|.
|
| - base::TimeDelta base_timestamp_;
|
| -
|
| - // Object to calculate the current audio timestamp for A/V sync.
|
| - std::unique_ptr<AudioTimestampHelper> audio_timestamp_helper_;
|
| -
|
| - // The time limit for the next frame to avoid underrun.
|
| - base::TimeTicks next_frame_time_limit_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob);
|
| -};
|
| -
|
| -} // namespace media
|
| -
|
| -#endif // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
|
|
|