diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2023-03-30 18:54:44 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-12 11:59:25 +0000 |
commit | 962a4f93ace92deb02ab5590be8854532609d255 (patch) | |
tree | c2fdb4bf08d74253dadfd291f8b4527927c7d676 /src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp | |
parent | 8108d06690087f610863e09863a9ef2525a65598 (diff) | |
download | qtmultimedia-962a4f93ace92deb02ab5590be8854532609d255.tar.gz |
Implement seamless ffmpeg playback looping
Users need seamless looping, in other words, looping without
little delays on jumping from the media end to the start.
The only way to make it seamles and smooth is to intrude into the
playback engine. As result, we have just a regular delay between frames
on shifting.
Also, a bunch of adjuscent small improvements have been introduced:
- simplify criteria of the demuxer's buffer size, it was more complex
and a bit not relevant before. Actually, we need to check
only max buffering time.
- Improve handling of media with streams of different length.
- Fix setting of the playback rate before opening sources.
- Add new auto tests for looping.
- Add debug logs.
Task-number: QTBUG-112305
Change-Id: Ic9073d77535f5aae19f9ea48d4e745c9f2fa9ea3
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 57ebebae16d9b4d984709541a1b37e711f48b14d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp')
-rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp | 105 |
1 files changed, 85 insertions, 20 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp index 19105499d..c9c4f20f2 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine.cpp @@ -18,6 +18,8 @@ QT_BEGIN_NAMESPACE namespace QFFmpeg { +static Q_LOGGING_CATEGORY(qLcPlaybackEngine, "qt.multimedia.ffmpeg.playbackengine"); + // The helper is needed since on some compilers std::unique_ptr // doesn't have a default constructor in the case of sizeof(CustomDeleter) > 0 template<typename Array> @@ -41,11 +43,13 @@ PlaybackEngine::PlaybackEngine() m_streams(defaultObjectsArray<decltype(m_streams)>()), m_renderers(defaultObjectsArray<decltype(m_renderers)>()) { + qCDebug(qLcPlaybackEngine) << "Create PlaybackEngine"; qRegisterMetaType<QFFmpeg::Packet>(); qRegisterMetaType<QFFmpeg::Frame>(); } PlaybackEngine::~PlaybackEngine() { + qCDebug(qLcPlaybackEngine) << "Delete PlaybackEngine"; forEachExistingObject([](auto &object) { object.reset(); }); deleteFreeThreads(); } @@ -62,22 +66,33 @@ void PlaybackEngine::onRendererFinished() if (!isAtEnd(QPlatformMediaPlayer::AudioStream)) return; - if (!isAtEnd(QPlatformMediaPlayer::SubtitleStream) - && !m_renderers[QPlatformMediaPlayer::AudioStream] - && !m_renderers[QPlatformMediaPlayer::VideoStream]) + if (!isAtEnd(QPlatformMediaPlayer::SubtitleStream) && !hasMediaStream()) return; if (std::exchange(m_state, QMediaPlayer::StoppedState) == QMediaPlayer::StoppedState) return; - m_timeController.setPaused(true); - m_timeController.sync(m_duration); + finilizeTime(duration()); forceUpdate(); + qCDebug(qLcPlaybackEngine) << "Playback engine end of stream"; + emit endOfStream(); } +void PlaybackEngine::onRendererLoopChanged(qint64 offset, int loopIndex) +{ + if (loopIndex > m_currentLoopOffset.index) { + m_currentLoopOffset = { offset, loopIndex }; + emit loopChanged(); + } else if (loopIndex == m_currentLoopOffset.index && offset != m_currentLoopOffset.pos) { + qWarning() << "Unexpected offset for loop" << loopIndex << ":" << offset << "vs" + << m_currentLoopOffset.pos; + m_currentLoopOffset.pos = offset; + } +} + void PlaybackEngine::onRendererSynchronized(std::chrono::steady_clock::time_point tp, qint64 pos) { Q_ASSERT(QObject::sender() == m_renderers[QPlatformMediaPlayer::AudioStream].get()); @@ -94,15 +109,13 @@ void PlaybackEngine::setState(QMediaPlayer::PlaybackState state) { if (!m_context) return; - if ( state == m_state ) + if (state == m_state) return; const auto prevState = std::exchange(m_state, state); - if (m_state == QMediaPlayer::StoppedState) { - m_timeController.setPaused(true); - m_timeController.sync(); - } + if (m_state == QMediaPlayer::StoppedState) + finilizeTime(0); if (prevState == QMediaPlayer::StoppedState || m_state == QMediaPlayer::StoppedState) recreateObjects(); @@ -208,14 +221,31 @@ void PlaybackEngine::forEachExistingObject(Action &&action) void PlaybackEngine::seek(qint64 pos) { - pos = qBound(0, pos, m_duration); + pos = qBound(0, pos, duration()); m_timeController.setPaused(true); - m_timeController.sync(pos); + m_timeController.sync(m_currentLoopOffset.pos + pos); forceUpdate(); } +void PlaybackEngine::setLoops(int loops) +{ + if (!isSeekable()) { + qWarning() << "Cannot set loops for non-seekable source"; + return; + } + + if (std::exchange(m_loops, loops) == loops) + return; + + qCDebug(qLcPlaybackEngine) << "set playback engine loops:" << loops << "prev loops:" << m_loops + << "index:" << m_currentLoopOffset.index; + + if (m_demuxer) + m_demuxer->setLoops(loops); +} + void PlaybackEngine::triggerStepIfNeeded() { if (m_state != QMediaPlayer::PausedState) @@ -295,6 +325,9 @@ void PlaybackEngine::createStreamAndRenderer(QPlatformMediaPlayer::TrackType tra connect(renderer.get(), &Renderer::synchronized, this, &PlaybackEngine::onRendererSynchronized); + connect(renderer.get(), &Renderer::loopChanged, this, + &PlaybackEngine::onRendererLoopChanged); + if constexpr (shouldPauseStreams) connect(renderer.get(), &Renderer::forceStepDone, this, &PlaybackEngine::updateObjectsPausedState); @@ -337,6 +370,8 @@ std::optional<Codec> PlaybackEngine::codecForTrack(QPlatformMediaPlayer::TrackTy auto &result = m_codecs[trackType]; if (!result) { + qCDebug(qLcPlaybackEngine) + << "Create codec for stream:" << streamIndex << "trackType:" << trackType; auto maybeCodec = Codec::create(m_context->streams[streamIndex]); if (!maybeCodec) { @@ -351,6 +386,12 @@ std::optional<Codec> PlaybackEngine::codecForTrack(QPlatformMediaPlayer::TrackTy return result; } +bool PlaybackEngine::hasMediaStream() const +{ + return m_renderers[QPlatformMediaPlayer::AudioStream] + || m_renderers[QPlatformMediaPlayer::VideoStream]; +} + void PlaybackEngine::createDemuxer() { decltype(m_currentAVStreamIndex) streamIndexes = { -1, -1, -1 }; @@ -365,8 +406,10 @@ void PlaybackEngine::createDemuxer() if (!hasStreams) return; - m_demuxer = - createPlaybackEngineObject<Demuxer>(m_context.get(), currentPosition(), streamIndexes); + const PositionWithOffset positionWithOffset{ currentPosition(false), m_currentLoopOffset }; + + m_demuxer = createPlaybackEngineObject<Demuxer>(m_context.get(), positionWithOffset, + streamIndexes, m_loops); forEachExistingObject<StreamDecoder>([&](auto &stream) { connect(m_demuxer.get(), Demuxer::signalByTrackType(stream->trackType()), stream.get(), @@ -425,14 +468,28 @@ void PlaybackEngine::setAudioSink(QAudioOutput *output) forceUpdate(); } -qint64 PlaybackEngine::currentPosition() const { - auto pos = std::numeric_limits<qint64>::max(); +qint64 PlaybackEngine::currentPosition(bool topPos) const { + std::optional<qint64> pos; + + for (size_t i = 0; i < m_renderers.size(); ++i) { + const auto &renderer = m_renderers[i]; + if (!renderer) + continue; + + // skip subtitle stream for finding lower rendering position + if (!topPos && i == QPlatformMediaPlayer::SubtitleStream && hasMediaStream()) + continue; + + const auto rendererPos = renderer->lastPosition(); + pos = !pos ? rendererPos + : topPos ? std::max(*pos, rendererPos) + : std::min(*pos, rendererPos); + } - for (auto trackType : { QPlatformMediaPlayer::VideoStream, QPlatformMediaPlayer::AudioStream }) - if (auto &renderer = m_renderers[trackType]) - pos = std::min(pos, renderer->lastPosition()); + if (!pos) + pos = m_timeController.currentPosition(); - return pos == std::numeric_limits<qint64>::max() ? m_timeController.currentPosition() : pos; + return qBound(0, *pos - m_currentLoopOffset.pos, duration()); } void PlaybackEngine::setActiveTrack(QPlatformMediaPlayer::TrackType trackType, int streamNumber) @@ -450,6 +507,14 @@ void PlaybackEngine::setActiveTrack(QPlatformMediaPlayer::TrackType trackType, i updateObjectsPausedState(); } +void PlaybackEngine::finilizeTime(qint64 pos) +{ + Q_ASSERT(pos >= 0 && pos <= duration()); + + m_timeController.setPaused(true); + m_timeController.sync(pos); + m_currentLoopOffset = {}; +} } QT_END_NAMESPACE |