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

Side by Side Diff: media/base/android/media_source_player.cc

Issue 868753004: Mechanical rename of tracing includes for /media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part2
Patch Set: Created 5 years, 11 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/base/android/media_decoder_job.cc ('k') | media/blink/webmediaplayer_impl.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "media/base/android/media_source_player.h" 5 #include "media/base/android/media_source_player.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/barrier_closure.h" 11 #include "base/barrier_closure.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/callback_helpers.h" 14 #include "base/callback_helpers.h"
15 #include "base/debug/trace_event.h"
16 #include "base/logging.h" 15 #include "base/logging.h"
17 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/trace_event/trace_event.h"
18 #include "media/base/android/audio_decoder_job.h" 18 #include "media/base/android/audio_decoder_job.h"
19 #include "media/base/android/media_drm_bridge.h" 19 #include "media/base/android/media_drm_bridge.h"
20 #include "media/base/android/media_player_manager.h" 20 #include "media/base/android/media_player_manager.h"
21 #include "media/base/android/video_decoder_job.h" 21 #include "media/base/android/video_decoder_job.h"
22 22
23 namespace media { 23 namespace media {
24 24
25 MediaSourcePlayer::MediaSourcePlayer( 25 MediaSourcePlayer::MediaSourcePlayer(
26 int player_id, 26 int player_id,
27 MediaPlayerManager* manager, 27 MediaPlayerManager* manager,
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 // support setMediaKeys(0) (see http://crbug.com/330324), or when we release 807 // support setMediaKeys(0) (see http://crbug.com/330324), or when we release
808 // MediaDrm when the video is paused, or when the device goes to sleep (see 808 // MediaDrm when the video is paused, or when the device goes to sleep (see
809 // http://crbug.com/272421). 809 // http://crbug.com/272421).
810 audio_decoder_job_->SetDrmBridge(NULL); 810 audio_decoder_job_->SetDrmBridge(NULL);
811 video_decoder_job_->SetDrmBridge(NULL); 811 video_decoder_job_->SetDrmBridge(NULL);
812 cdm_registration_id_ = 0; 812 cdm_registration_id_ = 0;
813 drm_bridge_ = NULL; 813 drm_bridge_ = NULL;
814 } 814 }
815 815
816 } // namespace media 816 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698