Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle setDataSource failures properly. #5261671"

Browse Source
This commit is contained in:
Dave Burke
2011-09-06 13:06:20 -07:00
committed by Android (Google) Code Review
parent 6436876156 a28279be32
commit f12abaf405
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/libmedia/mediaplayer.cpp
View File

@@ -148,10 +148,10 @@ status_t MediaPlayer::setDataSource(
const sp<IMediaPlayerService>& service(getMediaPlayerService()); const sp<IMediaPlayerService>& service(getMediaPlayerService());
if (service != 0) { if (service != 0) {
sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId)); sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId));
err = attachNewPlayer(player); if (NO_ERROR != player->setDataSource(url, headers)) {
if (err == NO_ERROR) { player.clear();
err = mPlayer->setDataSource(url, headers);
} }
err = attachNewPlayer(player);
} }
} }
return err; return err;
@@ -164,10 +164,10 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length)
const sp<IMediaPlayerService>& service(getMediaPlayerService()); const sp<IMediaPlayerService>& service(getMediaPlayerService());
if (service != 0) { if (service != 0) {
sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId)); sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId));
err = attachNewPlayer(player); if (NO_ERROR != player->setDataSource(fd, offset, length)) {
if (err == NO_ERROR) { player.clear();
err = mPlayer->setDataSource(fd, offset, length);
} }
err = attachNewPlayer(player);
} }
return err; return err;
} }
@@ -179,10 +179,10 @@ status_t MediaPlayer::setDataSource(const sp<IStreamSource> &source)
const sp<IMediaPlayerService>& service(getMediaPlayerService()); const sp<IMediaPlayerService>& service(getMediaPlayerService());
if (service != 0) { if (service != 0) {
sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId)); sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId));
err = attachNewPlayer(player); if (NO_ERROR != player->setDataSource(source)) {
if (err == NO_ERROR) { player.clear();
err = mPlayer->setDataSource(source);
} }
err = attachNewPlayer(player);
} }
return err; return err;
} }