Revert "Move MFT H264 video decoder implementation and connect it to GpuVideoDecoder"

This reverts commit 8462483619e253dca3717d51e340ed839a6cab1d.

Revert "Fix build failure."

This reverts commit 8dcd363637ac2e59f9472c0793a0b1fd3c2ad4c7.

TBR=scherkus

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3601019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61922 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 118 deletions

diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc
index 0cd9d14..86bcd04 100644
--- a/chrome/gpu/gpu_video_decoder.cc
+++ b/chrome/gpu/gpu_video_decoder.cc
@@ -4,9 +4,7 @@
 
 #include "chrome/gpu/gpu_video_decoder.h"
 
-#include "base/command_line.h"
 #include "chrome/common/child_thread.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_channel.h"
 #include "chrome/gpu/media/fake_gl_video_decode_engine.h"
@@ -14,12 +12,6 @@
 #include "media/base/data_buffer.h"
 #include "media/base/video_frame.h"
 
-#if defined(OS_WIN)
-#include "chrome/gpu/media/mft_angle_video_device.h"
-#include "media/video/mft_h264_decode_engine.h"
-#include <d3d9.h>
-#endif
-
 void GpuVideoDecoder::OnChannelConnected(int32 peer_pid) {
 }
 
@@ -113,12 +105,7 @@ void GpuVideoDecoder::ProduceVideoSample(scoped_refptr<Buffer> buffer) {
 }
 
 void GpuVideoDecoder::ConsumeVideoFrame(scoped_refptr<VideoFrame> frame) {
-  if (frame->IsEndOfStream()) {
-    SendConsumeVideoFrame(kGpuVideoInvalidFrameId, 0, 0, kGpuVideoEndOfStream);
-    return;
-  }
-
-  int32 frame_id = kGpuVideoInvalidFrameId;
+  int32 frame_id = -1;
   for (VideoFrameMap::iterator i = video_frame_map_.begin();
        i != video_frame_map_.end(); ++i) {
     if (i->second == frame) {
@@ -129,7 +116,8 @@ void GpuVideoDecoder::ConsumeVideoFrame(scoped_refptr<VideoFrame> frame) {
   DCHECK_NE(-1, frame_id) << "VideoFrame not recognized";
 
   SendConsumeVideoFrame(frame_id, frame->GetTimestamp().InMicroseconds(),
-                        frame->GetDuration().InMicroseconds(), 0);
+                        frame->GetDuration().InMicroseconds(),
+                        frame->IsEndOfStream() ? kGpuVideoEndOfStream : 0);
 }
 
 void* GpuVideoDecoder::GetDevice() {
@@ -237,16 +225,8 @@ GpuVideoDecoder::GpuVideoDecoder(
 
   // TODO(jiesun): find a better way to determine which VideoDecodeEngine
   // to return on current platform.
-#if defined(OS_WIN)
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableAcceleratedDecoding)) {
-    decode_engine_.reset(new media::MftH264DecodeEngine(true));
-    video_device_.reset(new MftAngleVideoDevice());
-  }
-#else
   decode_engine_.reset(new FakeGlVideoDecodeEngine());
   video_device_.reset(new FakeGlVideoDevice());
-#endif
 }
 
 void GpuVideoDecoder::OnInitialize(const GpuVideoDecoderInitParam& param) {
@@ -255,7 +235,7 @@ void GpuVideoDecoder::OnInitialize(const GpuVideoDecoderInitParam& param) {
   config_.width = param.width;
   config_.height = param.height;
   config_.opaque_context = NULL;
-  decode_engine_->Initialize(message_loop_, this, this, config_);
+  decode_engine_->Initialize(NULL, this, this, config_);
 }
 
 void GpuVideoDecoder::OnUninitialize() {
diff --git a/chrome/gpu/media/mft_angle_video_device.cc b/chrome/gpu/media/mft_angle_video_device.cc
deleted file mode 100644
index 1faf9dc..0000000
--- a/chrome/gpu/media/mft_angle_video_device.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2010 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 "chrome/gpu/media/mft_angle_video_device.h"
-
-#include <d3d9.h>
-
-#include "media/base/video_frame.h"
-#include "third_party/angle/src/libGLESv2/main.h"
-
-MftAngleVideoDevice::MftAngleVideoDevice()
-    : device_(reinterpret_cast<egl::Display*>(
-          eglGetCurrentDisplay())->getDevice()) {
-}
-
-void* MftAngleVideoDevice::GetDevice() {
-  return device_;
-}
-
-bool MftAngleVideoDevice::CreateVideoFrameFromGlTextures(
-    size_t width, size_t height, media::VideoFrame::Format format,
-    const std::vector<media::VideoFrame::GlTexture>& textures,
-    scoped_refptr<media::VideoFrame>* frame) {
-  media::VideoFrame::GlTexture texture_array[media::VideoFrame::kMaxPlanes];
-  memset(texture_array, 0, sizeof(texture_array));
-
-  for (size_t i = 0; i < textures.size(); ++i) {
-    texture_array[i] = textures[i];
-  }
-
-  media::VideoFrame::CreateFrameGlTexture(format,
-                                          width,
-                                          height,
-                                          texture_array,
-                                          frame);
-  return *frame != NULL;
-}
-
-void MftAngleVideoDevice::ReleaseVideoFrame(
-    const scoped_refptr<media::VideoFrame>& frame) {
-  // We didn't need to anything here because we didn't allocate any resources
-  // for the VideoFrame(s) generated.
-}
-
-bool MftAngleVideoDevice::UploadToVideoFrame(
-    void* buffer, scoped_refptr<media::VideoFrame> frame) {
-  gl::Context* context = (gl::Context*)eglGetCurrentContext();
-  // TODO(hclam): Connect ANGLE to upload the surface to texture when changes
-  // to ANGLE is done.
-  return true;
-}
diff --git a/chrome/gpu/media/mft_angle_video_device.h b/chrome/gpu/media/mft_angle_video_device.h
deleted file mode 100644
index fb1e0e8..0000000
--- a/chrome/gpu/media/mft_angle_video_device.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2010 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 CHROME_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_
-#define CHROME_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_
-
-#include "base/scoped_comptr_win.h"
-#include "chrome/gpu/media/gpu_video_device.h"
-
-struct IDirect3DDevice9;
-extern "C" const GUID IID_IDirect3DDevice9;
-
-namespace media {
-class VideoFrame;
-}  // namespace media
-
-// This class is used to provide hardware video device, video frames and
-// allow video frames to be uploaded to their final render target.
-//
-// This specifically serves MftH264DecodeEngine in the context of ANGLE.
-class MftAngleVideoDevice : public GpuVideoDevice {
- public:
-  MftAngleVideoDevice();
-  virtual ~MftAngleVideoDevice() {}
-
-  // GpuVideoDevice implementation.
-  virtual void* GetDevice();
-  virtual bool CreateVideoFrameFromGlTextures(
-      size_t width, size_t height, media::VideoFrame::Format format,
-      const std::vector<media::VideoFrame::GlTexture>& textures,
-      scoped_refptr<media::VideoFrame>* frame);
-  virtual void ReleaseVideoFrame(
-      const scoped_refptr<media::VideoFrame>& frame);
-  virtual bool UploadToVideoFrame(void* buffer,
-                                  scoped_refptr<media::VideoFrame> frame);
-
- private:
-  ScopedComPtr<IDirect3DDevice9, &IID_IDirect3DDevice9> device_;
-};
-
-#endif  // CHROME_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_