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

AMD Media - Fix FFmpeg swscale error when using hwdec for amd_media #1310

Merged
merged 1 commit into from
Mar 20, 2024
Merged

AMD Media - Fix FFmpeg swscale error when using hwdec for amd_media #1310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions amd_openvx_extensions/amd_media/decoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,16 +536,18 @@ vx_status CLoomIoMediaDecoder::Initialize()
vxAddLogEntry((vx_reference)node, VX_FAILURE, "ERROR: Failed to create specified HW device.\n");
return VX_FAILURE;
}
}

if (codecContext->pix_fmt == AV_PIX_FMT_YUVJ420P)
decoderFormat = AV_PIX_FMT_NV12; // set non-depracated format, vaapi uses NV12 for YUVJ420P
else if (codecContext->pix_fmt == AV_PIX_FMT_YUVJ422P)
decoderFormat = AV_PIX_FMT_YUV422P; // set non-depracated format
else if (codecContext->pix_fmt == AV_PIX_FMT_YUVJ444P)
decoderFormat = AV_PIX_FMT_YUV444P; // set non-depracated format
else
decoderFormat = codecContext->pix_fmt; // correct format will be set after vaapi initialization for hwdec
decoderFormat = codecContext->pix_fmt;
if (decoderFormat == AV_PIX_FMT_YUVJ420P)
decoderFormat = AV_PIX_FMT_YUV420P; // set non-depracated format, vaapi uses NV12 for YUVJ420P
else if (decoderFormat == AV_PIX_FMT_YUVJ422P)
decoderFormat = AV_PIX_FMT_YUV422P; // set non-depracated format
else if (decoderFormat == AV_PIX_FMT_YUVJ444P)
decoderFormat = AV_PIX_FMT_YUV444P; // set non-depracated format
// vaapi uses NV12 for AV_PIX_FMT_YUV420P: looks like FFMpeg is returning the wrong format which can cause swscale to fail
if (decoderFormat == AV_PIX_FMT_YUV420P)
decoderFormat = AV_PIX_FMT_NV12;
} else
decoderFormat = codecContext->pix_fmt; // correct format will be set after

ERROR_CHECK_STATUS(avcodec_open2(codecContext, decoder, nullptr));
SwsContext * swsContext = NULL;
Expand Down Expand Up @@ -693,7 +695,7 @@ vx_status CLoomIoMediaDecoder::ProcessFrame(vx_image output, vx_array aux_data)
// do sws_scale
int ret = sws_scale(conversionContext[mediaIndex], frame->data, frame->linesize, 0, frame->height, dst_data, dst_linesize);
if (ret < decoderImageHeight) {
fprintf(stderr, "Error in output image scaling using sws_scale\n");
fprintf(stderr, "Error in output image scaling using sws_scale <%d>\n", ret);
return VX_FAILURE;
}
#if DUMP_DECODED_FRAME
Expand Down
Loading