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

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

Issue 23513055: Populate canPlayType to renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moving ipc to chrome/common/ Created 7 years, 3 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
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"
(...skipping 10 matching lines...) Expand all
21 namespace { 21 namespace {
22 22
23 // Use 16bit PCM for audio output. Keep this value in sync with the output 23 // Use 16bit PCM for audio output. Keep this value in sync with the output
24 // format we passed to AudioTrack in MediaCodecBridge. 24 // format we passed to AudioTrack in MediaCodecBridge.
25 const int kBytesPerAudioOutputSample = 2; 25 const int kBytesPerAudioOutputSample = 2;
26 } 26 }
27 27
28 namespace media { 28 namespace media {
29 29
30 // static 30 // static
31 bool MediaSourcePlayer::IsTypeSupported( 31 bool MediaSourcePlayer::IsTypeSupported(
ddorwin 2013/09/16 17:58:10 What is this function used for?
qinmin 2013/09/17 19:21:06 This function is not used anywhere, I suppose we c
32 const std::vector<uint8>& scheme_uuid, 32 const std::vector<uint8>& scheme_uuid,
33 const std::string& security_level, 33 const std::string& security_level,
34 const std::string& container, 34 const std::string& container,
ddorwin 2013/09/16 17:58:10 What is the plan for the container parameter?
qinmin 2013/09/17 19:21:06 see above, the function is removed On 2013/09/16 1
35 const std::vector<std::string>& codecs) { 35 const std::vector<std::string>& codecs) {
36 if (!MediaDrmBridge::IsCryptoSchemeSupported(scheme_uuid, container)) { 36 if (!MediaDrmBridge::IsCryptoSchemeSupported(scheme_uuid)) {
37 DVLOG(1) << "UUID and container '" << container << "' not supported."; 37 DVLOG(1) << "UUID not supported.";
xhwang 2013/09/17 18:56:46 ditto, probably leave that as is?
qinmin 2013/09/17 21:26:23 Done.
38 return false; 38 return false;
39 } 39 }
40 40
41 if (!MediaDrmBridge::IsSecurityLevelSupported(scheme_uuid, security_level)) { 41 if (!MediaDrmBridge::IsSecurityLevelSupported(scheme_uuid, security_level)) {
42 DVLOG(1) << "UUID and security level '" << security_level 42 DVLOG(1) << "UUID and security level '" << security_level
43 << "' not supported."; 43 << "' not supported.";
44 return false; 44 return false;
45 } 45 }
46 46
47 bool is_secure = MediaDrmBridge::IsSecureDecoderRequired(security_level); 47 bool is_secure = MediaDrmBridge::IsSecureDecoderRequired(security_level);
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 730
731 void MediaSourcePlayer::ClearPendingEvent(PendingEventFlags event) { 731 void MediaSourcePlayer::ClearPendingEvent(PendingEventFlags event) {
732 DVLOG(1) << __FUNCTION__ << "(" << GetEventName(event) << ")"; 732 DVLOG(1) << __FUNCTION__ << "(" << GetEventName(event) << ")";
733 DCHECK_NE(event, NO_EVENT_PENDING); 733 DCHECK_NE(event, NO_EVENT_PENDING);
734 DCHECK(IsEventPending(event)) << GetEventName(event); 734 DCHECK(IsEventPending(event)) << GetEventName(event);
735 735
736 pending_event_ &= ~event; 736 pending_event_ &= ~event;
737 } 737 }
738 738
739 } // namespace media 739 } // namespace media
OLDNEW
« media/base/android/media_drm_bridge.cc ('K') | « media/base/android/media_drm_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698