virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/vulkan: use av_get_random_seed instead of rand

Browse Source 
We need at least a few bits of entropy to determine the start index of each
queue, in order to let filters run in parallel as much as possible, and
rand() is not thread safe and disrupts any external API's usage of rand,
so instead replace it with av_get_random_seed.
While it has more overhead than rand, we only run it once per filter upon init.
This commit is contained in:
Lynne 2020-05-29 13:10:58 +01:00
parent c0f01eaf12
commit 83fa39eb06
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_avgblur_vulkan.c
View File

@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/random_seed.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "vulkan.h" #include "vulkan.h"
#include "internal.h" #include "internal.h"
@ -99,7 +100,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index; s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index;
s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0); s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0);
s->vkctx.cur_queue_idx = rand() % s->vkctx.queue_count; s->vkctx.cur_queue_idx = av_get_random_seed() % s->vkctx.queue_count;
{ /* Create shader for the horizontal pass */ { /* Create shader for the horizontal pass */
desc_i[0].updater = s->input_images; desc_i[0].updater = s->input_images;

3
libavfilter/vf_chromaber_vulkan.c
View File

@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/random_seed.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "vulkan.h" #include "vulkan.h"
#include "internal.h" #include "internal.h"
@ -75,7 +76,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index; s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index;
s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0); s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0);
s->vkctx.cur_queue_idx = rand() % s->vkctx.queue_count; s->vkctx.cur_queue_idx = av_get_random_seed() % s->vkctx.queue_count;
s->pl = ff_vk_create_pipeline(ctx); s->pl = ff_vk_create_pipeline(ctx);
if (!s->pl) if (!s->pl)

3
libavfilter/vf_overlay_vulkan.c
View File

@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/random_seed.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "vulkan.h" #include "vulkan.h"
#include "internal.h" #include "internal.h"
@ -89,7 +90,7 @@ static av_cold int init_filter(AVFilterContext *ctx)
s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index; s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index;
s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0); s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0);
s->vkctx.cur_queue_idx = rand() % s->vkctx.queue_count; s->vkctx.cur_queue_idx = av_get_random_seed() % s->vkctx.queue_count;
{ /* Create the shader */ { /* Create the shader */
const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); const int planes = av_pix_fmt_count_planes(s->vkctx.output_format);

3
libavfilter/vf_scale_vulkan.c
View File

@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/random_seed.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "vulkan.h" #include "vulkan.h"
#include "scale_eval.h" #include "scale_eval.h"
@ -117,7 +118,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index; s->vkctx.queue_family_idx = s->vkctx.hwctx->queue_family_comp_index;
s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0); s->vkctx.queue_count = GET_QUEUE_COUNT(s->vkctx.hwctx, 0, 1, 0);
s->vkctx.cur_queue_idx = rand() % s->vkctx.queue_count; s->vkctx.cur_queue_idx = av_get_random_seed() % s->vkctx.queue_count;
switch (s->scaler) { switch (s->scaler) {
case F_NEAREST: case F_NEAREST: