Add |texture_target_| and |pixel_format_| to media::PictureBuffer

media/video/picture.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_VIDEO_PICTURE_H_
 #define MEDIA_VIDEO_PICTURE_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/media_export.h"
+#include "media/base/video_types.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 // A picture buffer that is composed of one or more GLES2 textures.
 // This is the media-namespace equivalent of PP_PictureBuffer_Dev.
 class MEDIA_EXPORT PictureBuffer {
  public:
   using TextureIds = std::vector<uint32_t>;
 
   PictureBuffer(int32_t id, const gfx::Size& size);
   PictureBuffer(int32_t id,
                 const gfx::Size& size,
                 const TextureIds& client_texture_ids);
   PictureBuffer(int32_t id,
                 const gfx::Size& size,
                 const TextureIds& client_texture_ids,
                 const TextureIds& service_texture_ids);
   PictureBuffer(int32_t id,
                 const gfx::Size& size,
                 const TextureIds& client_texture_ids,
+                uint32_t texture_target,
+                VideoPixelFormat pixel_format,
                 const std::vector<gpu::Mailbox>& texture_mailboxes);
   PictureBuffer(const PictureBuffer& other);
   ~PictureBuffer();
 
   // Returns the client-specified id of the buffer.
   int32_t id() const { return id_; }
 
   // Returns the size of the buffer.
   gfx::Size size() const { return size_; }
 
   void set_size(const gfx::Size& size) { size_ = size; }
 
   // The client texture ids, i.e., those returned by Chrome's GL service.
   const TextureIds& client_texture_ids() const { return client_texture_ids_; }
 
   // The service texture ids, i.e., the real platform ids corresponding to
   // |client_texture_ids|.
   const TextureIds& service_texture_ids() const { return service_texture_ids_; }
 
+  uint32_t texture_target() const { return texture_target_; }
+
+  VideoPixelFormat pixel_format() const { return pixel_format_; }
+
   gpu::Mailbox texture_mailbox(size_t plane) const;
 
  private:
   int32_t id_;
   gfx::Size size_;
   TextureIds client_texture_ids_;
   TextureIds service_texture_ids_;
+  uint32_t texture_target_;

[liberato (no reviews please), 2017/05/11 16:24:40]

this seems to be left uninitialized in some constructors.

[Chandan, 2017/05/12 13:47:51]

Done.

+  VideoPixelFormat pixel_format_;

[liberato (no reviews please), 2017/05/11 16:24:40]

same here.

[Chandan, 2017/05/12 13:47:51]

Done.

   std::vector<gpu::Mailbox> texture_mailboxes_;
 };
 
 // A decoded picture frame.
 // This is the media-namespace equivalent of PP_Picture_Dev.
 class MEDIA_EXPORT Picture {
  public:
   // Defaults |size_changed_| to false. Size changed is currently only used
   // by AVDA and is set via set_size_changd().
   Picture(int32_t picture_buffer_id,
@@ skipping 51 matching lines @@
   gfx::ColorSpace color_space_;
   bool allow_overlay_;
   bool size_changed_;
   bool surface_texture_;
   bool wants_promotion_hint_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_PICTURE_H_