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

Unified Diff: media/filters/audio_renderer_base.h

Issue 9295020: Fix ChunkDemuxer seek deadlock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments and added VideoRendererBase & FFmpegVideoDecoder unit tests. Created 8 years, 11 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/filters/audio_renderer_base.h
diff --git a/media/filters/audio_renderer_base.h b/media/filters/audio_renderer_base.h
index a57820495e601d7feda4abd8d9dccce023a170ba..0c2e939f885c80e48de16d3a663d98f264155260 100644
--- a/media/filters/audio_renderer_base.h
+++ b/media/filters/audio_renderer_base.h
@@ -99,6 +99,15 @@ class MEDIA_EXPORT AudioRendererBase : public AudioRenderer {
// Safe to call from any thread.
void ScheduleRead_Locked();
+ // Returns true if the data in the buffer is all before
+ // |seek_timestamp_|. This can only return true while
+ // in the kSeeking state.
+ bool IsBeforeSeekTime(const scoped_refptr<Buffer>& buffer);
+
+ // Enqueues |buffer| in |algorithm_| if it is non-NULL and
+ // buffer->IsEndOfStream() returns false.
+ void EnqueueBuffer(const scoped_refptr<Buffer>& buffer);
+
// Audio decoder.
scoped_refptr<AudioDecoder> decoder_;
@@ -114,7 +123,6 @@ class MEDIA_EXPORT AudioRendererBase : public AudioRenderer {
kSeeking,
kPlaying,
kStopped,
- kError,
kUnderflow,
kRebuffering,
};

Powered by Google App Engine
This is Rietveld 408576698