Don\'t use sp<>& (949333a3) · Commits · e / os / android_frameworks_av

include/media/IMediaDeathNotifier.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ public:
	virtual ~IMediaDeathNotifier() { removeObitRecipient(this); }		virtual ~IMediaDeathNotifier() { removeObitRecipient(this); }

	virtual void died() = 0;		virtual void died() = 0;
	static const sp<IMediaPlayerService>& getMediaPlayerService();		static const sp<IMediaPlayerService> getMediaPlayerService();

	private:		private:
	IMediaDeathNotifier &operator=(const IMediaDeathNotifier &);		IMediaDeathNotifier &operator=(const IMediaDeathNotifier &);

media/libmedia/IMediaDeathNotifier.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ sp<IMediaDeathNotifier::DeathNotifier> IMediaDeathNotifier::sDeathNotifier;
	SortedVector< wp<IMediaDeathNotifier> > IMediaDeathNotifier::sObitRecipients;		SortedVector< wp<IMediaDeathNotifier> > IMediaDeathNotifier::sObitRecipients;

	// establish binder interface to MediaPlayerService		// establish binder interface to MediaPlayerService
	/static/const sp<IMediaPlayerService>&		/static/const sp<IMediaPlayerService>
	IMediaDeathNotifier::getMediaPlayerService()		IMediaDeathNotifier::getMediaPlayerService()
	{		{
	ALOGV("getMediaPlayerService");		ALOGV("getMediaPlayerService");

media/libmedia/mediaplayer.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -149,7 +149,7 @@ status_t MediaPlayer::setDataSource(
	ALOGV("setDataSource(%s)", url);		ALOGV("setDataSource(%s)", url);
	status_t err = BAD_VALUE;		status_t err = BAD_VALUE;
	if (url != NULL) {		if (url != NULL) {
	const sp<IMediaPlayerService>& service(getMediaPlayerService());		const sp<IMediaPlayerService> service(getMediaPlayerService());
	if (service != 0) {		if (service != 0) {
	sp<IMediaPlayer> player(service->create(this, mAudioSessionId));		sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
	if ((NO_ERROR != doSetRetransmitEndpoint(player)) \|\|		if ((NO_ERROR != doSetRetransmitEndpoint(player)) \|\|
	@@ -166,7 +166,7 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length)
	{		{
	ALOGV("setDataSource(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length);		ALOGV("setDataSource(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length);
	status_t err = UNKNOWN_ERROR;		status_t err = UNKNOWN_ERROR;
	const sp<IMediaPlayerService>& service(getMediaPlayerService());		const sp<IMediaPlayerService> service(getMediaPlayerService());
	if (service != 0) {		if (service != 0) {
	sp<IMediaPlayer> player(service->create(this, mAudioSessionId));		sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
	if ((NO_ERROR != doSetRetransmitEndpoint(player)) \|\|		if ((NO_ERROR != doSetRetransmitEndpoint(player)) \|\|
	@@ -182,7 +182,7 @@ status_t MediaPlayer::setDataSource(const sp<IStreamSource> &source)
	{		{
	ALOGV("setDataSource");		ALOGV("setDataSource");
	status_t err = UNKNOWN_ERROR;		status_t err = UNKNOWN_ERROR;
	const sp<IMediaPlayerService>& service(getMediaPlayerService());		const sp<IMediaPlayerService> service(getMediaPlayerService());
	if (service != 0) {		if (service != 0) {
	sp<IMediaPlayer> player(service->create(this, mAudioSessionId));		sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
	if ((NO_ERROR != doSetRetransmitEndpoint(player)) \|\|		if ((NO_ERROR != doSetRetransmitEndpoint(player)) \|\|
	@@ -846,7 +846,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2, const Parcel *obj)
	{		{
	ALOGV("decode(%s)", url);		ALOGV("decode(%s)", url);
	status_t status;		status_t status;
	const sp<IMediaPlayerService>& service = getMediaPlayerService();		const sp<IMediaPlayerService> service = getMediaPlayerService();
	if (service != 0) {		if (service != 0) {
	status = service->decode(httpService, url, pSampleRate, pNumChannels, pFormat, heap, pSize);		status = service->decode(httpService, url, pSampleRate, pNumChannels, pFormat, heap, pSize);
	} else {		} else {
	@@ -870,7 +870,7 @@ void MediaPlayer::died()
	{		{
	ALOGV("decode(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length);		ALOGV("decode(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length);
	status_t status;		status_t status;
	const sp<IMediaPlayerService>& service = getMediaPlayerService();		const sp<IMediaPlayerService> service = getMediaPlayerService();
	if (service != 0) {		if (service != 0) {
	status = service->decode(fd, offset, length, pSampleRate,		status = service->decode(fd, offset, length, pSampleRate,
	pNumChannels, pFormat, heap, pSize);		pNumChannels, pFormat, heap, pSize);

media/libmedia/mediarecorder.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -624,7 +624,7 @@ MediaRecorder::MediaRecorder() : mSurfaceMediaSource(NULL)
	{		{
	ALOGV("constructor");		ALOGV("constructor");

	const sp<IMediaPlayerService>& service(getMediaPlayerService());		const sp<IMediaPlayerService> service(getMediaPlayerService());
	if (service != NULL) {		if (service != NULL) {
	mMediaRecorder = service->createMediaRecorder();		mMediaRecorder = service->createMediaRecorder();
	}		}