Add is_encrypted() in VideoDecoderConfig.

media/base/video_decoder_config.h

 // Copyright (c) 2012 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 <string>
+
 #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 {
@@ skipping 48 matching lines @@
   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,
                      const gfx::Size& natural_size,
-                     const uint8* extra_data, size_t extra_data_size);
+                     const uint8* extra_data, size_t extra_data_size,
+                     bool is_encrypted);
 
   ~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,
                   const gfx::Size& natural_size,
                   const uint8* extra_data, size_t extra_data_size,
+                  bool is_encrypted,
                   bool record_stats);
 
   // Deep copies |video_config|.
   void CopyFrom(const VideoDecoderConfig& video_config);
 
   // Returns true if this object has appropriate configuration values, false
   // otherwise.
   bool IsValidConfig() const;
 
   // Returns true if all fields in |config| match this config.
@@ skipping 19 matching lines @@
 
   // Final visible width and height of a video frame with aspect ratio taken
   // into account.
   gfx::Size natural_size() 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;
 
+  // Whether the video stream is potentially encrypted.
+  // Note that in a potentially encrypted video stream, individual buffers
+  // can be encrypted or not encrypted.
+  bool is_encrypted() const;
+  void set_is_encrypted(bool is_encrypted);

[scherkus (not reviewing), 2012/09/17 15:54:10]

note that there are no other setters on this class

it looks like the only uses are in ffmpeg_video_decoder_unittest.cc and
webm_stream_parser.cc but that they could both be changed to use Initialize()

[xhwang, 2012/09/17 19:42:25]

Done.

+
  private:
   VideoCodec codec_;
   VideoCodecProfile profile_;
 
   VideoFrame::Format format_;
 
   gfx::Size coded_size_;
   gfx::Rect visible_rect_;
   gfx::Size natural_size_;
 
   scoped_array<uint8> extra_data_;
   size_t extra_data_size_;
 
+  bool is_encrypted_;
+
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderConfig);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_