From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1D7D949E20 for ; Tue, 12 Mar 2024 10:57:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1112368D093; Tue, 12 Mar 2024 12:57:04 +0200 (EET) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F69068C633 for ; Tue, 12 Mar 2024 12:56:57 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a4644bde1d4so67814966b.3 for ; Tue, 12 Mar 2024 03:56:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710241016; x=1710845816; 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=JKZB+Ek0fil+FzGixubhSUIbmU4T/WgqHDDXwGEOORY=; b=ECw8yUNxvU9D5/mu4d8GEkki/qsOrQWa2jdiw5k27y6qTQy/6j6iuHe7qRuZrLeANx QodptU3vZ3TY7CKEyMhEhqI72jGH+Rg4/YQ2pZJ77m+h993ZNnmT2QiGo0p3P1N2hGG9 C7TMsnrDGJD3meqz9o3LSxYKumTX9UAOId+3thnUQe1fTGVD+Jf6L/LSxXJwoYaiNSS9 wsmarfuTmZa2uk+QexTVolBYx3DibohnPK89TraJqLCfyfevBDMfPRdx7v/r+hjnFHk4 PVUJYPR1sNQe9YJHyZ27F1vkChkNlV0oezzjLTUu1Jazn73Ldm8KKZYuDYNvERSXUGXi YbmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710241016; x=1710845816; 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=JKZB+Ek0fil+FzGixubhSUIbmU4T/WgqHDDXwGEOORY=; b=bMIpQCE84+is6IULjh/xb/D4E2fsVueYiNaWZ4RfYM5xz9eMxoYkel62z/0UToN+PS 72YIR3mcDQS4hjfDwAewLJvWL+z7CpgnlXp/n9IFqfsqCfniv2KhTHrEVPF158ODniIS ShaE4yI9YdseIeAFGfeCERD078Ud3//21KfWfNT0/+aEGlmVJ3RSsznrkEfVh55OMAEm 2vhUX3vuXOkxx+4bvjWUYeodj2W1f8txFJf48duCYOuxjUEPHmsQJN6dI7BvllC9/k8D vl0rgzmZrBKXlpBj/Y4qJLH5FmRECJe/YDQKCKivkyHBLHbvTJ/miX5DW34OUIXgFWw2 XOOA== X-Gm-Message-State: AOJu0YxrLNJNs22eYXiyX3wog6MnmWFQMsYmmm5kj6bv7EpYNKEYhEDv csAOClISJpyLog3OExxbxKJHknTPg9ClAN2LoDstg/efA5SlhDRdBCloFN+W X-Google-Smtp-Source: AGHT+IGKpIs06DzUQzGeRMDHCCXC/pibMWl9vSC/VnbwZG4qhPDjNBVAUCYp9npU/FcVC46xYXjntA== X-Received: by 2002:a17:907:d384:b0:a46:268b:2281 with SMTP id vh4-20020a170907d38400b00a46268b2281mr4080485ejc.51.1710241015892; Tue, 12 Mar 2024 03:56:55 -0700 (PDT) Received: from mariano ([188.210.239.79]) by smtp.gmail.com with ESMTPSA id h19-20020a170906591300b00a449756f727sm3792644ejq.147.2024.03.12.03.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 03:56:55 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 37F63BFCE0; Tue, 12 Mar 2024 11:56:54 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Tue, 12 Mar 2024 11:56:53 +0100 Message-Id: <20240312105654.342835-2-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240312105654.342835-1-stefasab@gmail.com> References: <20240312105654.342835-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/fifo_test: use FifoTest in place of Failing 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Use a more consistent and sensible prefix for the muxer structs and functions. --- libavformat/fifo_test.c | 45 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/libavformat/fifo_test.c b/libavformat/fifo_test.c index 84b762db5f..903f4bc34b 100644 --- a/libavformat/fifo_test.c +++ b/libavformat/fifo_test.c @@ -1,5 +1,5 @@ /* - * FIFO test pseudo-muxer + * FIFO pseudo-muxer test * Copyright (c) 2016 Jan Sebechlebsky * * This file is part of FFmpeg. @@ -38,14 +38,13 @@ /* This is structure of data sent in packets to * failing muxer */ -typedef struct FailingMuxerPacketData { +typedef struct FifoTestMuxerPacketData { int ret; /* return value of write_packet call*/ int recover_after; /* set ret to zero after this number of recovery attempts */ unsigned sleep_time; /* sleep for this long in write_packet to simulate long I/O operation */ -} FailingMuxerPacketData; +} FifoTestMuxerPacketData; - -typedef struct FailingMuxerContext { +typedef struct FifoTestMuxerContext { AVClass *class; int write_header_ret; int write_trailer_ret; @@ -55,22 +54,22 @@ typedef struct FailingMuxerContext { int flush_count; int pts_written[MAX_TST_PACKETS]; int pts_written_nr; -} FailingMuxerContext; +} FifoTestMuxerContext; -static int failing_write_header(AVFormatContext *avf) +static int fifo_test_write_header(AVFormatContext *avf) { - FailingMuxerContext *ctx = avf->priv_data; + FifoTestMuxerContext *ctx = avf->priv_data; return ctx->write_header_ret; } -static int failing_write_packet(AVFormatContext *avf, AVPacket *pkt) +static int fifo_test_write_packet(AVFormatContext *avf, AVPacket *pkt) { - FailingMuxerContext *ctx = avf->priv_data; + FifoTestMuxerContext *ctx = avf->priv_data; int ret = 0; if (!pkt) { ctx->flush_count++; } else { - FailingMuxerPacketData *data = (FailingMuxerPacketData*) pkt->data; + FifoTestMuxerPacketData *data = (FifoTestMuxerPacketData*) pkt->data; if (!data->recover_after) { data->ret = 0; @@ -98,16 +97,16 @@ static int failing_write_packet(AVFormatContext *avf, AVPacket *pkt) return ret; } -static int failing_write_trailer(AVFormatContext *avf) +static int fifo_test_write_trailer(AVFormatContext *avf) { - FailingMuxerContext *ctx = avf->priv_data; + FifoTestMuxerContext *ctx = avf->priv_data; return ctx->write_trailer_ret; } -static void failing_deinit(AVFormatContext *avf) +static void fifo_test_deinit(AVFormatContext *avf) { int i; - FailingMuxerContext *ctx = avf->priv_data; + FifoTestMuxerContext *ctx = avf->priv_data; if (!ctx->print_deinit_summary) return; @@ -120,7 +119,7 @@ static void failing_deinit(AVFormatContext *avf) } printf("\n"); } -#define OFFSET(x) offsetof(FailingMuxerContext, x) +#define OFFSET(x) offsetof(FifoTestMuxerContext, x) static const AVOption options[] = { {"print_deinit_summary", "print summary when deinitializing muxer", OFFSET(print_deinit_summary), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, @@ -131,7 +130,7 @@ static const AVOption options[] = { {NULL} }; -static const AVClass failing_muxer_class = { +static const AVClass fifo_test_muxer_class = { .class_name = "Fifo test muxer", .item_name = av_default_item_name, .option = options, @@ -141,12 +140,12 @@ static const AVClass failing_muxer_class = { const FFOutputFormat ff_fifo_test_muxer = { .p.name = "fifo_test", .p.long_name = NULL_IF_CONFIG_SMALL("Fifo test muxer"), - .priv_data_size = sizeof(FailingMuxerContext), - .write_header = failing_write_header, - .write_packet = failing_write_packet, - .write_trailer = failing_write_trailer, - .deinit = failing_deinit, - .p.priv_class = &failing_muxer_class, + .priv_data_size = sizeof(FifoTestMuxerContext), + .write_header = fifo_test_write_header, + .write_packet = fifo_test_write_packet, + .write_trailer = fifo_test_write_trailer, + .deinit = fifo_test_deinit, + .p.priv_class = &fifo_test_muxer_class, #if FF_API_ALLOW_FLUSH .p.flags = AVFMT_NOFILE | AVFMT_ALLOW_FLUSH, #else -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".