Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Seeking/duration in HLS content is based on the individual segments' duration"

Browse Source
This commit is contained in:
Andreas Huber
2011-06-30 16:58:41 -07:00
committed by Android (Google) Code Review
parent 9c902c1aa3 e9a4188119
commit 16efb101bd
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
media/libstagefright/httplive/LiveSession.cpp
View File

@@ -408,13 +408,20 @@ rinse_repeat:
if (firstTime) {
Mutex::Autolock autoLock(mLock);
int32_t targetDuration;
if (!mPlaylist->isComplete()
|| !mPlaylist->meta()->findInt32(
"target-duration", &targetDuration)) {
if (!mPlaylist->isComplete()) {
mDurationUs = -1;
} else {
mDurationUs = 1000000ll * targetDuration * mPlaylist->size();
mDurationUs = 0;
for (size_t i = 0; i < mPlaylist->size(); ++i) {
sp<AMessage> itemMeta;
CHECK(mPlaylist->itemAt(
i, NULL /* uri */, &itemMeta));
int64_t itemDurationUs;
CHECK(itemMeta->findInt64("durationUs", &itemDurationUs));
mDurationUs += itemDurationUs;
}
}
}
@@ -431,14 +438,26 @@ rinse_repeat:
bool bandwidthChanged = false;
if (mSeekTimeUs >= 0) {
int32_t targetDuration;
if (mPlaylist->isComplete() &&
mPlaylist->meta()->findInt32(
"target-duration", &targetDuration)) {
int64_t seekTimeSecs = (mSeekTimeUs + 500000ll) / 1000000ll;
int64_t index = seekTimeSecs / targetDuration;
if (mPlaylist->isComplete()) {
size_t index = 0;
int64_t segmentStartUs = 0;
while (index < mPlaylist->size()) {
sp<AMessage> itemMeta;
CHECK(mPlaylist->itemAt(
index, NULL /* uri */, &itemMeta));
if (index >= 0 && index < mPlaylist->size()) {
int64_t itemDurationUs;
CHECK(itemMeta->findInt64("durationUs", &itemDurationUs));
if (mSeekTimeUs < segmentStartUs + itemDurationUs) {
break;
}
segmentStartUs += itemDurationUs;
++index;
}
if (index < mPlaylist->size()) {
int32_t newSeqNumber = firstSeqNumberInPlaylist + index;
if (newSeqNumber != mSeqNumber) {

13
media/libstagefright/httplive/M3UParser.cpp
View File

@@ -64,14 +64,21 @@ size_t M3UParser::size() {
}
bool M3UParser::itemAt(size_t index, AString *uri, sp<AMessage> *meta) {
uri->clear();
if (meta) { *meta = NULL; }
if (uri) {
uri->clear();
}
if (meta) {
*meta = NULL;
}
if (index >= mItems.size()) {
return false;
}
*uri = mItems.itemAt(index).mURI;
if (uri) {
*uri = mItems.itemAt(index).mURI;
}
if (meta) {
*meta = mItems.itemAt(index).mMeta;