diff options
author | Ronghua Wu <ronghuawu@google.com> | 2015-04-21 14:23:06 -0700 |
---|---|---|
committer | Ronghua Wu <ronghuawu@google.com> | 2015-05-08 09:51:26 -0700 |
commit | 9ba21b9418d10ddcc39f08901e24fbf43d82b2bc (patch) | |
tree | 363f0598085516cf16ddd4ee5df2d1043e2955da /media/libmedia/MediaResourcePolicy.cpp | |
parent | ba21a9ac7b6b76f85681cfb5e756e947c0ae3b53 (diff) | |
download | frameworks_av-9ba21b9418d10ddcc39f08901e24fbf43d82b2bc.zip frameworks_av-9ba21b9418d10ddcc39f08901e24fbf43d82b2bc.tar.gz frameworks_av-9ba21b9418d10ddcc39f08901e24fbf43d82b2bc.tar.bz2 |
libstagefright: config resource manager with secure codec co-existing policy.
Bug: 19620911
Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
Diffstat (limited to 'media/libmedia/MediaResourcePolicy.cpp')
-rw-r--r-- | media/libmedia/MediaResourcePolicy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libmedia/MediaResourcePolicy.cpp b/media/libmedia/MediaResourcePolicy.cpp index 139a38c..5210825 100644 --- a/media/libmedia/MediaResourcePolicy.cpp +++ b/media/libmedia/MediaResourcePolicy.cpp @@ -24,25 +24,25 @@ namespace android { const char kPolicySupportsMultipleSecureCodecs[] = "supports-multiple-secure-codecs"; const char kPolicySupportsSecureWithNonSecureCodec[] = "supports-secure-with-non-secure-codec"; -MediaResourcePolicy::MediaResourcePolicy() : mValue(0) {} +MediaResourcePolicy::MediaResourcePolicy() {} -MediaResourcePolicy::MediaResourcePolicy(String8 type, uint64_t value) +MediaResourcePolicy::MediaResourcePolicy(String8 type, String8 value) : mType(type), mValue(value) {} void MediaResourcePolicy::readFromParcel(const Parcel &parcel) { mType = parcel.readString8(); - mValue = parcel.readUint64(); + mValue = parcel.readString8(); } void MediaResourcePolicy::writeToParcel(Parcel *parcel) const { parcel->writeString8(mType); - parcel->writeUint64(mValue); + parcel->writeString8(mValue); } String8 MediaResourcePolicy::toString() const { String8 str; - str.appendFormat("%s:%llu", mType.string(), (unsigned long long)mValue); + str.appendFormat("%s:%s", mType.string(), mValue.string()); return str; } |