Re-organizing all tools under /src/media to be consistent with the rest of the repository.

TEST=n/a
BUG=n/a

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


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

25 files changed, 73 insertions, 83 deletions

diff --git a/media/media.gyp b/media/media.gyp
index 14c41b9..5a0dd15 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -216,9 +216,9 @@
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
-        'bench/bench.cc',
-        'bench/file_protocol.cc',
-        'bench/file_protocol.h',
+        'tools/media_bench/file_protocol.cc',
+        'tools/media_bench/file_protocol.h',
+        'tools/media_bench/media_bench.cc',
       ],
     },
     {
@@ -228,14 +228,14 @@
         'media',
       ],
       'sources': [
-        'tools/wav_ola_test.cc'
+        'tools/wav_ola_test/wav_ola_test.cc'
       ],
     },
     {
       'target_name': 'qt_faststart',
       'type': 'executable',
       'sources': [
-        'tools/qt_faststart.c'
+        'tools/qt_faststart/qt_faststart.c'
       ],
     },
     {
@@ -258,7 +258,7 @@
     ['OS=="win"', {
       'targets': [
         {
-          'target_name': 'media_player',
+          'target_name': 'player_wtl',
           'type': 'executable',
           'dependencies': [
             'media',
@@ -268,18 +268,18 @@
             '../chrome/third_party/wtl/include',
           ],
           'sources': [
-            'player/list.h',
-            'player/mainfrm.h',
-            'player/movie.cc',
-            'player/movie.h',
-            'player/player_wtl.cc',
-            'player/player_wtl.rc',
-            'player/props.h',
-            'player/seek.h',
-            'player/resource.h',
-            'player/view.h',
-            'player/wtl_renderer.cc',
-            'player/wtl_renderer.h',
+            'tools/player_wtl/list.h',
+            'tools/player_wtl/mainfrm.h',
+            'tools/player_wtl/movie.cc',
+            'tools/player_wtl/movie.h',
+            'tools/player_wtl/player_wtl.cc',
+            'tools/player_wtl/player_wtl.rc',
+            'tools/player_wtl/props.h',
+            'tools/player_wtl/seek.h',
+            'tools/player_wtl/resource.h',
+            'tools/player_wtl/view.h',
+            'tools/player_wtl/wtl_renderer.cc',
+            'tools/player_wtl/wtl_renderer.h',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
@@ -295,7 +295,7 @@
     ['OS=="linux"', {
       'targets': [
         {
-          'target_name': 'media_player',
+          'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
@@ -309,9 +309,9 @@
             ],
           },
           'sources': [
-            'player/player_x11.cc',
-            'player/x11_video_renderer.cc',
-            'player/x11_video_renderer.h',
+            'tools/player_x11/player_x11.cc',
+            'tools/player_x11/x11_video_renderer.cc',
+            'tools/player_x11/x11_video_renderer.h',
           ],
         },
       ],
diff --git a/media/player/player.cc b/media/player/player.cc
deleted file mode 100644
index 70aea4f..0000000
--- a/media/player/player.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// Stand alone media player application used for testing the media library.
-
-int main(int argc, char** argv) {
-  return 0;
-}
diff --git a/media/bench/file_protocol.cc b/media/tools/media_bench/file_protocol.cc
index cf44eee..f85fe33 100644
--- a/media/bench/file_protocol.cc
+++ b/media/tools/media_bench/file_protocol.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/bench/file_protocol.h"
+#include "media/tools/media_bench/file_protocol.h"
 
 #include "build/build_config.h"
 
@@ -82,4 +82,3 @@ URLProtocol kFFmpegFileProtocol = {
   NULL,  // url_read_seek
   &GetHandle
 };
-
diff --git a/media/bench/file_protocol.h b/media/tools/media_bench/file_protocol.h
index 3cfddad..d4df2d3 100644
--- a/media/bench/file_protocol.h
+++ b/media/tools/media_bench/file_protocol.h
@@ -5,10 +5,10 @@
 // Implements a basic file I/O URLProtocol for FFmpeg.  Since we don't build
 // FFmpeg binaries with protocols, we have to write our own.
 
-#ifndef MEDIA_BENCH_FILE_PROTOCOL_H_
-#define MEDIA_BENCH_FILE_PROTOCOL_H_
+#ifndef MEDIA_TOOLS_MEDIA_BENCH_FILE_PROTOCOL_H_
+#define MEDIA_TOOLS_MEDIA_BENCH_FILE_PROTOCOL_H_
 
 struct URLProtocol;
 extern URLProtocol kFFmpegFileProtocol;
 
-#endif  // MEDIA_BENCH_FILE_PROTOCOL_H_
+#endif  // MEDIA_TOOLS_MEDIA_BENCH_FILE_PROTOCOL_H_
diff --git a/media/bench/bench.cc b/media/tools/media_bench/media_bench.cc
index dc994a7..fffbaf3 100644
--- a/media/bench/bench.cc
+++ b/media/tools/media_bench/media_bench.cc
@@ -29,9 +29,9 @@
 #include "base/time.h"
 #include "media/base/djb2.h"
 #include "media/base/media.h"
-#include "media/bench/file_protocol.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_video_decoder.h"
+#include "media/tools/media_bench/file_protocol.h"
 
 namespace switches {
 const char kStream[]       = "stream";
diff --git a/media/player/list.h b/media/tools/player_wtl/list.h
index ee0be75..f3b8d5b 100644
--- a/media/player/list.h
+++ b/media/tools/player_wtl/list.h
@@ -2,10 +2,10 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef MEDIA_PLAYER_LIST_H_
-#define MEDIA_PLAYER_LIST_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_LIST_H_
+#define MEDIA_TOOLS_PLAYER_WTL_LIST_H_
 
-#include "media/player/player_wtl.h"
+#include "media/tools/player_wtl/player_wtl.h"
 
 // Recent Files list.
 class CMruList : public CWindowImpl<CMruList, CListBox> {
@@ -124,4 +124,4 @@ class CMruList : public CWindowImpl<CMruList, CListBox> {
   SIZE size_;
 };
 
-#endif  // MEDIA_PLAYER_LIST_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_LIST_H_
diff --git a/media/player/mainfrm.h b/media/tools/player_wtl/mainfrm.h
index e8cab00..7379f71 100644
--- a/media/player/mainfrm.h
+++ b/media/tools/player_wtl/mainfrm.h
@@ -2,13 +2,13 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef MEDIA_PLAYER_MAINFRM_H_
-#define MEDIA_PLAYER_MAINFRM_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_MAINFRM_H_
+#define MEDIA_TOOLS_PLAYER_WTL_MAINFRM_H_
 
-#include "media/player/list.h"
-#include "media/player/props.h"
-#include "media/player/seek.h"
-#include "media/player/view.h"
+#include "media/tools/player_wtl/list.h"
+#include "media/tools/player_wtl/props.h"
+#include "media/tools/player_wtl/seek.h"
+#include "media/tools/player_wtl/view.h"
 
 const int POPUP_MENU_POSITION = 0;
 const int FILE_MENU_POSITION = 0;
@@ -715,4 +715,4 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>,
   }
 };
 
-#endif  // MEDIA_PLAYER_MAINFRM_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_MAINFRM_H_
diff --git a/media/player/movie.cc b/media/tools/player_wtl/movie.cc
index 8589956..b1d957a 100644
--- a/media/player/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -2,7 +2,7 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "media/player/movie.h"
+#include "media/tools/player_wtl/movie.h"
 
 #include "base/string_util.h"
 #include "media/base/pipeline_impl.h"
@@ -12,7 +12,7 @@
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/null_audio_renderer.h"
-#include "media/player/wtl_renderer.h"
+#include "media/tools/player_wtl/wtl_renderer.h"
 
 using media::AudioRendererImpl;
 using media::FFmpegAudioDecoder;
diff --git a/media/player/movie.h b/media/tools/player_wtl/movie.h
index 8bbbc68..ed81182 100644
--- a/media/player/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -4,10 +4,10 @@
 
 // Movie class for WTL forms to call to control the media pipeline.
 
-#ifndef MEDIA_PLAYER_MOVIE_H_
-#define MEDIA_PLAYER_MOVIE_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
+#define MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
 
-#include "media/player/player_wtl.h"
+#include "media/tools/player_wtl/player_wtl.h"
 
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
@@ -95,4 +95,4 @@ class Movie : public Singleton<Movie> {
 
 }  // namespace media
 
-#endif  // MEDIA_PLAYER_MOVIE_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
diff --git a/media/player/player_wtl.cc b/media/tools/player_wtl/player_wtl.cc
index 70f31c8..73abc95 100644
--- a/media/player/player_wtl.cc
+++ b/media/tools/player_wtl/player_wtl.cc
@@ -4,7 +4,7 @@
 
 // Stand alone media player application used for testing the media library.
 
-#include "media/player/player_wtl.h"
+#include "media/tools/player_wtl/player_wtl.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ -14,7 +14,7 @@
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
-#include "media/player/mainfrm.h"
+#include "media/tools/player_wtl/mainfrm.h"
 
 // See player_wtl.h to enable timing code by turning on TESTING macro.
 
diff --git a/media/player/player_wtl.h b/media/tools/player_wtl/player_wtl.h
index d25e7e8..96a866c 100644
--- a/media/player/player_wtl.h
+++ b/media/tools/player_wtl/player_wtl.h
@@ -4,8 +4,8 @@
 
 // Stand alone media player application used for testing the media library.
 
-#ifndef MEDIA_PLAYER_PLAYER_WTL_H_
-#define MEDIA_PLAYER_PLAYER_WTL_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_PLAYER_WTL_H_
+#define MEDIA_TOOLS_PLAYER_WTL_PLAYER_WTL_H_
 
 // Enable timing code by turning on TESTING macro.
 //#define TESTING 1
@@ -25,4 +25,4 @@
 
 extern CAppModule g_module;
 
-#endif  // MEDIA_PLAYER_PLAYER_WTL_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_PLAYER_WTL_H_
diff --git a/media/player/player_wtl.ico b/media/tools/player_wtl/player_wtl.ico
index 93d8182..93d8182 100644
--- a/media/player/player_wtl.ico
+++ b/media/tools/player_wtl/player_wtl.ico
diff --git a/media/player/player_wtl.rc b/media/tools/player_wtl/player_wtl.rc
index 68b892a..68b892a 100644
--- a/media/player/player_wtl.rc
+++ b/media/tools/player_wtl/player_wtl.rc
diff --git a/media/player/props.h b/media/tools/player_wtl/props.h
index 47298d7..65224e5 100644
--- a/media/player/props.h
+++ b/media/tools/player_wtl/props.h
@@ -2,10 +2,10 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef MEDIA_PLAYER_PROPS_H_
-#define MEDIA_PLAYER_PROPS_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_PROPS_H_
+#define MEDIA_TOOLS_PLAYER_WTL_PROPS_H_
 
-#include "media/player/movie.h"
+#include "media/tools/player_wtl/movie.h"
 
 #include "resource.h"
 
@@ -322,4 +322,4 @@ class CBmpProperties : public CPropertySheetImpl<CBmpProperties> {
   CPageThree page3_;
 };
 
-#endif  // MEDIA_PLAYER_PROPS_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_PROPS_H_
diff --git a/media/player/resource.h b/media/tools/player_wtl/resource.h
index 4c4b643..4c4b643 100644
--- a/media/player/resource.h
+++ b/media/tools/player_wtl/resource.h
diff --git a/media/player/seek.h b/media/tools/player_wtl/seek.h
index b9adc85..84f3c95 100644
--- a/media/player/seek.h
+++ b/media/tools/player_wtl/seek.h
@@ -2,10 +2,10 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef MEDIA_PLAYER_SEEK_H_
-#define MEDIA_PLAYER_SEEK_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_SEEK_H_
+#define MEDIA_TOOLS_PLAYER_WTL_SEEK_H_
 
-#include "media/player/player_wtl.h"
+#include "media/tools/player_wtl/player_wtl.h"
 
 // Movie seek dialog.
 // TODO(fbachard): Frame properties only work for images, so
@@ -94,4 +94,4 @@ class CSeek : public CSimpleDialog<IDD_SEEK>,
   }
 };
 
-#endif  // MEDIA_PLAYER_SEEK_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_SEEK_H_
diff --git a/media/player/toolbar.bmp b/media/tools/player_wtl/toolbar.bmp
index 5843d36..5843d36 100644
--- a/media/player/toolbar.bmp
+++ b/media/tools/player_wtl/toolbar.bmp
diff --git a/media/player/view.h b/media/tools/player_wtl/view.h
index 040a3cf..ce55c10 100644
--- a/media/player/view.h
+++ b/media/tools/player_wtl/view.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef MEDIA_PLAYER_VIEW_H_
-#define MEDIA_PLAYER_VIEW_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_VIEW_H_
+#define MEDIA_TOOLS_PLAYER_WTL_VIEW_H_
 
 #include <stdio.h>
 #include <process.h>
@@ -11,9 +11,9 @@
 
 #include "media/base/buffers.h"
 #include "media/base/yuv_convert.h"
-#include "media/player/movie.h"
-#include "media/player/player_wtl.h"
-#include "media/player/wtl_renderer.h"
+#include "media/tools/player_wtl/movie.h"
+#include "media/tools/player_wtl/player_wtl.h"
+#include "media/tools/player_wtl/wtl_renderer.h"
 
 // Fetchs current time as milliseconds.
 // Returns as double for high duration and precision.
@@ -417,4 +417,4 @@ class WtlVideoWindow : public CScrollWindowImpl<WtlVideoWindow> {
   DISALLOW_COPY_AND_ASSIGN(WtlVideoWindow);
 };
 
-#endif  // MEDIA_PLAYER_VIEW_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_VIEW_H_
diff --git a/media/player/wtl_renderer.cc b/media/tools/player_wtl/wtl_renderer.cc
index bef8e69..8a850f7 100644
--- a/media/player/wtl_renderer.cc
+++ b/media/tools/player_wtl/wtl_renderer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/player/wtl_renderer.h"
+#include "media/tools/player_wtl/wtl_renderer.h"
 
-#include "media/player/view.h"
+#include "media/tools/player_wtl/view.h"
 
 WtlVideoRenderer::WtlVideoRenderer(WtlVideoWindow* window)
     : window_(window) {
diff --git a/media/player/wtl_renderer.h b/media/tools/player_wtl/wtl_renderer.h
index 23f1b2a..86aa61f 100644
--- a/media/player/wtl_renderer.h
+++ b/media/tools/player_wtl/wtl_renderer.h
@@ -4,8 +4,8 @@
 
 // Video renderer for media player.
 
-#ifndef MEDIA_PLAYER_WTL_RENDERER_H_
-#define MEDIA_PLAYER_WTL_RENDERER_H_
+#ifndef MEDIA_TOOLS_PLAYER_WTL_WTL_RENDERER_H_
+#define MEDIA_TOOLS_PLAYER_WTL_WTL_RENDERER_H_
 
 #include "media/filters/video_renderer_base.h"
 
@@ -33,4 +33,4 @@ class WtlVideoRenderer : public media::VideoRendererBase {
   DISALLOW_COPY_AND_ASSIGN(WtlVideoRenderer);
 };
 
-#endif  // MEDIA_PLAYER_WTL_RENDERER_H_
+#endif  // MEDIA_TOOLS_PLAYER_WTL_WTL_RENDERER_H_
diff --git a/media/player/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 24d7430..f8263e9 100644
--- a/media/player/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -18,7 +18,7 @@
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/null_audio_renderer.h"
-#include "media/player/x11_video_renderer.h"
+#include "media/tools/player_x11/x11_video_renderer.h"
 
 Display* g_display;
 Window g_window;
diff --git a/media/player/x11_video_renderer.cc b/media/tools/player_x11/x11_video_renderer.cc
index 4780a45..4b0c45f 100644
--- a/media/player/x11_video_renderer.cc
+++ b/media/tools/player_x11/x11_video_renderer.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/player/x11_video_renderer.h"
+#include "media/tools/player_x11/x11_video_renderer.h"
 
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
diff --git a/media/player/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h
index 66f0137..68d7c29 100644
--- a/media/player/x11_video_renderer.h
+++ b/media/tools/player_x11/x11_video_renderer.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef MEDIA_PLAYER_X11_VIDEO_RENDERER_H_
-#define MEDIA_PLAYER_X11_VIDEO_RENDERER_H_
+#ifndef MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_
+#define MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_
 
 #include <X11/Xlib.h>
 
@@ -67,4 +67,4 @@ class X11VideoRenderer : public media::VideoRendererBase {
   DISALLOW_COPY_AND_ASSIGN(X11VideoRenderer);
 };
 
-#endif  // MEDIA_PLAYER_X11_VIDEO_RENDERER_H_
+#endif  // MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_
diff --git a/media/tools/qt_faststart.c b/media/tools/qt_faststart/qt_faststart.c
index 07b5aa3..07b5aa3 100644
--- a/media/tools/qt_faststart.c
+++ b/media/tools/qt_faststart/qt_faststart.c
diff --git a/media/tools/wav_ola_test.cc b/media/tools/wav_ola_test/wav_ola_test.cc
index 17bbabc..17bbabc 100644
--- a/media/tools/wav_ola_test.cc
+++ b/media/tools/wav_ola_test/wav_ola_test.cc