Revert 58423 - Refactor video decode engines to move them to a new folder

Moving video decode engines and friends to media/video.

TEST=Tree is green. Video plays.

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

TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/3361004

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

14 files changed, 36 insertions, 33 deletions

diff --git a/media/video/ffmpeg_video_allocator.cc b/media/filters/ffmpeg_video_allocator.cc
index e9530b35..63665f7 100644
--- a/media/video/ffmpeg_video_allocator.cc
+++ b/media/filters/ffmpeg_video_allocator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/video/ffmpeg_video_allocator.h"
+#include "media/filters/ffmpeg_video_allocator.h"
 
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
diff --git a/media/video/ffmpeg_video_allocator.h b/media/filters/ffmpeg_video_allocator.h
index 92b84d6..b72a1f1 100644
--- a/media/video/ffmpeg_video_allocator.h
+++ b/media/filters/ffmpeg_video_allocator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_VIDEO_FFMPEG_VIDEO_ALLOCATOR_H_
-#define MEDIA_VIDEO_FFMPEG_VIDEO_ALLOCATOR_H_
+#ifndef MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
+#define MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ -91,4 +91,4 @@ class FFmpegVideoAllocator {
 
 } // namespace media
 
-#endif  // MEDIA_VIDEO_FFMPEG_VIDEO_ALLOCATOR_H_
+#endif  // MEDIA_FILTERS_FFMPEG_VIDEO_ALLOCATOR_H_
diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc
index e71cb6f..0a2f384 100644
--- a/media/video/ffmpeg_video_decode_engine.cc
+++ b/media/filters/ffmpeg_video_decode_engine.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/video/ffmpeg_video_decode_engine.h"
+#include "media/filters/ffmpeg_video_decode_engine.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
@@ -14,7 +14,7 @@
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/ffmpeg/ffmpeg_util.h"
 #include "media/filters/ffmpeg_demuxer.h"
