Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

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

Issue 10535101: Replace Pipeline::SetNetworkActivity() with BufferedDataSource -> WebMediaPlayerImpl callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <X11/XKBlib.h> 5 #include <X11/XKBlib.h>
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <iostream> // NOLINT 9 #include <iostream> // NOLINT
10 10
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 true); 127 true);
128 collection->AddVideoRenderer(g_video_renderer); 128 collection->AddVideoRenderer(g_video_renderer);
129 129
130 collection->AddAudioRenderer( 130 collection->AddAudioRenderer(
131 new media::AudioRendererImpl(new media::NullAudioSink())); 131 new media::AudioRendererImpl(new media::NullAudioSink()));
132 132
133 // Create the pipeline and start it. 133 // Create the pipeline and start it.
134 *pipeline = new media::Pipeline(message_loop, new media::MediaLog()); 134 *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
135 media::PipelineStatusNotification note; 135 media::PipelineStatusNotification note;
136 (*pipeline)->Start( 136 (*pipeline)->Start(
137 collection.Pass(), media::PipelineStatusCB(), 137 collection.Pass(), media::PipelineStatusCB(), media::PipelineStatusCB(),
138 media::PipelineStatusCB(), media::NetworkEventCB(),
139 note.Callback()); 138 note.Callback());
140 139
141 // Wait until the pipeline is fully initialized. 140 // Wait until the pipeline is fully initialized.
142 note.Wait(); 141 note.Wait();
143 if (note.status() != media::PIPELINE_OK) { 142 if (note.status() != media::PIPELINE_OK) {
144 std::cout << "InitPipeline: " << note.status() << std::endl; 143 std::cout << "InitPipeline: " << note.status() << std::endl;
145 (*pipeline)->Stop(base::Closure()); 144 (*pipeline)->Stop(base::Closure());
146 return false; 145 return false;
147 } 146 }
148 147
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 // Release callback which releases video renderer. Do this before cleaning up 299 // Release callback which releases video renderer. Do this before cleaning up
301 // X below since the video renderer has some X cleanup duties as well. 300 // X below since the video renderer has some X cleanup duties as well.
302 paint_cb.Reset(); 301 paint_cb.Reset();
303 302
304 XDestroyWindow(g_display, g_window); 303 XDestroyWindow(g_display, g_window);
305 XCloseDisplay(g_display); 304 XCloseDisplay(g_display);
306 g_audio_manager = NULL; 305 g_audio_manager = NULL;
307 306
308 return 0; 307 return 0;
309 } 308 }
OLDNEW
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698