From patchwork Thu Sep 21 12:16:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 43862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp77535pzf; Thu, 21 Sep 2023 05:17:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5xgUpJvPlL7uZz5U3RXstG4JGr6XbKvbRWV9zGPXmNNAnSBN917z7qiFq191XntORJFS3 X-Received: by 2002:a17:906:21b:b0:9ae:3ee3:dc5a with SMTP id 27-20020a170906021b00b009ae3ee3dc5amr4221297ejd.73.1695298668778; Thu, 21 Sep 2023 05:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695298668; cv=none; d=google.com; s=arc-20160816; b=VWmFFd/SbveVD7biAAf666b7ic2F1geAgW2JZndN9RsYVfkjaINkzU2KIbSorevcXe xnUUAPX3PZrcto/ebz11Cm6zqBdYLHgmcuCV0gRAO5F9x2AHSTAAF+QAe6ov222RajGR v02lVRXCdjswxLhiU364Istp401JFAsWifKsyRPsg7ypPq++HnBi2YsJnBNATnj5Zw3h Zl3fm0C+Poy3i+U1NUI3MWS+8BvkACR0gl5OanrvietzDEk9tWeHV62L4AP7MOsddZ/s NF4zl2DADBUFxhcKQmaZu3YoqJnthAjuzF7dBnzvkLLMeJr/RM8acKNYSAwwNzW1gSIi zreA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=Gpa5p+tEwEdhBrWGFEXip41OYAWz32+QlSQCT9q+sc0=; fh=t7y2C+eTeDTjU/IXcwx7KgHV+pYAZ1n9wIrNqt3BZNM=; b=TVX5qQYmYuox+EFB0mbwWvAV6joxdrcnoJi2wSrhwPXqa5NXtg0u8lEEHZZSOLRzZ5 +1SAgBTcCl2x/omPpHh7VZJ/+szzBoDpU+StWysu7YfKcZWmQ1zqGW7mFd9aBnkVhmbL pIEU9MqRuRn5AhfQjElpwh18lbn8rJHin8tcgo5HN9MQ0voLybmd4PEpEh95gC0VM07n ptk/sK5eiMOx0Gugd71oYchKmjJrbz7b0EqcMd8l9DrLiMNuoiscCc0c07zR2/tUUF22 VeJKh8U6puShC1hW7HJc0OD/AhO9nSri7Gf9EhYCaBd6AdcQ7976C4el3VbnFAIa1hyX wbTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=nNeGcLal; 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 n8-20020a17090695c800b0099cbccaed7dsi1129015ejy.905.2023.09.21.05.17.47; Thu, 21 Sep 2023 05:17:48 -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=nNeGcLal; 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 D80C868C8DE; Thu, 21 Sep 2023 15:17:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8314268C870 for ; Thu, 21 Sep 2023 15:17:27 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-405361bb9cdso4406215e9.0 for ; Thu, 21 Sep 2023 05:17:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695298646; x=1695903446; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AsVfcfyUtbityxlc6pCRMPacz/A6MMq+5LfuYpA6L/s=; b=nNeGcLal0++VFAT5mhDDMogswiFDXFRe/PTEEkanDeb2Wr0aSlizc03gp6/7YLhNxv 6MPKW5AAbKg5HuEFqWAAU4YSL2jrcpO0t0C0Eq5U8gIwNhc9hLlu7EiIMdm3cDWaeyfJ Y98EnYm2vlRDif+B86U0D6sSpuWGHc3qITE5bYLRXCWqN0BSZ5xSpCBWkEm+VQcbwNdC sBPCQZP01xZGkf6O8oJyYrXYovY6Bo9XWPZrCJIWSQdFauTY9O32rdc4OvFWbcRDHJHZ f2GJ5nMVajn0XqXqmKi/Z/aEJOnwfIp/UYDMJaK6UvYJStbbr4AZLlWnXUgy+R4Zw6OF acSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695298646; x=1695903446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AsVfcfyUtbityxlc6pCRMPacz/A6MMq+5LfuYpA6L/s=; b=a4kxFsa1mfJcn2jKL9mSl2XnoqLvFedR7tzZ/TT8AR1vhfNGXo6OcWX9VqO6TWyUeP vu3eTt0zIngTI9dRIlYFomzp3LLQYtxht2P5X8MPspoTQYycaCNKAjjOMYmh1udNv59+ CsaFxfFOkCuiqLYHB1u/93pMTP41WtVskYzuFSuixbhbqn/PQ0o6wCPdgHLaRMazS2e1 ioCdh/KRm+gZOjiNkypFCHGDgNY3UN83TyeencvFbUL0LSpbvmlvjOfClxPLckKxx/4c 1EzYVyJHZF2/WA5wG2zOpF3tn+95uqvggpO3+yLcyf14//MRhA66RsAHR20ew/Cw2smI zAUg== X-Gm-Message-State: AOJu0YyV4zbgxnEOfjR6oQPz4FaLkgJZaa7AkVmpNE/cNTXlWyEldgEf 1sMATiN3K3YLehuaHO7nn/ptEKTc60M= X-Received: by 2002:a5d:650c:0:b0:318:8ad:f9f with SMTP id x12-20020a5d650c000000b0031808ad0f9fmr5046737wru.24.1695298645251; Thu, 21 Sep 2023 05:17:25 -0700 (PDT) Received: from Clement-Blade14.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id f11-20020adff98b000000b0030fd03e3d25sm1615108wrr.75.2023.09.21.05.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 05:17:24 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2023 14:16:58 +0200 Message-ID: <20230921121720.362842-2-peron.clem@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230921121720.362842-1-peron.clem@gmail.com> References: <20230921121720.362842-1-peron.clem@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC PATCH 1/3] frame: decode: propagate PRFT side data packet to frame 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: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +YTegqnw6DKB Introduce a new AV_FRAME_DATA_PRFT to propagate Producer Reference Timestamp. Signed-off-by: Clément Péron --- libavcodec/decode.c | 1 + libavfilter/f_sidedata.c | 1 + libavutil/frame.c | 1 + libavutil/frame.h | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 169ee79acd..223bb2e35e 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1429,6 +1429,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, { AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES }, + { AV_PKT_DATA_PRFT, AV_FRAME_DATA_PRFT }, }; frame->pts = pkt->pts; diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index c86190b062..becc5cfa3e 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -73,6 +73,7 @@ static const AVOption filt_name##_options[] = { \ { "REGIONS_OF_INTEREST", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_REGIONS_OF_INTEREST }, 0, 0, FLAGS, "type" }, \ { "DETECTION_BOUNDING_BOXES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DETECTION_BBOXES }, 0, 0, FLAGS, "type" }, \ { "SEI_UNREGISTERED", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SEI_UNREGISTERED }, 0, 0, FLAGS, "type" }, \ + { "PRFT", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_PRFT }, 0, 0, FLAGS, "type" }, \ { NULL } \ } diff --git a/libavutil/frame.c b/libavutil/frame.c index a3f07ca089..d379e57814 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -958,6 +958,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) case AV_FRAME_DATA_DOVI_RPU_BUFFER: return "Dolby Vision RPU Data"; case AV_FRAME_DATA_DOVI_METADATA: return "Dolby Vision Metadata"; case AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT: return "Ambient viewing environment"; + case AV_FRAME_DATA_PRFT : return "Producer time reference"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index c0c1b23db7..8bd87aa545 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -224,6 +224,10 @@ enum AVFrameSideDataType { * encoding. */ AV_FRAME_DATA_VIDEO_HINT, + /** + * Producer time reference data in the form of the AVProducerReferenceTime struct. + */ + AV_FRAME_DATA_PRFT, }; enum AVActiveFormatDescription { From patchwork Thu Sep 21 12:16:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 43863 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp77617pzf; Thu, 21 Sep 2023 05:17:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVCKZc8Nb8ZJXSws849jjWJ41UVZhxyjdbjbTj6/r5hM1OkgscTWEAjOLJ5zjoJL/NH2ze X-Received: by 2002:a17:906:74d3:b0:9ae:6ad0:f6db with SMTP id z19-20020a17090674d300b009ae6ad0f6dbmr384053ejl.71.1695298676838; Thu, 21 Sep 2023 05:17:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695298676; cv=none; d=google.com; s=arc-20160816; b=HjkPhiNEbG6p8VvtWI5l1Q60Z6RzslFeIlm+aB4WfhqzCoOgOCfnYTo+atShJjVbms Na32h4XAIJhmSYgClcMKyZf9ZCKRaI4UcAfbRZMLdFlrFeZq6nkPw4BSc3fEnlpb5RxG dRUNJ5L14uzuyxxvDWWGGG5UP9/aDi0xFp/ccOZGv1U9ItiyF3pF13cMhPwVBozbkvyl 2UFqi5mN08P6DW1CuyEtNbFAuf1KprSDzRH1yofnv9Z7ttxqmgHB3uBGp2iBXuTjehkS A+3ggD4zRUhwXPSftcpm9D4X/Bml/aX2JaiL5KI4FI9KWHRlrVZNC+xyaXbJZld+9k84 TRMA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=q5RAF0EAfL97MBQ5SyVpI8l+uuL4xgSdtrruODn6n0Y=; fh=t7y2C+eTeDTjU/IXcwx7KgHV+pYAZ1n9wIrNqt3BZNM=; b=bCcF7LA6xLevYGulovy0T9OKATtCyqxktW5CW/7fBHTI+a2yg9xMxnajfOF5VA9Qeo boOIrti3oZIbjCzFxa6pO4uzQsBDuj2DpkFudyNXxxXeTLBR+ZldMQUKKV3Blar93hRM TL4RCaTFCGkUpJ/qS+zXH3CHWcau5QpYqMJh2QMu/s/dNuxjsmaeorBJDhKWgvQ+RqAy CIAAYJu4aPAn/Ah7RI/eWmZ1M9WAFSpo2k26LcA7AWybeVlH5dprgYMF578gtMiIHWYL MkhX6ksGo2uW5QCryOJn3LwSNv50rN1+8EyXy6cG0UvwzX4LasogztqpepKprwk4XDGD IzdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ICial8FV; 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 lg8-20020a170906f88800b00991df467bafsi1197975ejb.617.2023.09.21.05.17.56; Thu, 21 Sep 2023 05:17:56 -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=ICial8FV; 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 0A5D068C8E7; Thu, 21 Sep 2023 15:17:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3993E68C870 for ; Thu, 21 Sep 2023 15:17:28 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3ff1c397405so9635775e9.3 for ; Thu, 21 Sep 2023 05:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695298647; x=1695903447; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x1DB4b7px34d4p0h4luQwsB1FZHRmqB8bhFIeSqatzw=; b=ICial8FVz4GhIkD8DitHY4weQcs+LkbXogVXsylpCOf/yriT7/qqCzVNlBUgEQyYHF SiONYYQzaprHbjuBfia0Ee6mC3qYIXqIMz6ujr+reU6xAW5v14I6NhKetV1eMdPH4jmD g0tsEzpacc1loyXt3NftIvUEJ70XKg3wCj31syuRKz1JrUAH+fWa3Hax+7XzgzUDLpfJ l9dl3Bq9ClmmQF5euILzRGfgB0Z9Uq4YJiH9OFXH2xO+G+Oz2KbMyBJJceH4SmwrymSJ 9kJVtruTT2AAno7+8hc9Mbad05NDDCDYEyGZ/IowC0iTXXwTsn57lXcoRiHlU7o0+iLd b1TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695298647; x=1695903447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x1DB4b7px34d4p0h4luQwsB1FZHRmqB8bhFIeSqatzw=; b=MtoYACJ1cB0m5nPu3/wNJqYBBHLV6rs0Y4JFsiShgGJkG0A3SHEQsooQ/PpKCkq+dP Nwah1pctXXoAhPY4X2XrOuIEupH+cQY9kXKvWdEDY4Z4QfWOmYPgNkhUY6Q8/SVqkhcZ ZE0RYOohijK1Fvqi8gBXFzlWMOHnnUXCCpRLRkxxu4DQ2/3GWWvV5wqobWai270wwd/A 656bYe0DlU1B3Yck9ZAWgHr0LKQ0UfqWCC3pltvfLUdV9XSF9uIriZ2GCwNX6JMSCZav I+bssrADJD4gigf1dRhE7B1yx8SnidpoOn7klcb6mLLFleh35ZIqmrVWV68TQUJcFWyq 1ArA== X-Gm-Message-State: AOJu0Yx1Fia0g4rxmYZZzoFsqyMOJ2Y8PB4g7RYyDTk3RsjgoaDUR7Yo cPGVJloc6qLDUbHHMLn2Ir63WBfoKco= X-Received: by 2002:a5d:4c85:0:b0:31f:a259:733 with SMTP id z5-20020a5d4c85000000b0031fa2590733mr4960792wrs.20.1695298646828; Thu, 21 Sep 2023 05:17:26 -0700 (PDT) Received: from Clement-Blade14.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id f11-20020adff98b000000b0030fd03e3d25sm1615108wrr.75.2023.09.21.05.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 05:17:25 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2023 14:16:59 +0200 Message-ID: <20230921121720.362842-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230921121720.362842-1-peron.clem@gmail.com> References: <20230921121720.362842-1-peron.clem@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC PATCH 2/3] avcodec: rawenc: Forward PRFT frame data to packet 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: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: niWsclj3gCrY Producer Reference time could be used in the muxing, propagate it. Signed-off-by: Clément Péron --- libavcodec/rawenc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index 8c577006d9..f238c8e165 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -49,6 +49,8 @@ static av_cold int raw_encode_init(AVCodecContext *avctx) static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { + AVFrameSideData *side_data; + int ret = av_image_get_buffer_size(frame->format, frame->width, frame->height, 1); @@ -78,6 +80,16 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, } } *got_packet = 1; + + // Forward the PRFT to Mux + side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_PRFT); + if (side_data && side_data->size) { + uint8_t *buf = av_packet_new_side_data(pkt, AV_PKT_DATA_PRFT, side_data->size); + if (!buf) + return AVERROR(ENOMEM); + memcpy(buf, side_data->data, side_data->size); + } + return 0; } From patchwork Thu Sep 21 12:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 43864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp77734pzf; Thu, 21 Sep 2023 05:18:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmK/mevriQM+tbwNcENA0SdgIxXdI1EwgBg8lb2SUSBfW6bmPQ/jaJ9OSRIHnd4AZQK2js X-Received: by 2002:a17:906:2258:b0:9ae:5fdc:aee8 with SMTP id 24-20020a170906225800b009ae5fdcaee8mr1468779ejr.53.1695298687924; Thu, 21 Sep 2023 05:18:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695298687; cv=none; d=google.com; s=arc-20160816; b=epCTXKhzd+xzJJuFo1zJu13Aux27vSJdkaVhj/HB9PPdFb/3Zinq7ca3pQMPy7Fx/l XHHGitTq3Wl+FytobpH2RFHibZkMwCwINLsRga0B6yd1JSdgb+PS6YLcbWNnmDiRD3tO hsIW0xKuldy34CvrYKKlfFrXreNS5r7QuJ02Rp4CuISuqf4M6hJXcU4/IcVBvjumy2Au OtZKvwzzC7aolj2gMbJzwwTLyNULcQpYK39N//qOBQDrkIE2rRS33Tf30cNdBLr+B1CS gZpz4dnyC3Td+WoGY8Y//znryxJGxRE8vyYeXuHjP9fdx6IhXI+GQbsBxOY3ZjYqaVxA BZqg== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=lORG4XQkcZD4Qc3UXLwEAgIQQ11hK0ArE8m5cE8r0sM=; fh=t7y2C+eTeDTjU/IXcwx7KgHV+pYAZ1n9wIrNqt3BZNM=; b=ZhVpLVsszbHWyNoJ5vv/CEOHYrkqk0OJFS5j+V1uZKKTd8Pvf+OoYdb8Vc54zSGZvl TFtMjr/GEiSvk7f/O2rTAtNHRlZtabXPeetfT2X7tQIi7tee4JfFPamdl/fm92CSVZ87 l6IxuIHVpZcarcKsJyrWeQG1eJXHpzXINBM4LOw3n6KotTNkZM/YxMHvSdcMWLjnUX59 xvL+5KePLDQssfufPyQ4tSMbMGQ2M0Kf2u7e/CvzzZ4H80T9sJBXEdXbyZYN6urtTbgO 4WOTTMWEEl/ReswbmldTbC0ogu9HkN4x8H93PXWxdor9lWBdi8kn+CUl/4RqIOqYTdfr n7wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="ZDr/I3rK"; 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 f18-20020a170906495200b009936735fecdsi1137558ejt.901.2023.09.21.05.18.06; Thu, 21 Sep 2023 05:18:07 -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="ZDr/I3rK"; 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 34C1E68C915; Thu, 21 Sep 2023 15:17:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A701968C8E7 for ; Thu, 21 Sep 2023 15:17:30 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-40472c3faadso9630545e9.2 for ; Thu, 21 Sep 2023 05:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695298649; x=1695903449; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0w7p1SZui6DQ6P1o4W+LkYeXPECOI3mq4PTq/tXsqLI=; b=ZDr/I3rKQ7WmdwuPhq+EvIB6+suHlmEhLBfhpNEgX6mqdwyK/VkjtwBZPQJJ26Avyj MjGjSqzG/5BO/WMYrEMWKxGvua7TnavQfVyUKLUHZAnk2NRdvVC5R21q79yQ1mXXOjvX yiFYzswmvdDgAdkBxb+WhHNTD2wzZdmdk/f7815NPksihohVpFFTqZjtjsGMi+wHgLpc ZUw1JdjFADNC7zsjmd/gFO58bI0C41NAMH2pbYtBIMCFcpUoMLgBJkNDgkd9hodHQNG0 dwo7B5NKSag5GvuvDk1vBO8ypKKwD8LhWoFEO/I8S+Qeh6WUeED1L3iWzHdK+5dmndss 4p/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695298649; x=1695903449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0w7p1SZui6DQ6P1o4W+LkYeXPECOI3mq4PTq/tXsqLI=; b=FPnjrhqei2Kkq5xqnDv6U93tgFueKFSQXMCppC7sSogUi9axUK+s0cCgdqneZ+b1kB BlJrAvg1jf5+367Cz0meA5KBhnw3aQ89uJuAH4gGL3Y1nKTMSyN7+mVmh5fRk1e2yihj pkk2IAAM9jEMJyvQUQlVOhmDxs5UFvtmklOPcRxevCCh1/Es7FbAYRHP4D7tTOgUyUMR 3M75gdI2b4ZVTgOcXO4N768hMi8B3PU5olNNWSAdMe7V4Y+0BiFiCHnwaWZV150c/Yxp 1FZcLa7upufLy+uGW8b2olIiEMT5HSmbq1BnpCs7CrXGopdBeWTJO4/Sn6Uhs2qin88P TuOw== X-Gm-Message-State: AOJu0YxejLkJGieEyhheXhuJixLBa1dEmEjZ9sLWAt6W22f7lvBQdUrL 8kLForsorZeXHr0cdaK3cQTJF2GRuK4= X-Received: by 2002:a5d:5742:0:b0:321:6673:4a9f with SMTP id q2-20020a5d5742000000b0032166734a9fmr4761195wrw.15.1695298649148; Thu, 21 Sep 2023 05:17:29 -0700 (PDT) Received: from Clement-Blade14.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id f11-20020adff98b000000b0030fd03e3d25sm1615108wrr.75.2023.09.21.05.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 05:17:27 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2023 14:17:00 +0200 Message-ID: <20230921121720.362842-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230921121720.362842-1-peron.clem@gmail.com> References: <20230921121720.362842-1-peron.clem@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC PATCH 3/3] HACK: avformat: rawenc: allow to output a raw PRFT 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: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ytAoZPY5ap6q Output the producer reference time to a dirty raw output. Signed-off-by: Clément Péron --- libavformat/rawenc.c | 122 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index f916db13a2..2953f07ec6 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -23,13 +23,49 @@ #include "config_components.h" #include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" #include "avformat.h" #include "rawenc.h" #include "mux.h" +typedef struct RawVideoContext { + const AVClass *class; + + int write_prft; +} RawVideoContext; + +// We want to have access to the timestamp with rawvideo +static int ff_raw_write_prft(AVFormatContext *s, AVPacket *pkt) +{ + size_t prft_size = 0; + AVProducerReferenceTime *prft = + (AVProducerReferenceTime *)av_packet_get_side_data(pkt, AV_PKT_DATA_PRFT, &prft_size); + + double frame_ts; + + avio_write(s->pb, "TIMESTAMP_MAGIC", 16); + if (prft && prft_size == sizeof(AVProducerReferenceTime)) { + // Save the frame_ts as a double + frame_ts = (prft->wallclock) / (double)AV_TIME_BASE; + av_log(s, AV_LOG_DEBUG, "ff_raw_write_packet: frame_ts %f.\n", frame_ts); + avio_write(s->pb, (void *)&frame_ts, sizeof(frame_ts)); + } else { + av_log(s, AV_LOG_DEBUG, "ff_raw_write_packet: No Timestamp.\n"); + avio_write(s->pb, "\0\0\0\0\0\0\0", 8); + } + + avio_write(s->pb, "FRAMEDATA_MAGIC", 16); + return 0; +} + int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt) { + RawVideoContext *raw = s->priv_data; + + if (raw->write_prft) + ff_raw_write_prft(s, pkt); + avio_write(s->pb, pkt->data, pkt->size); return 0; } @@ -56,12 +92,27 @@ static int force_one_stream(AVFormatContext *s) return 0; } +#undef OFFSET +#define OFFSET(x) offsetof(RawVideoContext, x) +static const AVOption raw_options[] = { + { "write_prft", "Output the Producer Reference Time", OFFSET(write_prft), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { NULL } +}; + +static const AVClass raw_muxer_class = { + .class_name = "RAW muxer", + .item_name = av_default_item_name, + .option = raw_options, + .version = LIBAVUTIL_VERSION_INT, +}; + /* Note: Do not forget to add new entries to the Makefile as well. */ #if CONFIG_AC3_MUXER const FFOutputFormat ff_ac3_muxer = { .p.name = "ac3", .p.long_name = NULL_IF_CONFIG_SMALL("raw AC-3"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/x-ac3", .p.extensions = "ac3", .p.audio_codec = AV_CODEC_ID_AC3, @@ -69,6 +120,7 @@ const FFOutputFormat ff_ac3_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -95,6 +147,7 @@ static int adx_write_trailer(AVFormatContext *s) const FFOutputFormat ff_adx_muxer = { .p.name = "adx", .p.long_name = NULL_IF_CONFIG_SMALL("CRI ADX"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "adx", .p.audio_codec = AV_CODEC_ID_ADPCM_ADX, .p.video_codec = AV_CODEC_ID_NONE, @@ -102,6 +155,7 @@ const FFOutputFormat ff_adx_muxer = { .write_packet = ff_raw_write_packet, .write_trailer = adx_write_trailer, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -109,12 +163,14 @@ const FFOutputFormat ff_adx_muxer = { const FFOutputFormat ff_aptx_muxer = { .p.name = "aptx", .p.long_name = NULL_IF_CONFIG_SMALL("raw aptX (Audio Processing Technology for Bluetooth)"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "aptx", .p.audio_codec = AV_CODEC_ID_APTX, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -122,12 +178,14 @@ const FFOutputFormat ff_aptx_muxer = { const FFOutputFormat ff_aptx_hd_muxer = { .p.name = "aptx_hd", .p.long_name = NULL_IF_CONFIG_SMALL("raw aptX HD (Audio Processing Technology for Bluetooth)"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "aptxhd", .p.audio_codec = AV_CODEC_ID_APTX_HD, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -135,12 +193,14 @@ const FFOutputFormat ff_aptx_hd_muxer = { const FFOutputFormat ff_avs2_muxer = { .p.name = "avs2", .p.long_name = NULL_IF_CONFIG_SMALL("raw AVS2-P2/IEEE1857.4 video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "avs,avs2", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_AVS2, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -148,12 +208,14 @@ const FFOutputFormat ff_avs2_muxer = { const FFOutputFormat ff_avs3_muxer = { .p.name = "avs3", .p.long_name = NULL_IF_CONFIG_SMALL("AVS3-P2/IEEE1857.10"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "avs3", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_AVS3, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -162,12 +224,14 @@ const FFOutputFormat ff_avs3_muxer = { const FFOutputFormat ff_cavsvideo_muxer = { .p.name = "cavsvideo", .p.long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "cavs", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_CAVS, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -175,11 +239,13 @@ const FFOutputFormat ff_cavsvideo_muxer = { const FFOutputFormat ff_codec2raw_muxer = { .p.name = "codec2raw", .p.long_name = NULL_IF_CONFIG_SMALL("raw codec2 muxer"), + .priv_data_size = sizeof(RawVideoContext), .p.audio_codec = AV_CODEC_ID_CODEC2, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -188,9 +254,11 @@ const FFOutputFormat ff_codec2raw_muxer = { const FFOutputFormat ff_data_muxer = { .p.name = "data", .p.long_name = NULL_IF_CONFIG_SMALL("raw data"), + .priv_data_size = sizeof(RawVideoContext), .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -198,12 +266,14 @@ const FFOutputFormat ff_data_muxer = { const FFOutputFormat ff_dfpwm_muxer = { .p.name = "dfpwm", .p.long_name = NULL_IF_CONFIG_SMALL("raw DFPWM1a"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "dfpwm", .p.audio_codec = AV_CODEC_ID_DFPWM, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -211,12 +281,14 @@ const FFOutputFormat ff_dfpwm_muxer = { const FFOutputFormat ff_dirac_muxer = { .p.name = "dirac", .p.long_name = NULL_IF_CONFIG_SMALL("raw Dirac"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "drc,vc2", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_DIRAC, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -224,12 +296,14 @@ const FFOutputFormat ff_dirac_muxer = { const FFOutputFormat ff_dnxhd_muxer = { .p.name = "dnxhd", .p.long_name = NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "dnxhd,dnxhr", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_DNXHD, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -237,6 +311,7 @@ const FFOutputFormat ff_dnxhd_muxer = { const FFOutputFormat ff_dts_muxer = { .p.name = "dts", .p.long_name = NULL_IF_CONFIG_SMALL("raw DTS"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/x-dca", .p.extensions = "dts", .p.audio_codec = AV_CODEC_ID_DTS, @@ -244,6 +319,7 @@ const FFOutputFormat ff_dts_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -251,6 +327,7 @@ const FFOutputFormat ff_dts_muxer = { const FFOutputFormat ff_eac3_muxer = { .p.name = "eac3", .p.long_name = NULL_IF_CONFIG_SMALL("raw E-AC-3"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/x-eac3", .p.extensions = "eac3,ec3", .p.audio_codec = AV_CODEC_ID_EAC3, @@ -258,6 +335,7 @@ const FFOutputFormat ff_eac3_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -265,6 +343,7 @@ const FFOutputFormat ff_eac3_muxer = { const FFOutputFormat ff_g722_muxer = { .p.name = "g722", .p.long_name = NULL_IF_CONFIG_SMALL("raw G.722"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/G722", .p.extensions = "g722", .p.audio_codec = AV_CODEC_ID_ADPCM_G722, @@ -272,6 +351,7 @@ const FFOutputFormat ff_g722_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -279,6 +359,7 @@ const FFOutputFormat ff_g722_muxer = { const FFOutputFormat ff_g723_1_muxer = { .p.name = "g723_1", .p.long_name = NULL_IF_CONFIG_SMALL("raw G.723.1"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/g723", .p.extensions = "tco,rco", .p.audio_codec = AV_CODEC_ID_G723_1, @@ -286,6 +367,7 @@ const FFOutputFormat ff_g723_1_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -293,11 +375,13 @@ const FFOutputFormat ff_g723_1_muxer = { const FFOutputFormat ff_g726_muxer = { .p.name = "g726", .p.long_name = NULL_IF_CONFIG_SMALL("raw big-endian G.726 (\"left-justified\")"), + .priv_data_size = sizeof(RawVideoContext), .p.audio_codec = AV_CODEC_ID_ADPCM_G726, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -305,11 +389,13 @@ const FFOutputFormat ff_g726_muxer = { const FFOutputFormat ff_g726le_muxer = { .p.name = "g726le", .p.long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right-justified\")"), + .priv_data_size = sizeof(RawVideoContext), .p.audio_codec = AV_CODEC_ID_ADPCM_G726LE, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -317,6 +403,7 @@ const FFOutputFormat ff_g726le_muxer = { const FFOutputFormat ff_gsm_muxer = { .p.name = "gsm", .p.long_name = NULL_IF_CONFIG_SMALL("raw GSM"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/x-gsm", .p.extensions = "gsm", .p.audio_codec = AV_CODEC_ID_GSM, @@ -324,6 +411,7 @@ const FFOutputFormat ff_gsm_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -331,6 +419,7 @@ const FFOutputFormat ff_gsm_muxer = { const FFOutputFormat ff_h261_muxer = { .p.name = "h261", .p.long_name = NULL_IF_CONFIG_SMALL("raw H.261"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "video/x-h261", .p.extensions = "h261", .p.audio_codec = AV_CODEC_ID_NONE, @@ -338,6 +427,7 @@ const FFOutputFormat ff_h261_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -345,6 +435,7 @@ const FFOutputFormat ff_h261_muxer = { const FFOutputFormat ff_h263_muxer = { .p.name = "h263", .p.long_name = NULL_IF_CONFIG_SMALL("raw H.263"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "video/x-h263", .p.extensions = "h263", .p.audio_codec = AV_CODEC_ID_NONE, @@ -352,6 +443,7 @@ const FFOutputFormat ff_h263_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -368,6 +460,7 @@ static int h264_check_bitstream(AVFormatContext *s, AVStream *st, const FFOutputFormat ff_h264_muxer = { .p.name = "h264", .p.long_name = NULL_IF_CONFIG_SMALL("raw H.264 video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "h264,264", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_H264, @@ -375,6 +468,7 @@ const FFOutputFormat ff_h264_muxer = { .write_packet = ff_raw_write_packet, .check_bitstream = h264_check_bitstream, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -391,6 +485,7 @@ static int vvc_check_bitstream(AVFormatContext *s, AVStream *st, const FFOutputFormat ff_vvc_muxer = { .p.name = "vvc", .p.long_name = NULL_IF_CONFIG_SMALL("raw H.266/VVC video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "vvc,h266,266", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_VVC, @@ -398,6 +493,7 @@ const FFOutputFormat ff_vvc_muxer = { .write_packet = ff_raw_write_packet, .check_bitstream = vvc_check_bitstream, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -414,6 +510,7 @@ static int hevc_check_bitstream(AVFormatContext *s, AVStream *st, const FFOutputFormat ff_hevc_muxer = { .p.name = "hevc", .p.long_name = NULL_IF_CONFIG_SMALL("raw HEVC video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "hevc,h265,265", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_HEVC, @@ -421,6 +518,7 @@ const FFOutputFormat ff_hevc_muxer = { .write_packet = ff_raw_write_packet, .check_bitstream = hevc_check_bitstream, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -428,12 +526,14 @@ const FFOutputFormat ff_hevc_muxer = { const FFOutputFormat ff_evc_muxer = { .p.name = "evc", .p.long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "evc", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_EVC, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -441,12 +541,14 @@ const FFOutputFormat ff_evc_muxer = { const FFOutputFormat ff_m4v_muxer = { .p.name = "m4v", .p.long_name = NULL_IF_CONFIG_SMALL("raw MPEG-4 video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "m4v", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_MPEG4, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -454,6 +556,7 @@ const FFOutputFormat ff_m4v_muxer = { const FFOutputFormat ff_mjpeg_muxer = { .p.name = "mjpeg", .p.long_name = NULL_IF_CONFIG_SMALL("raw MJPEG video"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "video/x-mjpeg", .p.extensions = "mjpg,mjpeg", .p.audio_codec = AV_CODEC_ID_NONE, @@ -461,6 +564,7 @@ const FFOutputFormat ff_mjpeg_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -468,12 +572,14 @@ const FFOutputFormat ff_mjpeg_muxer = { const FFOutputFormat ff_mlp_muxer = { .p.name = "mlp", .p.long_name = NULL_IF_CONFIG_SMALL("raw MLP"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "mlp", .p.audio_codec = AV_CODEC_ID_MLP, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -481,6 +587,7 @@ const FFOutputFormat ff_mlp_muxer = { const FFOutputFormat ff_mp2_muxer = { .p.name = "mp2", .p.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/mpeg", .p.extensions = "mp2,m2a,mpa", .p.audio_codec = AV_CODEC_ID_MP2, @@ -488,6 +595,7 @@ const FFOutputFormat ff_mp2_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -495,6 +603,7 @@ const FFOutputFormat ff_mp2_muxer = { const FFOutputFormat ff_mpeg1video_muxer = { .p.name = "mpeg1video", .p.long_name = NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "video/mpeg", .p.extensions = "mpg,mpeg,m1v", .p.audio_codec = AV_CODEC_ID_NONE, @@ -502,6 +611,7 @@ const FFOutputFormat ff_mpeg1video_muxer = { .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -509,12 +619,14 @@ const FFOutputFormat ff_mpeg1video_muxer = { const FFOutputFormat ff_mpeg2video_muxer = { .p.name = "mpeg2video", .p.long_name = NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "m2v", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_MPEG2VIDEO, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -528,6 +640,7 @@ static int obu_check_bitstream(AVFormatContext *s, AVStream *st, const FFOutputFormat ff_obu_muxer = { .p.name = "obu", .p.long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "obu", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_AV1, @@ -535,6 +648,7 @@ const FFOutputFormat ff_obu_muxer = { .write_packet = ff_raw_write_packet, .check_bitstream = obu_check_bitstream, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -542,11 +656,13 @@ const FFOutputFormat ff_obu_muxer = { const FFOutputFormat ff_rawvideo_muxer = { .p.name = "rawvideo", .p.long_name = NULL_IF_CONFIG_SMALL("raw video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "yuv,rgb", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_RAWVIDEO, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -554,12 +670,14 @@ const FFOutputFormat ff_rawvideo_muxer = { const FFOutputFormat ff_sbc_muxer = { .p.name = "sbc", .p.long_name = NULL_IF_CONFIG_SMALL("raw SBC"), + .priv_data_size = sizeof(RawVideoContext), .p.mime_type = "audio/x-sbc", .p.extensions = "sbc,msbc", .p.audio_codec = AV_CODEC_ID_SBC, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -567,12 +685,14 @@ const FFOutputFormat ff_sbc_muxer = { const FFOutputFormat ff_truehd_muxer = { .p.name = "truehd", .p.long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "thd", .p.audio_codec = AV_CODEC_ID_TRUEHD, .p.video_codec = AV_CODEC_ID_NONE, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif @@ -580,11 +700,13 @@ const FFOutputFormat ff_truehd_muxer = { const FFOutputFormat ff_vc1_muxer = { .p.name = "vc1", .p.long_name = NULL_IF_CONFIG_SMALL("raw VC-1 video"), + .priv_data_size = sizeof(RawVideoContext), .p.extensions = "vc1", .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_VC1, .init = force_one_stream, .write_packet = ff_raw_write_packet, .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &raw_muxer_class, }; #endif