From patchwork Thu Jun 28 00:51:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9535 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1479733jad; Wed, 27 Jun 2018 17:53:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpde8vwlt/lwBd/hkboepVSZZt2+Whv4IccoNhbxFmTXm4DvU+oJ00DS3rIwtkZcXqJdG/Sx X-Received: by 2002:adf:e188:: with SMTP id k8-v6mr7082040wri.179.1530147185393; Wed, 27 Jun 2018 17:53:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530147185; cv=none; d=google.com; s=arc-20160816; b=TsVKss8leT9O0bnuoa1Jp4gFZQXe5MMGQWNVHvnswc0XnjZGEL449SpU8xABVqujkU TegIea1mXp75XMYGxLa5hw5rr+NYEFTbnzS77IRsIpQsEB7+X5itBdUhP2Z3CGgdiS0c 27XOrsSH6njUCZUFZm8uaDCsJQ7AUGMuAkeWwHFwDHdwTpykbKfww+XFZC0rFc3SIdFt xD7Ucj1ire0bhKzq8EbhHLBvkuP8+HzZEuMpOcxzQbxKBFEo0qve7FbhVLp3PjRweRBl lq39MuF6Nc1OLV0zjwvcONFnFpkZeonFbalBlR8IG8K+qo+qhn/PKTjBVqMQLvkbaNGc 2I7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=W+mc8p6CE9cnXXICi11QBdp3C02M23J/ehCc4G+wtPs=; b=Irki7EPfwOVDTsuaV2POjFTCN87+LQpIcU4/tEThTzrvwKH7T6a+rDMEzH57iDJKk/ fdm9rXrLA0uYFWUNgknLIxtdJBShYf3yU1QY6jOFZpyFzzDNBCvatDUI1U5WnolCOP5f DZmFxJdTvkjxGxrdJCEMQ95dyLo3njwNw5SSj6JyYVHcaEY5Yp5kxz/xv4zJokl2/F+I 8KwZPwFLi45+nzbO0zEW11jKPBDXT3kRS9dX8dQeZ6uZ4TIyKsfsB/UsHdnGRutVhY20 9BvKBT3S+JA0A1N2U08T7+hhTY4O3p75URMUCJ/U8bzkGjiajyvIix+/nC1ROi4DFsUg i8Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=AStMxhGT; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c6-v6si2125342wrf.370.2018.06.27.17.53.04; Wed, 27 Jun 2018 17:53:05 -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=@googlemail.com header.s=20161025 header.b=AStMxhGT; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01EB768A595; Thu, 28 Jun 2018 03:51:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 699E868A588 for ; Thu, 28 Jun 2018 03:51:41 +0300 (EEST) Received: by mail-wm0-f51.google.com with SMTP id w137-v6so7676460wmw.1 for ; Wed, 27 Jun 2018 17:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=b/P1zIGVfVzfMk9Dfj+DLDjyRh9BifYTyX9tJ1nCm68=; b=AStMxhGToOrcb7kWTLez6Ar/7vyZxiUBm+1cHB9GgPM1W9VA9fNjkh2uReXSSvZHZt zPbpUzd06rsDTyiCiu5++0Dnvs/bPxwr7t29MgbifANVCf0Yw/zmw+8E5OOuyA3J3kSM ZXY0dAaRciTln/S/nQovGtTuBTyGK59JhksVg+FKkWaM70lv9fHaaaugBlep36bewBMB 1r1YwyhUbi7GhtraMMuzMV4I0cKrD0A2tXLDOHDUky8EY7zRfdAVFmfDerBAQB7bvheC UvEEPf85nh7t0BeE0mDQiyaGirzVl1a7xTWlDUMctob7ZSzvZRJ7Jzq/6c5b6oMV6DgZ Xcmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b/P1zIGVfVzfMk9Dfj+DLDjyRh9BifYTyX9tJ1nCm68=; b=cvVL4vvXkXfGXH0B3t2/nv2gU/YaYh2Ck9Fn+C+YESDSPJJZ5UaRCrWWiKkAex9f49 SBVmeOwppSDbQfeWAVJjtD49szy4sgZI49QV5ahuAgEqUP9jxG6qqg8WMDdGT5hjJzzO JPHQ6vuE8VQrogL+vjEcXzFYamlGt2SP6Og7/SICBGhFW+ryc6QVaZZVpx1kwxmFqMzk FRoSMsOdYcuibVO8NwfTY4st1q43SKdVbBU2vcPMQZbTB0pZn6/iMppbbTQj0bPQuklU 5CEf9aK/mJxL1lmnpruSNFUJ6AVT9Z/05THdPd0YFQZ0X7DCzRbb3XYg5YCgEmUMVxRJ xFuA== X-Gm-Message-State: APt69E1giRX3/sPatc35ZhMh6Ai5I5UxDkOqHdYhkEq38rqRu15oA5wF yN03y84/KYufEPSNgUMG+JgCyg== X-Received: by 2002:a1c:150d:: with SMTP id 13-v6mr6860368wmv.100.1530147101854; Wed, 27 Jun 2018 17:51:41 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id a9-v6sm1363017wrq.1.2018.06.27.17.51.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 17:51:41 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jun 2018 02:51:13 +0200 Message-Id: <20180628005117.18902-14-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628005117.18902-1-klaxa1337@googlemail.com> References: <20180628005117.18902-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 13/17] move FFServerInfo from publisher.h to httpd.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- httpd.h | 9 +++++++++ publisher.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/httpd.h b/httpd.h index a988916..1b2566e 100644 --- a/httpd.h +++ b/httpd.h @@ -72,6 +72,15 @@ struct HTTPDInterface { void (*shutdown)(void *server); }; +/* struct containing server and client info per client AVIOContext */ + +struct FFServerInfo { + struct HTTPDInterface *httpd; + void *server; + struct HTTPClient *client; +}; + + /** Current HTTPDInterface implementation using lavformat */ extern struct HTTPDInterface lavfhttpd; #endif diff --git a/publisher.h b/publisher.h index e07cb10..a873d09 100644 --- a/publisher.h +++ b/publisher.h @@ -42,15 +42,6 @@ enum State { }; -/* struct containing server and client info per client AVIOContext */ - -struct FFServerInfo { - struct HTTPDInterface *httpd; - void *server; - struct HTTPClient *client; -}; - - struct Client { AVFormatContext *ofmt_ctx; // writable AVFormatContext, basically our tcp connection to the client AVFifoBuffer *buffer; // Client buffer of Segment references