media: Followup changes to VideoFrame StructTraits.

media/mojo/interfaces/media_types.mojom

 // Copyright 2014 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.
 
 module media.mojom;
 
 import "gpu/ipc/common/mailbox_holder.mojom";
 import "mojo/common/time.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
@@ skipping 195 matching lines @@
 
   // Width and height of the video frame, in pixels.
   gfx.mojom.Size coded_size;
 
   // Visible size of the frame.
   gfx.mojom.Rect visible_rect;
 
   // Natural size of the frame.
   gfx.mojom.Size natural_size;
 
-  // True if end of stream.
-  bool end_of_stream;
-
   // Timestamp in microseconds of the associated frame.
   mojo.common.mojom.TimeDelta timestamp;
 
-  // Contents of the video frame. Will be null for end of stream frames.
-  VideoFrameData? data;
+  // Contents of the video frame (or EOS marker).
+  VideoFrameData data;
 };
 
 // Possible choices for storing VideoFrame data.
 union VideoFrameData {
+  EosVideoFrameData eos_data;
   SharedBufferVideoFrameData shared_buffer_data;
   MailboxVideoFrameData mailbox_data;
 };
 
+// A marker for EOS frames.
+struct EosVideoFrameData {
+};
+
 // This defines video frame data stored in a Mojo shared buffer.
 struct SharedBufferVideoFrameData {
   // Reference to the shared memory containing the frame's data.
   handle<shared_buffer> frame_data;
   uint64 frame_data_size;
 
   // Stride and offsets for each plane. Offsets are relative to the start
   // of |frame_data|.
   int32 y_stride;
   int32 u_stride;
@@ skipping 10 matching lines @@
 };
 
 struct PipelineStatistics {
   uint64 audio_bytes_decoded;
   uint64 video_bytes_decoded;
   uint32 video_frames_decoded;
   uint32 video_frames_dropped;
   int64 audio_memory_usage;
   int64 video_memory_usage;
 };