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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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 | « chromecast/media/cdm/cast_cdm_proxy.cc ('k') | content/renderer/media/cdm/ppapi_decryptor.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "content/renderer/media/android/webmediaplayer_android.h" 5 #include "content/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "content/renderer/render_view_impl.h" 30 #include "content/renderer/render_view_impl.h"
31 #include "gpu/GLES2/gl2extchromium.h" 31 #include "gpu/GLES2/gl2extchromium.h"
32 #include "gpu/command_buffer/client/gles2_interface.h" 32 #include "gpu/command_buffer/client/gles2_interface.h"
33 #include "gpu/command_buffer/common/constants.h" 33 #include "gpu/command_buffer/common/constants.h"
34 #include "gpu/command_buffer/common/mailbox_holder.h" 34 #include "gpu/command_buffer/common/mailbox_holder.h"
35 #include "media/base/android/media_codec_util.h" 35 #include "media/base/android/media_codec_util.h"
36 #include "media/base/android/media_common_android.h" 36 #include "media/base/android/media_common_android.h"
37 #include "media/base/android/media_player_android.h" 37 #include "media/base/android/media_player_android.h"
38 #include "media/base/bind_to_current_loop.h" 38 #include "media/base/bind_to_current_loop.h"
39 #include "media/base/media_content_type.h" 39 #include "media/base/media_content_type.h"
40 #include "media/base/media_keys.h"
41 #include "media/base/media_log.h" 40 #include "media/base/media_log.h"
42 #include "media/base/media_switches.h" 41 #include "media/base/media_switches.h"
43 #include "media/base/timestamp_constants.h" 42 #include "media/base/timestamp_constants.h"
44 #include "media/base/video_frame.h" 43 #include "media/base/video_frame.h"
45 #include "media/blink/webcontentdecryptionmodule_impl.h" 44 #include "media/blink/webcontentdecryptionmodule_impl.h"
46 #include "media/blink/webmediaplayer_cast_android.h" 45 #include "media/blink/webmediaplayer_cast_android.h"
47 #include "media/blink/webmediaplayer_delegate.h" 46 #include "media/blink/webmediaplayer_delegate.h"
48 #include "media/blink/webmediaplayer_util.h" 47 #include "media/blink/webmediaplayer_util.h"
49 #include "net/base/mime_util.h" 48 #include "net/base/mime_util.h"
50 #include "skia/ext/texture_handle.h" 49 #include "skia/ext/texture_handle.h"
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 1318 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1320 switches::kDisableMediaSuspend)) { 1319 switches::kDisableMediaSuspend)) {
1321 return false; 1320 return false;
1322 } 1321 }
1323 1322
1324 return base::FeatureList::IsEnabled(media::kResumeBackgroundVideo) && 1323 return base::FeatureList::IsEnabled(media::kResumeBackgroundVideo) &&
1325 hasAudio() && !isRemote() && delegate_ && delegate_->IsHidden(); 1324 hasAudio() && !isRemote() && delegate_ && delegate_->IsHidden();
1326 } 1325 }
1327 1326
1328 } // namespace content 1327 } // namespace content
OLDNEW
« no previous file with comments | « chromecast/media/cdm/cast_cdm_proxy.cc ('k') | content/renderer/media/cdm/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698