Merge 23038 - Updated decode logic to estimate timestamps if the demuxer has ...

media/filters/ffmpeg_audio_decoder.h

Index: media/filters/ffmpeg_audio_decoder.h
===================================================================
--- media/filters/ffmpeg_audio_decoder.h	(revision 23353)
+++ media/filters/ffmpeg_audio_decoder.h	(working copy)
@@ -26,6 +26,8 @@
  protected:
   virtual bool OnInitialize(DemuxerStream* demuxer_stream);
 
+  virtual void OnSeek(base::TimeDelta time);
+
   virtual void OnStop();
 
   virtual void OnDecode(Buffer* input);
@@ -43,6 +45,9 @@
   // is initialized in OnInitialize().
   AVCodecContext* codec_context_;
 
+  // Estimated timestamp for next packet. Useful for packets without timestamps.
+  base::TimeDelta estimated_next_timestamp_;
+
   // Data buffer to carry decoded raw PCM samples. This buffer is created by
   // av_malloc() and is used throughout the lifetime of this class.
   scoped_ptr_malloc<uint8, ScopedPtrAVFree> output_buffer_;
Property changes on: media\filters\ffmpeg_audio_decoder.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/media/filters/ffmpeg_audio_decoder.h:r23038
   Merged /branches/chrome_webkit_merge_branch/media/filters/ffmpeg_audio_decoder.h:r69-2775