Revert 77476 - Remove FFmpegVideoDecodeEngine's dependency on AVStream.

This change seems to have caused Linux Heapcheck bot redness.
http://build.chromium.org/p/chromium.memory/builders/Linux%20Heapcheck/builds/4846

First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat.

BUG=28206
TEST=media_unittests

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

TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/6665020

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

1 files changed, 8 insertions, 51 deletions

diff --git a/media/video/video_decode_engine.cc b/media/video/video_decode_engine.cc
index ca0093f..04f3bea 100644
--- a/media/video/video_decode_engine.cc
+++ b/media/video/video_decode_engine.cc
@@ -1,61 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "media/video/video_decode_engine.h"
 
-#include "base/logging.h"
-
 namespace media {
 
-VideoCodecConfig::VideoCodecConfig(VideoCodec codec,
-                                   int width,
-                                   int height,
-                                   int frame_rate_numerator,
-                                   int frame_rate_denominator,
-                                   uint8* extra_data,
-                                   size_t extra_data_size)
-    : codec_(codec),
-      width_(width),
-      height_(height),
-      frame_rate_numerator_(frame_rate_numerator),
-      frame_rate_denominator_(frame_rate_denominator),
-      extra_data_size_(extra_data_size) {
-  CHECK(extra_data_size_ == 0 || extra_data);
-  if (extra_data_size_ > 0) {
-    extra_data_.reset(new uint8[extra_data_size_]);
-    memcpy(extra_data_.get(), extra_data, extra_data_size_);
-  }
-}
-
-VideoCodecConfig::~VideoCodecConfig() {}
-
-VideoCodec VideoCodecConfig::codec() const {
-  return codec_;
-}
-
-int VideoCodecConfig::width() const {
-  return width_;
-}
-
-int VideoCodecConfig::height() const {
-  return height_;
-}
-
-int VideoCodecConfig::frame_rate_numerator() const {
-  return frame_rate_numerator_;
-}
-
-int VideoCodecConfig::frame_rate_denominator() const {
-  return frame_rate_denominator_;
-}
-
-uint8* VideoCodecConfig::extra_data() const {
-  return extra_data_.get();
-}
-
-size_t VideoCodecConfig::extra_data_size() const {
-  return extra_data_size_;
+VideoCodecConfig::VideoCodecConfig()
+    : codec(kCodecH264),
+      profile(kProfileDoNotCare),
+      level(kLevelDoNotCare),
+      width(0),
+      height(0),
+      opaque_context(NULL) {
 }
 
 }  // namespace media