Workaround server limitation with client retries.
Change-Id: Ia1c7b20682e50a5931a83be0f464d81acf7c07af
This commit is contained in:
parent
53443ac466
commit
5b826ec637
|
@ -7,6 +7,8 @@
|
||||||
#include "base/base64.h"
|
#include "base/base64.h"
|
||||||
#include "base/json/json_reader.h"
|
#include "base/json/json_reader.h"
|
||||||
#include "base/json/json_writer.h"
|
#include "base/json/json_writer.h"
|
||||||
|
#include "base/time/time.h"
|
||||||
|
#include "base/threading/platform_thread.h"
|
||||||
#include "base/values.h"
|
#include "base/values.h"
|
||||||
#include "media/base/httpfetcher.h"
|
#include "media/base/httpfetcher.h"
|
||||||
#include "media/base/request_signer.h"
|
#include "media/base/request_signer.h"
|
||||||
|
@ -23,6 +25,16 @@
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
|
const char kLicenseStatusOK[] = "OK";
|
||||||
|
// Server may return INTERNAL_ERROR intermittently, which is a transient error
|
||||||
|
// and the next client request may succeed without problem.
|
||||||
|
const char kLicenseStatusTransientError[] = "INTERNAL_ERROR";
|
||||||
|
|
||||||
|
// Number of times to retry requesting keys in case of a transient error from
|
||||||
|
// the server.
|
||||||
|
const int kNumTransientErrorRetries = 5;
|
||||||
|
const int kFirstRetryDelayMilliseconds = 1000;
|
||||||
|
|
||||||
bool Base64StringToBytes(const std::string& base64_string,
|
bool Base64StringToBytes(const std::string& base64_string,
|
||||||
std::vector<uint8>* bytes) {
|
std::vector<uint8>* bytes) {
|
||||||
DCHECK(bytes);
|
DCHECK(bytes);
|
||||||
|
@ -41,12 +53,12 @@ bool GetKeyAndKeyId(const base::DictionaryValue& track_dict,
|
||||||
|
|
||||||
std::string key_base64_string;
|
std::string key_base64_string;
|
||||||
RCHECK(track_dict.GetString("key", &key_base64_string));
|
RCHECK(track_dict.GetString("key", &key_base64_string));
|
||||||
VLOG(1) << "Key:" << key_base64_string;
|
VLOG(2) << "Key:" << key_base64_string;
|
||||||
RCHECK(Base64StringToBytes(key_base64_string, key));
|
RCHECK(Base64StringToBytes(key_base64_string, key));
|
||||||
|
|
||||||
std::string key_id_base64_string;
|
std::string key_id_base64_string;
|
||||||
RCHECK(track_dict.GetString("key_id", &key_id_base64_string));
|
RCHECK(track_dict.GetString("key_id", &key_id_base64_string));
|
||||||
VLOG(1) << "Keyid:" << key_id_base64_string;
|
VLOG(2) << "Keyid:" << key_id_base64_string;
|
||||||
RCHECK(Base64StringToBytes(key_id_base64_string, key_id));
|
RCHECK(Base64StringToBytes(key_id_base64_string, key_id));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -74,7 +86,7 @@ bool GetPssh(const base::DictionaryValue& track_dict,
|
||||||
std::string pssh_base64_string;
|
std::string pssh_base64_string;
|
||||||
RCHECK(pssh_dict->GetString("data", &pssh_base64_string));
|
RCHECK(pssh_dict->GetString("data", &pssh_base64_string));
|
||||||
|
|
||||||
VLOG(1) << "Pssh:" << pssh_base64_string;
|
VLOG(2) << "Pssh:" << pssh_base64_string;
|
||||||
RCHECK(Base64StringToBytes(pssh_base64_string, pssh));
|
RCHECK(Base64StringToBytes(pssh_base64_string, pssh));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -83,10 +95,11 @@ bool GetPssh(const base::DictionaryValue& track_dict,
|
||||||
|
|
||||||
namespace media {
|
namespace media {
|
||||||
|
|
||||||
WidevineEncryptorSource::WidevineEncryptorSource(const std::string& server_url,
|
WidevineEncryptorSource::WidevineEncryptorSource(
|
||||||
const std::string& content_id,
|
const std::string& server_url,
|
||||||
TrackType track_type,
|
const std::string& content_id,
|
||||||
scoped_ptr<RequestSigner> signer)
|
TrackType track_type,
|
||||||
|
scoped_ptr<RequestSigner> signer)
|
||||||
: server_url_(server_url),
|
: server_url_(server_url),
|
||||||
content_id_(content_id),
|
content_id_(content_id),
|
||||||
track_type_(track_type),
|
track_type_(track_type),
|
||||||
|
@ -103,33 +116,45 @@ Status WidevineEncryptorSource::Initialize() {
|
||||||
Status status = SignRequest(request, &message);
|
Status status = SignRequest(request, &message);
|
||||||
if (!status.ok())
|
if (!status.ok())
|
||||||
return status;
|
return status;
|
||||||
DLOG(INFO) << "Message: " << message;
|
VLOG(1) << "Message: " << message;
|
||||||
|
|
||||||
HTTPFetcher fetcher;
|
HTTPFetcher fetcher;
|
||||||
std::string raw_response;
|
std::string raw_response;
|
||||||
status = fetcher.Post(server_url_, message, &raw_response);
|
int64 sleep_duration = kFirstRetryDelayMilliseconds;
|
||||||
if (!status.ok())
|
|
||||||
return status;
|
|
||||||
DLOG(INFO) << "Response:" << raw_response;
|
|
||||||
|
|
||||||
std::string response;
|
// Perform client side retries if seeing server transient error to workaround
|
||||||
if (!DecodeResponse(raw_response, &response)) {
|
// server limitation.
|
||||||
return Status(error::INVALID_ARGUMENT,
|
for (int i = 0; i < kNumTransientErrorRetries; ++i) {
|
||||||
"Failed to decode response '" + raw_response + "'.");
|
status = fetcher.Post(server_url_, message, &raw_response);
|
||||||
|
if (!status.ok())
|
||||||
|
return status;
|
||||||
|
VLOG(1) << "Retry [" << i << "] Response:" << raw_response;
|
||||||
|
|
||||||
|
std::string response;
|
||||||
|
if (!DecodeResponse(raw_response, &response)) {
|
||||||
|
return Status(error::SERVER_ERROR,
|
||||||
|
"Failed to decode response '" + raw_response + "'.");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool transient_error = false;
|
||||||
|
if (ExtractEncryptionKey(response, &transient_error))
|
||||||
|
return Status::OK;
|
||||||
|
|
||||||
|
if (!transient_error) {
|
||||||
|
return Status(
|
||||||
|
error::SERVER_ERROR,
|
||||||
|
"Failed to extract encryption key from '" + response + "'.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exponential backoff.
|
||||||
|
if (i != kNumTransientErrorRetries - 1) {
|
||||||
|
base::PlatformThread::Sleep(
|
||||||
|
base::TimeDelta::FromMilliseconds(sleep_duration));
|
||||||
|
sleep_duration *= 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return Status(error::SERVER_ERROR,
|
||||||
std::vector<uint8> key_id;
|
"Failed to recover from server internal error.");
|
||||||
std::vector<uint8> key;
|
|
||||||
std::vector<uint8> pssh;
|
|
||||||
if (!ExtractEncryptionKey(response, &key_id, &key, &pssh)) {
|
|
||||||
return Status(error::INVALID_ARGUMENT,
|
|
||||||
"Failed to extract encryption key from '" + response + "'.");
|
|
||||||
}
|
|
||||||
|
|
||||||
set_key_id(key_id);
|
|
||||||
set_key(key);
|
|
||||||
set_pssh(pssh);
|
|
||||||
return Status::OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WidevineEncryptorSource::TrackType
|
WidevineEncryptorSource::TrackType
|
||||||
|
@ -229,10 +254,12 @@ bool WidevineEncryptorSource::IsExpectedTrackType(
|
||||||
return track_type_ == GetTrackTypeFromString(track_type_string);
|
return track_type_ == GetTrackTypeFromString(track_type_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WidevineEncryptorSource::ExtractEncryptionKey(const std::string& response,
|
bool WidevineEncryptorSource::ExtractEncryptionKey(
|
||||||
std::vector<uint8>* key_id,
|
const std::string& response,
|
||||||
std::vector<uint8>* key,
|
bool* transient_error) {
|
||||||
std::vector<uint8>* pssh) {
|
DCHECK(transient_error);
|
||||||
|
*transient_error = false;
|
||||||
|
|
||||||
scoped_ptr<base::Value> root(base::JSONReader::Read(response));
|
scoped_ptr<base::Value> root(base::JSONReader::Read(response));
|
||||||
if (!root) {
|
if (!root) {
|
||||||
LOG(ERROR) << "'" << response << "' is not in JSON format.";
|
LOG(ERROR) << "'" << response << "' is not in JSON format.";
|
||||||
|
@ -244,8 +271,9 @@ bool WidevineEncryptorSource::ExtractEncryptionKey(const std::string& response,
|
||||||
|
|
||||||
std::string license_status;
|
std::string license_status;
|
||||||
RCHECK(license_dict->GetString("status", &license_status));
|
RCHECK(license_dict->GetString("status", &license_status));
|
||||||
if (license_status != "OK") {
|
if (license_status != kLicenseStatusOK) {
|
||||||
LOG(ERROR) << "Received non-OK license response: " << response;
|
LOG(ERROR) << "Received non-OK license response: " << response;
|
||||||
|
*transient_error = (license_status == kLicenseStatusTransientError);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -263,8 +291,17 @@ bool WidevineEncryptorSource::ExtractEncryptionKey(const std::string& response,
|
||||||
if (!IsExpectedTrackType(track_type))
|
if (!IsExpectedTrackType(track_type))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
return GetKeyAndKeyId(*track_dict, key, key_id) &&
|
std::vector<uint8> key_id;
|
||||||
GetPssh(*track_dict, pssh);
|
std::vector<uint8> key;
|
||||||
|
std::vector<uint8> pssh;
|
||||||
|
if (!GetKeyAndKeyId(*track_dict, &key, &key_id) ||
|
||||||
|
!GetPssh(*track_dict, &pssh))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
set_key_id(key_id);
|
||||||
|
set_key(key);
|
||||||
|
set_pssh(pssh);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
LOG(ERROR) << "Cannot find key of type " << track_type_ << " from '"
|
LOG(ERROR) << "Cannot find key of type " << track_type_ << " from '"
|
||||||
<< response << "'.";
|
<< response << "'.";
|
||||||
|
|
|
@ -47,12 +47,11 @@ class WidevineEncryptorSource : public EncryptorSource {
|
||||||
bool DecodeResponse(const std::string& raw_response, std::string* response);
|
bool DecodeResponse(const std::string& raw_response, std::string* response);
|
||||||
bool IsExpectedTrackType(const std::string& track_type_string);
|
bool IsExpectedTrackType(const std::string& track_type_string);
|
||||||
// Extract encryption key from |response|, which is expected to be properly
|
// Extract encryption key from |response|, which is expected to be properly
|
||||||
// formatted.
|
// formatted. |transient_error| will be set to true if it fails and the
|
||||||
// |key_id|, |key| and |pssh| should not be NULL.
|
// failure is because of a transient error from the server. |transient_error|
|
||||||
|
// should not be NULL.
|
||||||
bool ExtractEncryptionKey(const std::string& response,
|
bool ExtractEncryptionKey(const std::string& response,
|
||||||
std::vector<uint8>* key_id,
|
bool* transient_error);
|
||||||
std::vector<uint8>* key,
|
|
||||||
std::vector<uint8>* pssh);
|
|
||||||
|
|
||||||
std::string server_url_;
|
std::string server_url_;
|
||||||
std::string content_id_;
|
std::string content_id_;
|
||||||
|
|
Loading…
Reference in New Issue