Merge "Signal an appropriate error even if there are no active streams yet."

theandi666 · Android (Google) Code Review · commit d33b3881f764 · 2011-09-27T13:36:22.000-07:00
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
@@ -41,7 +41,7 @@ NuPlayer::HTTPLiveSource::HTTPLiveSource(
       mUIDValid(uidValid),
       mUID(uid),
       mFlags(0),
-      mEOS(false),
+      mFinalResult(OK),
       mOffset(0) {
     if (headers) {
         mExtraHeaders = *headers;
@@ -95,9 +95,9 @@ sp<MetaData> NuPlayer::HTTPLiveSource::getFormat(bool audio) {
     return source->getFormat();
 }
 
-bool NuPlayer::HTTPLiveSource::feedMoreTSData() {
-    if (mEOS) {
-        return false;
+status_t NuPlayer::HTTPLiveSource::feedMoreTSData() {
+    if (mFinalResult != OK) {
+        return mFinalResult;
     }
 
     sp<LiveDataSource> source =
@@ -111,12 +111,12 @@ bool NuPlayer::HTTPLiveSource::feedMoreTSData() {
             break;
         } else if (n < 0) {
             if (n != ERROR_END_OF_STREAM) {
-                LOGI("input data EOS reached, error %d", n);
+                LOGI("input data EOS reached, error %ld", n);
             } else {
                 LOGI("input data EOS reached.");
             }
             mTSParser->signalEOS(n);
-            mEOS = true;
+            mFinalResult = n;
             break;
         } else {
             if (buffer[0] == 0x00) {
@@ -133,7 +133,7 @@ bool NuPlayer::HTTPLiveSource::feedMoreTSData() {
                 if (err != OK) {
                     LOGE("TS Parser returned error %d", err);
                     mTSParser->signalEOS(err);
-                    mEOS = true;
+                    mFinalResult = err;
                     break;
                 }
             }
@@ -142,7 +142,7 @@ bool NuPlayer::HTTPLiveSource::feedMoreTSData() {
         }
     }
 
-    return true;
+    return OK;
 }
 
 status_t NuPlayer::HTTPLiveSource::dequeueAccessUnit(
@@ -172,7 +172,7 @@ status_t NuPlayer::HTTPLiveSource::getDuration(int64_t *durationUs) {
 status_t NuPlayer::HTTPLiveSource::seekTo(int64_t seekTimeUs) {
     // We need to make sure we're not seeking until we have seen the very first
     // PTS timestamp in the whole stream (from the beginning of the stream).
-    while (!mTSParser->PTSTimeDeltaEstablished() && feedMoreTSData()) {
+    while (!mTSParser->PTSTimeDeltaEstablished() && feedMoreTSData() == OK) {
         usleep(100000);
     }
 
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.h b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.h
@@ -35,8 +35,7 @@ struct NuPlayer::HTTPLiveSource : public NuPlayer::Source {
 
     virtual void start();
 
-    // Returns true iff more data was available, false on EOS.
-    virtual bool feedMoreTSData();
+    virtual status_t feedMoreTSData();
 
     virtual sp<MetaData> getFormat(bool audio);
     virtual status_t dequeueAccessUnit(bool audio, sp<ABuffer> *accessUnit);
@@ -59,7 +58,7 @@ struct NuPlayer::HTTPLiveSource : public NuPlayer::Source {
     bool mUIDValid;
     uid_t mUID;
     uint32_t mFlags;
-    bool mEOS;
+    status_t mFinalResult;
     off64_t mOffset;
     sp<ALooper> mLiveLooper;
     sp<LiveSession> mLiveSession;
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -235,11 +235,17 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
                 instantiateDecoder(true, &mAudioDecoder);
             }
 
-            if (!mSource->feedMoreTSData()) {
+            status_t err;
+            if ((err = mSource->feedMoreTSData()) != OK) {
                 if (mAudioDecoder == NULL && mVideoDecoder == NULL) {
                     // We're not currently decoding anything (no audio or
                     // video tracks found) and we just ran out of input data.
-                    notifyListener(MEDIA_PLAYBACK_COMPLETE, 0, 0);
+
+                    if (err == ERROR_END_OF_STREAM) {
+                        notifyListener(MEDIA_PLAYBACK_COMPLETE, 0, 0);
+                    } else {
+                        notifyListener(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, err);
+                    }
                 }
                 break;
             }
@@ -267,7 +273,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
                         audio, codecRequest);
 
                 if (err == -EWOULDBLOCK) {
-                    if (mSource->feedMoreTSData()) {
+                    if (mSource->feedMoreTSData() == OK) {
                         msg->post();
                     }
                 }
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
@@ -29,8 +29,9 @@ struct NuPlayer::Source : public RefBase {
 
     virtual void start() = 0;
 
-    // Returns true iff more data was available, false on EOS.
-    virtual bool feedMoreTSData() = 0;
+    // Returns OK iff more data was available,
+    // an error or ERROR_END_OF_STREAM if not.
+    virtual status_t feedMoreTSData() = 0;
 
     virtual sp<MetaData> getFormat(bool audio) = 0;
 
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -34,7 +34,7 @@ namespace android {
 
 NuPlayer::StreamingSource::StreamingSource(const sp<IStreamSource> &source)
     : mSource(source),
-      mEOS(false) {
+      mFinalResult(OK) {
 }
 
 NuPlayer::StreamingSource::~StreamingSource() {
@@ -47,9 +47,9 @@ void NuPlayer::StreamingSource::start() {
     mStreamListener->start();
 }
 
-bool NuPlayer::StreamingSource::feedMoreTSData() {
-    if (mEOS) {
-        return false;
+status_t NuPlayer::StreamingSource::feedMoreTSData() {
+    if (mFinalResult != OK) {
+        return mFinalResult;
     }
 
     for (int32_t i = 0; i < 50; ++i) {
@@ -60,7 +60,7 @@ bool NuPlayer::StreamingSource::feedMoreTSData() {
         if (n == 0) {
             LOGI("input data EOS reached.");
             mTSParser->signalEOS(ERROR_END_OF_STREAM);
-            mEOS = true;
+            mFinalResult = ERROR_END_OF_STREAM;
             break;
         } else if (n == INFO_DISCONTINUITY) {
             ATSParser::DiscontinuityType type = ATSParser::DISCONTINUITY_SEEK;
@@ -92,14 +92,14 @@ bool NuPlayer::StreamingSource::feedMoreTSData() {
                     LOGE("TS Parser returned error %d", err);
 
                     mTSParser->signalEOS(err);
-                    mEOS = true;
+                    mFinalResult = err;
                     break;
                 }
             }
         }
     }
 
-    return true;
+    return OK;
 }
 
 sp<MetaData> NuPlayer::StreamingSource::getFormat(bool audio) {
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.h b/media/libmediaplayerservice/nuplayer/StreamingSource.h
@@ -31,8 +31,7 @@ struct NuPlayer::StreamingSource : public NuPlayer::Source {
 
     virtual void start();
 
-    // Returns true iff more data was available, false on EOS.
-    virtual bool feedMoreTSData();
+    virtual status_t feedMoreTSData();
 
     virtual sp<MetaData> getFormat(bool audio);
     virtual status_t dequeueAccessUnit(bool audio, sp<ABuffer> *accessUnit);
@@ -42,7 +41,7 @@ struct NuPlayer::StreamingSource : public NuPlayer::Source {
 
 private:
     sp<IStreamSource> mSource;
-    bool mEOS;
+    status_t mFinalResult;
     sp<NuPlayerStreamListener> mStreamListener;
     sp<ATSParser> mTSParser;
 

Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,17 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {`
`235`	`235`	`instantiateDecoder(true, &mAudioDecoder);`
`236`	`236`	`}`
`237`	`237`
`238`		`- if (!mSource->feedMoreTSData()) {`
	`238`	`+ status_t err;`
	`239`	`+ if ((err = mSource->feedMoreTSData()) != OK) {`
`239`	`240`	`if (mAudioDecoder == NULL && mVideoDecoder == NULL) {`
`240`	`241`	`// We're not currently decoding anything (no audio or`
`241`	`242`	`// video tracks found) and we just ran out of input data.`
`242`		`- notifyListener(MEDIA_PLAYBACK_COMPLETE, 0, 0);`
	`243`	`+`
	`244`	`+ if (err == ERROR_END_OF_STREAM) {`
	`245`	`+ notifyListener(MEDIA_PLAYBACK_COMPLETE, 0, 0);`
	`246`	`+ } else {`
	`247`	`+ notifyListener(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, err);`
	`248`	`+ }`
`243`	`249`	`}`
`244`	`250`	`break;`
`245`	`251`	`}`
`@@ -267,7 +273,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {`
`267`	`273`	`audio, codecRequest);`
`268`	`274`
`269`	`275`	`if (err == -EWOULDBLOCK) {`
`270`		`- if (mSource->feedMoreTSData()) {`
	`276`	`+ if (mSource->feedMoreTSData() == OK) {`
`271`	`277`	`msg->post();`
`272`	`278`	`}`
`273`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace android {`
`34`	`34`
`35`	`35`	`NuPlayer::StreamingSource::StreamingSource(const sp<IStreamSource> &source)`
`36`	`36`	`: mSource(source),`
`37`		`- mEOS(false) {`
	`37`	`+ mFinalResult(OK) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`NuPlayer::StreamingSource::~StreamingSource() {`
`@@ -47,9 +47,9 @@ void NuPlayer::StreamingSource::start() {`
`47`	`47`	`mStreamListener->start();`
`48`	`48`	`}`
`49`	`49`
`50`		`-bool NuPlayer::StreamingSource::feedMoreTSData() {`
`51`		`- if (mEOS) {`
`52`		`- return false;`
	`50`	`+status_t NuPlayer::StreamingSource::feedMoreTSData() {`
	`51`	`+ if (mFinalResult != OK) {`
	`52`	`+ return mFinalResult;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`for (int32_t i = 0; i < 50; ++i) {`
`@@ -60,7 +60,7 @@ bool NuPlayer::StreamingSource::feedMoreTSData() {`
`60`	`60`	`if (n == 0) {`
`61`	`61`	`LOGI("input data EOS reached.");`
`62`	`62`	`mTSParser->signalEOS(ERROR_END_OF_STREAM);`
`63`		`- mEOS = true;`
	`63`	`+ mFinalResult = ERROR_END_OF_STREAM;`
`64`	`64`	`break;`
`65`	`65`	`} else if (n == INFO_DISCONTINUITY) {`
`66`	`66`	`ATSParser::DiscontinuityType type = ATSParser::DISCONTINUITY_SEEK;`
`@@ -92,14 +92,14 @@ bool NuPlayer::StreamingSource::feedMoreTSData() {`
`92`	`92`	`LOGE("TS Parser returned error %d", err);`
`93`	`93`
`94`	`94`	`mTSParser->signalEOS(err);`
`95`		`- mEOS = true;`
	`95`	`+ mFinalResult = err;`
`96`	`96`	`break;`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- return true;`
	`102`	`+ return OK;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`sp<MetaData> NuPlayer::StreamingSource::getFormat(bool audio) {`