From 0cf22e1cec1f2632bfff054a52bf4fa56e60dca2 Mon Sep 17 00:00:00 2001 From: Rajy Rawther Date: Thu, 5 Dec 2024 13:45:04 -0800 Subject: [PATCH] Fixed a bug in hostToDevice copy (#472) * WIP: ffmpeg based software decoder * minor update * WIP: FFMpeg SW decoder support * FFMpeg decoder working version * working version without threading * multithreading working with FFMpeg decoder * moved ffmpeg decoder to separate folder * updated changelog * minor change * resolved review comments * resolved review comments * fixed a bug in hipMemcpy for copying decoded output to GPU --------- Co-authored-by: Lakshmi Kumar Co-authored-by: Aryan Salmanpour --- utils/ffmpegvideodecode/ffmpeg_video_dec.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/ffmpegvideodecode/ffmpeg_video_dec.cpp b/utils/ffmpegvideodecode/ffmpeg_video_dec.cpp index b60521b357..c3dca7a61b 100644 --- a/utils/ffmpegvideodecode/ffmpeg_video_dec.cpp +++ b/utils/ffmpegvideodecode/ffmpeg_video_dec.cpp @@ -625,7 +625,7 @@ int FFMpegVideoDecoder::HandlePictureDisplay(RocdecParserDispInfo *pDispInfo) { HIP_API_CALL(hipMemcpyDtoDAsync(p_frame_v, p_src_ptr_v, chroma_size, hip_stream_)); } else { // use 2d copy to copy an ROI - HIP_API_CALL(hipMemcpy2DAsync(p_frame_v, dst_pitch, p_src_ptr_v, src_pitch[2], dst_pitch, chroma_height_, hipMemcpyDeviceToDevice, hip_stream_)); + HIP_API_CALL(hipMemcpy2DAsync(p_frame_v, dst_pitch, p_src_ptr_v, src_pitch[2], dst_pitch, chroma_height_, hipMemcpyHostToDevice, hip_stream_)); } } else { @@ -755,7 +755,6 @@ int FFMpegVideoDecoder::DecodeAvFrame(AVPacket *av_pkt, AVFrame *p_frame) { InitOutputFrameInfo(p_frame); } decoded_pic_cnt_++; - if (no_multithreading_) av_frame_q_.push(p_frame); else