From: Nuo Mi <nuomi2021@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Nuo Mi <nuomi2021@gmail.com>
Subject: [FFmpeg-devel] [PATCH 01/18] avcodec/vvcdec: misc, inter, use is_chroma instead of is_luma
Date: Sun, 19 May 2024 21:27:32 +0800
Message-ID: <TYSPR06MB6433737FEF9AD76E007D710BAAE82@TYSPR06MB6433.apcprd06.prod.outlook.com> (raw)
---
libavcodec/vvc/inter.c | 50 +++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 4a8d1d866a..3f0718cb5a 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -31,33 +31,33 @@
static const int bcw_w_lut[] = {4, 5, 3, 10, -2};
static void subpic_offset(int *x_off, int *y_off,
- const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_luma)
+ const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_chroma)
{
- *x_off -= pps->subpic_x[subpic_idx] >> sps->hshift[!is_luma];
- *y_off -= pps->subpic_y[subpic_idx] >> sps->vshift[!is_luma];
+ *x_off -= pps->subpic_x[subpic_idx] >> sps->hshift[is_chroma];
+ *y_off -= pps->subpic_y[subpic_idx] >> sps->vshift[is_chroma];
}
static void subpic_width_height(int *pic_width, int *pic_height,
- const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_luma)
+ const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_chroma)
{
- *pic_width = pps->subpic_width[subpic_idx] >> sps->hshift[!is_luma];
- *pic_height = pps->subpic_height[subpic_idx] >> sps->vshift[!is_luma];
+ *pic_width = pps->subpic_width[subpic_idx] >> sps->hshift[is_chroma];
+ *pic_height = pps->subpic_height[subpic_idx] >> sps->vshift[is_chroma];
}
static int emulated_edge(const VVCLocalContext *lc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride,
- int x_off, int y_off, const int block_w, const int block_h, const int is_luma)
+ int x_off, int y_off, const int block_w, const int block_h, const int is_chroma)
{
const VVCFrameContext *fc = lc->fc;
const VVCSPS *sps = fc->ps.sps;
const VVCPPS *pps = fc->ps.pps;
const int subpic_idx = lc->sc->sh.r->curr_subpic_idx;
- const int extra_before = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE;
- const int extra_after = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER;
- const int extra = is_luma ? LUMA_EXTRA : CHROMA_EXTRA;
+ const int extra_before = is_chroma ? CHROMA_EXTRA_BEFORE : LUMA_EXTRA_BEFORE;
+ const int extra_after = is_chroma ? CHROMA_EXTRA_AFTER : LUMA_EXTRA_AFTER;
+ const int extra = is_chroma ? CHROMA_EXTRA : LUMA_EXTRA;
int pic_width, pic_height;
- subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_luma);
- subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_luma);
+ subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_chroma);
+ subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_chroma);
if (x_off < extra_before || y_off < extra_before ||
x_off >= pic_width - block_w - extra_after ||
@@ -78,20 +78,20 @@ static int emulated_edge(const VVCLocalContext *lc, uint8_t *dst, const uint8_t
}
static void emulated_edge_dmvr(const VVCLocalContext *lc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride,
- int x_sb, int y_sb, int x_off, int y_off, const int block_w, const int block_h, const int is_luma)
+ int x_sb, int y_sb, int x_off, int y_off, const int block_w, const int block_h, const int is_chroma)
{
const VVCFrameContext *fc = lc->fc;
const VVCSPS *sps = fc->ps.sps;
const VVCPPS *pps = fc->ps.pps;
const int subpic_idx = lc->sc->sh.r->curr_subpic_idx;
- const int extra_before = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE;
- const int extra_after = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER;
- const int extra = is_luma ? LUMA_EXTRA : CHROMA_EXTRA;
+ const int extra_before = is_chroma ? CHROMA_EXTRA_BEFORE : LUMA_EXTRA_BEFORE;
+ const int extra_after = is_chroma ? CHROMA_EXTRA_AFTER : LUMA_EXTRA_AFTER;
+ const int extra = is_chroma ? CHROMA_EXTRA : LUMA_EXTRA;
int pic_width, pic_height;
- subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_luma);
- subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_luma);
- subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_luma);
+ subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_chroma);
+ subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_chroma);
+ subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_chroma);
if (x_off < extra_before || y_off < extra_before ||
x_off >= pic_width - block_w - extra_after ||
@@ -124,8 +124,8 @@ static void emulated_edge_bilinear(const VVCLocalContext *lc, uint8_t *dst, cons
const int subpic_idx = lc->sc->sh.r->curr_subpic_idx;
int pic_width, pic_height;
- subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, 1);
- subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, 1);
+ subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, 0);
+ subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, 0);
if (x_off < BILINEAR_EXTRA_BEFORE || y_off < BILINEAR_EXTRA_BEFORE ||
x_off >= pic_width - block_w - BILINEAR_EXTRA_AFTER ||
@@ -144,16 +144,16 @@ static void emulated_edge_bilinear(const VVCLocalContext *lc, uint8_t *dst, cons
#define EMULATED_EDGE_LUMA(dst, src, src_stride, x_off, y_off) \
- emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 1)
+ emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 0)
#define EMULATED_EDGE_CHROMA(dst, src, src_stride, x_off, y_off) \
- emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 0)
+ emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 1)
#define EMULATED_EDGE_DMVR_LUMA(dst, src, src_stride, x_sb, y_sb, x_off, y_off) \
- emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 1)
+ emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 0)
#define EMULATED_EDGE_DMVR_CHROMA(dst, src, src_stride, x_sb, y_sb, x_off, y_off) \
- emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 0)
+ emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 1)
#define EMULATED_EDGE_BILINEAR(dst, src, src_stride, x_off, y_off) \
emulated_edge_bilinear(lc, dst, src, src_stride, x_off, y_off, pred_w, pred_h)
--
2.34.1
_______________________________________________
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".
reply other threads:[~2024-05-19 13:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=TYSPR06MB6433737FEF9AD76E007D710BAAE82@TYSPR06MB6433.apcprd06.prod.outlook.com \
--to=nuomi2021@gmail.com \
--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