Skip to content

Fixing HLS playback.#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
valbok wants to merge 1 commit into from
Closed

Fixing HLS playback. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/WebCore/Modules/mediasource/MediaSource.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ void MediaSource::monitorSourceBuffers()
// https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#buffer-monitoring

// Note, the behavior if activeSourceBuffers is empty is undefined.
if (!m_activeSourceBuffers) {
if (!m_activeSourceBuffers || m_activeSourceBuffers->length() == 0) {
m_private->setReadyState(MediaPlayer::HaveNothing);
return;
}
Expand Down
24 changes: 14 additions & 10 deletions Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerMSE.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -819,7 +819,7 @@ void MediaPlayerPrivateGStreamerMSE::durationChanged()
if (m_mediaTimeDuration != previousDuration && m_mediaTimeDuration.isValid() && previousDuration.isValid()) {
m_player->durationChanged();
m_playbackPipeline->notifyDurationChanged();
m_mediaSource->durationChanged(m_mediaTimeDuration);
m_mediaSource->durationChanged(durationMediaTime());
}
}

Expand DownExpand Up@@ -2266,7 +2266,7 @@ void MediaSourceClientGStreamerMSE::durationChanged(const MediaTime& duration)
ASSERT(WTF::isMainThread());

TRACE_MEDIA_MESSAGE("duration: %f", duration.toFloat());
if (!duration.isValid() || duration.isPositiveInfinite() || duration.isNegativeInfinite())
if (!duration.isValid() || duration.isNegativeInfinite())
return;

m_duration = duration;
Expand DownExpand Up@@ -2391,15 +2391,19 @@ float MediaPlayerPrivateGStreamerMSE::maxTimeSeekable() const
return 0.0f;

LOG_MEDIA_MESSAGE("maxTimeSeekable");
float result = duration();
// infinite duration means live stream
if (isinf(result)) {
MediaTime maxBufferedTime = buffered()->maximumBufferedTime();
// Return the highest end time reported by the buffered attribute.
result = maxBufferedTime.isValid() ? maxBufferedTime.toFloat() : 0;
}
return durationMediaTime().toFloat();
}

return result;
MediaTime MediaPlayerPrivateGStreamerMSE::durationMediaTime() const
{
// Infinite duration means live stream
if (!m_mediaTimeDuration.isPositiveInfinite())
return m_mediaTimeDuration;

MediaTime maxBufferedTime = buffered()->maximumBufferedTime();

// Return the highest end time reported by the buffered attribute
return maxBufferedTime.isValid() ? maxBufferedTime : MediaTime::zeroTime();
}

} // namespace WebCore
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerMSE.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ class MediaPlayerPrivateGStreamerMSE : public MediaPlayerPrivateGStreamer {
bool changePipelineState(GstState) override;

void durationChanged() override;
MediaTime durationMediaTime() const override { return m_mediaTimeDuration; }
MediaTime durationMediaTime() const override;
float duration() const override;
float mediaTimeForTimeValue(float timeValue) const;
void setRate(float) override;
Expand Down