diff options
author | Lajos Molnar <lajos@google.com> | 2015-01-28 21:38:38 -0800 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2015-01-28 21:52:09 -0800 |
commit | f0d689934e70d3e5b3784265e890377db04c7c1d (patch) | |
tree | 92a7f9bf2304a7b1ced4e34c7cca6ddc569b2e55 /media/libstagefright/httplive/PlaylistFetcher.cpp | |
parent | c84bc78d4244987268cbe621cecdfb72cbd48dc7 (diff) | |
download | frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.zip frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.tar.gz frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.tar.bz2 |
Revert "HLS: QCom enhancements"
This is to restore patch attributions
This reverts commit f580806d893c4631f5324ff0af5c2db68a40ef42.
Bug: 18821145
Change-Id: Idc49385fffccfde2a3915388fe3fe4e2b740d787
Diffstat (limited to 'media/libstagefright/httplive/PlaylistFetcher.cpp')
-rw-r--r-- | media/libstagefright/httplive/PlaylistFetcher.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp index 4a97803..d8eed5b 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.cpp +++ b/media/libstagefright/httplive/PlaylistFetcher.cpp @@ -49,9 +49,8 @@ namespace android { // static const int64_t PlaylistFetcher::kMinBufferedDurationUs = 10000000ll; const int64_t PlaylistFetcher::kMaxMonitorDelayUs = 3000000ll; -// LCM of 188 (size of a TS packet) & 1k works well -const int32_t PlaylistFetcher::kDownloadBlockSize = 47 * 1024; -const int32_t PlaylistFetcher::kNumSkipFrames = 5; +const int32_t PlaylistFetcher::kDownloadBlockSize = 2048; +const int32_t PlaylistFetcher::kNumSkipFrames = 10; PlaylistFetcher::PlaylistFetcher( const sp<AMessage> ¬ify, @@ -562,7 +561,7 @@ status_t PlaylistFetcher::onResumeUntil(const sp<AMessage> &msg) { // Don't resume if we would stop within a resume threshold. int32_t discontinuitySeq; int64_t latestTimeUs = 0, stopTimeUs = 0; - sp<AMessage> latestMeta = packetSource->getLatestEnqueuedMeta(); + sp<AMessage> latestMeta = packetSource->getLatestDequeuedMeta(); if (latestMeta != NULL && latestMeta->findInt32("discontinuitySeq", &discontinuitySeq) && discontinuitySeq == mDiscontinuitySeq @@ -611,12 +610,7 @@ void PlaylistFetcher::onMonitorQueue() { int32_t targetDurationSecs; int64_t targetDurationUs = kMinBufferedDurationUs; if (mPlaylist != NULL) { - if (mPlaylist->meta() == NULL || !mPlaylist->meta()->findInt32( - "target-duration", &targetDurationSecs)) { - ALOGE("Playlist is missing required EXT-X-TARGETDURATION tag"); - notifyError(ERROR_MALFORMED); - return; - } + CHECK(mPlaylist->meta()->findInt32("target-duration", &targetDurationSecs)); targetDurationUs = targetDurationSecs * 1000000ll; } @@ -1165,11 +1159,6 @@ const sp<ABuffer> &PlaylistFetcher::setAccessUnitProperties( accessUnit->meta()->setInt32("discard", discard); } - int32_t targetDurationSecs; - if (mPlaylist->meta()->findInt32("target-duration", &targetDurationSecs)) { - accessUnit->meta()->setInt32("targetDuration", targetDurationSecs); - } - accessUnit->meta()->setInt32("discontinuitySeq", mDiscontinuitySeq); accessUnit->meta()->setInt64("segmentStartTimeUs", getSegmentStartTimeUs(mSeqNumber)); return accessUnit; @@ -1679,7 +1668,7 @@ void PlaylistFetcher::updateDuration() { int64_t PlaylistFetcher::resumeThreshold(const sp<AMessage> &msg) { int64_t durationUs, threshold; - if (msg->findInt64("durationUs", &durationUs) && durationUs > 0) { + if (msg->findInt64("durationUs", &durationUs)) { return kNumSkipFrames * durationUs; } |