Skip to content
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

Jump to bottom

Fix gpu decode #38

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix gpu decode #38

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cb6c3c
修复IntelGPU解码问题，原因如果使用非DX3D11 的Renderer 必须将数据从Surface中拿出。
zjzhang-cn Jul 27, 2022
8b15f3c
set_ntp_time_ms & set_timestamp
zjzhang-cn Jul 27, 2022
0d303e3
修复Decode Release没有主动关闭m_pmfx_dec_ 而造成的多释放问题。
zjzhang-cn Jul 28, 2022
f145595
修复NV12ToI420的参数问题
zjzhang-cn Aug 9, 2022
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
43 changes: 27 additions & 16 deletions src/win/msdkvideodecoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
#include "src/win/d3d11_allocator.h"
#include "src/win/msdkvideodecoder.h"
#include "api/scoped_refptr.h"

#include "api/video/i420_buffer.h"
#include "libyuv/convert.h"
using namespace rtc;

#define MSDK_BS_INIT_SIZE (1024*1024)
Expand All @@ -20,13 +21,19 @@ namespace base {

int32_t MSDKVideoDecoder::Release() {
WipeMfxBitstream(&m_mfx_bs_);
if (m_pmfx_dec_ != nullptr) {
m_pmfx_dec_->Close();
m_pmfx_dec_.reset();
}
if (m_mfx_session_) {
MSDKFactory* factory = MSDKFactory::Get();
if (factory) {
factory->UnloadMSDKPlugin(m_mfx_session_, &m_plugin_id_);
factory->DestroySession(m_mfx_session_);
}
}
if (m_pmfx_allocator_)
m_pmfx_allocator_->Close();
m_pmfx_allocator_.reset();
MSDK_SAFE_DELETE_ARRAY(m_pinput_surfaces_);
inited_ = false;
Expand Down Expand Up @@ -371,21 +378,24 @@ int32_t MSDKVideoDecoder::Decode(
// Maybe we should also send the allocator as part of the frame
// handle for locking/unlocking purpose.
m_pmfx_allocator_->GetFrameHDL(dxMemId, (mfxHDL*)&pair);

#if 0
rtc::scoped_refptr<webrtc::VideoFrameBuffer> cropped_buffer =
WrapI420Buffer(frame_info.Width, frame_info.Height,
av_frame_->data[kYPlaneIndex],
av_frame_->linesize[kYPlaneIndex],
av_frame_->data[kUPlaneIndex],

av_frame_->linesize[kUPlaneIndex],
av_frame_->data[kVPlaneIndex],
av_frame_->linesize[kVPlaneIndex],
// To keep reference alive.
[frame_buffer] {});

#endif
#if 1
mfxFrameData* pData = &pOutputSurface->Data;
m_pmfx_allocator_->LockFrame(dxMemId, pData);
rtc::scoped_refptr<I420Buffer> i420_buffer =
I420Buffer::Create(frame_info.Width, frame_info.Height);
libyuv::NV12ToI420(pData->Y, pData->Pitch, pData->UV, pData->Pitch,
i420_buffer->MutableDataY(), i420_buffer->StrideY(),
i420_buffer->MutableDataU(), i420_buffer->StrideU(),
i420_buffer->MutableDataV(), i420_buffer->StrideV(),
frame_info.Width, frame_info.Height);
m_pmfx_allocator_->UnlockFrame(dxMemId, pData);
if (callback_) {
webrtc::VideoFrame decoded_frame(i420_buffer, inputImage.Timestamp(), 0, webrtc::kVideoRotation_0);
decoded_frame.set_ntp_time_ms(inputImage.ntp_time_ms_);
decoded_frame.set_timestamp(inputImage.Timestamp());
callback_->Decoded(decoded_frame);
}
#else
if (callback_) {
surface_handle_->d3d11_device = d3d11_device_.p;
surface_handle_->texture =
Expand All @@ -408,6 +418,7 @@ int32_t MSDKVideoDecoder::Decode(
decoded_frame.set_timestamp(inputImage.Timestamp());
callback_->Decoded(decoded_frame);
}
#endif
}
} else if (MFX_ERR_MORE_DATA == sts) {
return WEBRTC_VIDEO_CODEC_OK;
Expand Down