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

Unified Diff: media/base/android/media_codec_audio_decoder.h

Issue 1254293003: MediaCodecPlayer implementation (stage 4 - preroll) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mtplayer-browserseek
Patch Set: Added unit tests that check A/V sync after preroll Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_codec_audio_decoder.h
diff --git a/media/base/android/media_codec_audio_decoder.h b/media/base/android/media_codec_audio_decoder.h
index 53bb664f6018b833e4fa5f571c12051c8ad727c9..4f38f7ac75c5b1c47ab2b77ce7a86eedeeed98b1 100644
--- a/media/base/android/media_codec_audio_decoder.h
+++ b/media/base/android/media_codec_audio_decoder.h
@@ -5,6 +5,7 @@
#ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
#define MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
+#include <vector>
#include "media/base/android/media_codec_decoder.h"
namespace media {
@@ -21,6 +22,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
const scoped_refptr<base::SingleThreadTaskRunner>& media_runner,
const base::Closure& request_data_cb,
const base::Closure& starvation_cb,
+ const base::Closure& preroll_done_cb,
const base::Closure& stop_done_cb,
const base::Closure& error_cb,
const SetTimeCallback& update_current_time_cb);
@@ -31,6 +33,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
bool HasStream() const override;
void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
void Flush() override;
+ void ReleaseMediaCodec() override;
// Sets the volume of the audio output.
void SetVolume(double volume);
@@ -45,7 +48,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
void OnOutputFormatChanged() override;
void Render(int buffer_index,
size_t size,
- bool render_output,
+ RenderMode render_mode,
base::TimeDelta pts,
bool eos_encountered) override;

Powered by Google App Engine
This is Rietveld 408576698