Remove EMPTY from VideoFrame::Format.

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 "base/memory/shared_memory.h"
@@ skipping 23 matching lines @@
     kAPlane = 3,
   };
 
   // Surface formats roughly based on FOURCC labels, see:
   // http://www.fourcc.org/rgb.php
   // http://www.fourcc.org/yuv.php
   enum Format {
     UNKNOWN = 0,  // Unknown format value.
     YV12 = 6,  // 12bpp YVU planar 1x1 Y, 2x2 VU samples
     YV16 = 7,  // 16bpp YVU planar 1x1 Y, 2x1 VU samples
-    EMPTY = 9,  // An empty frame.
     I420 = 11,  // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
     NATIVE_TEXTURE = 12,  // Native texture.  Pixel-format agnostic.
 #if defined(GOOGLE_TV)
     HOLE = 13,  // Hole frame.
 #endif
     YV12A = 14,  // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
   };
 
   // Returns the name of a Format as a string.
   static std::string FormatToString(Format format);
@@ skipping 107 matching lines @@
       const gfx::Size& natural_size,
       int32 y_stride,
       int32 u_stride,
       int32 v_stride,
       uint8* y_data,
       uint8* u_data,
       uint8* v_data,
       base::TimeDelta timestamp,
       const base::Closure& no_longer_needed_cb);
 
-  // Creates a frame with format equals to VideoFrame::EMPTY, width, height,
-  // and timestamp are all 0.
-  static scoped_refptr<VideoFrame> CreateEmptyFrame();
+  // Creates a frame which indicates end-of-stream.
+  static scoped_refptr<VideoFrame> CreateEOSFrame();
 
   // Allocates YV12 frame based on |size|, and sets its data to the YUV(y,u,v).
   static scoped_refptr<VideoFrame> CreateColorFrame(
       const gfx::Size& size,
       uint8 y, uint8 u, uint8 v,
       base::TimeDelta timestamp);
 
   // Allocates YV12 frame based on |size|, and sets its data to the YUV
   // equivalent of RGB(0,0,0).
   static scoped_refptr<VideoFrame> CreateBlackFrame(const gfx::Size& size);
@@ skipping 33 matching lines @@
   // mailbox, the caller must wait for the included sync point.
   const scoped_refptr<MailboxHolder>& texture_mailbox() const;
 
   // Returns the texture target. Only valid for NATIVE_TEXTURE frames.
   uint32 texture_target() const;
 
   // Returns the shared-memory handle, if present
   base::SharedMemoryHandle shared_memory_handle() const;
 
   // Returns true if this VideoFrame represents the end of the stream.
-  bool IsEndOfStream() const;
+  bool end_of_stream() const { return end_of_stream_; }
 
   base::TimeDelta GetTimestamp() const {
     return timestamp_;
   }
   void SetTimestamp(const base::TimeDelta& timestamp) {
     timestamp_ = timestamp;
   }
 
   // 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,
              const gfx::Size& coded_size,
              const gfx::Rect& visible_rect,
              const gfx::Size& natural_size,
-             base::TimeDelta timestamp);
+             base::TimeDelta timestamp,
+             bool eos_frame);

[scherkus (not reviewing), 2013/11/05 00:24:43]

nit: end_of_stream

(good practice to have ctor var names match the member var names, sans
underscore suffix)

[rileya (GONE FROM CHROMIUM), 2013/11/05 00:37:27]

Changed.

   virtual ~VideoFrame();
 
   void AllocateYUV();
 
   // Used to DCHECK() plane parameters.
   bool IsValidPlane(size_t plane) const;
 
   // Frame format.
   Format format_;
 
@@ skipping 20 matching lines @@
   uint32 texture_target_;
   ReadPixelsCB read_pixels_cb_;
 
   // Shared memory handle, if this frame was allocated from shared memory.
   base::SharedMemoryHandle shared_memory_handle_;
 
   base::Closure no_longer_needed_cb_;
 
   base::TimeDelta timestamp_;
 
+  const bool end_of_stream_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_FRAME_H_