Update to Pipeline Metadata and Decoder Stream for Orientation Data

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 <vector>
 
@@ skipping 48 matching lines @@
   H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH,
   VP8PROFILE_MIN = 11,
   VP8PROFILE_MAIN = VP8PROFILE_MIN,
   VP8PROFILE_MAX = VP8PROFILE_MAIN,
   VP9PROFILE_MIN = 12,
   VP9PROFILE_MAIN = VP9PROFILE_MIN,
   VP9PROFILE_MAX = VP9PROFILE_MAIN,
   VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
 };
 
+enum VideoRotation { kRotate0 = 0, kRotate90, kRotate180, kRotate270 };

[scherkus (not reviewing), 2014/07/07 20:52:38]

let's move this into its own file (media/base/video_rotation.h), add some
comments, and use MACRO_STYLE for the names as per
http://dev.chromium.org/developers/coding-style#Naming

we'll tack this onto the DemuxerStream interface as a video_rotation() getter
since rotation information isn't really part of a video decoder configuration
(i.e., video decoders don't make any use of the information)

+
 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,
@@ skipping 49 matching lines @@
   // Optional byte data required to initialize video decoders, such as H.264
   // AAVC data.
   const 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;
 
+  // Rotation of frame (0, 90, 180, 270) given in metadata
+  VideoRotation rotation() const;
+  void set_rotation(VideoRotation rotation);
+
  private:
   VideoCodec codec_;
   VideoCodecProfile profile_;
 
   VideoFrame::Format format_;
 
   gfx::Size coded_size_;
   gfx::Rect visible_rect_;
   gfx::Size natural_size_;
 
   std::vector<uint8> extra_data_;
 
   bool is_encrypted_;
+  VideoRotation rotation_;
 
   // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
   // generated copy constructor and assignment operator. Since the extra data is
   // typically small, the performance impact is minimal.
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_