Remove VideoDecoderConfig.frame_rate_xxx() & VideoFrame:Get/SetDuration()

media/base/video_frame.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.
 
 #ifndef MEDIA_BASE_VIDEO_FRAME_H_
 #define MEDIA_BASE_VIDEO_FRAME_H_
 
 #include "base/callback.h"
 #include "base/md5.h"
 #include "media/base/buffers.h"
@@ skipping 25 matching lines @@
     I420 = 11,  // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
     NATIVE_TEXTURE = 12,  // Native texture.  Pixel-format agnostic.
   };
 
   // Creates a new frame in system memory with given parameters. Buffers for
   // the frame are allocated but not initialized.
   static scoped_refptr<VideoFrame> CreateFrame(
       Format format,
       size_t width,
       size_t height,
-      base::TimeDelta timestamp,
-      base::TimeDelta duration);
+      base::TimeDelta timestamp);
 
   // Call prior to CreateFrame to ensure validity of frame configuration. Called
   // automatically by VideoDecoderConfig::IsValidConfig().
   // TODO(scherkus): VideoDecoderConfig shouldn't call this method
   static bool IsValidConfig(
       Format format,
       size_t width,
       size_t height);
 
   // Wraps a native texture of the given parameters with a VideoFrame.  When the
   // frame is destroyed |no_longer_needed.Run()| will be called.
   static scoped_refptr<VideoFrame> WrapNativeTexture(
       uint32 texture_id,
       uint32 texture_target,
       size_t width,
       size_t height,
       base::TimeDelta timestamp,
-      base::TimeDelta duration,
       const base::Closure& no_longer_needed);
 
-  // Creates a frame with format equals to VideoFrame::EMPTY, width, height
-  // timestamp and duration are all 0.
+  // Creates a frame with format equals to VideoFrame::EMPTY, width, height,
+  // and timestamp are all 0.
   static scoped_refptr<VideoFrame> CreateEmptyFrame();
 
   // Allocates YV12 frame based on |width| and |height|, and sets its data to
   // the YUV equivalent of RGB(0,0,0).
   static scoped_refptr<VideoFrame> CreateBlackFrame(int width, int height);
 
   Format format() const { return format_; }
 
   size_t width() const { return width_; }
 
@@ skipping 22 matching lines @@
   // Returns true if this VideoFrame represents the end of the stream.
   bool IsEndOfStream() const;
 
   base::TimeDelta GetTimestamp() const {
     return timestamp_;
   }
   void SetTimestamp(const base::TimeDelta& timestamp) {
     timestamp_ = timestamp;
   }
 
-  base::TimeDelta GetDuration() const {

[scherkus (not reviewing), 2012/07/31 18:24:40]

\o/!!!

-    return duration_;
-  }
-  void SetDuration(const base::TimeDelta& duration) {
-    duration_ = duration;
-  }
-
   // Used to keep a running hash of seen frames.  Expects an initialized MD5
   // context.  Calls MD5Update with the context and the contents of the frame.
   void HashFrameForTesting(base::MD5Context* context);
 
  private:
   friend class base::RefCountedThreadSafe<VideoFrame>;
   // Clients must use the static CreateFrame() method to create a new frame.
   VideoFrame(Format format,
              size_t video_width,
              size_t video_height,
-             base::TimeDelta timestamp,
-             base::TimeDelta duration);
+             base::TimeDelta timestamp);
   virtual ~VideoFrame();
 
   // Used internally by CreateFrame().
   void AllocateRGB(size_t bytes_per_pixel);
   void AllocateYUV();
 
   // Used to DCHECK() plane parameters.
   bool IsValidPlane(size_t plane) const;
 
   // Frame format.
@@ skipping 10 matching lines @@
 
   // Array of data pointers to each plane.
   uint8* data_[kMaxPlanes];
 
   // Native texture ID, if this is a NATIVE_TEXTURE frame.
   uint32 texture_id_;
   uint32 texture_target_;
   base::Closure texture_no_longer_needed_;
 
   base::TimeDelta timestamp_;
-  base::TimeDelta duration_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_FRAME_H_