From: "Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org> To: "ffmpeg-devel@ffmpeg.org" <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH 2/6] avcodec/vaapi_h264: Do not store our error code in VASliceParameterBufferH264 Date: Tue, 9 Jul 2024 06:11:54 +0000 Message-ID: <c30ba5e768eb567324b32e1577e8709e6f0d3f7d.camel@intel.com> (raw) In-Reply-To: <20240707184729.3525852-2-michael@niedermayer.cc> On So, 2024-07-07 at 20:47 +0200, Michael Niedermayer wrote: > I am not sure this is possible (thus this requires review) > > Fixes: CID1604570 Overflowed constant > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/vaapi_h264.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c > index 398e92568c2..77819a64a4e 100644 > --- a/libavcodec/vaapi_h264.c > +++ b/libavcodec/vaapi_h264.c > @@ -342,6 +342,10 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, > const H264SliceContext *sl = &h->slice_ctx[0]; > VASliceParameterBufferH264 slice_param; > int err; > + int slice_type = ff_h264_get_slice_type(sl); > + > + if (slice_type < 0) > + return slice_type; sl->slice_type should be one of AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_SP and AV_PICTURE_TYPE_SI when this callback function is called, I don't think the if statement is required. Thanks Haihao > > slice_param = (VASliceParameterBufferH264) { > .slice_data_size = size, > @@ -349,7 +353,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, > .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, > .slice_data_bit_offset = get_bits_count(&sl->gb), > .first_mb_in_slice = (sl->mb_y >> > FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + sl->mb_x, > - .slice_type = ff_h264_get_slice_type(sl), > + .slice_type = slice_type, > .direct_spatial_mv_pred_flag = sl->slice_type == AV_PICTURE_TYPE_B > ? sl->direct_spatial_mv_pred : 0, > .num_ref_idx_l0_active_minus1 = sl->list_count > 0 ? sl- > >ref_count[0] - 1 : 0, > .num_ref_idx_l1_active_minus1 = sl->list_count > 1 ? sl- > >ref_count[1] - 1 : 0, _______________________________________________ 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".
next prev parent reply other threads:[~2024-07-09 6:12 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-07-07 18:47 [FFmpeg-devel] [PATCH 1/6] avcodec/tiff: Check value on positive signed targets Michael Niedermayer 2024-07-07 18:47 ` [FFmpeg-devel] [PATCH 2/6] avcodec/vaapi_h264: Do not store our error code in VASliceParameterBufferH264 Michael Niedermayer 2024-07-09 6:11 ` Xiang, Haihao [this message] 2024-07-12 20:37 ` Michael Niedermayer 2024-07-07 18:47 ` [FFmpeg-devel] [PATCH 3/6] avcodec/vvc/refs: Use unsigned mask Michael Niedermayer 2024-07-08 13:49 ` Nuo Mi 2024-07-09 12:59 ` Michael Niedermayer 2024-07-07 18:47 ` [FFmpeg-devel] [PATCH 4/6] avdevice/dshow_capture: Fix error handling in ff_dshow_##prefix##_Create() Michael Niedermayer 2024-07-07 18:47 ` [FFmpeg-devel] [PATCH 5/6] avfilter: Free out on error Michael Niedermayer 2024-07-07 18:47 ` [FFmpeg-devel] [PATCH 6/6] avfilter/af_surround: Check av_channel_layout_channel_from_index() stays within the fixed array used Michael Niedermayer 2024-07-07 19:05 ` Andreas Rheinhardt 2024-07-07 19:12 ` Andreas Rheinhardt 2024-07-07 21:59 ` Michael Niedermayer 2024-07-08 2:28 ` James Almer 2024-07-12 22:36 ` [FFmpeg-devel] [PATCH 1/6] avcodec/tiff: Check value on positive signed targets Michael Niedermayer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c30ba5e768eb567324b32e1577e8709e6f0d3f7d.camel@intel.com \ --to=haihao.xiang-at-intel.com@ffmpeg.org \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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