From patchwork Wed Mar 20 16:28:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 47266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp4852pzb; Wed, 20 Mar 2024 09:29:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXw6eiqS7/AF3hZ0uLJTCBEV3pJAUpyn8EJBzU2PZBd3CcmkeNWmJp/l6apn+haVOlp7EfR/DNCh7v6mMDfQ6fvevmhPTZ6whOuOQ== X-Google-Smtp-Source: AGHT+IEidB9+/3g5OCxqNBGdCPMtyHORysq3xZGEFQ/zLhAnWa7Ji4UiDoFyrhfJuOY8GRU5QcSH X-Received: by 2002:a05:6402:414e:b0:566:18ba:6b80 with SMTP id x14-20020a056402414e00b0056618ba6b80mr15507343eda.31.1710952163276; Wed, 20 Mar 2024 09:29:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710952163; cv=none; d=google.com; s=arc-20160816; b=qF0f6l+QCSfPamOwUqVGnaJoY9jkmNYESS+f2j5uevL334XEqZowxtaIArauGUBw1n P4lMYRRDwelwa7PLdXiB+UBvxRs1bwLClK9RyvANI4/BCA0hPSVPR4R+rA8BDnuAk80X fUdVvlTy5Ei9ebbzOzacWtBTOVoYuuIoAZ5SSd0QAHzp3P2Wm5w8PUdvPTyHibzb81yI Lq5EBkf00nXMp9zaHM9YH9sMpn4YmqCz3HYb3cpZdV6ntmoN+qW0U65DjyMu7xy44dcz ZbCHdVJGxk6QF/K6QFun62H71S5gwKkbMl1zMaf3CQalrvpQ6m83WVERyxgfk6v8TRx1 /cVQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=wgPQNhi5DICFHyQKebyyppPjEWEAQNelis40ozwkdF8=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=u8EhHGf3tXe8LEcJTZUUdPP6t/+iaeIx2ctMJaATpBSh74cXxpvx3SjGdDz27iysW8 wSOD5lvd63zs7VJn5l25N0QgXHnAfW/VySXHHR8oiPDAZFnWHR6j75a3rbpdWAPyyEo3 mls/Y9iYhsQRMTKm1/Lp/Wizp649svU1rOanpeCdlKZhaj734l/dBv3H7UQ/Ns/lj0kV uHAtM4IP9GRksRqinNq0AcwAcbTHR4qXd1r6a/RZ4t20Sie/qLI1OeYDyrn0K/UP1+Ty mKVV3X/o7z8ZLbqePyNFR2rc0KrFtRBqhD7Z/7kkOQKgfwLkZDOWOm8H4X9mFkz+S/uX u0OA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GBw8zupN; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f8-20020a056402004800b0056884c2f202si6730833edu.515.2024.03.20.09.29.09; Wed, 20 Mar 2024 09:29:23 -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=@gmail.com header.s=20230601 header.b=GBw8zupN; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEABD68D4A5; Wed, 20 Mar 2024 18:29:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B256368D0C4 for ; Wed, 20 Mar 2024 18:28:58 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4146f2bf8ecso2752295e9.3 for ; Wed, 20 Mar 2024 09:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710952137; x=1711556937; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OTdW872k5CVf2qoOd7ZH7i0td11BPleBaxrIcu0nXYI=; b=GBw8zupNmPz+4UWC2fFq9y5Vjhxaahpgxvmo4EPcjdqT8ymzfJUb0lzAekxRO6OWbO V6b/+rNqw2mEibHHOmhFJLusdsE/6AsEgvhF7Jg5PrEms761cub9tjaCEqq7wf+gVJZu 109fdwwVwlcNyCX8INVHvGB9vh7WXKhP5XabZjLO8ZvzWVkkyDkxml7IZ8/ZRx5aRXI1 98JLZC7qMVtDAp6dotRYwGeBxRZGmAIHyS7h/1AAEgHeM9mxERE8jIOcXTLM92iWBUJS fGYk08dFKOEvA7wq/Rbgcrm4JllNG8hwC79V8cEdOLgY5sT6bd0S+lcggiVxdJnrZ5Jr /UNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710952137; x=1711556937; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OTdW872k5CVf2qoOd7ZH7i0td11BPleBaxrIcu0nXYI=; b=Ndb+doI6vWiis5CfmDhTFZbiOeEFOoKZoYfS5cCDSTwviangafRbozU0vv1B3IB10X BMXPUddpumJfQJPjV9P9NyPNaoSn4KzqJHGEEnpbmkKRt7crv4/Bte6kw1R6iMxfGyU3 SfcrMCqILgndnzBWFULiOox8gddw1u7JlLQnhWPe3q62aSH8uS76JDikWPAX3SGJQvXA /5lE6Td2lowQEac7ndA/MSMWtFUyuLgvg5D9pTyfWrrmJWVCy4kGgk8c9yLZXzgX0yE3 /pQ2mBhk6Yjuf6PPYM4DpHGaVym69osaULIcZVpEgvHiwZVDqEbJhtMFDxTaj6ihbkcZ yv3Q== X-Gm-Message-State: AOJu0YyfClCCilDV3t7ozLGYwgy65YdZXpvjhkmdJvDAJkQn7NMQxvVT isghY11XDpjqugmnwGQpxS3glsbi1fjoqbLttltFITPMIL6764rXFz3ddbEd X-Received: by 2002:a05:600c:4f53:b0:414:ed4:e959 with SMTP id m19-20020a05600c4f5300b004140ed4e959mr8859305wmq.41.1710952136809; Wed, 20 Mar 2024 09:28:56 -0700 (PDT) Received: from mariano ([188.210.239.0]) by smtp.gmail.com with ESMTPSA id fc18-20020a05600c525200b00414105c4cd9sm2690873wmb.21.2024.03.20.09.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:28:56 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 69D2FBFCDC; Wed, 20 Mar 2024 17:28:54 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 17:28:54 +0100 Message-Id: <20240320162854.70853-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavf/gxfenc: consistently use snake_case in function names 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0JrpEy3rCdGt --- libavformat/gxfenc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 7495924722..9ea24c2f27 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -137,7 +137,7 @@ static void gxf_write_padding(AVIOContext *pb, int64_t to_pad) ffio_fill(pb, 0, to_pad); } -static int64_t updatePacketSize(AVIOContext *pb, int64_t pos) +static int64_t update_packet_size(AVIOContext *pb, int64_t pos) { int64_t curpos; int size; @@ -154,7 +154,7 @@ static int64_t updatePacketSize(AVIOContext *pb, int64_t pos) return curpos - pos; } -static int64_t updateSize(AVIOContext *pb, int64_t pos) +static int64_t update_size(AVIOContext *pb, int64_t pos) { int64_t curpos; @@ -300,7 +300,7 @@ static int gxf_write_track_description(AVFormatContext *s, GXFStreamContext *sc, avio_w8(pb, 4); avio_wb32(pb, sc->fields); - return updateSize(pb, pos); + return update_size(pb, pos); } static int gxf_write_material_data_section(AVFormatContext *s) @@ -351,7 +351,7 @@ static int gxf_write_material_data_section(AVFormatContext *s) avio_w8(pb, 4); avio_wb32(pb, avio_size(pb) / 1024); - return updateSize(pb, pos); + return update_size(pb, pos); } static int gxf_write_track_description_section(AVFormatContext *s) @@ -368,7 +368,7 @@ static int gxf_write_track_description_section(AVFormatContext *s) gxf_write_track_description(s, &gxf->timecode_track, s->nb_streams); - return updateSize(pb, pos); + return update_size(pb, pos); } static int gxf_write_map_packet(AVFormatContext *s, int rewrite) @@ -400,7 +400,7 @@ static int gxf_write_map_packet(AVFormatContext *s, int rewrite) gxf_write_material_data_section(s); gxf_write_track_description_section(s); - return updatePacketSize(pb, pos); + return update_packet_size(pb, pos); } static int gxf_write_flt_packet(AVFormatContext *s) @@ -424,7 +424,7 @@ static int gxf_write_flt_packet(AVFormatContext *s) ffio_fill(pb, 0, (1000 - i) * 4); - return updatePacketSize(pb, pos); + return update_packet_size(pb, pos); } static int gxf_write_umf_material_description(AVFormatContext *s) @@ -643,7 +643,7 @@ static int gxf_write_umf_packet(AVFormatContext *s) gxf->umf_track_size = gxf_write_umf_track_description(s); gxf->umf_media_size = gxf_write_umf_media_description(s); gxf->umf_length = avio_tell(pb) - gxf->umf_start_offset; - return updatePacketSize(pb, pos); + return update_packet_size(pb, pos); } static void gxf_init_timecode_track(GXFStreamContext *sc, GXFStreamContext *vsc) @@ -823,7 +823,7 @@ static int gxf_write_eos_packet(AVIOContext *pb) int64_t pos = avio_tell(pb); gxf_write_packet_header(pb, PKT_EOS); - return updatePacketSize(pb, pos); + return update_packet_size(pb, pos); } static int gxf_write_trailer(AVFormatContext *s) @@ -956,7 +956,7 @@ static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) gxf->nb_fields += 2; // count fields } - updatePacketSize(pb, pos); + update_packet_size(pb, pos); gxf->packet_count++; if (gxf->packet_count == 100) { From patchwork Wed Mar 20 16:29:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 47267 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp4862pzb; Wed, 20 Mar 2024 09:29:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJrszFy7ytdUVbffLssqAqczZ8gkVFz1zmcejxHnryksLoOt/HX3vOe1qsXT3IT754y1+ru4QYh7fxAbCdGmE5PBuAx+zPfS7gpg== X-Google-Smtp-Source: AGHT+IGEiQ3JVtuxLMRHixn4p1F/xuTV9o/gmJuABdVj8MzYH3fvcoSdBUt5pho0taflDuH1Sbtv X-Received: by 2002:a05:6402:3988:b0:566:e3c7:921f with SMTP id fk8-20020a056402398800b00566e3c7921fmr2002859edb.22.1710952164213; Wed, 20 Mar 2024 09:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710952164; cv=none; d=google.com; s=arc-20160816; b=oUGgQRbg/k2FxgIxvy+0Bboh/Rr8Cnmc+HrfMGOkEXvX5Lo4hL+MmZytDBjfB10iQ+ tA6jSBVN+2bAyYzZYfps4Im7Hsv/uWIbem77X4lgf2v77zVQnMxOwpOFH1N4kuy+zhbV Jwea80sVTcM8lEcmkR3u+r4zHBDb8SXrhktpILsTTHfGMznRtmN1Oq5wVNay1+phvJxP GhdIhTubmwvlvJHTSQAhHguOk64VHAzwwFlVY/ntko+S91WRKkgSmQhk9WqlENWZ5bW6 N+/iqPa4sZQj/dE8MOvPmkYEI51TAVQaQTB3P7EU4nzW3EA2oiSRSbHUyVOkDklv3jg0 7HDg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=CCmnqsBmLHSBpeixAvUHf1ypFNj6Wstfhs9MOGEVamg=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=LsbBbpOTwd374PXOFF4EbiQ2K2kraiwNSZKxM4Uvh2ONxGvUdUA0KpqB6jMs5Lukzl 9GdAUPslMiOCJTT9/+H7+ZKC3M2M4Vu327n6kBS8OXcXBdwmrnElRbh3yn/gO5g3a7IF G53yKCmU23p0grhk233oMz5id/jwVcaONgypMp24K52VRsWpS93cdrYGPgxFvYaDKrQb 33retvFhfxvXqnRUrSNWSGg+4t3JMqWKQ5jXE7jRkPdrOcKmX6CRvrhrU1/dK1h/399O peCTCdCAcXdY7nzJcJRmAHY0/0XUbyvlhHkJ08edSN6MOln7ryVliGD6hyi8brFDjKcy VF1A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=U25jlAxl; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z11-20020a05640240cb00b00568b5f61ba3si5131403edb.300.2024.03.20.09.29.21; Wed, 20 Mar 2024 09:29:24 -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=@gmail.com header.s=20230601 header.b=U25jlAxl; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 255A068D4AE; Wed, 20 Mar 2024 18:29:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C546F68D2F1 for ; Wed, 20 Mar 2024 18:29:04 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4146f2bd5f1so27155e9.3 for ; Wed, 20 Mar 2024 09:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710952143; x=1711556943; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZUmM89nM/0JJfH7xmAdsNHmB8uPWJ0yEgpwVd1fPSKA=; b=U25jlAxlX6vNYpnGFuALUCxWus6ttVNQXX5B4R2tvDBTUjoVhvRqalNASV9SAKKVSl svWcK7QGIbFDh+2W/P/HLqsqZTPZeZo8jFEbDhKFIaQtP6mRl4OKx7b3CRNPMezVIXhj SGo7fKTzpyLuaQiErWtjHZ80uqhzj6JBMgyNJilMcheQyb/F5uxHPpezMGZDNm2BPIgx FlD4HzwCC7YxK1uOrytTkiUwXL+w4wPwk3HSppQnBd5XsNOM5IFtf+e69Rp28+dLfrWp iOmx28M0xPmPnzc8a0KyXA7FCgP5p5nwIEE2yhKMbTQHX2b/vV/Y5JZvTSnOFqa/fDdd w/bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710952143; x=1711556943; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZUmM89nM/0JJfH7xmAdsNHmB8uPWJ0yEgpwVd1fPSKA=; b=tStq1MCTZ6zNWAxlyTXeY/k07GnhtmjDhFTROoOGRNMNGYjRbxl2iJWDM5gx/FZ0vD oM506caub/EKpGWI02fgV8/bPo+jMYJ5lbKlr6w6fsRuZ48GO/b/WKBcV/VevdjnfvDg Shjc2cbI7kcdpJTVMmQI9HG06NynR0p37Gu4W3XOd3B/H2JVrh8fvHgUEdc/rX2xkk7F Wx1dAbLiFy2VLLWZ5nQDuie/vlnrdYQMKaDZ4FPd6d1sjPxsN0eIfCqr+WKecZ+lZz1V N8yHUWrWG8RqDFBPlRAH+1nLXof8t/icTuZytRkoQh642Chq6ZLWx2wxvFX5N68PY1t4 EWqA== X-Gm-Message-State: AOJu0Yx+Uu5XxyofeuWpcVPjM09mPUhdm8/zlccWPEWXA8f6M3cQH4+C +6qJd6NFT3lCqEqsPaezk+QHxiPYE6U31TpG2FkJ8KxsL7wSqxGXLEflfOob X-Received: by 2002:a05:600c:3ca6:b0:413:2c4b:35d1 with SMTP id bg38-20020a05600c3ca600b004132c4b35d1mr2134825wmb.31.1710952143203; Wed, 20 Mar 2024 09:29:03 -0700 (PDT) Received: from mariano ([188.210.239.0]) by smtp.gmail.com with ESMTPSA id c21-20020a05600c0a5500b004146f728906sm736815wmq.7.2024.03.20.09.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:29:02 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 5656EBFCDC; Wed, 20 Mar 2024 17:29:01 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 17:29:01 +0100 Message-Id: <20240320162901.70879-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavf/gcfenc: return proper error codes in case of failure 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wFNBvGLL4Fx3 --- libavformat/gxfenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 9ea24c2f27..0aea7bd7c2 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -692,7 +692,7 @@ static int gxf_write_header(AVFormatContext *s) if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { av_log(s, AV_LOG_ERROR, "gxf muxer does not support streamed output, patch welcome\n"); - return -1; + return AVERROR_PATCHWELCOME; } gxf->flags |= 0x00080000; /* material is simple clip */ @@ -707,15 +707,15 @@ static int gxf_write_header(AVFormatContext *s) if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE) { av_log(s, AV_LOG_ERROR, "only 16 BIT PCM LE allowed for now\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->sample_rate != 48000) { av_log(s, AV_LOG_ERROR, "only 48000hz sampling rate is allowed\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "only mono tracks are allowed\n"); - return -1; + return AVERROR(EINVAL); } ret = ff_stream_add_bitstream_filter(st, "pcm_rechunk", "n="AV_STRINGIFY(GXF_SAMPLES_PER_FRAME)); if (ret < 0) @@ -733,7 +733,7 @@ static int gxf_write_header(AVFormatContext *s) } else if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { if (i != 0) { av_log(s, AV_LOG_ERROR, "video stream must be the first track\n"); - return -1; + return AVERROR(EINVAL); } /* FIXME check from time_base ? */ if (st->codecpar->height == 480 || st->codecpar->height == 512) { /* NTSC or NTSC+VBI */ @@ -750,7 +750,7 @@ static int gxf_write_header(AVFormatContext *s) } else { av_log(s, AV_LOG_ERROR, "unsupported video resolution, " "gxf muxer only accepts PAL or NTSC resolutions currently\n"); - return -1; + return AVERROR(EINVAL); } if (!tcr) tcr = av_dict_get(st->metadata, "timecode", NULL, 0); From patchwork Wed Mar 20 16:29:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 47268 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp4938pzb; Wed, 20 Mar 2024 09:29:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUcjmjWW3VQDjQiZBCmW0STmJiswjqKPfBahzipvM/N91ZSZFmaQZzJO4Do5+CsEw2+KLzMNZU5wOGDR7qYNdhZ7VuM/OmiGAOUTQ== X-Google-Smtp-Source: AGHT+IGR23DT3tOEhygHfzmZ37SkfjwYdodJy2XEYN/i2nfk2Obl0pHjpQeCQmmykqOSRvdg8toj X-Received: by 2002:a05:6402:3988:b0:566:e3c7:921f with SMTP id fk8-20020a056402398800b00566e3c7921fmr2003124edb.22.1710952174172; Wed, 20 Mar 2024 09:29:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710952174; cv=none; d=google.com; s=arc-20160816; b=ejAQSw47R3ZjhQapL0rPPxW1IvX3p2KgPeg5Cb3hdGNtw9t9Ltl8hZhfuRlrB46Kch oKyKlELYmYkNMOeVLTk7PRxq1eW2OBjh463HCYaDAAPks3j/DJnwYZcvoM85zPemV+TH e3V643DG/RGsvKaTOeqvW3fONNy5Ax2HXI7dKmXEOm5jqV3l3qUj6+XKrtikBru50gEK gmzQj2WSmGERmXpUs6Hjrfh2C/6bsZ5W34verssyqkiHAFXzZbbX3f8eqaoQkOT0YMN0 S5HKZTeXcqJVVr+MBTiwFcZxrNEKRZprDnD3C0W4kYck0z7GRGucKd1LRClr+/WKA1dt 0rkQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=3/W29Ujx/I/Gg6kCI7aHAqxt1A/QxQ08k5HMhz9mQA4=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=l8YtKQwWjweSlxj0catlZt60DfB0LUpC4rnqXA4RPwES3kUAdfWPsdPZ0pWiiqFKZb IUF3gfdGhMJoMBficX4UqeHX0ofW8jm1QjdFQDrxEclF83ec8EH+LiV+/FCp63n6n854 UAuQS07G2cynYt0fKkrJSjvc0aWQJInOcVemSPOXpHBR7u6Y4AKCiLrWQgjnp3y2xKaz IKMZUBgWdTygSwwcYR0QQMXZd4pkyn0t4aEk4j1g7Ej9S/3nHppVdcTvU8gHo9VCIVSd X9V/QpkAOlHQheQK5mNLdamLmYlj8p6wbJgqOtynEfHbSCCrCZNZk+dgGShpunqXi/5e ZFpg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GSj+7Qg4; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g14-20020a056402090e00b00568b43d33f9si5549248edz.213.2024.03.20.09.29.33; Wed, 20 Mar 2024 09:29:34 -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=@gmail.com header.s=20230601 header.b=GSj+7Qg4; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CE2268D4B4; Wed, 20 Mar 2024 18:29:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE0A068D2F1 for ; Wed, 20 Mar 2024 18:29:16 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-41413c99748so202825e9.0 for ; Wed, 20 Mar 2024 09:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710952155; x=1711556955; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kE3yF8gTaBlCYe0x/NEZi6lr774MGf6gm4iOoEc5KSI=; b=GSj+7Qg4tPunO4blSMz4UYNZQ9VL3S5wM6rGFUZTpNoeyBXZDJvrjW/xYRYY+Ji35U xCAYtufGk/BKUtyV/HguPXGMebYPagoN5wGWSc2Cib4JSfT4jvobl/jVnKn84yzjh3w7 nms6FgxDbMVRGj67OpWLEAAe5iic1ojDIRKInN6qtfM8lXoYvs367nSmsxA4LChB/s47 JxIMUdjsUiDnpJ7w3wgyQjcYIJi2jUISiP2gDoLStXd7nRN07nwWFPvZmCAJPQzQajRP g+N84pth3a9bwJ8Al2ZLkAL5aNP2jEidiF8Zbsspm6d1Bsos3eoLguV+ENgtTayZuNdn pYTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710952155; x=1711556955; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kE3yF8gTaBlCYe0x/NEZi6lr774MGf6gm4iOoEc5KSI=; b=lJSykpdcx1D6NcwQggHat5UW+wcobkfLZDCJ2qVDtNVyDLbb6YOCIp0r2q/Dl9BbkH p6GHSMuaX58v4dxqgelgA86NwxDcrej5t8dgGSA2AsFEHU/jgNYSDEud+pvvihcxIzRl cbGaHWenGU8dHDOLhvNC0Q8cK8QI50g1pfZbPhQB9YndH2idzD3H9WCtvqno2IpemxjZ I5x0tsjwWZMoE2ToWJLokM5/fkK+dt8zMdB9xcKf2vmQ0EA/QMp6LdBCDKFqcY2nYelW i1tweBRkHYjBGJ4JaImc4AJFien7smlUH8gnfo1F8pvKDksMhQcjF2kpbbpFyOVU7X9Y XwEg== X-Gm-Message-State: AOJu0Yyt1Ze3j2meV7tS3MKUxNMqOnXhcvzV3Hb+hRT3m2S+RukOzR0+ dVKFjZAaD2CzLSZ4yD757f2b9C/tSAyO+fM9OOu1S7GRjqrYRZCxT0radzW2 X-Received: by 2002:a5d:4e04:0:b0:33e:6ac:691b with SMTP id p4-20020a5d4e04000000b0033e06ac691bmr2034436wrt.9.1710952155208; Wed, 20 Mar 2024 09:29:15 -0700 (PDT) Received: from mariano ([188.210.239.0]) by smtp.gmail.com with ESMTPSA id o23-20020a5d58d7000000b0033ec5ca5665sm15014034wrf.95.2024.03.20.09.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:29:14 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 94506BFCDC; Wed, 20 Mar 2024 17:29:13 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 17:29:13 +0100 Message-Id: <20240320162913.70909-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] doc/muxers: add gxf 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZAr2bEvjXLNT --- doc/muxers.texi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index d9dd72e613..25d1a5907e 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1776,6 +1776,16 @@ force the @ref{image2} muxer: ffmpeg -i INPUT -c:v gif -f image2 "out%d.gif" @end example +@section gxf +General eXchange Format (GXF) muxer. + +GXF was developed by Grass Valley Group, then standardized by SMPTE as SMPTE +360M and was extended in SMPTE RDD 14-2007 to include high-definition video +resolutions. + +It accepts an arbitrary number of audio and video streams, but only a limited +number of codecs and parameters are accepted. + @anchor{hash} @section hash From patchwork Wed Mar 20 16:29:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 47269 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp5059pzb; Wed, 20 Mar 2024 09:29:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhwVV5M0dOGo26WFXV0Y9LiTAU5xNpWCzScoY/N1MAfVG/IHV93yeMiDzJtlNC4/yR76z6wSiG0Cu7N8kXnfNiuZ0pGIP2BVB8IA== X-Google-Smtp-Source: AGHT+IEdyvIaAn7Gh2bo9hHduvc6AQprt1bq+c/RamQZiBkIb4oSP7xqsVsyk1RkOoYWLtEjtgWF X-Received: by 2002:a05:6402:401a:b0:56b:b8c8:53e4 with SMTP id d26-20020a056402401a00b0056bb8c853e4mr935673eda.4.1710952186998; Wed, 20 Mar 2024 09:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710952186; cv=none; d=google.com; s=arc-20160816; b=JW14PuLD4rvGVzRimfT0hC2xXN8XGH6z1IO/S6M/Ev6bEiOWumNPLQj9A1RKFkYqcd Bot+mu+gtfDvrfdTrMvDiO9DYG4MSwzulzSC2FebWCtGnSZFJYcPhlr3hYce8eoRtkwG ooJmTaY7bVEJF/E3hhmZEO3tBqMWP2RguNtU5/bKYpBbvE+QsQYnpkMOLwibk91ftCrh jh2aR9Ql9/Z4nmpw4lnlPLb92rEtgbukA9kW5XPHvmGpCYGV0WxUK8zw9KCShukijFGn Jt6KXe6tOiEEoLbNIcFwlcc4GCrRvJN7BZFo8f/WZVlDbl3bj7Abm+ZibcbG6Id+Z5d3 L0Pg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=fd6/M0lGDCFzMh1aXgBfZHLiaisgyOW0Fj+8vD9HVro=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=fBBVqXUJC7MzFzZrSeOq2plndHTzr31bxAeZK/JAWXyBn/bdFwDBcv+nYSK70qDRhT kiUyke7zEuG/6FkHwGLTHescBekvmwUt3ed3rO1fVi9IEE2Z5/ZzgxzrB9kq1QDTtxQ9 nxe70rY0dBOjeOfoBtJksozxISPijSgPj0QCgq9S9C5Brm4I1sgtU/Bt+NpMpBSm3ahH jawwUC8kJM4ydjtql0VdT5YXaa38n0rH+vQWGYVB52EXYploe71U0qIrchzUO+xB53lF Lx6jAJw9MWMdsbW7eU1Nrjt3p5K568Jg7YA/g1k8H8bp/GmbJQSeiI5+4K2YCHrT6Ao+ rDAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XzA0g1mk; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y22-20020a056402359600b00568c5c7a3e3si4372609edc.555.2024.03.20.09.29.46; Wed, 20 Mar 2024 09:29:46 -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=@gmail.com header.s=20230601 header.b=XzA0g1mk; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8125268D4BB; Wed, 20 Mar 2024 18:29:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F335C68D4A6 for ; Wed, 20 Mar 2024 18:29:22 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4146af3ebc8so6958125e9.2 for ; Wed, 20 Mar 2024 09:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710952161; x=1711556961; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=A8XrLkORdRBMRPpoSJVHeEb2mL5eK6UzYEkb52EOyq4=; b=XzA0g1mkgu8qTpk7TUX6xJV2NAcHh4IaTZtvg4os+sMLATNZSLPWwe27dP9XBygk3I Eht9s2GiteNKva9f2KBv+UYNe0AJLfGVz8GexmfBHksgZWp8B4GPeifpEUI/3fbqE4/2 P1N9RFey1ukUkn88ALpXwefQB8ca/qHwNblcnS7hPUfRJokcY67N8gZMuEC4brPdBmzX vHH2w6ozcpgfTbggMa0lg/Jl3QdYkh2NX3Zi8B1IY+1RXkNKnYVi82yDQH1K1KGAvjlg LSrH+/LJrXzC94MZdTYua9YR3JYnNYX8YnI+ZfnqAm/gmG4Y+TKc6qMkZxGEQS44qegy jDxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710952161; x=1711556961; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=A8XrLkORdRBMRPpoSJVHeEb2mL5eK6UzYEkb52EOyq4=; b=Nhw0bwD3hesu1LNi6uPkeOO8ib0CCEik3Iu5/oNbdbMoEfT2CDMvIdrkDpWBmPQwG5 dc1MljblSEQMGS4htGbWxGzVNbM/vztaT5devS1H1IfdB8JxNanShHBSOQ5P0lJquMsd yH2056GUI9LOnjCBKj7eJUTGvopt5z38evf5ycSGQTd5IbItWkmddSTBZf7L29UhceFP ppO2cv2y2ZyMNNHpQraSE7LUGmIztaQBs8WF8UyoKO9zn9M6QMuIoyGkHoWOcvxz3lvP 6Cw9SkGdKdeatm0M40NTw+H+Sh3rQm1swXgwL+r+Xg0nTZSvRnFOR9aQyI+9jD/ZkBtk rvVg== X-Gm-Message-State: AOJu0Yxr+BqvW8afaIeDSN8W9SbnDC42wRQrWT/7D/wQ7BAsppJUpXb7 WRH6BnuLjfnK4VPgcXcNobwRUEKIuSexz2h01PoBhsQj6dXlt/t7rRNFs3xg X-Received: by 2002:a05:600c:19d1:b0:414:6d31:1e0f with SMTP id u17-20020a05600c19d100b004146d311e0fmr1608775wmq.4.1710952161296; Wed, 20 Mar 2024 09:29:21 -0700 (PDT) Received: from mariano ([188.210.239.0]) by smtp.gmail.com with ESMTPSA id e13-20020a05600c218d00b00412cfdc41f7sm1361574wme.0.2024.03.20.09.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:29:20 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id DDAA2BFCDC; Wed, 20 Mar 2024 17:29:19 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 17:29:19 +0100 Message-Id: <20240320162919.70930-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] doc/muxers: add hds 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OC0Ig7RKSjS+ --- doc/muxers.texi | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 25d1a5907e..e7f2a93058 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1831,6 +1831,45 @@ ffmpeg -i INPUT -f hash -hash md5 - See also the @ref{framehash} muxer. +@anchor{hds} +@section hds +HTTP Dynamic Streaming (HDS) muxer. + +HTTP dynamic streaming, or HDS, is an adaptive bitrate streaming method +developed by Adobe. HDS delivers MP4 video content over HTTP connections. HDS +can be used for on-demand streaming or live streaming. + +This muxer creates an .f4m (Adobe Flash Media Manifest File) manifest, an .abst +(Adobe Bootstrap File) for each stream, and segment files in a directory +specified as the output. + +These needs to be accessed by an HDS player throuhg HTTPS for it to be able to +perform playback on the generated stream. + +@subsection Options +@table @option +@item extra_window_size @var{int} +number of fragments kept outside of the manifest before removing from disk + +@item min_frag_duration @var{microseconds} +minimum fragment duration (in microseconds), default value is 1 second +(@code{10000000}) + +@item remove_at_exit @var{bool} +remove all fragments when finished when set to @code{true} + +@item window_size @var{int} +number of fragments kept in the manifest, if set to a value different from +@code{0}. By default all segments are kept in the output directory. +@end table + +@subsection Example +Use @command{ffmpeg} to generate HDS files to the @file{output.hds} directory in +real-time rate: +@example +ffmpeg -re -i INPUT -f hds -b:v 200k output.hds +@end example + @anchor{hls} @section hls