Merge M51: "Disable idle suspend for GpuVideoDecoder produced frames on OSX, Win."

media/base/video_frame_metadata.h

 // Copyright 2015 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_METADATA_H_
 #define MEDIA_BASE_VIDEO_FRAME_METADATA_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 23 matching lines @@
     // Some VideoFrames have an indication of the color space used.  Use
     // GetInteger()/SetInteger() and ColorSpace enumeration.
     COLOR_SPACE,
 
     // Indicates that this frame must be copied to a new texture before use,
     // rather than being used directly. Specifically this is required for
     // WebView because of limitations about sharing surface textures between GL
     // contexts.
     COPY_REQUIRED,
 
+    // Indicates that the frame is owned by the decoder and that destroying the
+    // decoder will make the frame unrenderable. TODO(sandersd): Remove once OSX
+    // and Windows hardware decoders support frames which outlive the decoder.
+    // http://crbug.com/595716 and http://crbug.com/602708.
+    DECODER_OWNS_FRAME,
+
     // Indicates if the current frame is the End of its current Stream. Use
     // Get/SetBoolean() for this Key.
     END_OF_STREAM,
 
     // The estimated duration of this frame (i.e., the amount of time between
     // the media timestamp of this frame and the next).  Note that this is not
     // the same information provided by FRAME_RATE as the FRAME_DURATION can
     // vary unpredictably for every frame.  Consumers can use this to optimize
     // playback scheduling, make encoding quality decisions, and/or compute
     // frame-level resource utilization stats.  Use Get/SetTimeDelta() for this
@@ skipping 90 matching lines @@
   const base::BinaryValue* GetBinaryValue(Key key) const;
 
   base::DictionaryValue dictionary_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoFrameMetadata);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_FRAME_METADATA_H_