<video> decode in hardware!

media/base/video_decoder_config.h

 // Copyright (c) 2011 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_DECODER_CONFIG_H_
 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 
-enum VideoCodec {
+enum MEDIA_EXPORT VideoCodec {
   // These values are histogrammed over time; do not change their ordinal
   // values.  When deleting a codec replace it with a dummy value; when adding a
   // codec, do so at the bottom (and update kVideoCodecMax).
   kUnknownVideoCodec = 0,
   kCodecH264,
   kCodecVC1,
   kCodecMPEG2,
   kCodecMPEG4,
   kCodecTheora,
   kCodecVP8,
   // DO NOT ADD RANDOM VIDEO CODECS!
   //
   // The only acceptable time to add a new codec is if there is production code
   // that uses said codec in the same CL.
 
   kVideoCodecMax = kCodecVP8  // Must equal the last "real" codec above.
 };
 
+// Video stream profile.  This *must* match PP_VideoDecoder_Profile.

[scherkus (not reviewing), 2011/12/06 00:27:44]

I can't recall but I thought we didn't want to have an implicit dependency on
PPAPI code

is this compile asserted anywhere? would a conversion function be of more use if
these enums aren't used in performance critical code?

[Ami GONE FROM CHROMIUM, 2011/12/07 00:03:04]

The dependency we couldn't take was an explicit one (which is why we have this
copy of the enum in both places instead of simply referencing one from the
other).  The implicit dep is where it's at.
(note this is a move, not a new enum)
No, but we have a TODO!
http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/webkit/plugins/ppapi/...
I think all the code that uses this needs to be able to handle unknown values
anyway, so not sure what a conv function buys us.

+enum MEDIA_EXPORT VideoCodecProfile {
+  // 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.
+  VIDEO_CODEC_PROFILE_UNKNOWN = -1,

[scherkus (not reviewing), 2011/12/06 00:27:44]

we're mixing up kStyle and ENUM_STYLE

[Ami GONE FROM CHROMIUM, 2011/12/07 00:03:04]

Yeah, we are.  Style guide prefers kStyle (newer) but doesn't justify mass
conversions.  This move highlights the inconsistency in our codebase.  Argl.

+  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,
+  VIDEO_CODEC_PROFILE_MAX = H264PROFILE_MAX,
+};
+
 class MEDIA_EXPORT VideoDecoderConfig {
  public:
   // Constructs an uninitialized object. Clients should call Initialize() with
   // appropriate values before using.
   VideoDecoderConfig();
 
   // Constructs an initialized object. It is acceptable to pass in NULL for
   // |extra_data|, otherwise the memory is copied.
   VideoDecoderConfig(VideoCodec codec,
+                     VideoCodecProfile profile,
                      VideoFrame::Format format,
                      const gfx::Size& coded_size,
                      const gfx::Rect& visible_rect,
                      int frame_rate_numerator, int frame_rate_denominator,
                      int aspect_ratio_numerator, int aspect_ratio_denominator,
                      const uint8* extra_data, size_t extra_data_size);
 
   ~VideoDecoderConfig();
 
   // Resets the internal state of this object.
   void Initialize(VideoCodec codec,
+                  VideoCodecProfile profile,
                   VideoFrame::Format format,
                   const gfx::Size& coded_size,
                   const gfx::Rect& visible_rect,
                   int frame_rate_numerator, int frame_rate_denominator,
                   int aspect_ratio_numerator, int aspect_ratio_denominator,
                   const uint8* extra_data, size_t extra_data_size);
 
   // Returns true if this object has appropriate configuration values, false
   // otherwise.
   bool IsValidConfig() const;
 
+  // Returns a human-readable string describing |*this|.  For debugging & test
+  // output only.
+  std::string AsHumanReadableString() const;
+
   VideoCodec codec() const;
+  VideoCodecProfile profile() const;
 
   // Video format used to determine YUV buffer sizes.
   VideoFrame::Format format() const;
 
   // Width and height of video frame immediately post-decode. Not all pixels
   // in this region are valid.
   gfx::Size coded_size() const;
 
   // Region of |coded_size_| that is visible.
   gfx::Rect visible_rect() const;
@@ skipping 17 matching lines @@
   int aspect_ratio_numerator() const;
   int aspect_ratio_denominator() const;
 
   // Optional byte data required to initialize video decoders, such as H.264
   // AAVC data.
   uint8* extra_data() const;
   size_t extra_data_size() const;
 
  private:
   VideoCodec codec_;
+  VideoCodecProfile profile_;
 
   VideoFrame::Format format_;
 
   gfx::Size coded_size_;
   gfx::Rect visible_rect_;
   gfx::Size natural_size_;
 
   int frame_rate_numerator_;
   int frame_rate_denominator_;
 
   int aspect_ratio_numerator_;
   int aspect_ratio_denominator_;
 
   scoped_array<uint8> extra_data_;
   size_t extra_data_size_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderConfig);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_