From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7A39A4C259 for ; Tue, 11 Feb 2025 11:50:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9BB968BBB1; Tue, 11 Feb 2025 13:50:13 +0200 (EET) Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB3C068B2B1 for ; Tue, 11 Feb 2025 13:49:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1739274590; bh=ItpifGpDK8+qM/WJhFJMlXAhMdreUTwuSjiZDR1Sdxw=; h=From:Subject:Date:References:To:In-Reply-To; b=BvbVd57irQNCs66xG/UAXjldUz05UYrUZbdHivsVMlRErSZn8cqnihu10V4zMc837 PS4Giz9fabu2tWymgD66LSUCWdOckc3VCTGvJLSL484r4QYqYPdt9Bkk28Xs9keugr 8AsaO+Dz/vHznDubAJK38CeHcRgDQpBH7B5tbb7U= Received: from smtpclient.apple ([119.147.10.207]) by newxmesmtplogicsvrszc11-0.qq.com (NewEsmtp) with SMTP id C71844F2; Tue, 11 Feb 2025 19:49:49 +0800 X-QQ-mid: xmsmtpt1739274589t57dhpwje Message-ID: X-QQ-XMAILINFO: Nen6aMh+i+QRoH39hRMwJDRa5YOzv5YCXz73yJa0Be71cTOLX9d/yOKOAe4sqA 0PYDx9QtEEEDhIUMIPf0Nr5TY9Tenrvb96K+/d5eCLdlpocA9vTj7JArLWMyaU17oYf1+qbHHU71 hjKZruIlaW6TDawDoH4sw++i6AS+j3DbiI85yLPjXxwNTr7It9eS61zcJd9G9dkoXPWRYtusTS/O azvebNu0MuMwD5Ob9r9mTSo1qRNEtLEG9BIaFxaElfPq9kHlBMVXzkR14QXMtcM/etQyyW1zu9oW 7M9JcXWR4IulQaGzBqhFhhv1at6Q5Qnx48ONB1xhYbdEQvHb05sHdc67R+GhFsDXZtuCZAP1m9+m D6Gx6sP+DqAsoCNbhk7s0o8EwqgxTwAn8ZvZfq8MktvQWnwks6bW7QhNLsggBHucLDHq8gryAJbI j7RO8nJXI8qhyEYnXhYh2VQzon94ZWNFTE3Pz7h9qjE5c25VHhAV9b3h2sfSt5wvpxWHWrp3stIJ c2r/12lV88KP7l4Uvax8impmuA9AhEW06EFYu75okcClfs45udsUxR05298ujJKWwaI/PlqDOpQG Pk2gToYQkbGSaEQNc2/EfNBW6NEENSgqlvEDOzDcA/UD3TKQDCxTdRN30u227QmJyGC4qRpImrZO 6awTXuDhrcFdDWy4ZaVPby4etSwbAUjoH1yHqVHjP7ln4f/rfS7X5Ud7nYjN4fnTZljtWDB698Wm /pKkjF9FaVoQhn7SfV++UmEz1DlgRHTr/qKbnKjN8OvcjGca2briG+nA0s5ZwmZbsCzFZltkK+wV P5ZBD7EAViB7rXay7UEFgPMZ/hA1GlH/EZlPd+H0hP6jp2YQsjBnL+M9RrJngDRRvPCtlXVQ31by KD0SS+91HdQ3qvPh9GJLShiR5cTyw+ViC7CDlOgQkl9aj+jzOtXpohWXHq8bagAoR1axP3LFNZMR Kvy5R/nN/bPpsionP8+cUoUWLuQQmIDdghudlab6GBMgdMmaLdgFFZrk62jzHPMyTKAK8eTIBP8b WOihoDqOvqcogsakTUsC36u8QPA/fdRi4LQ40qJw== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Date: Tue, 11 Feb 2025 19:49:39 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <4AB0E44E-8054-4453-8D18-E34DD87C9BB9@foxmail.com> X-Mailer: Apple Mail (2.3818.100.11.1.3) Subject: Re: [FFmpeg-devel] [PATCH v6 3/3] avcodec/hevc: Add alpha layer support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On Feb 11, 2025, at 19:23, Andreas Rheinhardt wrote: > > Zhao Zhili: >> From: Zhao Zhili >> >> Signed-off-by: Zhao Zhili >> --- >> libavcodec/hevc/hevcdec.c | 73 ++++++++++++++++++++++++++++++++++++++- >> libavcodec/hevc/hevcdec.h | 2 ++ >> libavcodec/hevc/refs.c | 34 +++++++++++++++++- >> 3 files changed, 107 insertions(+), 2 deletions(-) >> >> diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c >> index e9c045f7a1..f71edf213b 100644 >> --- a/libavcodec/hevc/hevcdec.c >> +++ b/libavcodec/hevc/hevcdec.c >> @@ -466,6 +466,25 @@ static int export_multilayer(HEVCContext *s, const HEVCVPS *vps) >> return 0; >> } >> >> +int ff_hevc_is_alpha_video(const HEVCContext *s) >> +{ >> + const HEVCVPS *vps = s->vps; >> + int ret = 0; >> + >> + if (vps->nb_layers != 2 || !vps->layer_id_in_nuh[1]) >> + return 0; >> + >> + /* decode_vps_ext() guarantees that SCALABILITY_AUXILIARY with AuxId other >> + * than alpha cannot reach here. >> + */ >> + ret = (s->vps->scalability_mask_flag & HEVC_SCALABILITY_AUXILIARY); >> + >> + av_log(s->avctx, AV_LOG_DEBUG, "Multi layer video, %s alpha video\n", >> + ret ? "is" : "not"); >> + >> + return ret; >> +} >> + >> static int setup_multilayer(HEVCContext *s, const HEVCVPS *vps) >> { >> unsigned layers_active_output = 0, highest_layer; >> @@ -473,6 +492,18 @@ static int setup_multilayer(HEVCContext *s, const HEVCVPS *vps) >> s->layers_active_output = 1; >> s->layers_active_decode = 1; >> >> + if (ff_hevc_is_alpha_video(s)) { >> + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); >> + >> + if (!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) >> + return 0; >> + >> + s->layers_active_decode = (1 << vps->nb_layers) - 1; >> + s->layers_active_output = 1; >> + >> + return 0; >> + } >> + >> // nothing requested - decode base layer only >> if (!s->nb_view_ids) >> return 0; >> @@ -530,6 +561,34 @@ static int setup_multilayer(HEVCContext *s, const HEVCVPS *vps) >> return 0; >> } >> >> +static enum AVPixelFormat map_to_alpha_format(HEVCContext *s, >> + enum AVPixelFormat pix_fmt) >> +{ >> + switch (pix_fmt) { >> + case AV_PIX_FMT_YUV420P: >> + case AV_PIX_FMT_YUVJ420P: >> + return AV_PIX_FMT_YUVA420P; >> + case AV_PIX_FMT_YUV420P10: >> + return AV_PIX_FMT_YUVA420P10; >> + case AV_PIX_FMT_YUV444P: >> + return AV_PIX_FMT_YUVA444P; >> + case AV_PIX_FMT_YUV422P: >> + return AV_PIX_FMT_YUVA422P; >> + case AV_PIX_FMT_YUV422P10LE: >> + return AV_PIX_FMT_YUVA422P10LE; >> + case AV_PIX_FMT_YUV444P10: >> + return AV_PIX_FMT_YUVA444P10; >> + case AV_PIX_FMT_YUV444P12: >> + return AV_PIX_FMT_YUVA444P12; >> + case AV_PIX_FMT_YUV422P12: >> + return AV_PIX_FMT_YUVA422P12; >> + default: >> + av_log(s->avctx, AV_LOG_WARNING, "No alpha pixel format map for %s\n", >> + av_get_pix_fmt_name(pix_fmt)); >> + return AV_PIX_FMT_NONE; >> + } >> +} >> + >> static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) >> { >> #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + \ >> @@ -540,9 +599,13 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) >> CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL + \ >> CONFIG_HEVC_VDPAU_HWACCEL + \ >> CONFIG_HEVC_VULKAN_HWACCEL) >> - enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; >> + enum AVPixelFormat pix_fmts[HWACCEL_MAX + 3], *fmt = pix_fmts; >> + enum AVPixelFormat alpha_fmt = AV_PIX_FMT_NONE; >> int ret; >> >> + if (ff_hevc_is_alpha_video(s)) >> + alpha_fmt = map_to_alpha_format(s, sps->pix_fmt); >> + >> switch (sps->pix_fmt) { >> case AV_PIX_FMT_YUV420P: >> case AV_PIX_FMT_YUVJ420P: >> @@ -664,6 +727,8 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) >> break; >> } >> >> + if (alpha_fmt != AV_PIX_FMT_NONE) >> + *fmt++ = alpha_fmt; >> *fmt++ = sps->pix_fmt; >> *fmt = AV_PIX_FMT_NONE; >> >> @@ -3194,6 +3259,12 @@ static int hevc_frame_start(HEVCContext *s, HEVCLayerContext *l, >> !sps->vui.common.video_signal_type_present_flag) >> pix_fmt = sps_base->pix_fmt; >> >> + // Ignore range mismatch between base layer and alpha layer >> + if (ff_hevc_is_alpha_video(s) && >> + sps_base->pix_fmt == AV_PIX_FMT_YUV420P && >> + pix_fmt == AV_PIX_FMT_YUVJ420P) >> + pix_fmt = sps_base->pix_fmt; >> + >> if (pix_fmt != sps_base->pix_fmt || >> sps->width != sps_base->width || >> sps->height != sps_base->height) { >> diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h >> index 4e95035688..b2b725b5cd 100644 >> --- a/libavcodec/hevc/hevcdec.h >> +++ b/libavcodec/hevc/hevcdec.h >> @@ -714,6 +714,8 @@ void ff_hevc_hls_residual_coding(HEVCLocalContext *lc, const HEVCPPS *pps, >> >> void ff_hevc_hls_mvd_coding(HEVCLocalContext *lc, int x0, int y0, int log2_cb_size); >> >> +int ff_hevc_is_alpha_video(const HEVCContext *s); >> + >> extern const uint8_t ff_hevc_qpel_extra_before[4]; >> extern const uint8_t ff_hevc_qpel_extra_after[4]; >> extern const uint8_t ff_hevc_qpel_extra[4]; >> diff --git a/libavcodec/hevc/refs.c b/libavcodec/hevc/refs.c >> index dd7f7f95a8..da0bac8d9c 100644 >> --- a/libavcodec/hevc/refs.c >> +++ b/libavcodec/hevc/refs.c >> @@ -79,6 +79,30 @@ void ff_hevc_flush_dpb(HEVCContext *s) >> } >> } >> >> +static int replace_alpha_plane(AVFrame *alpha, AVFrame *base) >> +{ >> + AVBufferRef *base_a = av_frame_get_plane_buffer(base, 3); >> + uint8_t *data = alpha->data[0]; >> + int ret; >> + >> + for (int i = 0; i < FF_ARRAY_ELEMS(alpha->buf) && alpha->buf[i]; i++) { >> + AVBufferRef *buf = alpha->buf[i]; >> + >> + if (data >= buf->data && data < buf->data + buf->size) { > > Pointer comparisons (other than equality/inquality comparisons) are > undefined behavior unless the two pointers point into the same array (or > one past the last element of an array). av_frame_get_plane_buffer does the same compare. Any idea to fix this UB? > >> + ret = av_buffer_replace(&alpha->buf[i], base_a); >> + if (ret < 0) >> + return ret; >> + >> + alpha->linesize[0] = base->linesize[3]; >> + alpha->data[0] = base->data[3]; >> + >> + return 0; >> + } >> + } >> + >> + return AVERROR_BUG; >> +} >> + >> static HEVCFrame *alloc_frame(HEVCContext *s, HEVCLayerContext *l) >> { >> const HEVCVPS *vps = l->sps->vps; >> @@ -103,7 +127,7 @@ static HEVCFrame *alloc_frame(HEVCContext *s, HEVCLayerContext *l) >> } >> >> // add view ID side data if it's nontrivial >> - if (vps->nb_layers > 1 || view_id) { >> + if (!ff_hevc_is_alpha_video(s) && (vps->nb_layers > 1 || view_id)) { >> HEVCSEITDRDI *tdrdi = &s->sei.tdrdi; >> AVFrameSideData *sd = av_frame_side_data_new(&frame->f->side_data, >> &frame->f->nb_side_data, >> @@ -161,7 +185,15 @@ static HEVCFrame *alloc_frame(HEVCContext *s, HEVCLayerContext *l) >> if (ret < 0) >> goto fail; >> >> + >> frame->pps = av_refstruct_ref_c(s->pps); >> + if (l != &s->layers[0] && ff_hevc_is_alpha_video(s)) { >> + AVFrame *alpha = frame->f; >> + AVFrame *base = s->layers[0].cur_frame->f; >> + ret = replace_alpha_plane(alpha, base); >> + if (ret < 0) >> + goto fail; >> + } >> >> return frame; >> fail: > > _______________________________________________ > 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". _______________________________________________ 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".