drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair

Browse Source 
Merge commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7' into eclair-mr2-plus-aosp

* commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
This commit is contained in:
Andreas Huber
2009-11-10 12:33:53 -08:00
committed by Android Git Automerger
parent f30404929e d533ca61fa
commit 00443d661d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libmediaplayerservice/StagefrightPlayer.cpp
View File

@ -40,11 +40,13 @@ status_t StagefrightPlayer::setDataSource(const char *url) {
return err; return err;
} }
// Warning: The filedescriptor passed into this method will only be valid until
// the method returns, if you want to keep it, dup it!
status_t StagefrightPlayer::setDataSource(int fd, int64_t offset, int64_t length) { status_t StagefrightPlayer::setDataSource(int fd, int64_t offset, int64_t length) {
LOGV("setDataSource(%d, %lld, %lld)", fd, offset, length); LOGV("setDataSource(%d, %lld, %lld)", fd, offset, length);
reset(); reset();
mPlayer = new MediaPlayerImpl(fd, offset, length); mPlayer = new MediaPlayerImpl(dup(fd), offset, length);
status_t err = mPlayer->initCheck(); status_t err = mPlayer->initCheck();
if (err != OK) { if (err != OK) {