* [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately
@ 2024-03-13 0:53 Andreas Rheinhardt
2024-03-13 8:30 ` Kieran Kunhya
2024-03-14 20:49 ` Sean McGovern
0 siblings, 2 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2024-03-13 0:53 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
It is accessed via AV_RN64() in ff_simple_idct_put_int32_10bit().
Should fix the UBSan failures in the mpeg4-simple-studio-profile
test here:
https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/mpeg4videodec.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpeg4videodec.h b/libavcodec/mpeg4videodec.h
index c0e6ec6592..4a26d18987 100644
--- a/libavcodec/mpeg4videodec.h
+++ b/libavcodec/mpeg4videodec.h
@@ -29,6 +29,7 @@
#include "mpegvideo.h"
#include "mpeg4videodsp.h"
+#include "libavutil/mem_internal.h"
typedef struct Mpeg4DecContext {
MpegEncContext m;
@@ -83,7 +84,7 @@ typedef struct Mpeg4DecContext {
Mpeg4VideoDSPContext mdsp;
- int32_t block32[12][64];
+ DECLARE_ALIGNED(8, int32_t, block32)[12][64];
// 0 = DCT, 1 = DPCM top to bottom scan, -1 = DPCM bottom to top scan
int dpcm_direction;
int16_t dpcm_macroblock[3][256];
--
2.40.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] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately
2024-03-13 0:53 [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately Andreas Rheinhardt
@ 2024-03-13 8:30 ` Kieran Kunhya
2024-03-14 20:49 ` Sean McGovern
1 sibling, 0 replies; 4+ messages in thread
From: Kieran Kunhya @ 2024-03-13 8:30 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Andreas Rheinhardt
On Wed, 13 Mar 2024 at 00:53, Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:
> It is accessed via AV_RN64() in ff_simple_idct_put_int32_10bit().
> Should fix the UBSan failures in the mpeg4-simple-studio-profile
> test here:
>
> https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>
LGTM
_______________________________________________
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] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately
2024-03-13 0:53 [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately Andreas Rheinhardt
2024-03-13 8:30 ` Kieran Kunhya
@ 2024-03-14 20:49 ` Sean McGovern
2024-03-14 20:51 ` Andreas Rheinhardt
1 sibling, 1 reply; 4+ messages in thread
From: Sean McGovern @ 2024-03-14 20:49 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Andreas:
On Tue, Mar 12, 2024 at 8:53 PM Andreas Rheinhardt
<andreas.rheinhardt@outlook.com> wrote:
>
> It is accessed via AV_RN64() in ff_simple_idct_put_int32_10bit().
> Should fix the UBSan failures in the mpeg4-simple-studio-profile
> test here:
> https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/mpeg4videodec.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/mpeg4videodec.h b/libavcodec/mpeg4videodec.h
> index c0e6ec6592..4a26d18987 100644
> --- a/libavcodec/mpeg4videodec.h
> +++ b/libavcodec/mpeg4videodec.h
> @@ -29,6 +29,7 @@
> #include "mpegvideo.h"
> #include "mpeg4videodsp.h"
>
> +#include "libavutil/mem_internal.h"
>
> typedef struct Mpeg4DecContext {
> MpegEncContext m;
> @@ -83,7 +84,7 @@ typedef struct Mpeg4DecContext {
>
> Mpeg4VideoDSPContext mdsp;
>
> - int32_t block32[12][64];
> + DECLARE_ALIGNED(8, int32_t, block32)[12][64];
> // 0 = DCT, 1 = DPCM top to bottom scan, -1 = DPCM bottom to top scan
> int dpcm_direction;
> int16_t dpcm_macroblock[3][256];
> --
> 2.40.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".
Confirming that this fixes fate-mpeg4-simple-studio-profile on PowerPC
QEMU with GCC UBsan as noted.
It was not failing on POWER7 (ppc64) or POWER9 (ppc64le).
Thanks,
Sean McGovern
_______________________________________________
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] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately
2024-03-14 20:49 ` Sean McGovern
@ 2024-03-14 20:51 ` Andreas Rheinhardt
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2024-03-14 20:51 UTC (permalink / raw)
To: ffmpeg-devel
Sean McGovern:
> Andreas:
>
> On Tue, Mar 12, 2024 at 8:53 PM Andreas Rheinhardt
> <andreas.rheinhardt@outlook.com> wrote:
>>
>> It is accessed via AV_RN64() in ff_simple_idct_put_int32_10bit().
>> Should fix the UBSan failures in the mpeg4-simple-studio-profile
>> test here:
>> https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> libavcodec/mpeg4videodec.h | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavcodec/mpeg4videodec.h b/libavcodec/mpeg4videodec.h
>> index c0e6ec6592..4a26d18987 100644
>> --- a/libavcodec/mpeg4videodec.h
>> +++ b/libavcodec/mpeg4videodec.h
>> @@ -29,6 +29,7 @@
>> #include "mpegvideo.h"
>> #include "mpeg4videodsp.h"
>>
>> +#include "libavutil/mem_internal.h"
>>
>> typedef struct Mpeg4DecContext {
>> MpegEncContext m;
>> @@ -83,7 +84,7 @@ typedef struct Mpeg4DecContext {
>>
>> Mpeg4VideoDSPContext mdsp;
>>
>> - int32_t block32[12][64];
>> + DECLARE_ALIGNED(8, int32_t, block32)[12][64];
>> // 0 = DCT, 1 = DPCM top to bottom scan, -1 = DPCM bottom to top scan
>> int dpcm_direction;
>> int16_t dpcm_macroblock[3][256];
>> --
>> 2.40.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".
>
> Confirming that this fixes fate-mpeg4-simple-studio-profile on PowerPC
> QEMU with GCC UBsan as noted.
>
> It was not failing on POWER7 (ppc64) or POWER9 (ppc64le).
>
Not surprising: The Mpeg4VideoDSPContext immediately before block32
contains (function) pointers and therefore has alignment 8 on 64bit
machines, so that block32 happens to be properly aligned already.
- 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] 4+ messages in thread
end of thread, other threads:[~2024-03-14 20:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-13 0:53 [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately Andreas Rheinhardt
2024-03-13 8:30 ` Kieran Kunhya
2024-03-14 20:49 ` Sean McGovern
2024-03-14 20:51 ` Andreas Rheinhardt
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