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

Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)

Browse Source 
Change-Id: Id3a8a997fb1186c6af6e94f2fc2d4788238a0452
This commit is contained in:
Jeffrey Tinker
2011-05-26 10:49:15 -07:00
parent a7d2e068b6
commit 66d9ff5fb5
7 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
proprietary/drmwvmplugin/lib/libwvdrm.so
View File

Binary file not shown.

1
proprietary/samplePlayer/src/com/widevine/demo/ConfigXMLParser.java
View File

@@ -54,6 +54,7 @@ public class ConfigXMLParser {
public void end() {
if (currentAssetDescriptor.getUri().indexOf(".wvm") != -1
|| currentAssetDescriptor.getUri().indexOf(".ts") != -1
|| currentAssetDescriptor.getUri().indexOf(".m3u8") != -1
|| !currentAssetDescriptor.getUri().substring(currentAssetDescriptor
.getUri().lastIndexOf("/")).contains(".")) {
assetDescriptors.add(currentAssetDescriptor.copy());

3
proprietary/samplePlayer/src/com/widevine/demo/DownloadActivity.java
View File

@@ -38,7 +38,8 @@ public class DownloadActivity extends AssetActivity {
File file = new File(dir.getAbsolutePath() + File.separator + name);
if (!file.isDirectory()
&& !name.equals("curl")
&& (name.contains(".wvm") || name.contains(".ts") || name.contains(".mp4") || !name.contains(".")))
&& (name.contains(".wvm") || name.contains(".ts") || name.contains(".mp4") ||
name.contains(".m3u8") | !name.contains(".")))
return true;
else
return false;

BIN
proprietary/streamcontrol/lib/libWVStreamControlAPI.so
View File

Binary file not shown.

28
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -241,6 +241,15 @@ status_t WVMExtractorImpl::readMetaData()
videoMetaData->setInt32(kKeyWidth, width);
videoMetaData->setInt32(kKeyHeight, height);
if (mIsLiveStream) {
float scaleUsed;
result = WV_Play(mSession, 1.0, &scaleUsed, "npt=now-");
if (result != WV_Status_OK) {
LOGE("WV_Play for live stream setup failed: %d", result);
return ERROR_IO;
}
}
status_t status;
status = readAVCCMetaData(videoMetaData);
@@ -251,8 +260,15 @@ status_t WVMExtractorImpl::readMetaData()
if (status != OK)
return status;
mAudioSource = new WVMMediaSource(mSession, WV_EsSelector_Audio, audioMetaData);
mVideoSource = new WVMMediaSource(mSession, WV_EsSelector_Video, videoMetaData);
if (mIsLiveStream) {
result = WV_Pause(mSession, "");
if (result != WV_Status_OK) {
LOGE("WV_Pause for live stream setup failed: %d", result);
}
}
mAudioSource = new WVMMediaSource(mSession, WV_EsSelector_Audio, audioMetaData, mIsLiveStream);
mVideoSource = new WVMMediaSource(mSession, WV_EsSelector_Video, videoMetaData, mIsLiveStream);
// Since the WVExtractor goes away soon after this, we delegate ownership of some resources
// to the constructed media source
@@ -276,7 +292,7 @@ status_t WVMExtractorImpl::readAVCCMetaData(sp<MetaData> videoMetaData)
const unsigned char *config;
unsigned long size;
int limit = 50;
int limit = 500;
do {
size_t bytesRead;
bool auStart, sync;
@@ -293,7 +309,7 @@ status_t WVMExtractorImpl::readAVCCMetaData(sp<MetaData> videoMetaData)
result = WV_Info_GetCodecConfig(mSession, WV_CodecConfigType_AVCC, config, size);
if (result != WV_Status_OK)
usleep(100);
usleep(10000);
} while (result == WV_Status_Warning_Not_Available && limit-- > 0);
if (result != WV_Status_OK) {
@@ -322,7 +338,7 @@ status_t WVMExtractorImpl::readESDSMetaData(sp<MetaData> audioMetaData)
const unsigned char *config;
unsigned long size;
int limit = 50;
int limit = 500;
do {
size_t bytesRead;
bool auStart, sync;
@@ -339,7 +355,7 @@ status_t WVMExtractorImpl::readESDSMetaData(sp<MetaData> audioMetaData)
result = WV_Info_GetCodecConfig(mSession, WV_CodecConfigType_ESDS, config, size);
if (result != WV_Status_OK)
usleep(100);
usleep(10000);
} while (result == WV_Status_Warning_Not_Available && limit-- > 0);
if (result != WV_Status_OK) {

18
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -36,11 +36,13 @@ static void _cb(int code)
status_t WVMMediaSource::sLastError = NO_ERROR;
WVMMediaSource::WVMMediaSource(WVSession *session, WVEsSelector esSelector,
const sp<MetaData> &metaData)
const sp<MetaData> &metaData, bool isLive)
: mSession(session),
mESSelector(esSelector),
mTrackMetaData(metaData),
mStarted(false),
mIsLiveStream(isLive),
mNewSegment(false),
mGroup(NULL),
mDts(0),
mPts(0)
@@ -88,6 +90,7 @@ status_t WVMMediaSource::start(MetaData *)
allocBufferGroup();
mNewSegment = true;
mStarted = true;
mLogOnce = true;
@@ -157,6 +160,15 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
*buffer = NULL;
bool seekNextSync = false;
#if 0
// The sync bits aren't working right yet on live streams, so need to disable this
// for now.
if (mIsLiveStream && mNewSegment && (mESSelector == WV_EsSelector_Video)) {
seekNextSync = true;
mNewSegment = false;
}
#endif
int64_t seekTimeUs;
int retryLimit = 500; // Limit on number of retries before timeout, 10ms per retry
@@ -332,9 +344,9 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
#endif
#if 0
LOGD("[%p] %s set range_length=%d, get range_length=%d kKeyTime=%lld sync=%d\n", mediaBuf,
LOGD("[%p] %s packet length=%d kKeyTime=%lld %s\n", mediaBuf,
(mESSelector == WV_EsSelector_Video ? "video" : "audio"),
bytesRead + offset, mediaBuf->range_length(), keyTime, syncFrame);
bytesRead + offset, keyTime, syncFrame ? "sync" : "");
#endif
*buffer = mediaBuf;

4
proprietary/wvm/include/WVMMediaSource.h
View File

@@ -33,7 +33,7 @@ class WVMFileSource;
class WVMMediaSource : public MediaSource {
public:
WVMMediaSource(WVSession *session, WVEsSelector esSelector,
const sp<MetaData> &metaData);
const sp<MetaData> &metaData, bool isLive);
void delegateFileSource(sp<WVMFileSource> fileSource);
void delegateDataSource(sp<DataSource> dataSource);
@@ -60,6 +60,8 @@ private:
bool mStarted;
bool mLogOnce;
bool mIsLiveStream;
bool mNewSegment;
MediaBufferGroup *mGroup;