From patchwork Wed Nov 1 09:01:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: angus.chen-at-intel.com@ffmpeg.org X-Patchwork-Id: 44469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp297224pzb; Wed, 1 Nov 2023 02:00:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYKh8h7RVN+AHZKe8uDZQbS9hfed1J3wJWp59KU7jPBYNrk6YIsPRD9s2sLcuZ5LruFQ50 X-Received: by 2002:a17:907:2d91:b0:9ae:5765:c134 with SMTP id gt17-20020a1709072d9100b009ae5765c134mr1627027ejc.15.1698829228176; Wed, 01 Nov 2023 02:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698829228; cv=none; d=google.com; s=arc-20160816; b=UCNIy6dOAWL1Ej0vOURLg7/0lHotNaXCvykXuRj1fepkOlDCJGqcrEmIY6emFeBYgJ ivm1T7r7nb9b4byrPfE5EOAh2Dp2/cLpSjtBpSgmA6eNwJYmMMEryvsLDU0N6eeYXtPf 19kSjeMviC9NcnnhYIYNeuEpOKDBKB9Tk+y0ZmPROcwaKrZZdRENN32NrckePMfMlOwz zLkRx2QvK4DKxkMxu0hy40SCiHXSsvw1kKK0hXASRrDPwKyKIm6xbAGC5XpuJCcbdWng 6kC0XMLOnImfAKeQxppg1HiOqsmnlFA9q7EfyCENMTDcr58s6yvUEc6JjBijfo8AJZP1 Tb0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=4zCbwsh85Uo/0H5M+VMrWxhWWfixRlwQ5Qt6CcwLXwQ=; fh=7WhTJAnkZr9dJaQEuL30TXw0nxz7NHP8an9/oforL8g=; b=tsJkg5prO4Bbd44yrs6Ns5rdHrpyobN67aHcXhxogVkPCcgHUFtnJHGfDVonE56rG3 mHUPEOD1aQ2N+rQiW+psrY8BAOK0TLfIIQ18PIl8F4pGK16EQ3kiUD7yb1FqdhqGdgmM Fs6RorahI80TE8HpGt9VW24/lcqtIQNM6fHWOEPBiDeck3u4Tp4Pnhs+qhxyHhvyJwYk lKOHakQEJuSDLEeOJS2/+rsd71g7f+yZyoTrMT21w0xVIL7nFJiJR5QOjHQy0KQjZL1r EfG7jLJk5ICMJnTNwvqk79srvqfuAprHgk7jWaOaikmbagpdLetDEMtNQ5BewdX7imKE pq3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=K8GrQfnr; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dp21-20020a170906c15500b009a63cbd4b01si1326610ejc.924.2023.11.01.02.00.27; Wed, 01 Nov 2023 02:00:28 -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=@intel.com header.s=Intel header.b=K8GrQfnr; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7922568CC84; Wed, 1 Nov 2023 11:00:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B58168CC8D for ; Wed, 1 Nov 2023 11:00:16 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698829222; x=1730365222; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=OkjD9RhZshZ0kKKLzCq6AuKXP/CV8JzpcN3ztKB+xtE=; b=K8GrQfnrSmB8NHCoocQColu+PmC51T6CseY+NqTQiSBt28OA4VNHJt9N qD+u3aX4soVMOhz5fL0XQndFvu4MzVKuNFPc4zD8jc6MAEoFR/yZ0WoTu g4atWyPdyuKTLK6/z1aU3K5Pp49/rL32kiP0zKBdfci1PZVE8t8LfI5Ct sokFcNsdz0OboyOnwNRF+3tFwewffDs8Z7HnAM5I1Z4VLQf7h+xFeEZyC WkNyoo9xz3E/LDf5VBbuioOrf5TxA1y3MmrzgOlsAvjC3SHNzgLiJBtWs QdXhtvCJWCIdhaAr37HchpoE6X0Lsbp9EauaueUKMp56WA0xWGQlCdnB1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10880"; a="1313227" X-IronPort-AV: E=Sophos;i="6.03,267,1694761200"; d="scan'208";a="1313227" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 02:00:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10880"; a="790064175" X-IronPort-AV: E=Sophos;i="6.03,267,1694761200"; d="scan'208";a="790064175" Received: from gio-07b44530712.itwn.intel.com ([10.5.221.18]) by orsmga008.jf.intel.com with ESMTP; 01 Nov 2023 02:00:12 -0700 From: angus.chen-at-intel.com@ffmpeg.org To: angus.chen@intel.com, ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 17:01:15 +0800 Message-Id: <20231101090115.10655-1-angus.chen@intel.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux: keep write_header and write_packet in the same thread 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: k3yylZKpmqNf From: "Chen, Angus" sdl2_muxer(wayland): In ffmpeg6, we create a separate thread for muxer after calling avformat_write_header(). It may generate EGL_BAD_ACCESS when we call write_packet. This is because egl_context is bound to previous thread. From EGL spec: If ctx is current to some other thread, or if either draw or read are bound to contexts in another thread, an EGL_BAD_ACCESS error is generated. Signed-off-by: Chen, Angus --- fftools/ffmpeg_mux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 7a924dba6c..d9eee3bb6d 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -215,12 +215,21 @@ static void *muxer_thread(void *arg) OutputFile *of = &mux->of; AVPacket *pkt = NULL; int ret = 0; + AVFormatContext *fc = mux->fc; pkt = av_packet_alloc(); if (!pkt) { ret = AVERROR(ENOMEM); goto finish; } + ret = avformat_write_header(fc, &mux->opts); + if (ret < 0) { + av_log(mux, AV_LOG_ERROR, "Could not write header (incorrect codec " + "parameters ?): %s\n", av_err2str(ret)); + goto finish; + } + //assert_avoptions(of->opts); + mux->header_written = 1; thread_set_name(of); @@ -599,15 +608,6 @@ int mux_check_init(Muxer *mux) return 0; } - ret = avformat_write_header(fc, &mux->opts); - if (ret < 0) { - av_log(mux, AV_LOG_ERROR, "Could not write header (incorrect codec " - "parameters ?): %s\n", av_err2str(ret)); - return ret; - } - //assert_avoptions(of->opts); - mux->header_written = 1; - av_dump_format(fc, of->index, fc->url, 1); nb_output_dumped++;