media/tools/player_x11/player_x11.cc - Issue 941633004: Moved renderer implementation from media/filters/ to media/renderers/

Side by Side Diff: media/tools/player_x11/player_x11.cc

Issue 941633004: Moved renderer implementation from media/filters/ to media/renderers/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed android build Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « media/test/pipeline_integration_test_base.cc ('k') | mojo/services/html_viewer/webmediaplayer_factory.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <signal.h>	5 #include <signal.h>

6	6

7 #include <iostream> // NOLINT	7 #include <iostream> // NOLINT

8	8

9 #include "base/at_exit.h"	9 #include "base/at_exit.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/files/file_path.h"	12 #include "base/files/file_path.h"

13 #include "base/memory/scoped_ptr.h"	13 #include "base/memory/scoped_ptr.h"

14 #include "base/memory/scoped_vector.h"	14 #include "base/memory/scoped_vector.h"

15 #include "base/threading/platform_thread.h"	15 #include "base/threading/platform_thread.h"

16 #include "base/threading/thread.h"	16 #include "base/threading/thread.h"

17 #include "media/audio/audio_manager.h"	17 #include "media/audio/audio_manager.h"

18 #include "media/audio/null_audio_sink.h"	18 #include "media/audio/null_audio_sink.h"

19 #include "media/base/audio_hardware_config.h"	19 #include "media/base/audio_hardware_config.h"

20 #include "media/base/bind_to_current_loop.h"	20 #include "media/base/bind_to_current_loop.h"

21 #include "media/base/decryptor.h"	21 #include "media/base/decryptor.h"

22 #include "media/base/media.h"	22 #include "media/base/media.h"

23 #include "media/base/media_log.h"	23 #include "media/base/media_log.h"

24 #include "media/base/media_switches.h"	24 #include "media/base/media_switches.h"

25 #include "media/base/pipeline.h"	25 #include "media/base/pipeline.h"

26 #include "media/base/text_track.h"	26 #include "media/base/text_track.h"

27 #include "media/base/text_track_config.h"	27 #include "media/base/text_track_config.h"

28 #include "media/base/video_frame.h"	28 #include "media/base/video_frame.h"

29 #include "media/filters/audio_renderer_impl.h"

30 #include "media/filters/ffmpeg_audio_decoder.h"	29 #include "media/filters/ffmpeg_audio_decoder.h"

31 #include "media/filters/ffmpeg_demuxer.h"	30 #include "media/filters/ffmpeg_demuxer.h"

32 #include "media/filters/ffmpeg_video_decoder.h"	31 #include "media/filters/ffmpeg_video_decoder.h"

33 #include "media/filters/file_data_source.h"	32 #include "media/filters/file_data_source.h"

34 #include "media/filters/renderer_impl.h"	33 #include "media/renderers/audio_renderer_impl.h"

35 #include "media/filters/video_renderer_impl.h"	34 #include "media/renderers/renderer_impl.h"

	35 #include "media/renderers/video_renderer_impl.h"

36 #include "media/tools/player_x11/data_source_logger.h"	36 #include "media/tools/player_x11/data_source_logger.h"

37	37

38 // Include X11 headers here because X11/Xlib.h #define's Status	38 // Include X11 headers here because X11/Xlib.h #define's Status

39 // which causes compiler errors with Status enum declarations	39 // which causes compiler errors with Status enum declarations

40 // in media::DemuxerStream & media::AudioDecoder.	40 // in media::DemuxerStream & media::AudioDecoder.

41 #include <X11/XKBlib.h>	41 #include <X11/XKBlib.h>

42 #include <X11/Xlib.h>	42 #include <X11/Xlib.h>

43	43

44 #include "media/tools/player_x11/gl_video_renderer.h"	44 #include "media/tools/player_x11/gl_video_renderer.h"

45 #include "media/tools/player_x11/x11_video_renderer.h"	45 #include "media/tools/player_x11/x11_video_renderer.h"

(...skipping 255 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
301 // Release callback which releases video renderer. Do this before cleaning up	301 // Release callback which releases video renderer. Do this before cleaning up

302 // X below since the video renderer has some X cleanup duties as well.	302 // X below since the video renderer has some X cleanup duties as well.

303 paint_cb.Reset();	303 paint_cb.Reset();

304	304

305 XDestroyWindow(g_display, g_window);	305 XDestroyWindow(g_display, g_window);

306 XCloseDisplay(g_display);	306 XCloseDisplay(g_display);

307 g_audio_manager = NULL;	307 g_audio_manager = NULL;

308	308

309 return 0;	309 return 0;

310 }	310 }

OLD	NEW