widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app" into honeycomb-mr1

Browse Source
This commit is contained in:
Jeffrey Tinker
2011-03-16 14:33:06 -07:00
committed by Android (Google) Code Review
parent 778b5ce26f 656ec45728
commit 1dd666966d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -198,6 +198,9 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
if (result == WV_Status_End_Of_Media) { if (result == WV_Status_End_Of_Media) {
mediaBuf->release(); mediaBuf->release();
return ERROR_END_OF_STREAM; return ERROR_END_OF_STREAM;
} else if (result == WV_Status_Terminate_Requested) {
mediaBuf->release();
return ERROR_NO_LICENSE;
} else if (result != WV_Status_OK) { } else if (result != WV_Status_OK) {
if (result != WV_Status_Warning_Need_Key && if (result != WV_Status_Warning_Need_Key &&
result != WV_Status_Warning_Download_Stalled) result != WV_Status_Warning_Download_Stalled)