Revert "Speculative revert by sheriff"

media/tools/player_x11/player_x11.cc

Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
deleted file mode 100644
index d149ca46f66227c70fd8d29c1d9a4202c5994a49..0000000000000000000000000000000000000000
--- a/media/tools/player_x11/player_x11.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright (c) 2012 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 <signal.h>
-
-#include <iostream>  // NOLINT
-
-#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
-#include "base/threading/platform_thread.h"
-#include "base/threading/thread.h"
-#include "media/audio/audio_manager.h"
-#include "media/audio/null_audio_sink.h"
-#include "media/base/audio_hardware_config.h"
-#include "media/base/bind_to_current_loop.h"
-#include "media/base/decryptor.h"
-#include "media/base/media.h"
-#include "media/base/media_log.h"
-#include "media/base/media_switches.h"
-#include "media/base/pipeline.h"
-#include "media/base/text_track.h"
-#include "media/base/text_track_config.h"
-#include "media/base/video_frame.h"
-#include "media/filters/ffmpeg_audio_decoder.h"
-#include "media/filters/ffmpeg_demuxer.h"
-#include "media/filters/ffmpeg_video_decoder.h"
-#include "media/filters/file_data_source.h"
-#include "media/renderers/audio_renderer_impl.h"
-#include "media/renderers/renderer_impl.h"
-#include "media/renderers/video_renderer_impl.h"
-#include "media/tools/player_x11/data_source_logger.h"
-
-// Include X11 headers here because X11/Xlib.h #define's Status
-// which causes compiler errors with Status enum declarations
-// in media::DemuxerStream & media::AudioDecoder.
-#include <X11/XKBlib.h>
-#include <X11/Xlib.h>
-
-#include "media/tools/player_x11/gl_video_renderer.h"
-#include "media/tools/player_x11/x11_video_renderer.h"
-
-static Display* g_display = NULL;
-static Window g_window = 0;
-static bool g_running = false;
-
-media::AudioManager* g_audio_manager = NULL;
-
-scoped_ptr<media::DataSource> CreateDataSource(const std::string& file_path) {
-  media::FileDataSource* file_data_source = new media::FileDataSource();
-  CHECK(file_data_source->Initialize(base::FilePath(file_path)));
-
-  scoped_ptr<media::DataSource> data_source(file_data_source);
-  return data_source.Pass();
-}
-
-// Initialize X11. Returns true if successful. This method creates the X11
-// window. Further initialization is done in X11VideoRenderer.
-bool InitX11() {
-  g_display = XOpenDisplay(NULL);
-  if (!g_display) {
-    std::cout << "Error - cannot open display" << std::endl;
-    return false;
-  }
-
-  // Get properties of the screen.
-  int screen = DefaultScreen(g_display);
-  int root_window = RootWindow(g_display, screen);
-
-  // Creates the window.
-  g_window = XCreateSimpleWindow(g_display, root_window, 1, 1, 100, 50, 0,
-                                 BlackPixel(g_display, screen),
-                                 BlackPixel(g_display, screen));
-  XStoreName(g_display, g_window, "X11 Media Player");
-
-  XSelectInput(g_display, g_window,
-               ExposureMask | ButtonPressMask | KeyPressMask);
-  XMapWindow(g_display, g_window);
-  return true;
-}
-
-static void DoNothing() {}
-
-static void OnStatus(media::PipelineStatus status) {}
-
-static void OnMetadata(media::PipelineMetadata metadata) {}
-
-static void OnBufferingStateChanged(media::BufferingState buffering_state) {}
-
-static void OnAddTextTrack(const media::TextTrackConfig& config,
-                           const media::AddTextTrackDoneCB& done_cb) {
-}
-
-static void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type,
-                                     const std::vector<uint8>& init_data) {
-  std::cout << "File is encrypted." << std::endl;
-}
-
-static void SaveStatusAndSignal(base::WaitableEvent* event,
-                                media::PipelineStatus* status_out,
-                                media::PipelineStatus status) {
-  *status_out = status;
-  event->Signal();
-}
-
-// TODO(vrk): Re-enabled audio. (crbug.com/112159)
-void InitPipeline(
-    media::Pipeline* pipeline,
-    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
-    media::Demuxer* demuxer,
-    const media::VideoRendererImpl::PaintCB& paint_cb,
-    bool /* enable_audio */) {
-  ScopedVector<media::VideoDecoder> video_decoders;
-  video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner));
-  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
-      task_runner, video_decoders.Pass(), true, new media::MediaLog()));
-
-  ScopedVector<media::AudioDecoder> audio_decoders;
-  audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner,
-                                                         media::LogCB()));
-  media::AudioParameters out_params(
-      media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
-      media::CHANNEL_LAYOUT_STEREO,
-      44100,
-      16,
-      512);
-  media::AudioHardwareConfig hardware_config(out_params, out_params);
-
-  scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
-      task_runner, new media::NullAudioSink(task_runner), audio_decoders.Pass(),
-      hardware_config, new media::MediaLog()));
-
-  scoped_ptr<media::Renderer> renderer(new media::RendererImpl(
-      task_runner, audio_renderer.Pass(), video_renderer.Pass()));
-
-  base::WaitableEvent event(true, false);
-  media::PipelineStatus status;
-
-  pipeline->Start(demuxer,
-                  renderer.Pass(),
-                  base::Bind(&DoNothing),
-                  base::Bind(&OnStatus),
-                  base::Bind(&SaveStatusAndSignal, &event, &status),
-                  base::Bind(&OnMetadata),
-                  base::Bind(&OnBufferingStateChanged),
-                  paint_cb,
-                  base::Bind(&DoNothing),
-                  base::Bind(&OnAddTextTrack),
-                  base::Bind(&DoNothing));
-
-  // Wait until the pipeline is fully initialized.
-  event.Wait();
-  CHECK_EQ(status, media::PIPELINE_OK) << "Pipeline initialization failed";
-
-  // And start the playback.
-  pipeline->SetPlaybackRate(1.0f);
-}
-
-void TerminateHandler(int signal) {
-  g_running = false;
-}
-
-void PeriodicalUpdate(
-    media::Pipeline* pipeline,
-    base::MessageLoop* message_loop) {
-  if (!g_running) {
-    // interrupt signal was received during last time period.
-    // Quit message_loop only when pipeline is fully stopped.
-    pipeline->Stop(base::MessageLoop::QuitClosure());
-    return;
-  }
-
-  // Consume all the X events
-  while (XPending(g_display)) {
-    XEvent e;
-    XNextEvent(g_display, &e);
-    switch (e.type) {
-      case ButtonPress:
-        {
-          Window window;
-          int x, y;
-          unsigned int width, height, border_width, depth;
-          XGetGeometry(g_display,
-                       g_window,
-                       &window,
-                       &x,
-                       &y,
-                       &width,
-                       &height,
-                       &border_width,
-                       &depth);
-          base::TimeDelta time = pipeline->GetMediaDuration();
-          pipeline->Seek(time*e.xbutton.x/width, base::Bind(&OnStatus));
-        }
-        break;
-      case KeyPress:
-        {
-          KeySym key = XkbKeycodeToKeysym(g_display, e.xkey.keycode, 0, 0);
-          if (key == XK_Escape) {
-            g_running = false;
-            // Quit message_loop only when pipeline is fully stopped.
-            pipeline->Stop(base::MessageLoop::QuitClosure());
-            return;
-          } else if (key == XK_space) {
-            if (pipeline->GetPlaybackRate() < 0.01f)  // paused
-              pipeline->SetPlaybackRate(1.0f);
-            else
-              pipeline->SetPlaybackRate(0.0f);
-          }
-        }
-        break;
-      default:
-        break;
-    }
-  }
-
-  message_loop->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&PeriodicalUpdate,
-                 base::Unretained(pipeline),
-                 message_loop),
-      base::TimeDelta::FromMilliseconds(10));
-}
-
-int main(int argc, char** argv) {
-  base::AtExitManager at_exit;
-  media::InitializeMediaLibraryForTesting();
-
-  base::CommandLine::Init(argc, argv);
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  std::string filename = command_line->GetSwitchValueASCII("file");
-
-  if (filename.empty()) {
-    std::cout << "Usage: " << argv[0] << " --file=FILE" << std::endl
-              << std::endl
-              << "Optional arguments:" << std::endl
-              << "  [--audio]"
-              << "  [--alsa-device=DEVICE]"
-              << "  [--use-gl]"
-              << "  [--streaming]" << std::endl
-              << " Press [ESC] to stop" << std::endl
-              << " Press [SPACE] to toggle pause/play" << std::endl
-              << " Press mouse left button to seek" << std::endl;
-    return 1;
-  }
-
-  scoped_ptr<media::AudioManager> audio_manager(
-      media::AudioManager::CreateForTesting());
-  g_audio_manager = audio_manager.get();
-
-  logging::LoggingSettings settings;
-  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-  logging::InitLogging(settings);
-
-  // Install the signal handler.
-  signal(SIGTERM, &TerminateHandler);
-  signal(SIGINT, &TerminateHandler);
-
-  // Initialize X11.
-  if (!InitX11())
-    return 1;
-
-  // Initialize the pipeline thread and the pipeline.
-  base::MessageLoop message_loop;
-  base::Thread media_thread("MediaThread");
-  media_thread.Start();
-
-  media::VideoRendererImpl::PaintCB paint_cb;
-  if (command_line->HasSwitch("use-gl")) {
-    paint_cb = media::BindToCurrentLoop(base::Bind(
-        &GlVideoRenderer::Paint, new GlVideoRenderer(g_display, g_window)));
-  } else {
-    paint_cb = media::BindToCurrentLoop(base::Bind(
-        &X11VideoRenderer::Paint, new X11VideoRenderer(g_display, g_window)));
-  }
-
-  scoped_ptr<media::DataSource> data_source(new DataSourceLogger(
-      CreateDataSource(filename), command_line->HasSwitch("streaming")));
-  scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer(
-      media_thread.message_loop_proxy(), data_source.get(),
-      base::Bind(&OnEncryptedMediaInitData), new media::MediaLog()));
-
-  media::Pipeline pipeline(media_thread.message_loop_proxy(),
-                           new media::MediaLog());
-  InitPipeline(&pipeline, media_thread.message_loop_proxy(), demuxer.get(),
-               paint_cb, command_line->HasSwitch("audio"));
-
-  // Main loop of the application.
-  g_running = true;
-
-  message_loop.PostTask(FROM_HERE, base::Bind(
-      &PeriodicalUpdate, base::Unretained(&pipeline), &message_loop));
-  message_loop.Run();
-
-  // Cleanup tasks.
-  media_thread.Stop();
-
-  // Release callback which releases video renderer. Do this before cleaning up
-  // X below since the video renderer has some X cleanup duties as well.
-  paint_cb.Reset();
-
-  XDestroyWindow(g_display, g_window);
-  XCloseDisplay(g_display);
-  g_audio_manager = NULL;
-
-  return 0;
-}