From patchwork Thu Dec 10 11:16:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24489 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 141B244BA99 for ; Thu, 10 Dec 2020 13:22:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08D3B68A61A; Thu, 10 Dec 2020 13:19:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEF2F68A552 for ; Thu, 10 Dec 2020 13:19:05 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id 3so4897587wmg.4 for ; Thu, 10 Dec 2020 03:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=BllkKVWPrO/wYzIM+ZdSkTsXZaJiJjmoRUfSatorHs4=; b=MgYrOI5X36kstYMFukFpfv25N5+yf7fJDS1L0O1jsmD4tzvuaAsZZgeuaLa0plQUlN 2OCPFcFBbd7OTeLDrCdR+K6xURGgkmHJ+zuXIlgqoeXh66sjBX48WiHzK0B2k8bOrndb jCDyTBdT6ZwcI/F8Zeb6NMoUEciTc2GT+ZkG/EIjeqwpbEOJPdbLn+oEWvdtwTGuAqjO u4J5ezt3bfcD9XDSBZvvEWcSN/ZBkxwf8h3uhsdmy7dM+OwCp6qjOMUMMM+fijE6SEgX ECrzOvtvwT064bNSdUskNpY/oAfr4/SMNISPPAOSbMGIQPqfKgs2WjE4eJmMsZDTdipq b0mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=BllkKVWPrO/wYzIM+ZdSkTsXZaJiJjmoRUfSatorHs4=; b=aK3bB8TJYNSqtdYM91eUFF2LGEQg+WghFzftuxiFFdGXPoDLb47oShVc5+0hlbzgkH E4EDuGyH35i5QFHhVE1qhQp2EwdVsLlLLfrBGekbVL3vfix28FDtSfZmb+kSddxJWgC2 th2+fUIfDPhz068Ov98oafQFvp/4EHr81Ke/2hqOcn9zRFNJ3uAYkR8SkiHxd67BGHME tUM8O1u7w/VTE4Tl0BdPMKcE0vK9ipswAyoeMa4eedxL6cii2dBxWOqw2at7gFj/DKA4 Fe1kgNGrWT//jC6OSBVm/2mlIDu4efgEU7d0JXdiFAcbIuHsl+8BvZLWXUCuMcgCOUZx deAA== X-Gm-Message-State: AOAM532XtMXrV9dDDyqD6z3MBejXrlj4EBaIgiX6RE3ImmxG7Av/hxNW rF/0pFjez/hQwQ+5uWQx2zH3bQtannjPjg== X-Google-Smtp-Source: ABdhPJw5Ojmm9Ha9ZrR93R4ulBlzVejBxfThSX8/isjU67Hq0oySBYNbO6RLiYsX/+j23YcXRF4/AA== X-Received: by 2002:a7b:cf08:: with SMTP id l8mr7807325wmg.189.1607599144879; Thu, 10 Dec 2020 03:19:04 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:37 +0100 Message-Id: <20201210111657.2276739-20-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/39] avcodec/mpegvideo_enc: Make mpv_encode_defaults thread-safe X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is a prerequisite for making any encoder that uses ff_mpv_encode_init() init-threadsafe; it already makes the AMV, the MJPEG and the MPEG-1/2 encoders init-threadsafe. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 4 ++-- libavcodec/mpeg12enc.c | 4 ++-- libavcodec/mpegvideo_enc.c | 15 +++++++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 56ccbc5fb1..466f48eba9 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -415,7 +415,7 @@ AVCodec ff_mjpeg_encoder = { .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, @@ -441,7 +441,7 @@ AVCodec ff_amv_encoder = { .init = ff_mpv_encode_init, .encode2 = amv_encode_picture, .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 5cbcb15630..e38cd074e1 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1195,7 +1195,7 @@ AVCodec ff_mpeg1video_encoder = { .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .priv_class = &mpeg1_class, }; @@ -1213,6 +1213,6 @@ AVCodec ff_mpeg2video_encoder = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .priv_class = &mpeg2_class, }; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4cefe05353..061081db08 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -38,6 +38,7 @@ #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "dct.h" #include "idctdsp.h" @@ -248,18 +249,24 @@ static void update_duplicate_context_after_me(MpegEncContext *dst, #undef COPY } +static void mpv_encode_init_static(void) +{ + for (int i = -16; i < 16; i++) + default_fcode_tab[i + MAX_MV] = 1; +} + /** * Set the given MpegEncContext to defaults for encoding. * the changed fields will not depend upon the prior state of the MpegEncContext. */ static void mpv_encode_defaults(MpegEncContext *s) { - int i; + static AVOnce init_static_once = AV_ONCE_INIT; + ff_mpv_common_defaults(s); - for (i = -16; i < 16; i++) { - default_fcode_tab[i + MAX_MV] = 1; - } + ff_thread_once(&init_static_once, mpv_encode_init_static); + s->me.mv_penalty = default_mv_penalty; s->fcode_tab = default_fcode_tab;