Merge change I96c4d4b3 into eclair

* changes:
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.

1 files changed, 3 insertions, 1 deletions

diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp
index 9a06d13be747..dbee451b01e1 100644
--- a/media/libmediaplayerservice/StagefrightPlayer.cpp
+++ b/media/libmediaplayerservice/StagefrightPlayer.cpp
@@ -40,11 +40,13 @@ status_t StagefrightPlayer::setDataSource(const char *url) {
     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) {
     LOGV("setDataSource(%d, %lld, %lld)", fd, offset, length);
 
     reset();
-    mPlayer = new MediaPlayerImpl(fd, offset, length);
+    mPlayer = new MediaPlayerImpl(dup(fd), offset, length);
 
     status_t err = mPlayer->initCheck();
     if (err != OK) {