* [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset
@ 2024-03-08 0:55 fei.w.wang-at-intel.com
2024-03-08 0:55 ` [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR fei.w.wang-at-intel.com
2024-03-09 11:57 ` [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset Nuo Mi
0 siblings, 2 replies; 6+ messages in thread
From: fei.w.wang-at-intel.com @ 2024-03-08 0:55 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: fei.w.wang
From: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
---
libavcodec/vvc/vvc_refs.c | 8 ++++----
libavcodec/vvc/vvcdec.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/vvc/vvc_refs.c b/libavcodec/vvc/vvc_refs.c
index 99f2dcf3ec..afcfc09da7 100644
--- a/libavcodec/vvc/vvc_refs.c
+++ b/libavcodec/vvc/vvc_refs.c
@@ -185,10 +185,10 @@ int ff_vvc_set_new_ref(VVCContext *s, VVCFrameContext *fc, AVFrame **frame)
ref->poc = poc;
ref->sequence = s->seq_decode;
- ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset;
- ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset;
- ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset;
- ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset;
+ ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset << fc->ps.sps->hshift[CHROMA];
+ ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset << fc->ps.sps->hshift[CHROMA];
+ ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset << fc->ps.sps->vshift[CHROMA];
+ ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset << fc->ps.sps->vshift[CHROMA];
return 0;
}
diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c
index 570e2aa513..a979ebd41c 100644
--- a/libavcodec/vvc/vvcdec.c
+++ b/libavcodec/vvc/vvcdec.c
@@ -727,8 +727,8 @@ static void export_frame_params(VVCContext *s, const VVCFrameContext *fc)
c->pix_fmt = sps->pix_fmt;
c->coded_width = pps->width;
c->coded_height = pps->height;
- c->width = pps->width - pps->r->pps_conf_win_left_offset - pps->r->pps_conf_win_right_offset;
- c->height = pps->height - pps->r->pps_conf_win_top_offset - pps->r->pps_conf_win_bottom_offset;
+ c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]);
+ c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]);
}
static int frame_setup(VVCFrameContext *fc, VVCContext *s)
--
2.25.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".
^ permalink raw reply [flat|nested] 6+ messages in thread* [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR
2024-03-08 0:55 [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset fei.w.wang-at-intel.com
@ 2024-03-08 0:55 ` fei.w.wang-at-intel.com
2024-03-09 11:59 ` Nuo Mi
2024-03-09 11:57 ` [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset Nuo Mi
1 sibling, 1 reply; 6+ messages in thread
From: fei.w.wang-at-intel.com @ 2024-03-08 0:55 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: fei.w.wang
From: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
---
libavcodec/vvc/vvc_ps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c
index e6e46d2039..7972803da6 100644
--- a/libavcodec/vvc/vvc_ps.c
+++ b/libavcodec/vvc/vvc_ps.c
@@ -742,7 +742,7 @@ static int decode_frame_ps(VVCFrameParamSets *fps, const VVCParamSets *ps,
static void decode_recovery_flag(VVCContext *s)
{
if (IS_IDR(s))
- s->no_output_before_recovery_flag = 0;
+ s->no_output_before_recovery_flag = 1;
else if (IS_CRA(s) || IS_GDR(s))
s->no_output_before_recovery_flag = s->last_eos;
}
--
2.25.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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR
2024-03-08 0:55 ` [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR fei.w.wang-at-intel.com
@ 2024-03-09 11:59 ` Nuo Mi
2024-03-11 2:03 ` Wang, Fei W
0 siblings, 1 reply; 6+ messages in thread
From: Nuo Mi @ 2024-03-09 11:59 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: fei.w.wang
Hi Fei,
Thank you fei,
Better provide more comments
Is there any clip fail for this?
On Fri, Mar 8, 2024 at 8:55 AM <fei.w.wang-at-intel.com@ffmpeg.org> wrote:
> From: Fei Wang <fei.w.wang@intel.com>
>
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
> libavcodec/vvc/vvc_ps.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c
> index e6e46d2039..7972803da6 100644
> --- a/libavcodec/vvc/vvc_ps.c
> +++ b/libavcodec/vvc/vvc_ps.c
> @@ -742,7 +742,7 @@ static int decode_frame_ps(VVCFrameParamSets *fps,
> const VVCParamSets *ps,
> static void decode_recovery_flag(VVCContext *s)
> {
> if (IS_IDR(s))
> - s->no_output_before_recovery_flag = 0;
> + s->no_output_before_recovery_flag = 1;
> else if (IS_CRA(s) || IS_GDR(s))
> s->no_output_before_recovery_flag = s->last_eos;
> }
> --
> 2.25.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".
>
_______________________________________________
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] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR
2024-03-09 11:59 ` Nuo Mi
@ 2024-03-11 2:03 ` Wang, Fei W
0 siblings, 0 replies; 6+ messages in thread
From: Wang, Fei W @ 2024-03-11 2:03 UTC (permalink / raw)
To: nuomi2021, ffmpeg-devel
On Sat, 2024-03-09 at 19:59 +0800, Nuo Mi wrote:
Hi Fei,
Thank you fei,
Better provide more comments
Added in V2.
Is there any clip fail for this?
No, just notice the defect when I check why recovering frames been outputted in GDR_D_ERICSSON_1.bit.
Thanks
Fei
On Fri, Mar 8, 2024 at 8:55 AM <fei.w.wang-at-intel.com@ffmpeg.org<mailto:fei.w.wang-at-intel.com@ffmpeg.org>> wrote:
From: Fei Wang <fei.w.wang@intel.com<mailto:fei.w.wang@intel.com>>
Signed-off-by: Fei Wang <fei.w.wang@intel.com<mailto:fei.w.wang@intel.com>>
---
libavcodec/vvc/vvc_ps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c
index e6e46d2039..7972803da6 100644
--- a/libavcodec/vvc/vvc_ps.c
+++ b/libavcodec/vvc/vvc_ps.c
@@ -742,7 +742,7 @@ static int decode_frame_ps(VVCFrameParamSets *fps, const VVCParamSets *ps,
static void decode_recovery_flag(VVCContext *s)
{
if (IS_IDR(s))
- s->no_output_before_recovery_flag = 0;
+ s->no_output_before_recovery_flag = 1;
else if (IS_CRA(s) || IS_GDR(s))
s->no_output_before_recovery_flag = s->last_eos;
}
_______________________________________________
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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset
2024-03-08 0:55 [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset fei.w.wang-at-intel.com
2024-03-08 0:55 ` [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR fei.w.wang-at-intel.com
@ 2024-03-09 11:57 ` Nuo Mi
2024-03-11 1:54 ` Wang, Fei W
1 sibling, 1 reply; 6+ messages in thread
From: Nuo Mi @ 2024-03-09 11:57 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: fei.w.wang
Thank you, Fei,
Do you happen to know why the following clips are still failing?
CROP_A_Panasonic_4.bit
CROP_B_Panasonic_4.bit
https://github.com/ffvvc/tests/tree/main/conformance/failed/v1/CROP
On Fri, Mar 8, 2024 at 8:54 AM <fei.w.wang-at-intel.com@ffmpeg.org> wrote:
> From: Fei Wang <fei.w.wang@intel.com>
>
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
> libavcodec/vvc/vvc_refs.c | 8 ++++----
> libavcodec/vvc/vvcdec.c | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/vvc/vvc_refs.c b/libavcodec/vvc/vvc_refs.c
> index 99f2dcf3ec..afcfc09da7 100644
> --- a/libavcodec/vvc/vvc_refs.c
> +++ b/libavcodec/vvc/vvc_refs.c
> @@ -185,10 +185,10 @@ int ff_vvc_set_new_ref(VVCContext *s,
> VVCFrameContext *fc, AVFrame **frame)
>
> ref->poc = poc;
> ref->sequence = s->seq_decode;
> - ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset;
> - ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset;
> - ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset;
> - ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset;
> + ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset <<
> fc->ps.sps->hshift[CHROMA];
> + ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset <<
> fc->ps.sps->hshift[CHROMA];
> + ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset <<
> fc->ps.sps->vshift[CHROMA];
> + ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset
> << fc->ps.sps->vshift[CHROMA];
>
> return 0;
> }
> diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c
> index 570e2aa513..a979ebd41c 100644
> --- a/libavcodec/vvc/vvcdec.c
> +++ b/libavcodec/vvc/vvcdec.c
> @@ -727,8 +727,8 @@ static void export_frame_params(VVCContext *s, const
> VVCFrameContext *fc)
> c->pix_fmt = sps->pix_fmt;
> c->coded_width = pps->width;
> c->coded_height = pps->height;
> - c->width = pps->width - pps->r->pps_conf_win_left_offset -
> pps->r->pps_conf_win_right_offset;
> - c->height = pps->height - pps->r->pps_conf_win_top_offset -
> pps->r->pps_conf_win_bottom_offset;
> + c->width = pps->width - ((pps->r->pps_conf_win_left_offset +
> pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]);
> + c->height = pps->height - ((pps->r->pps_conf_win_top_offset +
> pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]);
> }
>
> static int frame_setup(VVCFrameContext *fc, VVCContext *s)
> --
> 2.25.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".
>
_______________________________________________
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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset
2024-03-09 11:57 ` [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset Nuo Mi
@ 2024-03-11 1:54 ` Wang, Fei W
0 siblings, 0 replies; 6+ messages in thread
From: Wang, Fei W @ 2024-03-11 1:54 UTC (permalink / raw)
To: nuomi2021, ffmpeg-devel
On Sat, 2024-03-09 at 19:57 +0800, Nuo Mi wrote:
Thank you, Fei,
Do you happen to know why the following clips are still failing?
CROP_A_Panasonic_4.bit
Ffmepg decode doesn't apply crop strictly. It will adjust crop for alignment, see av_frame_apply_cropping().
Thanks
Fei
CROP_B_Panasonic_4.bit
https://github.com/ffvvc/tests/tree/main/conformance/failed/v1/CROP
On Fri, Mar 8, 2024 at 8:54 AM <fei.w.wang-at-intel.com@ffmpeg.org<mailto:fei.w.wang-at-intel.com@ffmpeg.org>> wrote:
From: Fei Wang <fei.w.wang@intel.com<mailto:fei.w.wang@intel.com>>
Signed-off-by: Fei Wang <fei.w.wang@intel.com<mailto:fei.w.wang@intel.com>>
---
libavcodec/vvc/vvc_refs.c | 8 ++++----
libavcodec/vvc/vvcdec.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/vvc/vvc_refs.c b/libavcodec/vvc/vvc_refs.c
index 99f2dcf3ec..afcfc09da7 100644
--- a/libavcodec/vvc/vvc_refs.c
+++ b/libavcodec/vvc/vvc_refs.c
@@ -185,10 +185,10 @@ int ff_vvc_set_new_ref(VVCContext *s, VVCFrameContext *fc, AVFrame **frame)
ref->poc = poc;
ref->sequence = s->seq_decode;
- ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset;
- ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset;
- ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset;
- ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset;
+ ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset << fc->ps.sps->hshift[CHROMA];
+ ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset << fc->ps.sps->hshift[CHROMA];
+ ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset << fc->ps.sps->vshift[CHROMA];
+ ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset << fc->ps.sps->vshift[CHROMA];
return 0;
}
diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c
index 570e2aa513..a979ebd41c 100644
--- a/libavcodec/vvc/vvcdec.c
+++ b/libavcodec/vvc/vvcdec.c
@@ -727,8 +727,8 @@ static void export_frame_params(VVCContext *s, const VVCFrameContext *fc)
c->pix_fmt = sps->pix_fmt;
c->coded_width = pps->width;
c->coded_height = pps->height;
- c->width = pps->width - pps->r->pps_conf_win_left_offset - pps->r->pps_conf_win_right_offset;
- c->height = pps->height - pps->r->pps_conf_win_top_offset - pps->r->pps_conf_win_bottom_offset;
+ c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]);
+ c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]);
}
static int frame_setup(VVCFrameContext *fc, VVCContext *s)
_______________________________________________
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] 6+ messages in thread
end of thread, other threads:[~2024-03-11 2:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-08 0:55 [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset fei.w.wang-at-intel.com
2024-03-08 0:55 ` [FFmpeg-devel] [PATCH v1 2/2] lavc/vvc_ps: Correct NoOutputBeforeRecoveryFlag of IDR fei.w.wang-at-intel.com
2024-03-09 11:59 ` Nuo Mi
2024-03-11 2:03 ` Wang, Fei W
2024-03-09 11:57 ` [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset Nuo Mi
2024-03-11 1:54 ` Wang, Fei W
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