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

Merge "/vendor/widevine portion of removing YouTube-specific error codes"

Browse Source
This commit is contained in:
Jeff Tinker
2012-04-04 10:17:10 -07:00
committed by Android (Google) Code Review
parent b12c4a93f4 efd3647691
commit e612ce59c4
2 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -8,7 +8,6 @@
#include "WVMMediaSource.h" #include "WVMMediaSource.h"
#include "WVMFileSource.h" #include "WVMFileSource.h"
#include "WVMExtractorImpl.h" #include "WVMExtractorImpl.h"
#include "WVMErrorCodes.h"
#include "media/stagefright/foundation/ADebug.h" #include "media/stagefright/foundation/ADebug.h"
#include "media/stagefright/MediaErrors.h" #include "media/stagefright/MediaErrors.h"
#include "media/stagefright/MediaDefs.h" #include "media/stagefright/MediaDefs.h"
@@ -268,6 +267,11 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
status_t status; status_t status;
if (result >= WV_Status_Min_TP_Error && result <= WV_Status_Max_TP_Error) {
// handle the third party error code range by mapping to a reserved
// vendor defined range of media player error codes
status = ERROR_DRM_WV_VENDOR_MIN + result - WV_Status_Min_TP_Error;
} else {
switch(result) { switch(result) {
case WV_Status_End_Of_Media: case WV_Status_End_Of_Media:
status = ERROR_END_OF_STREAM; status = ERROR_END_OF_STREAM;
@@ -275,21 +279,6 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
case WV_Status_Terminate_Requested: case WV_Status_Terminate_Requested:
status = ERROR_HEARTBEAT_TERMINATE_REQUESTED; status = ERROR_HEARTBEAT_TERMINATE_REQUESTED;
break; break;
case YT_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT:
status = ERROR_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT;
break;
case YT_HEARTBEAT_CONCURRENT_PLAYBACK:
status = ERROR_HEARTBEAT_CONCURRENT_PLAYBACK;
break;
case YT_HEARTBEAT_UNUSUAL_ACTIVITY:
status = ERROR_HEARTBEAT_UNUSUAL_ACTIVITY;
break;
case YT_HEARTBEAT_STREAMING_UNAVAILABLE:
status = ERROR_HEARTBEAT_STREAMING_UNAVAILABLE;
break;
case YT_HEARTBEAT_CANNOT_ACTIVATE_RENTAL:
status = ERROR_HEARTBEAT_CANNOT_ACTIVATE_RENTAL;
break;
default: default:
if (mLogOnce) { if (mLogOnce) {
ALOGE("WV_GetEsData returned ERROR %d in WVMMediaSource::read\n", result); ALOGE("WV_GetEsData returned ERROR %d in WVMMediaSource::read\n", result);
@@ -298,6 +287,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
status = ERROR_IO; status = ERROR_IO;
break; break;
} }
}
mediaBuf->release(); mediaBuf->release();
return status; return status;

9
proprietary/wvm/include/WVMErrorCodes.h
View File

@@ -1,9 +0,0 @@
enum {
// YouTube Heartbeat error codes
YT_HEARTBEAT_CANNOT_AUTHENTICATE = 513,
YT_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT = 514,
YT_HEARTBEAT_CONCURRENT_PLAYBACK = 515,
YT_HEARTBEAT_UNUSUAL_ACTIVITY = 516,
YT_HEARTBEAT_STREAMING_UNAVAILABLE = 517,
YT_HEARTBEAT_CANNOT_ACTIVATE_RENTAL = 518,
};