diff options
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/data_source_logger.cc | 59 | ||||
| -rw-r--r-- | media/tools/player_x11/data_source_logger.h | 41 | ||||
| -rw-r--r-- | media/tools/player_x11/gl_video_renderer.cc | 251 | ||||
| -rw-r--r-- | media/tools/player_x11/gl_video_renderer.h | 43 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 311 | ||||
| -rw-r--r-- | media/tools/player_x11/x11_video_renderer.cc | 215 | ||||
| -rw-r--r-- | media/tools/player_x11/x11_video_renderer.h | 47 |
7 files changed, 0 insertions, 967 deletions
diff --git a/media/tools/player_x11/data_source_logger.cc b/media/tools/player_x11/data_source_logger.cc deleted file mode 100644 index d09b6bf..0000000 --- a/media/tools/player_x11/data_source_logger.cc +++ /dev/null @@ -1,59 +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 "base/bind.h" -#include "base/logging.h" -#include "media/tools/player_x11/data_source_logger.h" - -static void LogAndRunReadCB( - int64 position, int size, - const media::DataSource::ReadCB& read_cb, int result) { - VLOG(1) << "Read(" << position << ", " << size << ") -> " << result; - read_cb.Run(result); -} - -DataSourceLogger::DataSourceLogger( - scoped_ptr<media::DataSource> data_source, - bool streaming) - : data_source_(data_source.Pass()), - streaming_(streaming) { -} - -void DataSourceLogger::Stop() { - VLOG(1) << "Stop()"; - data_source_->Stop(); -} - -void DataSourceLogger::Read( - int64 position, int size, uint8* data, - const media::DataSource::ReadCB& read_cb) { - VLOG(1) << "Read(" << position << ", " << size << ")"; - data_source_->Read(position, size, data, base::Bind( - &LogAndRunReadCB, position, size, read_cb)); -} - -bool DataSourceLogger::GetSize(int64* size_out) { - bool success = data_source_->GetSize(size_out); - VLOG(1) << "GetSize() -> " << (success ? "true" : "false") - << ", " << *size_out; - return success; -} - -bool DataSourceLogger::IsStreaming() { - if (streaming_) { - VLOG(1) << "IsStreaming() -> true (overridden)"; - return true; - } - - bool streaming = data_source_->IsStreaming(); - VLOG(1) << "IsStreaming() -> " << (streaming ? "true" : "false"); - return streaming; -} - -void DataSourceLogger::SetBitrate(int bitrate) { - VLOG(1) << "SetBitrate(" << bitrate << ")"; - data_source_->SetBitrate(bitrate); -} - -DataSourceLogger::~DataSourceLogger() {} diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h deleted file mode 100644 index 13fdc60..0000000 --- a/media/tools/player_x11/data_source_logger.h +++ /dev/null @@ -1,41 +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. - -#ifndef MEDIA_TOOLS_PLAYER_X11_DATA_SOURCE_LOGGER_H_ -#define MEDIA_TOOLS_PLAYER_X11_DATA_SOURCE_LOGGER_H_ - -#include "media/base/data_source.h" - -// Logs all DataSource operations to VLOG(1) for debugging purposes. -class DataSourceLogger : public media::DataSource { - public: - // Constructs a DataSourceLogger to log operations against another DataSource. - // - // |data_source| must be initialized in advance. - // - // |streaming| when set to true will override the implementation - // IsStreaming() to always return true, otherwise it will delegate to - // |data_source|. - DataSourceLogger(scoped_ptr<DataSource> data_source, - bool force_streaming); - ~DataSourceLogger() override; - - // media::DataSource implementation. - void Stop() override; - void Read(int64 position, - int size, - uint8* data, - const media::DataSource::ReadCB& read_cb) override; - bool GetSize(int64* size_out) override; - bool IsStreaming() override; - void SetBitrate(int bitrate) override; - - private: - scoped_ptr<media::DataSource> data_source_; - bool streaming_; - - DISALLOW_COPY_AND_ASSIGN(DataSourceLogger); -}; - -#endif // MEDIA_TOOLS_PLAYER_X11_DATA_SOURCE_LOGGER_H_ diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc deleted file mode 100644 index 5f233c4..0000000 --- a/media/tools/player_x11/gl_video_renderer.cc +++ /dev/null @@ -1,251 +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 "media/tools/player_x11/gl_video_renderer.h" - -#include <X11/Xutil.h> - -#include "base/bind.h" -#include "base/message_loop/message_loop.h" -#include "media/base/buffers.h" -#include "media/base/video_frame.h" -#include "media/base/yuv_convert.h" -#include "ui/gl/gl_surface.h" - -enum { kNumYUVPlanes = 3 }; - -static GLXContext InitGLContext(Display* display, Window window) { - // Some versions of NVIDIA's GL libGL.so include a broken version of - // dlopen/dlsym, and so linking it into chrome breaks it. So we dynamically - // load it, and use glew to dynamically resolve symbols. - // See http://code.google.com/p/chromium/issues/detail?id=16800 - if (!gfx::GLSurface::InitializeOneOff()) { - LOG(ERROR) << "GLSurface::InitializeOneOff failed"; - return NULL; - } - - XWindowAttributes attributes; - XGetWindowAttributes(display, window, &attributes); - XVisualInfo visual_info_template; - visual_info_template.visualid = XVisualIDFromVisual(attributes.visual); - int visual_info_count = 0; - XVisualInfo* visual_info_list = XGetVisualInfo(display, VisualIDMask, - &visual_info_template, - &visual_info_count); - GLXContext context = NULL; - for (int i = 0; i < visual_info_count && !context; ++i) { - context = glXCreateContext(display, visual_info_list + i, 0, - True /* Direct rendering */); - } - - XFree(visual_info_list); - if (!context) { - return NULL; - } - - if (!glXMakeCurrent(display, window, context)) { - glXDestroyContext(display, context); - return NULL; - } - - return context; -} - -// Matrix used for the YUV to RGB conversion. -static const float kYUV2RGB[9] = { - 1.f, 0.f, 1.403f, - 1.f, -.344f, -.714f, - 1.f, 1.772f, 0.f, -}; - -// Vertices for a full screen quad. -static const float kVertices[8] = { - -1.f, 1.f, - -1.f, -1.f, - 1.f, 1.f, - 1.f, -1.f, -}; - -// Pass-through vertex shader. -static const char kVertexShader[] = - "varying vec2 interp_tc;\n" - "\n" - "attribute vec4 in_pos;\n" - "attribute vec2 in_tc;\n" - "\n" - "void main() {\n" - " interp_tc = in_tc;\n" - " gl_Position = in_pos;\n" - "}\n"; - -// YUV to RGB pixel shader. Loads a pixel from each plane and pass through the -// matrix. -static const char kFragmentShader[] = - "varying vec2 interp_tc;\n" - "\n" - "uniform sampler2D y_tex;\n" - "uniform sampler2D u_tex;\n" - "uniform sampler2D v_tex;\n" - "uniform mat3 yuv2rgb;\n" - "\n" - "void main() {\n" - " float y = texture2D(y_tex, interp_tc).x;\n" - " float u = texture2D(u_tex, interp_tc).r - .5;\n" - " float v = texture2D(v_tex, interp_tc).r - .5;\n" - " vec3 rgb = yuv2rgb * vec3(y, u, v);\n" - " gl_FragColor = vec4(rgb, 1);\n" - "}\n"; - -// Buffer size for compile errors. -static const unsigned int kErrorSize = 4096; - -GlVideoRenderer::GlVideoRenderer(Display* display, Window window) - : display_(display), - window_(window), - gl_context_(NULL) { -} - -GlVideoRenderer::~GlVideoRenderer() { - glXMakeCurrent(display_, 0, NULL); - glXDestroyContext(display_, gl_context_); -} - -void GlVideoRenderer::Paint( - const scoped_refptr<media::VideoFrame>& video_frame) { - if (!gl_context_) - Initialize(video_frame->coded_size(), video_frame->visible_rect()); - - // Convert YUV frame to RGB. - DCHECK(video_frame->format() == media::VideoFrame::YV12 || - video_frame->format() == media::VideoFrame::I420 || - video_frame->format() == media::VideoFrame::YV16); - DCHECK(video_frame->stride(media::VideoFrame::kUPlane) == - video_frame->stride(media::VideoFrame::kVPlane)); - - if (glXGetCurrentContext() != gl_context_ || - glXGetCurrentDrawable() != window_) { - glXMakeCurrent(display_, window_, gl_context_); - } - for (unsigned int i = 0; i < kNumYUVPlanes; ++i) { - unsigned int width = video_frame->stride(i); - unsigned int height = video_frame->rows(i); - glActiveTexture(GL_TEXTURE0 + i); - glPixelStorei(GL_UNPACK_ROW_LENGTH, video_frame->stride(i)); - glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, width, height, 0, - GL_LUMINANCE, GL_UNSIGNED_BYTE, video_frame->data(i)); - } - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - glXSwapBuffers(display_, window_); -} - -void GlVideoRenderer::Initialize(gfx::Size coded_size, gfx::Rect visible_rect) { - CHECK(!gl_context_); - VLOG(0) << "Initializing GL Renderer..."; - - // Resize the window to fit that of the video. - XResizeWindow(display_, window_, visible_rect.width(), visible_rect.height()); - - gl_context_ = InitGLContext(display_, window_); - CHECK(gl_context_) << "Failed to initialize GL context"; - - // Create 3 textures, one for each plane, and bind them to different - // texture units. - glGenTextures(3, textures_); - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, textures_[0]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glEnable(GL_TEXTURE_2D); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, textures_[1]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glEnable(GL_TEXTURE_2D); - - glActiveTexture(GL_TEXTURE2); - glBindTexture(GL_TEXTURE_2D, textures_[2]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glEnable(GL_TEXTURE_2D); - - GLuint program = glCreateProgram(); - - // Create our YUV->RGB shader. - GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER); - const char* vs_source = kVertexShader; - int vs_size = sizeof(kVertexShader); - glShaderSource(vertex_shader, 1, &vs_source, &vs_size); - glCompileShader(vertex_shader); - int result = GL_FALSE; - glGetShaderiv(vertex_shader, GL_COMPILE_STATUS, &result); - if (!result) { - char log[kErrorSize]; - int len = 0; - glGetShaderInfoLog(vertex_shader, kErrorSize - 1, &len, log); - log[kErrorSize - 1] = 0; - LOG(FATAL) << log; - } - glAttachShader(program, vertex_shader); - glDeleteShader(vertex_shader); - - GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER); - const char* ps_source = kFragmentShader; - int ps_size = sizeof(kFragmentShader); - glShaderSource(fragment_shader, 1, &ps_source, &ps_size); - glCompileShader(fragment_shader); - result = GL_FALSE; - glGetShaderiv(fragment_shader, GL_COMPILE_STATUS, &result); - if (!result) { - char log[kErrorSize]; - int len = 0; - glGetShaderInfoLog(fragment_shader, kErrorSize - 1, &len, log); - log[kErrorSize - 1] = 0; - LOG(FATAL) << log; - } - glAttachShader(program, fragment_shader); - glDeleteShader(fragment_shader); - - glLinkProgram(program); - result = GL_FALSE; - glGetProgramiv(program, GL_LINK_STATUS, &result); - if (!result) { - char log[kErrorSize]; - int len = 0; - glGetProgramInfoLog(program, kErrorSize - 1, &len, log); - log[kErrorSize - 1] = 0; - LOG(FATAL) << log; - } - glUseProgram(program); - glDeleteProgram(program); - - // Bind parameters. - glUniform1i(glGetUniformLocation(program, "y_tex"), 0); - glUniform1i(glGetUniformLocation(program, "u_tex"), 1); - glUniform1i(glGetUniformLocation(program, "v_tex"), 2); - int yuv2rgb_location = glGetUniformLocation(program, "yuv2rgb"); - glUniformMatrix3fv(yuv2rgb_location, 1, GL_TRUE, kYUV2RGB); - - int pos_location = glGetAttribLocation(program, "in_pos"); - glEnableVertexAttribArray(pos_location); - glVertexAttribPointer(pos_location, 2, GL_FLOAT, GL_FALSE, 0, kVertices); - - int tc_location = glGetAttribLocation(program, "in_tc"); - glEnableVertexAttribArray(tc_location); - float verts[8]; - float x0 = static_cast<float>(visible_rect.x()) / coded_size.width(); - float y0 = static_cast<float>(visible_rect.y()) / coded_size.height(); - float x1 = static_cast<float>(visible_rect.right()) / coded_size.width(); - float y1 = static_cast<float>(visible_rect.bottom()) / coded_size.height(); - verts[0] = x0; verts[1] = y0; - verts[2] = x0; verts[3] = y1; - verts[4] = x1; verts[5] = y0; - verts[6] = x1; verts[7] = y1; - glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0, verts); - - // We are getting called on a thread. Release the context so that it can be - // made current on the main thread. - glXMakeCurrent(display_, 0, NULL); -} diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h deleted file mode 100644 index a652eea..0000000 --- a/media/tools/player_x11/gl_video_renderer.h +++ /dev/null @@ -1,43 +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. - -#ifndef MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ -#define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ - -#include "base/basictypes.h" -#include "base/memory/ref_counted.h" -#include "ui/gfx/geometry/rect.h" -#include "ui/gfx/geometry/size.h" -#include "ui/gl/gl_bindings.h" - -namespace media { -class VideoFrame; -} - -class GlVideoRenderer : public base::RefCountedThreadSafe<GlVideoRenderer> { - public: - GlVideoRenderer(Display* display, Window window); - - void Paint(const scoped_refptr<media::VideoFrame>& video_frame); - - private: - friend class base::RefCountedThreadSafe<GlVideoRenderer>; - ~GlVideoRenderer(); - - // Initializes GL rendering for the given dimensions. - void Initialize(gfx::Size coded_size, gfx::Rect visible_rect); - - Display* display_; - Window window_; - - // GL context. - GLXContext gl_context_; - - // 3 textures, one for each plane. - GLuint textures_[3]; - - DISALLOW_COPY_AND_ASSIGN(GlVideoRenderer); -}; - -#endif // MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc deleted file mode 100644 index d149ca4..0000000 --- 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; -} diff --git a/media/tools/player_x11/x11_video_renderer.cc b/media/tools/player_x11/x11_video_renderer.cc deleted file mode 100644 index 2ae8e3b..0000000 --- a/media/tools/player_x11/x11_video_renderer.cc +++ /dev/null @@ -1,215 +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 "media/tools/player_x11/x11_video_renderer.h" - -#include <dlfcn.h> -#include <X11/Xutil.h> -#include <X11/extensions/Xrender.h> -#include <X11/extensions/Xcomposite.h> - -#include "base/bind.h" -#include "base/message_loop/message_loop.h" -#include "media/base/video_frame.h" -#include "media/base/yuv_convert.h" - -// Creates a 32-bit XImage. -static XImage* CreateImage(Display* display, int width, int height) { - VLOG(0) << "Allocating XImage " << width << "x" << height; - return XCreateImage(display, - DefaultVisual(display, DefaultScreen(display)), - DefaultDepth(display, DefaultScreen(display)), - ZPixmap, - 0, - static_cast<char*>(malloc(width * height * 4)), - width, - height, - 32, - width * 4); -} - -// Returns the picture format for ARGB. -// This method is originally from chrome/common/x11_util.cc. -static XRenderPictFormat* GetRenderARGB32Format(Display* dpy) { - static XRenderPictFormat* pictformat = NULL; - if (pictformat) - return pictformat; - - // First look for a 32-bit format which ignores the alpha value. - XRenderPictFormat templ; - templ.depth = 32; - templ.type = PictTypeDirect; - templ.direct.red = 16; - templ.direct.green = 8; - templ.direct.blue = 0; - templ.direct.redMask = 0xff; - templ.direct.greenMask = 0xff; - templ.direct.blueMask = 0xff; - templ.direct.alphaMask = 0; - - static const unsigned long kMask = - PictFormatType | PictFormatDepth | - PictFormatRed | PictFormatRedMask | - PictFormatGreen | PictFormatGreenMask | - PictFormatBlue | PictFormatBlueMask | - PictFormatAlphaMask; - - pictformat = XRenderFindFormat(dpy, kMask, &templ, 0 /* first result */); - - if (!pictformat) { - // Not all X servers support xRGB32 formats. However, the XRender spec - // says that they must support an ARGB32 format, so we can always return - // that. - pictformat = XRenderFindStandardFormat(dpy, PictStandardARGB32); - CHECK(pictformat) << "XRender ARGB32 not supported."; - } - - return pictformat; -} - -X11VideoRenderer::X11VideoRenderer(Display* display, Window window) - : display_(display), - window_(window), - image_(NULL), - picture_(0), - use_render_(false) { -} - -X11VideoRenderer::~X11VideoRenderer() { - if (image_) - XDestroyImage(image_); - if (use_render_) - XRenderFreePicture(display_, picture_); -} - -void X11VideoRenderer::Paint( - const scoped_refptr<media::VideoFrame>& video_frame) { - if (!image_) - Initialize(video_frame->coded_size(), video_frame->visible_rect()); - - const int coded_width = video_frame->coded_size().width(); - const int coded_height = video_frame->coded_size().height(); - const int visible_width = video_frame->visible_rect().width(); - const int visible_height = video_frame->visible_rect().height(); - - // Check if we need to reallocate our XImage. - if (image_->width != coded_width || image_->height != coded_height) { - XDestroyImage(image_); - image_ = CreateImage(display_, coded_width, coded_height); - } - - // Convert YUV frame to RGB. - DCHECK(video_frame->format() == media::VideoFrame::YV12 || - video_frame->format() == media::VideoFrame::I420 || - video_frame->format() == media::VideoFrame::YV16); - DCHECK(video_frame->stride(media::VideoFrame::kUPlane) == - video_frame->stride(media::VideoFrame::kVPlane)); - - DCHECK(image_->data); - media::YUVType yuv_type = (video_frame->format() == media::VideoFrame::YV12 || - video_frame->format() == media::VideoFrame::I420) - ? media::YV12 - : media::YV16; - media::ConvertYUVToRGB32(video_frame->data(media::VideoFrame::kYPlane), - video_frame->data(media::VideoFrame::kUPlane), - video_frame->data(media::VideoFrame::kVPlane), - (uint8*)image_->data, coded_width, coded_height, - video_frame->stride(media::VideoFrame::kYPlane), - video_frame->stride(media::VideoFrame::kUPlane), - image_->bytes_per_line, - yuv_type); - - if (use_render_) { - // If XRender is used, we'll upload the image to a pixmap. And then - // creats a picture from the pixmap and composite the picture over - // the picture represending the window. - - // Creates a XImage. - XImage image; - memset(&image, 0, sizeof(image)); - image.width = coded_width; - image.height = coded_height; - image.depth = 32; - image.bits_per_pixel = 32; - image.format = ZPixmap; - image.byte_order = LSBFirst; - image.bitmap_unit = 8; - image.bitmap_bit_order = LSBFirst; - image.bytes_per_line = image_->bytes_per_line; - image.red_mask = 0xff; - image.green_mask = 0xff00; - image.blue_mask = 0xff0000; - image.data = image_->data; - - // Creates a pixmap and uploads from the XImage. - unsigned long pixmap = XCreatePixmap(display_, window_, - visible_width, visible_height, - 32); - GC gc = XCreateGC(display_, pixmap, 0, NULL); - XPutImage(display_, pixmap, gc, &image, - video_frame->visible_rect().x(), - video_frame->visible_rect().y(), - 0, 0, - visible_width, visible_height); - XFreeGC(display_, gc); - - // Creates the picture representing the pixmap. - unsigned long picture = XRenderCreatePicture( - display_, pixmap, GetRenderARGB32Format(display_), 0, NULL); - - // Composite the picture over the picture representing the window. - XRenderComposite(display_, PictOpSrc, picture, 0, - picture_, 0, 0, 0, 0, 0, 0, - visible_width, visible_height); - - XRenderFreePicture(display_, picture); - XFreePixmap(display_, pixmap); - return; - } - - // If XRender is not used, simply put the image to the server. - // This will have a tearing effect but this is OK. - // TODO(hclam): Upload the image to a pixmap and do XCopyArea() - // to the window. - GC gc = XCreateGC(display_, window_, 0, NULL); - XPutImage(display_, window_, gc, image_, - video_frame->visible_rect().x(), - video_frame->visible_rect().y(), - 0, 0, visible_width, visible_height); - XFlush(display_); - XFreeGC(display_, gc); -} - -void X11VideoRenderer::Initialize(gfx::Size coded_size, - gfx::Rect visible_rect) { - CHECK(!image_); - VLOG(0) << "Initializing X11 Renderer..."; - - // Resize the window to fit that of the video. - XResizeWindow(display_, window_, visible_rect.width(), visible_rect.height()); - image_ = CreateImage(display_, coded_size.width(), coded_size.height()); - - // Testing XRender support. We'll use the very basic of XRender - // so if it presents it is already good enough. We don't need - // to check its version. - int dummy; - use_render_ = XRenderQueryExtension(display_, &dummy, &dummy); - - if (use_render_) { - VLOG(0) << "Using XRender extension."; - - // If we are using XRender, we'll create a picture representing the - // window. - XWindowAttributes attr; - XGetWindowAttributes(display_, window_, &attr); - - XRenderPictFormat* pictformat = XRenderFindVisualFormat( - display_, - attr.visual); - CHECK(pictformat) << "XRender does not support default visual"; - - picture_ = XRenderCreatePicture(display_, window_, pictformat, 0, NULL); - CHECK(picture_) << "Backing picture not created"; - } -} diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h deleted file mode 100644 index 11213c3..0000000 --- a/media/tools/player_x11/x11_video_renderer.h +++ /dev/null @@ -1,47 +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. - -#ifndef MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_ -#define MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_ - -#include <X11/Xlib.h> - -#include "base/basictypes.h" -#include "base/memory/ref_counted.h" -#include "ui/gfx/geometry/rect.h" -#include "ui/gfx/geometry/size.h" - -namespace media { -class VideoFrame; -} - -class X11VideoRenderer : public base::RefCountedThreadSafe<X11VideoRenderer> { - public: - X11VideoRenderer(Display* display, Window window); - - void Paint(const scoped_refptr<media::VideoFrame>& video_frame); - - private: - friend class base::RefCountedThreadSafe<X11VideoRenderer>; - ~X11VideoRenderer(); - - // Initializes X11 rendering for the given dimensions. - void Initialize(gfx::Size coded_size, gfx::Rect visible_rect); - - Display* display_; - Window window_; - - // Image in heap that contains the RGBA data of the video frame. - XImage* image_; - - // Picture represents the paint target. This is a picture located - // in the server. - unsigned long picture_; - - bool use_render_; - - DISALLOW_COPY_AND_ASSIGN(X11VideoRenderer); -}; - -#endif // MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_ |