From patchwork Sun Sep 17 03:37:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp1214058pzb; Sat, 16 Sep 2023 20:38:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEq5ML8YS2/Pn1SZ3rtbB11IglaDtWu48SP3H7F4BrJugIb/FOrCovhPmA0qLYCIeSMro+f X-Received: by 2002:a17:907:2cd8:b0:9a5:c9a4:ba1a with SMTP id hg24-20020a1709072cd800b009a5c9a4ba1amr4945221ejc.59.1694921881818; Sat, 16 Sep 2023 20:38:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694921881; cv=none; d=google.com; s=arc-20160816; b=NAQED+Ar6YzZJPS3PjrqNDYWgK8r2S05J93gXdPjc5LbDL8zrN7w3JMjHHF5LDryaY 82iBaR85uUejJSvKH1XyxGvuKxrKmTvLt1qJfKJJGJ5/U95IY0mJf89pPZMfsKAO6zGt pfcRpNyTzjF6l5Z+UIPtyj6r4r9MIEuzarK+S3JyPshAl4bqTWX78MA8ylIh1S1n+RKE czrm+Bld9qRyQLKipUw0dztYDL17BuKRIzmjAxhkwx9CnYW8qytj3KiWZu9SLuOSbgUe GcrNI/OO+Q6deuNkyfj80MoyWpSTWI2AaFnJZa9RIDoart2p/1wWJcRr5+/FeQrZRRGd ubSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=b7J9vY8fPVSgknMtzoJtHtwRfph/DZAJt9QETu81Khc=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=1I8tSLfZ5/5yuxPhe3Sn2BzGh21ae0djeX2wRRKh/EXucu6W1zPbvjxZ6Zego3EfDa 10gALdh+ddnwwlOaTAEn9oAlp0GTGXrnHv8kyY9eWz4kyzqe1HDx1Oklc2H/frUpGkw8 cYzzutkjWxxoqydLVhEUnPjxJ7Z6CEr+KYJbCaNVccnsKi3qrehznZ+Vi5d11cfgvYXG AOdVfgnQ3rL3eW0SEFlPh75woDwdYdUWGCB2CwYQP0E1hEIKHskVa9mnlmTqyQlzFXzG bIuL7SrmIgrdWQDumBS5avD11yV+fUTg6WApSkdOBB9l+2jvXFS9KIgoG8IuXoAnBYD/ O/bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PYcpqLMm; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g2-20020a1709064e4200b00992d730e99dsi5984767ejw.494.2023.09.16.20.38.00; Sat, 16 Sep 2023 20:38:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PYcpqLMm; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D81F68C805; Sun, 17 Sep 2023 06:37:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8D9E68C7DA for ; Sun, 17 Sep 2023 06:37:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1694921858; bh=olNuvaqzpKdKZ8dKIdpn/F7GJKE8fv+JIM2bh56np/g=; h=From:To:Cc:Subject:Date; b=PYcpqLMmoR31vRt4G0qqXjwgcT7Liy3NIwEyWKIeqinsHiTA7j+Sp4L3fMlDpBNvN vo1s7blRlqhPgrJqWJ0IyVv8Pjoyep0mSr/DJhOGf2gJOPxXws4sK3LM4K8OjryxVy szQ14FqkqR9r+ad70FxoxV+ojQPq08MghmS1xkIQ= Received: from localhost.localdomain ([113.116.29.33]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 965B2CA4; Sun, 17 Sep 2023 11:37:37 +0800 X-QQ-mid: xmsmtpt1694921857tgvzbdrkn Message-ID: X-QQ-XMAILINFO: MDZPbNHjkmF2HiuZNOpP9n0jU0nOmfJZ6/ao3PQPqFB8qxTEv5QhTWxqYyFRsS LJ+OmsX5TWZkFQY2D+4KtHNjzXWrng4CN1lWIFC66K38fGA6qGiUzBA46q3XppU48i5ECa7jsNRR Sa21lCR+TbFp2GBgBYIu9sA5Lao8qru/PGY9Ww29x30glyZGRZ0XM9uSuxd/BSpZV1civR/KR5wz HeS/uJuOZALyuMGLc+MIm5WUT1Zb5lsbfbG58+6j8qvOfFtwTGtI475QbBwG9DQu6yWgqG2hwsgZ jak6iCofP+OvhbOXluLZUOouH2LfVbK+HkAf54bqS0eeOPNSgc6/pmqWCRIUzSmVEUkyHumFEU6g REfTEzVkhWyop10v2nDq5ZqHns6SIDVJ6bSKByM9O3AtWbMbdIfbT+EhLKTc/EyGg78/Yg8lerst RzdOKDZ0ahIyqtSSrsNH7dMsfac+26Z+9fJsok2oQI0UZUXTLN9ZoDOen1qZIKQKe/LQTsVrM1hG t+drfDQeFaTkL0DG+oAgDgW/A5oRw01BqRjHxGtdZIWCUkunAGVnP/KKpFrm9byVxPIx+k4073zE uM1gqhXbrxL/EJiY5tp8ickIfoD8i6jKYfoWmIqJ7S7X0ltNKd9CprBvG3si1Q2A8jB8KJ8S3tEO RzJoY5RoTDwGt2GiOqr5shMvhY04CAPb45rJS3PecUWFxpf1PimzyFV0JBk2mv/H73iLRwVlUhjv FdZm/E6zmxE+qvOE6HFRLN/ytXcNhIAgLONIS344G02u4v2vLEx18Wzdkigzv72HgVKIuiKMukvS ACLlqZPGVqs955Oj6K3cIBXODxaEm+VXXlhF7rs4QXJ7HNmXAegqiswEZfDf5TW2JSN/eZXH+kx4 rMJWRaXokkUzvvELRAvqNtCEv6BbzYnhhRN7CMSVWjYywcQoV7bTRzrGHFTYu8wD6G/6qQkPgBfW EyVTW4CbOWldcSWUcl0UnqIro7tTxP X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Sep 2023 11:37:33 +0800 X-OQ-MSGID: <20230917033734.13342-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avdevice/android_camera: fix missing include for usleep X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R/cWEbtkvDjr From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavdevice/android_camera.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavdevice/android_camera.c b/libavdevice/android_camera.c index 1934999c18..0425b27518 100644 --- a/libavdevice/android_camera.c +++ b/libavdevice/android_camera.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include From patchwork Sun Sep 17 03:37:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp1214101pzb; Sat, 16 Sep 2023 20:38:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzfkUD6bQ+Qryqro59KH08K5/PX71h+osPds2ol1IdFNFvjsGIbfC7137I2Arh0mFjeB48 X-Received: by 2002:a05:6402:603:b0:527:fa8d:d3ff with SMTP id n3-20020a056402060300b00527fa8dd3ffmr4392076edv.6.1694921892520; Sat, 16 Sep 2023 20:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694921892; cv=none; d=google.com; s=arc-20160816; b=otzGmoOmpvpYKd8+5ZnEi7/z9t2c38fqHOd2uwJJQrhZAI/xyld4bqRH6YHpHoOSb5 VFByC4mjkVbVLfClVvzKEBKpp+AgubmkbDR1NYmmj7cMkbRjvNMCMWMl1MkcAr+n/iCj 73mPyueJYiuJs7e0eKk+I/YmOGWWQilGm2ZF6qIVKu1eD/zAGMhi5pLzwhHHkUAGE9TA uTJvzdpQ2f4kOMOs5m9xztjBQeGJtajTk7ClE59tDrHseIY7ua7r0qmoirFqmrxztkJl cOR1Chy1NXFJwdJB5KOopspb44lpr2vBmmFEv7CoPWE/ybdvm1KART1lykWML2TWSzWC DQKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=hgN26LYBrQXuM3v4WtZU8K7KEdAe9LQMh7IHzoC5xvA=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=DAAQfzQY5ewvMdWdSnyvySJU9/0Ab1Ynkrg+rr9mNpmuHrrPTLRUnMM6ulPUfsLelr LFDVgSw7SWbnF6w3m+Kbv4WR6YwRraRW5LCSUSawlos8scgrYCIvnji/eweflLboWmOL ZOiigcfdiNyYtu8yyjgC4kuQHKPrW2Puf6F2cww6jpfgV0A4ihTiRobb3N/M7bK9Lnir l8UiUE6EAoVulSx93DhWuAMhE7ehIFBlAD7qIuqXPh5dyzORE5GAb2ReUtWnOTwGdX43 H6UMbIbyTPVhZCMhmH6/Nvz3p+fP0bFJgXBREksumzlEuClTWl46xRdTs9oMRDQhzW0V ucOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MaE6AYTs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t25-20020a05640203d900b0052ff7b17d3bsi6361356edw.136.2023.09.16.20.38.11; Sat, 16 Sep 2023 20:38:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MaE6AYTs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6547E68C7FE; Sun, 17 Sep 2023 06:37:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C606F68C60B for ; Sun, 17 Sep 2023 06:37:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1694921859; bh=dcu2xYpuilBiFYIZyTuh3q6j1xAFls1dvvOyZKJY0FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MaE6AYTs+HqGHp4SRBnc592OpETV4zt/N+evbi1+kRQ6qx0h9Wnyq9vXqwOtFRiYT hfIJHxEWYfWUPmo1fivRfcqgPf7e8LJScmgu+I0TRPNRpes2XgfrJmPs5X7zMHx77h yWYHKk2R4yoLfVxkk+1lTSMnnkJ7pNyH4u4cJ86M= Received: from localhost.localdomain ([113.116.29.33]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 965B2CA4; Sun, 17 Sep 2023 11:37:37 +0800 X-QQ-mid: xmsmtpt1694921858thm7cxmg5 Message-ID: X-QQ-XMAILINFO: NkBK3x0tNc75kV6J9bVnrI7FqC4VBFsND9ewM+uHHMtOvwHAxUZwHZjIKrKhdm SSoppCinUynwL+Q1+bRHfg6eajUv7xKPWHJLvwU3B6XN8yyy/0RXQryzEX6pskEsmpzrhdMZwmu6 rP5zlrL1mnSxLf9QUmJOwoEPzCs8FNs1Mq1YppNvlcPd0fU22fLudT/TctSWLMZ0wyJN0IVemxju MysmovvIuZbI5cC32JbjI8Vu9VIoQ4MlhvYUdu4IRBA71niblXc8xWtlHyXxLPFKvb92rqql0cqH UPnsRYGMYTRdNWErKhHG4Q2bofbUquN2S47be+vX8lBx+J+BRSyqVvHoYUqQyETgQnHYsURg+L2p VQJ/mVnnjG9eIrennxE4cOeIMM7mFiISkUkBPRAnriSFocPYZBXxcfJht74Kn/xp27F6FSG3Uinc RJVkMlHVyzmUzqTJs2LfzZPQcuP/jAkhY4Eh79ZMsUhcbw1Mmrx1Ml35vWN9cG7ipiMhcjSUyH1L byNpyExt3k1WiQwnepQOtWPmwUs7fUtZHVN2H0MAAJrithnwfxSG8Bq+OmGe4vt8kqJo/O6lvt9Z abuYkt0pxbo02H/rRvmgSUW8m41+OiaUasupQistSYu8fBTAv25bMXR428Mfuq6vXoTgq45d1MH8 rumibK7Lg9FXQuwxk7hR0WT/WVQrERUUn9PFqdjpAG2EjyqzmPRF1hPzF6io6Oq1MH+ZtbhBfOw5 3xBwhpYMr4QeAcPj39YVXQRy/WvmUVXCtDb6D2Q6PFFJwbvIGuUfdYq9qijmZ6fSp45EzL++N13v BmwVJ8zgTWk+u+5lzcWtkiK5f0IhxPiL2OLXHXxxM9wisW0pENH6jBQmLNTt8wwHzV5AANQWdkZL G4vnUUMf8uOhxm7bovOUzwAqlGK13hppmhRxzVTZjLEyQTygoFlqQjk7UP86ZLpnebGs1wRZyi8y Il72Rhe6MxySVmP/dVoJbvQ7PrIW11VLzAfjb7ChI= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Sep 2023 11:37:34 +0800 X-OQ-MSGID: <20230917033734.13342-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230917033734.13342-1-quinkblack@foxmail.com> References: <20230917033734.13342-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/jni: make global variables static X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: a0Z3vl8xp290 From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/jni.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/jni.c b/libavcodec/jni.c index 85dcf2abaf..ae6490de9d 100644 --- a/libavcodec/jni.c +++ b/libavcodec/jni.c @@ -34,8 +34,8 @@ #include "libavutil/log.h" #include "ffjni.h" -void *java_vm; -pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +static void *java_vm; +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; int av_jni_set_java_vm(void *vm, void *log_ctx) {