From 2461e0cf6ae3fe5c9b52ce9e3ac764f4aff5e5eb Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Tue, 12 Aug 2014 08:55:25 -0700 Subject: MediaCodecList: don't return references Bug: 16905025 Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487 --- include/media/MediaCodecInfo.h | 4 ++-- media/libmedia/MediaCodecInfo.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/media/MediaCodecInfo.h b/include/media/MediaCodecInfo.h index 29315ce..b4916af 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 7900eae..5ea0519 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) { -- cgit v1.1