Fix corrupted audio and video at playback start in ogg containers.

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2012 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.
 
 // Implements the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
@@ skipping 40 matching lines @@
 class FFmpegDemuxer;
 class FFmpegGlue;
 class FFmpegH264ToAnnexBBitstreamConverter;
 
 typedef scoped_ptr<AVPacket, ScopedPtrAVFreePacket> ScopedAVPacket;
 
 class FFmpegDemuxerStream : public DemuxerStream {
  public:
   // Keeps a copy of |demuxer| and initializes itself using information inside
   // |stream|.  Both parameters must outlive |this|.
-  // |discard_negative_timestamps| tells the DemuxerStream that all packets with
-  // negative timestamps should be marked for post-decode discard.  All decoded
-  // data before time zero will be discarded.
-  FFmpegDemuxerStream(FFmpegDemuxer* demuxer,
-                      AVStream* stream,
-                      bool discard_negative_timestamps);
+  FFmpegDemuxerStream(FFmpegDemuxer* demuxer, AVStream* stream);
   virtual ~FFmpegDemuxerStream();
 
   // Enqueues the given AVPacket. It is invalid to queue a |packet| after
   // SetEndOfStream() has been called.
   void EnqueuePacket(ScopedAVPacket packet);
 
   // Enters the end of stream state. After delivering remaining queued buffers
   // only end of stream buffers will be delivered.
   void SetEndOfStream();
 
   // Drops queued buffers and clears end of stream state.
   void FlushBuffers();
 
   // Empties the queues and ignores any additional calls to Read().
   void Stop();
 
   base::TimeDelta duration() const { return duration_; }
 
+  // Enables fixes for ogg files with negative timestamps.  For AUDIO streams,
+  // all packets with negative timestamps will be marked for post-decode
+  // discard.  For all other stream types, if FFmpegDemuxer::start_time() is
+  // negative, it will not be used to shift timestamps during EnqueuePacket().
+  void enable_negative_timestamp_fixups_for_ogg() {
+    fixup_negative_ogg_timestamps_ = true;
+  }
+
   // DemuxerStream implementation.
   virtual Type type() OVERRIDE;
   virtual void Read(const ReadCB& read_cb) OVERRIDE;
   virtual void EnableBitstreamConverter() OVERRIDE;
   virtual bool SupportsConfigChanges() OVERRIDE;
   virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
   virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
 
   // Returns the range of buffered data in this stream.
   Ranges<base::TimeDelta> GetBufferedRanges() const;
@@ skipping 39 matching lines @@
   DecoderBufferQueue buffer_queue_;
   ReadCB read_cb_;
 
 #if defined(USE_PROPRIETARY_CODECS)
   scoped_ptr<FFmpegH264ToAnnexBBitstreamConverter> bitstream_converter_;
 #endif
 
   bool bitstream_converter_enabled_;
 
   std::string encryption_key_id_;
-  const bool discard_negative_timestamps_;
+  bool fixup_negative_ogg_timestamps_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
 };
 
 class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
  public:
   FFmpegDemuxer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                 DataSource* data_source,
                 const NeedKeyCB& need_key_cb,
                 const scoped_refptr<MediaLog>& media_log);
@@ skipping 137 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_