-#include "media/video/ffmpeg_video_allocator.h"
+#include "media/filters/ffmpeg_video_allocator.h"
 
 namespace media {
 
diff --git a/media/video/ffmpeg_video_decode_engine.h b/media/filters/ffmpeg_video_decode_engine.h
index 3e030db..fbb465a 100644
--- a/media/video/ffmpeg_video_decode_engine.h
+++ b/media/filters/ffmpeg_video_decode_engine.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
-#define MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
+#ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODE_ENGINE_H_
+#define MEDIA_FILTERS_FFMPEG_VIDEO_DECODE_ENGINE_H_
 
 #include <deque>
 
 #include "base/scoped_ptr.h"
 #include "media/ffmpeg/ffmpeg_common.h"
-#include "media/video/video_decode_engine.h"
+#include "media/filters/video_decode_engine.h"
 
 // FFmpeg types.
 struct AVCodecContext;
@@ -82,4 +82,4 @@ class FFmpegVideoDecodeEngine : public VideoDecodeEngine {
 
 }  // namespace media
 
-#endif  // MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
+#endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODE_ENGINE_H_
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/filters/ffmpeg_video_decode_engine_unittest.cc
index 73ac917..c8e8d06 100644
--- a/media/video/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/filters/ffmpeg_video_decode_engine_unittest.cc
@@ -6,7 +6,8 @@
 #include "media/base/data_buffer.h"
 #include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_task.h"
-#include "media/video/ffmpeg_video_decode_engine.h"
+#include "media/filters/ffmpeg_video_decode_engine.h"
+#include "media/filters/ffmpeg_video_decoder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index eb57493..46e4036 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -16,8 +16,8 @@
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/ffmpeg/ffmpeg_util.h"
 #include "media/filters/ffmpeg_interfaces.h"
-#include "media/video/ffmpeg_video_decode_engine.h"
-#include "media/video/video_decode_engine.h"
+#include "media/filters/ffmpeg_video_decode_engine.h"
+#include "media/filters/video_decode_engine.h"
 
 namespace media {
 
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index e898266..972010b 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -14,7 +14,7 @@
 #include "media/base/pts_heap.h"
 #include "media/base/video_frame.h"
 #include "media/filters/decoder_base.h"
-#include "media/video/video_decode_engine.h"
+#include "media/filters/video_decode_engine.h"
 
 // FFmpeg types.
 struct AVRational;
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index b1bd481..90a538f 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -17,7 +17,7 @@
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_interfaces.h"
 #include "media/filters/ffmpeg_video_decoder.h"
-#include "media/video/video_decode_engine.h"
+#include "media/filters/video_decode_engine.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
diff --git a/media/video/omx_video_decode_engine.cc b/media/filters/omx_video_decode_engine.cc
index b6d7fea..358e005 100644
--- a/media/video/omx_video_decode_engine.cc
+++ b/media/filters/omx_video_decode_engine.cc
@@ -14,7 +14,7 @@
 // all methods in this class are executed on the same thread as
 // VideoDecoderImpl. Because of that there's no need for locking anywhere.
 
-#include "media/video/omx_video_decode_engine.h"
+#include "media/filters/omx_video_decode_engine.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
diff --git a/media/video/omx_video_decode_engine.h b/media/filters/omx_video_decode_engine.h
index 9e8bcf3..da3fe52 100644
--- a/media/video/omx_video_decode_engine.h
+++ b/media/filters/omx_video_decode_engine.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
-#define MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
+#ifndef MEDIA_FILTERS_OMX_VIDEO_DECODE_ENGINE_H_
+#define MEDIA_FILTERS_OMX_VIDEO_DECODE_ENGINE_H_
 
 #include <queue>
 #include <vector>
@@ -12,8 +12,8 @@
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "media/filters/video_decode_engine.h"
 #include "media/omx/omx_configurator.h"
-#include "media/video/video_decode_engine.h"
 #include "third_party/openmax/il/OMX_Component.h"
 #include "third_party/openmax/il/OMX_Core.h"
 #include "third_party/openmax/il/OMX_Video.h"
@@ -243,4 +243,4 @@ class OmxVideoDecodeEngine : public VideoDecodeEngine {
 
 }  // namespace media
 
-#endif  // MEDIA_VIDEO_OMX_VIDEO_DECODE_ENGINE_H_
+#endif  // MEDIA_FILTERS_OMX_VIDEO_DECODE_ENGINE_H_
diff --git a/media/filters/omx_video_decoder.cc b/media/filters/omx_video_decoder.cc
index 0a6d9910..2c96117 100644
--- a/media/filters/omx_video_decoder.cc
+++ b/media/filters/omx_video_decoder.cc
@@ -11,7 +11,7 @@
 #include "media/base/limits.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_interfaces.h"
-#include "media/video/omx_video_decode_engine.h"
+#include "media/filters/omx_video_decode_engine.h"
 
 namespace media {
 
diff --git a/media/filters/omx_video_decoder.h b/media/filters/omx_video_decoder.h
index 26efc38..16f3b64 100644
--- a/media/filters/omx_video_decoder.h
+++ b/media/filters/omx_video_decoder.h
@@ -10,7 +10,7 @@
 #include "media/base/factory.h"
 #include "media/base/filters.h"
 #include "media/base/media_format.h"
-#include "media/video/video_decode_engine.h"
+#include "media/filters/video_decode_engine.h"
 
 class MessageLoop;
 
diff --git a/media/video/video_decode_engine.h b/media/filters/video_decode_engine.h
index d2cf7b2..f1faf7b 100644
--- a/media/video/video_decode_engine.h
+++ b/media/filters/video_decode_engine.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_
-#define MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_
+#ifndef MEDIA_FILTERS_VIDEO_DECODE_ENGINE_H_
+#define MEDIA_FILTERS_VIDEO_DECODE_ENGINE_H_
 
 #include "base/callback.h"
 #include "base/message_loop.h"
@@ -125,4 +125,4 @@ class VideoDecodeEngine : public base::RefCountedThreadSafe<VideoDecodeEngine> {
 
 }  // namespace media
 
-#endif  // MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_
+#endif  // MEDIA_FILTERS_VIDEO_DECODE_ENGINE_H_
diff --git a/media/media.gyp b/media/media.gyp
index 21f0dc1..15b4266 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -126,19 +126,19 @@
         'filters/ffmpeg_glue.h',
         'filters/ffmpeg_interfaces.cc',
         'filters/ffmpeg_interfaces.h',
+        'filters/ffmpeg_video_allocator.cc',
+        'filters/ffmpeg_video_allocator.h',
+        'filters/ffmpeg_video_decode_engine.cc',
+        'filters/ffmpeg_video_decode_engine.h',
         'filters/ffmpeg_video_decoder.cc',
         'filters/ffmpeg_video_decoder.h',
         'filters/file_data_source.cc',
         'filters/file_data_source.h',
         'filters/null_audio_renderer.cc',
         'filters/null_audio_renderer.h',
+        'filters/video_decode_engine.h',
         'filters/video_renderer_base.cc',
         'filters/video_renderer_base.h',
-        'video/ffmpeg_video_allocator.cc',
-        'video/ffmpeg_video_allocator.h',
-        'video/ffmpeg_video_decode_engine.cc',
-        'video/ffmpeg_video_decode_engine.h',
-        'video/video_decode_engine.h',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -170,6 +170,8 @@
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'sources': [
+            'filters/omx_video_decode_engine.cc',
+            'filters/omx_video_decode_engine.h',
             'filters/omx_video_decoder.cc',
             'filters/omx_video_decoder.h',
           ],
@@ -270,12 +272,12 @@
         'filters/decoder_base_unittest.cc',
         'filters/ffmpeg_demuxer_unittest.cc',
         'filters/ffmpeg_glue_unittest.cc',
+        'filters/ffmpeg_video_decode_engine_unittest.cc',
         'filters/ffmpeg_video_decoder_unittest.cc',
         'filters/file_data_source_unittest.cc',
         'filters/video_renderer_base_unittest.cc',
         'omx/mock_omx.cc',
         'omx/mock_omx.h',
-        'video/ffmpeg_video_decode_engine_unittest.cc',
       ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
@@ -567,10 +569,10 @@
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
+            'filters/omx_video_decode_engine.cc',
+            'filters/omx_video_decode_engine.cc',
             'omx/omx_configurator.cc',
             'omx/omx_configurator.h',
-            'video/omx_video_decode_engine.cc',
-            'video/omx_video_decode_engine.cc',
           ],
           'hard_dependency': 1,
           'export_dependent_settings': [