* Re: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt [not found] <1582596153-1442-1-git-send-email-linjie.fu@intel.com> @ 2022-01-07 7:55 ` Xiang, Haihao 2022-01-10 7:07 ` Xiang, Haihao 0 siblings, 1 reply; 2+ messages in thread From: Xiang, Haihao @ 2022-01-07 7:55 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Fu, Linjie > -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Linjie > Fu > Sent: Tuesday, February 25, 2020 10:03 > To: ffmpeg-devel@ffmpeg.org > Cc: Fu, Linjie <linjie.fu@intel.com> > Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for > ff_qsv_map_pixfmt > > Return an error directly if pixfmt is not supported for encoding, otherwise > it may be hidden until query/check in MSDK. > > Signed-off-by: Linjie Fu <linjie.fu@intel.com> > --- > libavcodec/qsvenc.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 571a711..40ff17c 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -436,7 +436,9 @@ static int init_video_param_jpeg(AVCodecContext > *avctx, QSVEncContext *q) > if (!desc) > return AVERROR_BUG; > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + if (ret < 0) > + return AVERROR_BUG; > > q->param.mfx.FrameInfo.CropX = 0; > q->param.mfx.FrameInfo.CropY = 0; > @@ -537,7 +539,9 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > if (!desc) > return AVERROR_BUG; > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + if (ret < 0) > + return AVERROR_BUG; > > q->param.mfx.FrameInfo.CropX = 0; > q->param.mfx.FrameInfo.CropY = 0; > -- > 2.7.4 LGTM, and I will apply it if no objection. Thanks Haihao _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt 2022-01-07 7:55 ` [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt Xiang, Haihao @ 2022-01-10 7:07 ` Xiang, Haihao 0 siblings, 0 replies; 2+ messages in thread From: Xiang, Haihao @ 2022-01-10 7:07 UTC (permalink / raw) To: ffmpeg-devel; +Cc: linjie.fu On Fri, 2022-01-07 at 07:55 +0000, Xiang, Haihao wrote: > > -----Original Message----- > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Linjie > > Fu > > Sent: Tuesday, February 25, 2020 10:03 > > To: ffmpeg-devel@ffmpeg.org > > Cc: Fu, Linjie <linjie.fu@intel.com> > > Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for > > ff_qsv_map_pixfmt > > > > Return an error directly if pixfmt is not supported for encoding, otherwise > > it may be hidden until query/check in MSDK. > > > > Signed-off-by: Linjie Fu <linjie.fu@intel.com> > > --- > > libavcodec/qsvenc.c | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > > index 571a711..40ff17c 100644 > > --- a/libavcodec/qsvenc.c > > +++ b/libavcodec/qsvenc.c > > @@ -436,7 +436,9 @@ static int init_video_param_jpeg(AVCodecContext > > *avctx, QSVEncContext *q) > > if (!desc) > > return AVERROR_BUG; > > > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > > + if (ret < 0) > > + return AVERROR_BUG; > > > > q->param.mfx.FrameInfo.CropX = 0; > > q->param.mfx.FrameInfo.CropY = 0; > > @@ -537,7 +539,9 @@ static int init_video_param(AVCodecContext *avctx, > > QSVEncContext *q) > > if (!desc) > > return AVERROR_BUG; > > > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > > + if (ret < 0) > > + return AVERROR_BUG; > > > > q->param.mfx.FrameInfo.CropX = 0; > > q->param.mfx.FrameInfo.CropY = 0; > > -- > > 2.7.4 > > LGTM, and I will apply it if no objection. > Applied, thx! -Haihao _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-10 7:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1582596153-1442-1-git-send-email-linjie.fu@intel.com>
2022-01-07 7:55 ` [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt Xiang, Haihao
2022-01-10 7:07 ` Xiang, Haihao
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git