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

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

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android changes Created 5 years, 9 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
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 <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"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 pipeline->Start(demuxer, 143 pipeline->Start(demuxer,
144 renderer.Pass(), 144 renderer.Pass(),
145 base::Bind(&DoNothing), 145 base::Bind(&DoNothing),
146 base::Bind(&OnStatus), 146 base::Bind(&OnStatus),
147 base::Bind(&SaveStatusAndSignal, &event, &status), 147 base::Bind(&SaveStatusAndSignal, &event, &status),
148 base::Bind(&OnMetadata), 148 base::Bind(&OnMetadata),
149 base::Bind(&OnBufferingStateChanged), 149 base::Bind(&OnBufferingStateChanged),
150 paint_cb, 150 paint_cb,
151 base::Bind(&DoNothing), 151 base::Bind(&DoNothing),
152 base::Bind(&OnAddTextTrack)); 152 base::Bind(&OnAddTextTrack),
153 base::Bind(&DoNothing));
153 154
154 // Wait until the pipeline is fully initialized. 155 // Wait until the pipeline is fully initialized.
155 event.Wait(); 156 event.Wait();
156 CHECK_EQ(status, media::PIPELINE_OK) << "Pipeline initialization failed"; 157 CHECK_EQ(status, media::PIPELINE_OK) << "Pipeline initialization failed";
157 158
158 // And start the playback. 159 // And start the playback.
159 pipeline->SetPlaybackRate(1.0f); 160 pipeline->SetPlaybackRate(1.0f);
160 } 161 }
161 162
162 void TerminateHandler(int signal) { 163 void TerminateHandler(int signal) {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 // Release callback which releases video renderer. Do this before cleaning up 302 // 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. 303 // X below since the video renderer has some X cleanup duties as well.
303 paint_cb.Reset(); 304 paint_cb.Reset();
304 305
305 XDestroyWindow(g_display, g_window); 306 XDestroyWindow(g_display, g_window);
306 XCloseDisplay(g_display); 307 XCloseDisplay(g_display);
307 g_audio_manager = NULL; 308 g_audio_manager = NULL;
308 309
309 return 0; 310 return 0;
310 } 311 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698