Revert 113895 - <video> decode in hardware!

media/base/video_frame.cc

 // 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.
 
 #include "media/base/video_frame.h"
 
 #include "base/logging.h"
 
 namespace media {
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateFrame(
     VideoFrame::Format format,
     size_t width,
     size_t height,
     base::TimeDelta timestamp,
     base::TimeDelta duration) {
   DCHECK(width > 0 && height > 0);
   DCHECK(width * height < 100000000);
-  scoped_refptr<VideoFrame> frame(new VideoFrame(
-      format, width, height, timestamp, duration));
+  scoped_refptr<VideoFrame> frame(new VideoFrame(format, width, height));
+  frame->SetTimestamp(timestamp);
+  frame->SetDuration(duration);
   switch (format) {
     case VideoFrame::RGB555:
     case VideoFrame::RGB565:
       frame->AllocateRGB(2u);
       break;
     case VideoFrame::RGB24:
       frame->AllocateRGB(3u);
       break;
     case VideoFrame::RGB32:
     case VideoFrame::RGBA:
       frame->AllocateRGB(4u);
       break;
     case VideoFrame::YV12:
     case VideoFrame::YV16:
       frame->AllocateYUV();
       break;
     case VideoFrame::ASCII:
       frame->AllocateRGB(1u);
       break;
     default:
       NOTREACHED();
       return NULL;
   }
   return frame;
 }
 
 // static
-scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
-    uint32 texture_id,
-    size_t width,
-    size_t height,
-    base::TimeDelta timestamp,
-    base::TimeDelta duration,
-    const base::Closure& no_longer_needed) {
-  scoped_refptr<VideoFrame> frame(
-      new VideoFrame(NATIVE_TEXTURE, width, height, timestamp, duration));
-  frame->planes_ = 0;
-  frame->texture_id_ = texture_id;
-  frame->texture_no_longer_needed_ = no_longer_needed;
-  return frame;
-}
-
-// static
 scoped_refptr<VideoFrame> VideoFrame::CreateEmptyFrame() {
-  return new VideoFrame(
-      VideoFrame::EMPTY, 0, 0, base::TimeDelta(), base::TimeDelta());
+  return new VideoFrame(VideoFrame::EMPTY, 0, 0);
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateBlackFrame(int width, int height) {
   DCHECK_GT(width, 0);
   DCHECK_GT(height, 0);
 
   // Create our frame.
   const base::TimeDelta kZero;
   scoped_refptr<VideoFrame> frame =
@@ skipping 69 matching lines @@
   data_[VideoFrame::kYPlane] = data;
   data_[VideoFrame::kUPlane] = data + y_bytes;
   data_[VideoFrame::kVPlane] = data + y_bytes + uv_bytes;
   strides_[VideoFrame::kYPlane] = y_stride;
   strides_[VideoFrame::kUPlane] = uv_stride;
   strides_[VideoFrame::kVPlane] = uv_stride;
 }
 
 VideoFrame::VideoFrame(VideoFrame::Format format,
                        size_t width,
-                       size_t height,
-                       base::TimeDelta timestamp,
-                       base::TimeDelta duration)
+                       size_t height)
     : format_(format),
       width_(width),
       height_(height),
-      planes_(0),
-      texture_id_(0) {
-  SetTimestamp(timestamp);
-  SetDuration(duration);
+      planes_(0) {
   memset(&strides_, 0, sizeof(strides_));
   memset(&data_, 0, sizeof(data_));
 }
 
 VideoFrame::~VideoFrame() {
-  if (format_ == NATIVE_TEXTURE && !texture_no_longer_needed_.is_null()) {
-    texture_no_longer_needed_.Run();
-    texture_no_longer_needed_.Reset();
-  }
-
   // In multi-plane allocations, only a single block of memory is allocated
   // on the heap, and other |data| pointers point inside the same, single block
   // so just delete index 0.
   delete[] data_[0];
 }
 
 bool VideoFrame::IsValidPlane(size_t plane) const {
   switch (format_) {
     case RGB555:
     case RGB565:
     case RGB24:
     case RGB32:
     case RGBA:
       return plane == kRGBPlane;
 
     case YV12:
     case YV16:
       return plane == kYPlane || plane == kUPlane || plane == kVPlane;
 
-    case NATIVE_TEXTURE:
-      NOTREACHED() << "NATIVE_TEXTUREs don't use plane-related methods!";
-      return false;
-
     default:
       break;
   }
 
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return false;
 }
 
 int VideoFrame::stride(size_t plane) const {
@@ skipping 49 matching lines @@
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return 0;
 }
 
 uint8* VideoFrame::data(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   return data_[plane];
 }
 
-uint32 VideoFrame::texture_id() const {
-  DCHECK_EQ(format_, NATIVE_TEXTURE);
-  DCHECK_EQ(planes_, 0U);
-  return texture_id_;
-}
-
 bool VideoFrame::IsEndOfStream() const {
   return format_ == VideoFrame::EMPTY;
 }
 
 }  // namespace media