Rename PPAPI Video Stream APIs.

ppapi/cpp/private/video_frame_private.h

Index: ppapi/cpp/private/video_frame_private.h
diff --git a/ppapi/cpp/video_frame.h b/ppapi/cpp/private/video_frame_private.h
similarity index 40%
rename from ppapi/cpp/video_frame.h
rename to ppapi/cpp/private/video_frame_private.h
index cb695962dd7aa0abc2a94919292a3a41a94625d1..fed9d1da4793c40213a3b0222efd696f9b0b7cd4 100644
--- a/ppapi/cpp/video_frame.h
+++ b/ppapi/cpp/private/video_frame_private.h
@@ -2,47 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_CPP_VIDEO_FRAME_H_
-#define PPAPI_CPP_VIDEO_FRAME_H_
+#ifndef PPAPI_CPP_PRIVATE_VIDEO_FRAME_PRIVATE_H_
+#define PPAPI_CPP_PRIVATE_VIDEO_FRAME_PRIVATE_H_
 
 #include "ppapi/c/pp_time.h"
-#include "ppapi/c/pp_video_frame.h"
+#include "ppapi/c/private/pp_video_frame_private.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/pass_ref.h"
 
 /// @file
-/// This file defines the video frame struct used by video readers and writers.
+/// This file defines the struct used to hold a video frame.
 
 namespace pp {
 
-// VideoFrame ------------------------------------------------------------------
-
-/// The <code>VideoFrame</code> class represents a frame of video in a stream.
-class VideoFrame {
+/// The <code>PP_VideoFrame_Private</code> struct represents a video frame.
+/// Video sources and destinations use frames to transfer video to and from
+/// the browser.
+class VideoFrame_Private {
  public:
-  /// Default constructor for creating a <code>VideoFrame</code> object.
-  VideoFrame();
+  /// Default constructor for creating a <code>VideoFrame_Private</code> object.
+  VideoFrame_Private();
 
-  /// Constructor that takes an existing <code>PP_VideoFrame</code> structure.
-  /// The 'image_data' PP_Resource field in the structure will be managed by
-  /// this instance.
-  VideoFrame(PassRef, const PP_VideoFrame& pp_video_frame);
+  /// Constructor that takes an existing <code>PP_VideoFrame_Private</code>
+  /// structure. The 'image_data' PP_Resource field in the structure will be
+  /// managed by this instance.
+  VideoFrame_Private(PassRef, const PP_VideoFrame_Private& pp_video_frame);
 
   /// Constructor that takes an existing <code>ImageData</code> instance and
   /// a timestamp.
-  VideoFrame(const ImageData& image_data, PP_TimeTicks timestamp);
+  VideoFrame_Private(const ImageData& image_data, PP_TimeTicks timestamp);
 
-  /// The copy constructor for <code>VideoFrame</code>.
+  /// The copy constructor for <code>VideoFrame_Private</code>.
   ///
-  /// @param[in] other A reference to a <code>VideoFrame</code>.
-  VideoFrame(const VideoFrame& other);
+  /// @param[in] other A reference to a <code>VideoFrame_Private</code>.
+  VideoFrame_Private(const VideoFrame_Private& other);
 
-  ~VideoFrame();
+  ~VideoFrame_Private();
 
-  VideoFrame& operator=(const VideoFrame& other);
+  /// The assignment operator for <code>VideoFrame_Private</code>.
+  ///
+  /// @param[in] other A reference to a <code>VideoFrame_Private</code>.
+  VideoFrame_Private& operator=(const VideoFrame_Private& other);
 
-  const PP_VideoFrame& pp_video_frame() const {
+  const PP_VideoFrame_Private& pp_video_frame() const {
     return video_frame_;
   }
 
@@ -63,26 +66,26 @@ class VideoFrame {
 
  private:
   ImageData image_data_;  // This manages the PP_Resource in video_frame_.
-  PP_VideoFrame video_frame_;
+  PP_VideoFrame_Private video_frame_;
 };
 
 namespace internal {
 
 // A specialization of CallbackOutputTraits to provide the callback system the
-// information on how to handle pp::VideoFrame. This converts PP_VideoFrame to
-// pp::VideoFrame when passing to the plugin, and specifically manages the
-// PP_Resource embedded in the video_frame_ field.
+// information on how to handle pp::VideoFrame_Private. This converts
+// PP_VideoFrame_Private to pp::VideoFrame_Private when passing to the plugin,
+// and specifically manages the PP_Resource embedded in the video_frame_ field.
 template<>
-struct CallbackOutputTraits<pp::VideoFrame> {
-  typedef PP_VideoFrame* APIArgType;
-  typedef PP_VideoFrame StorageType;
+struct CallbackOutputTraits<pp::VideoFrame_Private> {
+  typedef PP_VideoFrame_Private* APIArgType;
+  typedef PP_VideoFrame_Private StorageType;
 
   static inline APIArgType StorageToAPIArg(StorageType& t) {
     return &t;
   }
 
-  static inline pp::VideoFrame StorageToPluginArg(StorageType& t) {
-    return pp::VideoFrame(PASS_REF, t);
+  static inline pp::VideoFrame_Private StorageToPluginArg(StorageType& t) {
+    return pp::VideoFrame_Private(PASS_REF, t);
   }
 };
 
@@ -90,4 +93,4 @@ struct CallbackOutputTraits<pp::VideoFrame> {
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_VIDEO_FRAME_H_
+#endif  // PPAPI_CPP_PRIVATE_VIDEO_FRAME_PRIVATE_H_