Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1752282 [Linux] Mark VideoFrameSurface as used in VideoFramePool::GetVideoFrameSurface() r=alwu,media-playback-reviewers

Browse Source 
- Right now we mark VideoFrameSurface as used in VideoFrameSurface constructor (for newly created surfaces) and in
  GetFreeVideoFrameSurface() for recycled ones.
  In this patch we remove them and mark it as used in VideoFramePool::GetVideoFrameSurface() for both cases
  when VideoFrameSurface is really used.
- Call av_buffer_unref() only if VideoFrameSurface is locked, i.e. we have valid mAVHWFramesContext/mHWAVBuffer.

Differential Revision: https://phabricator.services.mozilla.com/D137142
This commit is contained in:
stransky 2022-01-29 19:54:51 +00:00
parent 6162647fa5
commit 68d00e7f67
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
View File

@ -20,14 +20,16 @@ RefPtr<layers::Image> VideoFrameSurfaceVAAPI::GetAsImage() {
}
VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
: mSurface(aSurface) {
: mSurface(aSurface),
mLib(nullptr),
mAVHWFramesContext(nullptr),
mHWAVBuffer(nullptr) {
// Create global refcount object to track mSurface usage over
// gects rendering engine. We can't release it until it's used
// by GL compositor / WebRender.
MOZ_ASSERT(mSurface);
MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV());
mSurface->GlobalRefCountCreate();
mSurface->GlobalRefAdd();
FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d",
mSurface->GetUID());
}
@ -52,12 +54,14 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
// In such case we don't care as the dmabuf surface will not be
// recycled for another frame and stays here untill last fd of it
// is closed.
mLib->av_buffer_unref(&mHWAVBuffer);
mLib->av_buffer_unref(&mAVHWFramesContext);
if (mLib) {
mLib->av_buffer_unref(&mHWAVBuffer);
mLib->av_buffer_unref(&mAVHWFramesContext);
}
// If we want to recycle the frame, make sure it's not used
// by gecko rendering pipeline.
if (aForFrameRecycle) {
// If we want to recycle the frame, make sure it's not used
// by gecko rendering pipeline.
MOZ_DIAGNOSTIC_ASSERT(!IsUsed());
mSurface->ReleaseSurface();
}
@ -94,7 +98,6 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetFreeVideoFrameSurface() {
}
auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
vaapiSurface->ReleaseVAAPIData();
vaapiSurface->MarkAsUsed();
return surface;
}
return nullptr;
@ -136,9 +139,10 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID());
}
if (auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI()) {
vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
}
auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI();
vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
vaapiSurface->MarkAsUsed();
return videoSurface;
}