From f2df7403a99838a6a63444d0770700038ad8eb58 Mon Sep 17 00:00:00 2001 From: suresh-khurdiya-epam Date: Wed, 29 Nov 2023 21:12:44 +0530 Subject: [PATCH 1/2] revert of loading failure logs are not seen in systemconsole(journalctl) --- .../WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp index d92ad13233858..72cd56ea4c039 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -281,10 +281,6 @@ void WebFrameLoaderClient::dispatchDidReceiveResponse(DocumentLoader*, ResourceL return; webPage->injectedBundleResourceLoadClient().didReceiveResponseForResource(*webPage, m_frame, identifier, response); - if (response.httpStatusCode() >= 400) { - String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')'; - LOG(Loading,"dispatchDidReceiveResponse->message:%s", message.utf8().data()); - } } void WebFrameLoaderClient::dispatchDidReceiveContentLength(DocumentLoader*, ResourceLoaderIdentifier identifier, int dataLength) @@ -324,7 +320,6 @@ void WebFrameLoaderClient::dispatchDidFailLoading(DocumentLoader*, ResourceLoade webPage->injectedBundleResourceLoadClient().didFailLoadForResource(*webPage, m_frame, identifier, error); webPage->removeResourceRequest(identifier); - LOG(Loading,"dispatchedDidFailLoading: isTimeout=%d, isCancellation=%d, isAccessControl=%d, errorCode=%d description:%s", error.isTimeout(), error.isCancellation(), error.isAccessControl(), error.errorCode(), error.localizedDescription().utf8().data()); } bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int /*length*/) @@ -638,8 +633,6 @@ void WebFrameLoaderClient::dispatchDidFailLoad(const ResourceError& error) // If we have a load listener, notify it. if (WebFrame::LoadListener* loadListener = m_frame->loadListener()) loadListener->didFailLoad(m_frame.ptr(), error.isCancellation()); - - LOG(Loading,"dispatchDidFailLoad: isTimeout= %d, isCancellation= %d, isAccessControl= %d, errorCode= %d description: %s", error.isTimeout(), error.isCancellation(), error.isAccessControl(), error.errorCode(), error.localizedDescription().utf8().data()); } void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() From a6576dedfe19fcf883af0275f827b10c6a37807c Mon Sep 17 00:00:00 2001 From: suresh-khurdiya-epam Date: Mon, 8 Jan 2024 13:43:33 +0530 Subject: [PATCH 2/2] [ONEM-33645]: Setting PlaybackRate=0 does not pause video in WPE2.38 --- .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp index 78869e7aecd91..3b6cb794a876b 100644 --- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp @@ -640,6 +640,12 @@ void MediaPlayerPrivateGStreamer::setRate(float rate) m_playbackRatePausedState = PlaybackRatePausedState::RatePaused; updateStates(); } + if (m_currentState == GST_STATE_PLAYING && m_playbackRatePausedState != PlaybackRatePausedState::RatePaused) { + GST_INFO_OBJECT(pipeline(), "Pausing stream because of zero playback rate in setRate"); + m_playbackRatePausedState = PlaybackRatePausedState::RatePaused; + changePipelineState(GST_STATE_PAUSED); + updatePlaybackRate(); + } return; } else if (m_playbackRatePausedState == PlaybackRatePausedState::RatePaused) { m_playbackRatePausedState = PlaybackRatePausedState::ShouldMoveToPlaying; @@ -652,6 +658,11 @@ void MediaPlayerPrivateGStreamer::setRate(float rate) || (pending == GST_STATE_PAUSED)) return; + if (m_currentState == GST_STATE_PAUSED && m_playbackRate && m_playbackRatePausedState != PlaybackRatePausedState::Playing) { + m_playbackRatePausedState = PlaybackRatePausedState::Playing; + GST_INFO_OBJECT(pipeline(), "[Buffering] Restarting playback (because of resuming from zero playback rate) in setRate"); + changePipelineState(GST_STATE_PLAYING); + } updatePlaybackRate(); }