From a75e9fb4876139fff4bb836fb0ebd5f80c8b20b3 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 10 Nov 2009 11:51:43 -0800 Subject: Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it. --- media/libmediaplayerservice/StagefrightPlayer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'media/libmediaplayerservice/StagefrightPlayer.cpp') diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index 9a06d13..dbee451 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) { -- cgit v1.1