diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-12 12:39:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-12 12:39:26 -0800 |
| commit | e7c599ea75b0dd3b47a93bbcc8edb475f6defa97 (patch) | |
| tree | 3c357443eb92bfa53451bf56f93ee17b2bb9434d | |
| parent | 94c3442361d3aa34119b6fa547f2e4b19d0dca66 (diff) | |
| parent | 8539253a04145bef8b675a9000b8e284c77a6558 (diff) | |
| download | android_hardware_qcom_media-e7c599ea75b0dd3b47a93bbcc8edb475f6defa97.tar.gz android_hardware_qcom_media-e7c599ea75b0dd3b47a93bbcc8edb475f6defa97.tar.bz2 android_hardware_qcom_media-e7c599ea75b0dd3b47a93bbcc8edb475f6defa97.zip | |
Merge "dashplayer: Handle error for text track"
| -rw-r--r-- | dashplayer/DashPlayer.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dashplayer/DashPlayer.cpp b/dashplayer/DashPlayer.cpp index 3c239973..ed63bcbe 100644 --- a/dashplayer/DashPlayer.cpp +++ b/dashplayer/DashPlayer.cpp @@ -1303,10 +1303,11 @@ status_t DashPlayer::feedDecoderInputData(int track, const sp<AMessage> &msg) { reply->post(); return OK; } - else if ( (track == kText) && (err == ERROR_END_OF_STREAM)) - { - sendTextPacket(NULL,ERROR_END_OF_STREAM); - return ERROR_END_OF_STREAM; + else if ((track == kText) && + (err == ERROR_END_OF_STREAM || err == (status_t)UNKNOWN_ERROR)) { + ALOGE("Text track has encountered error %d", err ); + sendTextPacket(NULL, err); + return err; } } @@ -1596,7 +1597,8 @@ void DashPlayer::sendTextPacket(sp<ABuffer> accessUnit,status_t err) //Local setting parcel.writeInt32(KEY_LOCAL_SETTING); - if (err == ERROR_END_OF_STREAM) + if (err == ERROR_END_OF_STREAM || + err == (status_t)UNKNOWN_ERROR) { parcel.writeInt32(KEY_TEXT_EOS); // write size of sample |