* [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter()
@ 2022-05-24 0:06 Michael Niedermayer
2022-05-24 0:06 ` [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: Mark unreachable code by av_assert() Michael Niedermayer
2022-05-24 18:50 ` [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Andreas Rheinhardt
0 siblings, 2 replies; 5+ messages in thread
From: Michael Niedermayer @ 2022-05-24 0:06 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixes: CID1435168
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/vc1_loopfilter.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c
index 0f990cccef..ee694ede28 100644
--- a/libavcodec/vc1_loopfilter.c
+++ b/libavcodec/vc1_loopfilter.c
@@ -1125,10 +1125,7 @@ static av_always_inline void vc1_b_h_intfi_loop_filter(VC1Context *v, uint8_t *d
dst = dest + (block_num & 2) * 4 * s->linesize + (block_num & 1) * 8;
if (!(flags & RIGHT_EDGE) || !(block_num & 5)) {
- if (block_num > 3)
- v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
- else
- v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
+ v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
}
tt = ttblk[0] >> (block_num * 4) & 0xf;
--
2.17.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] 5+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: Mark unreachable code by av_assert()
2022-05-24 0:06 [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Michael Niedermayer
@ 2022-05-24 0:06 ` Michael Niedermayer
2022-05-24 18:50 ` [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Andreas Rheinhardt
1 sibling, 0 replies; 5+ messages in thread
From: Michael Niedermayer @ 2022-05-24 0:06 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Helps: CID1440835
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavfilter/vf_tpad.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c
index c870478158..1a41c3f1a7 100644
--- a/libavfilter/vf_tpad.c
+++ b/libavfilter/vf_tpad.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avfilter.h"
@@ -159,7 +160,8 @@ static int activate(AVFilterContext *ctx)
frame = av_frame_clone(s->cache_stop);
if (!frame)
return AVERROR(ENOMEM);
- }
+ } else
+ av_assert1(0);
frame->pts = s->pts;
s->pts += av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base);
if (s->pad_stop > 0)
--
2.17.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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter()
2022-05-24 0:06 [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Michael Niedermayer
2022-05-24 0:06 ` [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: Mark unreachable code by av_assert() Michael Niedermayer
@ 2022-05-24 18:50 ` Andreas Rheinhardt
2022-05-25 15:53 ` Michael Niedermayer
1 sibling, 1 reply; 5+ messages in thread
From: Andreas Rheinhardt @ 2022-05-24 18:50 UTC (permalink / raw)
To: ffmpeg-devel
Michael Niedermayer:
> Fixes: CID1435168
>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/vc1_loopfilter.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c
> index 0f990cccef..ee694ede28 100644
> --- a/libavcodec/vc1_loopfilter.c
> +++ b/libavcodec/vc1_loopfilter.c
> @@ -1125,10 +1125,7 @@ static av_always_inline void vc1_b_h_intfi_loop_filter(VC1Context *v, uint8_t *d
> dst = dest + (block_num & 2) * 4 * s->linesize + (block_num & 1) * 8;
>
> if (!(flags & RIGHT_EDGE) || !(block_num & 5)) {
> - if (block_num > 3)
> - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> - else
> - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> + v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> }
>
> tt = ttblk[0] >> (block_num * 4) & 0xf;
Are you certain that the current code is actually correct or whether
something else was intended?
- Andreas
_______________________________________________
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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter()
2022-05-24 18:50 ` [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Andreas Rheinhardt
@ 2022-05-25 15:53 ` Michael Niedermayer
2024-05-18 0:25 ` Michael Niedermayer
0 siblings, 1 reply; 5+ messages in thread
From: Michael Niedermayer @ 2022-05-25 15:53 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 2007 bytes --]
On Tue, May 24, 2022 at 08:50:51PM +0200, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: CID1435168
> >
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> > libavcodec/vc1_loopfilter.c | 5 +----
> > 1 file changed, 1 insertion(+), 4 deletions(-)
> >
> > diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c
> > index 0f990cccef..ee694ede28 100644
> > --- a/libavcodec/vc1_loopfilter.c
> > +++ b/libavcodec/vc1_loopfilter.c
> > @@ -1125,10 +1125,7 @@ static av_always_inline void vc1_b_h_intfi_loop_filter(VC1Context *v, uint8_t *d
> > dst = dest + (block_num & 2) * 4 * s->linesize + (block_num & 1) * 8;
> >
> > if (!(flags & RIGHT_EDGE) || !(block_num & 5)) {
> > - if (block_num > 3)
> > - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> > - else
> > - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> > + v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> > }
> >
> > tt = ttblk[0] >> (block_num * 4) & 0xf;
>
> Are you certain that the current code is actually correct or whether
> something else was intended?
iam not certain no but the vc1_b_v_intfi_loop_filter() function also
treats luma and chroma the same
if(!(flags & BOTTOM_EDGE) || block_num < 2)
v->vc1dsp.vc1_v_loop_filter8(dst + 8 * linesize, linesize, pq);
this is just the matching function for horizontal instead of vertical
also whan looking at the 4x4 4x8 and 8x4 cases i see no difference
between horizontal and vertical for intfi. But ultimately yes of course
it could be buggy and something else could be correct.
but if i replace this by an abort()
make: *** [fate-vc1_sa10143] Error 134
make: *** [fate-vc1_ilaced_twomv] Error 134
Fate fails, so it should be tested
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
You can kill me, but you cannot change the truth.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter()
2022-05-25 15:53 ` Michael Niedermayer
@ 2024-05-18 0:25 ` Michael Niedermayer
0 siblings, 0 replies; 5+ messages in thread
From: Michael Niedermayer @ 2024-05-18 0:25 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 2388 bytes --]
On Wed, May 25, 2022 at 05:53:12PM +0200, Michael Niedermayer wrote:
> On Tue, May 24, 2022 at 08:50:51PM +0200, Andreas Rheinhardt wrote:
> > Michael Niedermayer:
> > > Fixes: CID1435168
> > >
> > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > > ---
> > > libavcodec/vc1_loopfilter.c | 5 +----
> > > 1 file changed, 1 insertion(+), 4 deletions(-)
> > >
> > > diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c
> > > index 0f990cccef..ee694ede28 100644
> > > --- a/libavcodec/vc1_loopfilter.c
> > > +++ b/libavcodec/vc1_loopfilter.c
> > > @@ -1125,10 +1125,7 @@ static av_always_inline void vc1_b_h_intfi_loop_filter(VC1Context *v, uint8_t *d
> > > dst = dest + (block_num & 2) * 4 * s->linesize + (block_num & 1) * 8;
> > >
> > > if (!(flags & RIGHT_EDGE) || !(block_num & 5)) {
> > > - if (block_num > 3)
> > > - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> > > - else
> > > - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> > > + v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq);
> > > }
> > >
> > > tt = ttblk[0] >> (block_num * 4) & 0xf;
> >
> > Are you certain that the current code is actually correct or whether
> > something else was intended?
>
> iam not certain no but the vc1_b_v_intfi_loop_filter() function also
> treats luma and chroma the same
>
> if(!(flags & BOTTOM_EDGE) || block_num < 2)
> v->vc1dsp.vc1_v_loop_filter8(dst + 8 * linesize, linesize, pq);
>
> this is just the matching function for horizontal instead of vertical
>
> also whan looking at the 4x4 4x8 and 8x4 cases i see no difference
> between horizontal and vertical for intfi. But ultimately yes of course
> it could be buggy and something else could be correct.
>
> but if i replace this by an abort()
> make: *** [fate-vc1_sa10143] Error 134
> make: *** [fate-vc1_ilaced_twomv] Error 134
>
> Fate fails, so it should be tested
will apply this unless someone has some further insight in this or objection
as i just run into this again
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 5+ messages in thread
end of thread, other threads:[~2024-05-18 0:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-24 0:06 [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Michael Niedermayer
2022-05-24 0:06 ` [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: Mark unreachable code by av_assert() Michael Niedermayer
2022-05-24 18:50 ` [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() Andreas Rheinhardt
2022-05-25 15:53 ` Michael Niedermayer
2024-05-18 0:25 ` Michael Niedermayer
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