Add texture target field to video frame (for use by native textures).

media/base/video_frame.cc

Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 7e7e60c1f3b56a66de39e702e16c499aa03547c7..9b8eb92f10d2ab4f322b25463d8ea477203992eb 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -4,6 +4,8 @@
 
 #include "media/base/video_frame.h"
 
+#include <GL/gl.h>

[Ami GONE FROM CHROMIUM, 2012/02/22 04:51:00]

Can drop this if you take my suggestion below.

+
 #include "base/logging.h"
 #include "media/base/video_util.h"
 
@@ -57,6 +59,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
   scoped_refptr<VideoFrame> frame(
       new VideoFrame(NATIVE_TEXTURE, width, height, timestamp, duration));
   frame->texture_id_ = texture_id;
+  frame->texture_target_ = GL_TEXTURE_2D;

[Ami GONE FROM CHROMIUM, 2012/02/22 04:51:00]

This smells wrong to me (b/c what's 2Dlicious about this class/method?).  I
think at the very least mention of GL_TEXTURE_2D belongs one level higher (in
the caller, GpuVideoDecoder), but more likely it belongs even higher than that. 


The magic of TEXTURE_2D is introduced in
RendererGpuVideoDecoderFactories::AsyncCreateTextures, so ISTM *that's* where
the texture_target should start being specified from.  Following that logic
through would have media::GpuVideoDecoder::Factories::CreateTextures also return
the target (assuming we can use a single target for all returned textures).  A
purist approach would preserve the target alongside the texture_id in
media::PictureBuffer but that seems like overkill to me (both because it would
require plumbing through pepper as well, and because it is constant per video
element).  I think a reasonable compromise is to have CreateTextures return the
textures' target in an additional out param, and have GpuVideoDecoder remember
the target for later calls to WrapNativeTexture().  WDYT?

(a side benefit of this scheme is that everyone but
RendererGpuVideoDecoderFactories gets to treat the target as an opaque uint32 so
you don't have to think too hard about what may include <GL/gl.h> :))

   frame->texture_no_longer_needed_ = no_longer_needed;
   return frame;
 }
@@ -138,7 +141,8 @@ VideoFrame::VideoFrame(VideoFrame::Format format,
     : format_(format),
       width_(width),
       height_(height),
-      texture_id_(0) {
+      texture_id_(0),
+      texture_target_(0) {
   SetTimestamp(timestamp);
   SetDuration(duration);
   memset(&strides_, 0, sizeof(strides_));
@@ -248,6 +252,11 @@ uint32 VideoFrame::texture_id() const {
   return texture_id_;
 }
 
+uint32 VideoFrame::texture_target() const {
+  DCHECK_EQ(format_, NATIVE_TEXTURE);
+  return texture_target_;
+}
+
 bool VideoFrame::IsEndOfStream() const {
   return format_ == VideoFrame::EMPTY;
 }