From: Lajos Molnar Date: Tue, 12 Aug 2014 15:55:25 +0000 (-0700) Subject: MediaCodecList: don't return references X-Git-Tag: android-x86-6.0-r1~852^2~483 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2461e0cf6ae3fe5c9b52ce9e3ac764f4aff5e5eb;p=android-x86%2Fframeworks-av.git MediaCodecList: don't return references Bug: 16905025 Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487 --- diff --git a/include/media/MediaCodecInfo.h b/include/media/MediaCodecInfo.h index 29315ce33c..b4916af13d 100644 --- a/include/media/MediaCodecInfo.h +++ b/include/media/MediaCodecInfo.h @@ -45,7 +45,7 @@ struct MediaCodecInfo : public RefBase { void getSupportedProfileLevels(Vector *profileLevels) const; void getSupportedColorFormats(Vector *colorFormats) const; uint32_t getFlags() const; - const sp &getDetails() const; + const sp getDetails() const; private: Vector mProfileLevels; @@ -67,7 +67,7 @@ struct MediaCodecInfo : public RefBase { bool isEncoder() const; bool hasQuirk(const char *name) const; void getSupportedMimes(Vector *mimes) const; - const sp &getCapabilitiesFor(const char *mime) const; + const sp getCapabilitiesFor(const char *mime) const; const char *getCodecName() const; /** diff --git a/media/libmedia/MediaCodecInfo.cpp b/media/libmedia/MediaCodecInfo.cpp index 7900eae4c0..5ea05190b9 100644 --- a/media/libmedia/MediaCodecInfo.cpp +++ b/media/libmedia/MediaCodecInfo.cpp @@ -46,7 +46,7 @@ uint32_t MediaCodecInfo::Capabilities::getFlags() const { return mFlags; } -const sp &MediaCodecInfo::Capabilities::getDetails() const { +const sp MediaCodecInfo::Capabilities::getDetails() const { return mDetails; } @@ -121,7 +121,7 @@ void MediaCodecInfo::getSupportedMimes(Vector *mimes) const { } } -const sp & +const sp MediaCodecInfo::getCapabilitiesFor(const char *mime) const { ssize_t ix = getCapabilityIndex(mime); if (ix >= 0) {