Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avfilter/framepool: use aligned height when allocating plane buffers
@ 2022-11-20 17:06 James Almer
  2022-11-20 17:40 ` Paul B Mahol
  2022-11-20 19:41 ` StreamNG Harold Camargo
  0 siblings, 2 replies; 4+ messages in thread
From: James Almer @ 2022-11-20 17:06 UTC (permalink / raw)
  To: ffmpeg-devel

Fixes tickets #10051 and #10052.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavfilter/framepool.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
index 0404589055..7e830c5a3b 100644
--- a/libavfilter/framepool.c
+++ b/libavfilter/framepool.c
@@ -91,15 +91,13 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size),
         linesizes[i] = pool->linesize[i];
 
     if (av_image_fill_plane_sizes(sizes, pool->format,
-                                  pool->height,
+                                  FFALIGN(pool->height, align),
                                   linesizes) < 0) {
         goto fail;
     }
 
     for (i = 0; i < 4 && sizes[i]; i++) {
-        if (sizes[i] > SIZE_MAX - align)
-            goto fail;
-        pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc);
+        pool->pools[i] = av_buffer_pool_init(sizes[i], alloc);
         if (!pool->pools[i])
             goto fail;
     }
-- 
2.38.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] avfilter/framepool: use aligned height when allocating plane buffers
  2022-11-20 17:06 [FFmpeg-devel] [PATCH] avfilter/framepool: use aligned height when allocating plane buffers James Almer
@ 2022-11-20 17:40 ` Paul B Mahol
  2022-11-20 17:45   ` James Almer
  2022-11-20 19:41 ` StreamNG Harold Camargo
  1 sibling, 1 reply; 4+ messages in thread
From: Paul B Mahol @ 2022-11-20 17:40 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

On 11/20/22, James Almer <jamrial@gmail.com> wrote:
> Fixes tickets #10051 and #10052.
>

Not real fix, more like big hack.

> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavfilter/framepool.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
> index 0404589055..7e830c5a3b 100644
> --- a/libavfilter/framepool.c
> +++ b/libavfilter/framepool.c
> @@ -91,15 +91,13 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef*
> (*alloc)(size_t size),
>          linesizes[i] = pool->linesize[i];
>
>      if (av_image_fill_plane_sizes(sizes, pool->format,
> -                                  pool->height,
> +                                  FFALIGN(pool->height, align),
>                                    linesizes) < 0) {
>          goto fail;
>      }
>
>      for (i = 0; i < 4 && sizes[i]; i++) {
> -        if (sizes[i] > SIZE_MAX - align)
> -            goto fail;
> -        pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc);
> +        pool->pools[i] = av_buffer_pool_init(sizes[i], alloc);
>          if (!pool->pools[i])
>              goto fail;
>      }
> --
> 2.38.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] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH] avfilter/framepool: use aligned height when allocating plane buffers
  2022-11-20 17:40 ` Paul B Mahol
@ 2022-11-20 17:45   ` James Almer
  0 siblings, 0 replies; 4+ messages in thread
From: James Almer @ 2022-11-20 17:45 UTC (permalink / raw)
  To: ffmpeg-devel

On 11/20/2022 2:40 PM, Paul B Mahol wrote:
> On 11/20/22, James Almer <jamrial@gmail.com> wrote:
>> Fixes tickets #10051 and #10052.
>>
> 
> Not real fix, more like big hack.

This is in line with other frame pools like the lavc one. If you know a 
better fix, then please send a patch.

> 
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   libavfilter/framepool.c | 6 ++----
>>   1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
>> index 0404589055..7e830c5a3b 100644
>> --- a/libavfilter/framepool.c
>> +++ b/libavfilter/framepool.c
>> @@ -91,15 +91,13 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef*
>> (*alloc)(size_t size),
>>           linesizes[i] = pool->linesize[i];
>>
>>       if (av_image_fill_plane_sizes(sizes, pool->format,
>> -                                  pool->height,
>> +                                  FFALIGN(pool->height, align),
>>                                     linesizes) < 0) {
>>           goto fail;
>>       }
>>
>>       for (i = 0; i < 4 && sizes[i]; i++) {
>> -        if (sizes[i] > SIZE_MAX - align)
>> -            goto fail;
>> -        pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc);
>> +        pool->pools[i] = av_buffer_pool_init(sizes[i], alloc);
>>           if (!pool->pools[i])
>>               goto fail;
>>       }
>> --
>> 2.38.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".
_______________________________________________
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] avfilter/framepool: use aligned height when allocating plane buffers
  2022-11-20 17:06 [FFmpeg-devel] [PATCH] avfilter/framepool: use aligned height when allocating plane buffers James Almer
  2022-11-20 17:40 ` Paul B Mahol
@ 2022-11-20 19:41 ` StreamNG Harold Camargo
  1 sibling, 0 replies; 4+ messages in thread
From: StreamNG Harold Camargo @ 2022-11-20 19:41 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Hello, unsuscribe.

bye

Harold F. Camargo R.
Stream NG
Cel. 318 3227862
Bogotá Colombia
www.stream-ng.com


El dom, 20 nov 2022 a las 12:06, James Almer (<jamrial@gmail.com>) escribió:

> Fixes tickets #10051 and #10052.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavfilter/framepool.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
> index 0404589055..7e830c5a3b 100644
> --- a/libavfilter/framepool.c
> +++ b/libavfilter/framepool.c
> @@ -91,15 +91,13 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef*
> (*alloc)(size_t size),
>          linesizes[i] = pool->linesize[i];
>
>      if (av_image_fill_plane_sizes(sizes, pool->format,
> -                                  pool->height,
> +                                  FFALIGN(pool->height, align),
>                                    linesizes) < 0) {
>          goto fail;
>      }
>
>      for (i = 0; i < 4 && sizes[i]; i++) {
> -        if (sizes[i] > SIZE_MAX - align)
> -            goto fail;
> -        pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc);
> +        pool->pools[i] = av_buffer_pool_init(sizes[i], alloc);
>          if (!pool->pools[i])
>              goto fail;
>      }
> --
> 2.38.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] 4+ messages in thread

end of thread, other threads:[~2022-11-20 19:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-20 17:06 [FFmpeg-devel] [PATCH] avfilter/framepool: use aligned height when allocating plane buffers James Almer
2022-11-20 17:40 ` Paul B Mahol
2022-11-20 17:45   ` James Almer
2022-11-20 19:41 ` StreamNG Harold Camargo

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