Use av_rescale_q() for converting FFmpeg timestamps to base::TimeDelta (second attempt).

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2009 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 52 matching lines @@
   // Signals to empty queue and mark next packet as discontinuous.
   void FlushBuffers();
 
   // Returns the duration of this stream.
   base::TimeDelta duration() { return duration_; }
 
   // DemuxerStream implementation.
   virtual const MediaFormat& media_format();
   virtual void Read(Callback1<Buffer*>::Type* read_callback);
 
-  AVStream* av_stream() {
-    return av_stream_;
-  }
+  AVStream* av_stream() const { return stream_; }
 
   static const char* interface_id();
 
  protected:
   virtual void* QueryInterface(const char* interface_id);
 
  private:
   // Returns true if there are still pending reads.
   bool FulfillPendingReads();
 
+  // Converts an FFmpeg stream timestamp into a base::TimeDelta.
+  base::TimeDelta ConvertTimestamp(int64 timestamp);
+
   FFmpegDemuxer* demuxer_;
-  AVStream* av_stream_;
+  AVStream* stream_;
   MediaFormat media_format_;
-  base::TimeDelta time_base_;
   base::TimeDelta duration_;
   bool discontinuous_;
 
   Lock lock_;
 
   typedef std::deque< scoped_refptr<Buffer> > BufferQueue;
   BufferQueue buffer_queue_;
 
   typedef std::deque<Callback1<Buffer*>::Type*> ReadQueue;
   ReadQueue read_queue_;
@@ skipping 62 matching lines @@
 
   // Thread handle.
   base::Thread thread_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_