From patchwork Tue Feb 27 19:58:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp2221375pzb; Tue, 27 Feb 2024 11:57:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXKtDJYGWoLF8HkUPGtngxUE9tP2ZNdrZChBDtyGEa+ktCbgg/Z3Ur6qLSPA2a37RHKauNovKF0Q7UlTTKPrTpnr4gmQ5N2KOA73A== X-Google-Smtp-Source: AGHT+IE8tOtrhfW2/lhLTzFzJ0aa7dM6ltmrpMCM6pqhyhlWiisgExQVqa3Xh5avYUJww7bv92/t X-Received: by 2002:a2e:b0c6:0:b0:2d2:51ec:6fff with SMTP id g6-20020a2eb0c6000000b002d251ec6fffmr6235052ljl.2.1709063849583; Tue, 27 Feb 2024 11:57:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n4-20020aa7d044000000b00565bede3515si936406edo.530.2024.02.27.11.57.28; Tue, 27 Feb 2024 11:57:29 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=BC85u8bt; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D65C68CE10; Tue, 27 Feb 2024 21:57:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2082.outbound.protection.outlook.com [40.92.49.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3718368CDE3 for ; Tue, 27 Feb 2024 21:57:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NyUIXY0DcgPGBJMAkTQR/PK4xbcTSyAKRbxW/3bucSeklh6X5TghTlQy+kPoe0aceNkJtMPnORQ1+YP+3DnYDadZqRTqKzPwR+TFmtyHpNoJVOjltKa/xLoFQIfEDEcTDI0hVhmBd7Bf1PTY6tuqmKqz8+hp/LFXWeBTaFMM/KxVLRHtYvzU6nPphI27qHdv4gkfO7X65rzs44g/EN4gF27s0glvBEyVDEZg6yoXJi3pJHVD7b2fCIfCegAu/i98UyliqKTef2URPKMpsr66JblmS9HXbqoOiO+QbKXMPc6WF5xumggN7AH0j+Sta0s2zy7Umj2R8nztAEPUH23bow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oFqDqWGkmrNc/cSZQcy8s33ijM8Ra/91fgku2JOS8mE=; b=H3wSU2/boGUB0Eq8s2LeN+YFfs5G414XuoBJRJFQwOQjGJVyPf+5ImzhHNtHpKum0l7uCIYhzaO9hd9d0v34iiezSwonvWcy8XhQkpkLMsmIDPGxax0gWOlN6yZI/ItbMYeJfiawvFhOPTgA8W57nDu0wLjnWopBB9dgOexRk5h7Bsgq9PaghCi1N+L8z4gcGQSMDddHw6OgrkL6Lk0+1ZmQ8qYk/IBys2vMnJ78e+n3ZFZGJBtuZsXD3Z8o9gFiTVvgi1Z2MjybPsVvK3yESJV+YzfvxpB+KSul48vqCk2rXuGW+0CC5p8+JkfqerITw6RXeW1huus3jxi+4+Nnzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oFqDqWGkmrNc/cSZQcy8s33ijM8Ra/91fgku2JOS8mE=; b=BC85u8btdQbj7eQ6GW3CNk7uN82+2EvSOqOmT/iV9sm430TwxicQCmPurA4uos4WjIYqygv3q1Wa+eRRalkVJp96E0mdaYehqF2fmkBGEYyxgej6GjzftPKXVotzZvqo1v19OEyawO2gNC6c9wKXT6pboeNdkl+a377pXJBhCU1Avi2VsYYiDTAlnFKSiLmSI5wxNMUzOYEFfepRQteOg1OHmd+LqSqRg4/e5ztvEFTEg53g23uQ+n+z94uM9CZD7+sNY9QxwHNyXDecEDW2XcLk/39YdVJ3EyxXFpezOi7x7jxCrqDg3plTmkRxtJ93jpF23ridXRNtu+Tbpvzg6g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0353.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.39; Tue, 27 Feb 2024 19:56:53 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Tue, 27 Feb 2024 19:56:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 20:58:33 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [rwfGjrJcz9VGvHQWS59v2VMSl/zKu14Cpg3hW+EOqc4=] X-ClientProxiedBy: ZR0P278CA0128.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240227195837.1410882-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0353:EE_ X-MS-Office365-Filtering-Correlation-Id: e1855131-248e-40e2-7e04-08dc37ce3e41 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoh573Ov4uul0xl4pTrThcmt4Mi2v65s3IZeCnxtMf/HfCUof1kfcex730j3yaRM2SZ/8QUi0pC+rziVSejhct5LkYE8Bid7qtaqsSjT1eaCtx7QdN5IUgrDWC0KLTrVS5m8hX/Y1CRRPyEriHlpgQxVGM5tHHnjZW4jl3iqcvGiRWh3k+f5T4aZ1XUL6TppYOtlowZaahf/KkZvkNV4bbsaiHni6ITzw9iMHS97i/GNaEZT+WH1LW1HOV4Oqsj3EZKEk2Cor+kkajyOuN3ozmcetOd5utRtZmxM5KodtJrZbL+xoCh4oDmF3JQHP5sDgY2dMT+gwa2odl3knte6aDkx0Jt5UmUWeKNHqhfFaAX5CI2hQX2PcVjRFzZujfSCxFaeJ7t68JdOAW5ggtmwIUiKGp2AgApRfasNR1uHZ+2DZGoGZZRdHk7CBhj07eGRz5pPKQN23q5gTdlNz9nU6L0mXGhEtlFQf8VIvH7UMmtiARv4DuyCBLnwvhzl0g9Nf66ezO3KpD19DmTFiK/k/YwkxSiEMAwtAfUIv6Nm6qcBpiu8aQOgU/UgYWv+ZNCI0rLUG1oMIct8n8Yz95whoVA5viDoRH1A3lxBSF6/ZlDenZUdPZQa1/3VtwwKJ0g98nzjP5AOspW5XDp68cN+Ng6R6UsB6aV2uqF+GtJ4beK/Jse2nff7jNUKL4IhGZgB5q3aVk4XJSy0PJsPAl2tpa/Rn6z0VMYueaMwoZlbAhkPVZNstOZ3mDq7Do+mLnnFiA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SY2z5ajNcx1bY2idhG9UQdPV+j7aHX5buL/kRui3vcS5eASmqm1Wvgu5ubTomCF7jidxzQzyDizulzue5Uv9+W0rXLo61GVbgLHnJagmuDYM8ckwo1vPg5l3119yxo8CwEvkyJwe/lBAZYMRevj+PcEzCZQZBVxJ73/t5GxqZ10rxiurcbz28Nd9ZE5sgsUn0ererPCu5LrKI5jnwXtQlQ7vcA0lW55arPCrwOqJgOBN9nzEjlNCxuyuPspV3fIzI64ip/oFKIX/G8v2fkFexS/aZuW2BZzofW9YyPuiYwQX5t8N9oQa/d0epS6TZ6v30bEdfpwD7TCAgnuBQSNTpYTVT5uBRsLC6kZoyDKXMP7ThNwkBwvRPoudMxUKZSddWryZ8SaOWbIQTbPxtcgmg4LCBvqdB1eO8InNpvMvlr01uwb61PTVyqZd8GuaLQBP+xUYknO/eJ1pv6zEF0RyYvtEPAuBS7FKq1YzdBxpPyZ3O6DX7pVH548gJjLYXH6RMahln41EVGMXdv9/Ao6Qnzh7w2t6pLnRg5xYj80Vnmo53ium1zaJGCGeQO7wK8RZGHv1dAMKR8J3zl75hqUC0DwFfLVXUsj2jpcpK2LfwslanP6IhWBrUr9PzZXKNPtM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /ZPFKuXkBi5dvZMOl9Ne5PP5CLoprJWA+reGR72X8jPt+GnGJ6W2BMUWXteaoCoZvw4uPYTnF7D2BxVIyNO5Y56LBoX8gdYnjSFsv8N/cc0iiRMf+fRnpXO+3VVUHoPOiBGVzNxYXnSRC/+9iwk0w1/UdyXmkayDk34uHi3kQqCU6e18oYqrkkujhTJ6dyWPCGkWivSMVgyLLzKUStUHn+1TkJ1VSE3HhUJo8rFtBp/if46TnQlrcv7w+jpfRRuFAjXl5KHPLaO4HfwYiUsYEXxS/BTePZ+8z4Lm2ed6QGmQIIFEUjqIBzoJKSxzt79NLWMp7SmAACK3pRfXcKEJlowlcxXeSlYHUNQhPq2yII/qEoueqfu4HzEIgy9SUJ/V/g14zefaBFS4cYJ4vM4TBcXhaUHTakfUXOAChjIPhR7nIJgyNotDJa/jNakoKMBlKUwg2k8aQJA+AyEgXFcFQSbBaUfe4ZcCw3BhR8T6q6N9cAphth5QHb/klFhPNyRxD5Qc3+F4uW2BjNtonFv0R15/+diK2lsVmVYHTBMn01Hxadpb5G4brMdYvzes7Svg9e/xB3JJg7nHMyNffjhBtUGr/YQaSAt4jcEh5DopUYkd3GT1hsRQthHl2TYcO+ztMWM3vIZ41fV06YfNAstAmtWMo6MwZa3PpGgfDegYW7FoDVJBd/ARi4dNyW8o7nXgLV0CzJBQw4EfRi+5X4A5UrsvI9hUXc6Ift6ugTDQqoKhTOkbFjKPxQwJtMFc1B48BSHTRgb/ZjvarWYM2jsXZCLCDTi/TpztEyiUdhz5EkxVTY4iNdBeMCBwgEwA431Yj34wYvxSsSkDTI4U56Ht9Gw6c5KmakrG6/v1ciBoBqqMFutLUsN2n0AZFyxYq8nnz7n2Cn3hFbdDMJOWz6f/YHf7Trmi8RmR5wKkFXmNwM2V7o7MVYgahZKRj1ZeaqZ+lvZAjvp+m+oMB2ZSbzkFvtu+6gbLonAVqDpfCfKJRvwiX7pYe5sQLy7z9G5rpKf3UdjvHWYZW26CUO0NAYcPMQkiry/K1Gqv/00we4JaiXrh0UH7izPlIieyui+SmLbUPJNtMATpA5tMAjlL98NBUlenSUMdCKqkG+jyIxvUXuqg/BpJxZQko6oKqNf31Qeyg+Ba4fte5C7vhL0DFKfYUinA3b9mDz48+wEAhpFldulyhwa+DjXZXVlG/OQDz9fnlAAtXljzX+W3M+UcDHKXkVw+amUGQwyHkG5Dd94R2kwi1zvab+yz6GQn9Oi0Gwj+oIBKe4ibRQFoP2s6LAd3MA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1855131-248e-40e2-7e04-08dc37ce3e41 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 19:56:52.8600 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0353 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/libxevd: Reindent after the previous commit 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3qKvKnIM75Qs Signed-off-by: Andreas Rheinhardt --- libavcodec/libxevd.c | 74 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index 33fd18f74d..de0739a80c 100644 --- a/libavcodec/libxevd.c +++ b/libavcodec/libxevd.c @@ -255,59 +255,59 @@ static av_cold int libxevd_init(AVCodecContext *avctx) static int libxevd_return_frame(AVCodecContext *avctx, AVFrame *frame, XEVD_IMGB *imgb, AVPacket **pkt_au) { + AVPacket *pkt_au_imgb = (AVPacket*)imgb->pdata[0]; int ret; - AVPacket* pkt_au_imgb = (AVPacket*)imgb->pdata[0]; - if(!pkt_au_imgb) { - av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n"); + if (!pkt_au_imgb) { + av_log(avctx, AV_LOG_ERROR, "Invalid data needed to fill frame properties\n"); - if (pkt_au) - av_packet_free(pkt_au); - av_frame_unref(frame); + if (pkt_au) + av_packet_free(pkt_au); + av_frame_unref(frame); - imgb->release(imgb); - imgb = NULL; + imgb->release(imgb); + imgb = NULL; - return AVERROR_INVALIDDATA; - } + return AVERROR_INVALIDDATA; + } - // got frame - ret = libxevd_image_copy(avctx, imgb, frame); - if(ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Image copying error\n"); + // got frame + ret = libxevd_image_copy(avctx, imgb, frame); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Image copying error\n"); - av_packet_free(&pkt_au_imgb); - av_frame_unref(frame); + av_packet_free(&pkt_au_imgb); + av_frame_unref(frame); - imgb->release(imgb); - imgb = NULL; + imgb->release(imgb); + imgb = NULL; - return ret; - } + return ret; + } - // use ff_decode_frame_props_from_pkt() to fill frame properties - ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n"); + // use ff_decode_frame_props_from_pkt() to fill frame properties + ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt_au_imgb); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "ff_decode_frame_props_from_pkt error\n"); - av_packet_free(&pkt_au_imgb); - av_frame_unref(frame); + av_packet_free(&pkt_au_imgb); + av_frame_unref(frame); - imgb->release(imgb); - imgb = NULL; + imgb->release(imgb); + imgb = NULL; - return ret; - } + return ret; + } - frame->pkt_dts = imgb->ts[XEVD_TS_DTS]; - frame->pts = imgb->ts[XEVD_TS_PTS]; + frame->pkt_dts = imgb->ts[XEVD_TS_DTS]; + frame->pts = imgb->ts[XEVD_TS_PTS]; - av_packet_free(&pkt_au_imgb); + av_packet_free(&pkt_au_imgb); - // xevd_pull uses pool of objects of type XEVD_IMGB. - // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed - imgb->release(imgb); - imgb = NULL; + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; return 0; }