Revert 113895 - <video> decode in hardware!

media/video/video_decode_accelerator.h

Index: media/video/video_decode_accelerator.h
===================================================================
--- media/video/video_decode_accelerator.h	(revision 113907)
+++ media/video/video_decode_accelerator.h	(working copy)
@@ -10,7 +10,6 @@
 #include "base/basictypes.h"
 #include "base/callback_old.h"
 #include "media/base/bitstream_buffer.h"
-#include "media/base/video_decoder_config.h"
 #include "media/video/picture.h"
 #include "ui/gfx/size.h"
 
@@ -25,8 +24,25 @@
 class MEDIA_EXPORT VideoDecodeAccelerator
     : public base::RefCountedThreadSafe<VideoDecodeAccelerator> {
  public:
-  // TODO(fischman): fix foreign references to this and get rid of this typedef.
-  typedef VideoCodecProfile Profile;
+  // Video stream profile.  This *must* match PP_VideoDecoder_Profile.
+  enum Profile {
+    // Keep the values in this enum unique, as they imply format (h.264 vs. VP8,
+    // for example), and keep the values for a particular format grouped
+    // together for clarity.
+    H264PROFILE_MIN = 0,
+    H264PROFILE_BASELINE = H264PROFILE_MIN,
+    H264PROFILE_MAIN,
+    H264PROFILE_EXTENDED,
+    H264PROFILE_HIGH,
+    H264PROFILE_HIGH10PROFILE,
+    H264PROFILE_HIGH422PROFILE,
+    H264PROFILE_HIGH444PREDICTIVEPROFILE,
+    H264PROFILE_SCALABLEBASELINE,
+    H264PROFILE_SCALABLEHIGH,
+    H264PROFILE_STEREOHIGH,
+    H264PROFILE_MULTIVIEWHIGH,
+    H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH,
+  };
 
   // Enumeration of potential errors generated by the API.
   // Note: Keep these in sync with PP_VideoDecodeError_Dev.
Property changes on: media/video/video_decode_accelerator.h
___________________________________________________________________
Added: svn:mergeinfo