From patchwork Sun May 20 18:54:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9027 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp7569614jad; Sun, 20 May 2018 12:01:01 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoYi1hSCC+PcvuNQPJXlq3OQrm4GiDPN3ZnqEbmug2ViytqN9EGYhCZZeTtPHtCWoqI0GAw X-Received: by 2002:a1c:f108:: with SMTP id p8-v6mr9857304wmh.84.1526842861584; Sun, 20 May 2018 12:01:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526842861; cv=none; d=google.com; s=arc-20160816; b=iJuPO5hkquKCR0jY5L6IT9JkDWAKFLe71OljlOCJ7zyAW2h9hHTJ57iEe1wbomoXmv l6XrIrEeIkf8U4m35cG5i0L1WOlz3MDsLbtxeoWb8djGIHeBUa/wJHC+ItNAQ3C0vciJ 7sq55no4SZ9BQa2gKaTHJn1wiTe7j8ZGri+Vt8QbiEDb/aeCz0EYCING2gvR9meS/hb1 oWz06PW7TfJT9qLWqalLqxtvG4wYfBOvdn5ZOhck8tlInOQcKSmOkqbY6VCe65v3eXnv Y4RfPW3xAhSUM9N4cWuzbeBCkvvRaf0i8ChXyahAX5/DIga4uyWQmDRDS3Q3KCy0ZAri UV0g== 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=Z2Zr7DNYV991R5sacig0nANU1W0SEU4+amkGbggRj9Q=; b=UJjTEyrpg2mtOykJzaGRuyijf797fsoIkru5dkBElPk2WUKWES0plM5YkAEIOX3LuU jc4OcGa1WgJ0M/Ni6u07vhZ6/s/OF9Kt8R+Jd+neREAqkYkrNxtNO7A4HiHwngmvqPmp MsGSIrDR96YkCS7aw5N08v08apCjoKV8nIojChEGkJvPRqFNfLYdV5L7F98IYGW0qOfj FTJCOHS1TFqqNMxcd9GcF1vLvID33Bv/epWEG50wGcz2DttVUoyKVh5s0NcPhLDAM5SO SF3uSuXCc64fqT24E08qly3P1VrxF2cOkDApwd35AMNBH7zkVEHDH6lMF0iMTAV1z4nK oPGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=YewDOZpH; 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 f124-v6si8703383wma.188.2018.05.20.12.01.01; Sun, 20 May 2018 12:01:01 -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=YewDOZpH; 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 CED6D68A516; Sun, 20 May 2018 22:00:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04FD568A4A1 for ; Sun, 20 May 2018 22:00:14 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id w3-v6so6181876wrl.12 for ; Sun, 20 May 2018 12:00:54 -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=rRegungMd0pVItV8NOyvWDq2VAOqR7nrZX3Xdm0ecVg=; b=YewDOZpHFfD1/P5F7UZUDcOIG1st11UczKqY9Sz/LrC0Xa/BhmvcJRl8KP4TgVYiyN x9mO6wkXwexnDLzlMxOTu1mrgge5ZKLt8jrm4biJCgGm9fjGdx0hTufP3u+f6thzOl3Z cqAGMERA4DLSjLLIXcnHfDz3JEisTJRCRJcQh9d3hgEhbOua3gkczKvkni5Ro5HcTnG6 m23r9NxI8Imvq2he9Veq+m6dEp7yvCbbOgnsa1mB0rAs59vuM0qdfM6z6NiN9C+37Ev+ RhXdvZEHerIW+uDOacUnOtOc3TCf5xh5qQSI1wBrpfk0I4nevoci2RFM+b2fHdF5n2x9 fpsA== 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=rRegungMd0pVItV8NOyvWDq2VAOqR7nrZX3Xdm0ecVg=; b=f8W6PtWjEVswwbbaPzpG2+KT7bnJFlGUZ4f5eBWBCqwzaWDmMWrkktY3go9+NSh0X6 TgDEvT2TrMIZmq5flpMeILPzvuIrPyw99dilfqShE7SluPWt44hj4fSVbYH875uagSwu ojXe+qmdzzAPtD8r2DBzvOFi/kFzQv8/eAzZSMX7jJ80yr0t/0s7Afy7+IhZhttKKbRj rQFq3ZxTA2CP4fPkFD3MsfmD+ZN7B6tKZmnyN44CYMEltc1bflM7cakBagxtlUqg1XK8 KRl3O7686O0daIVQoIHpwOSrSCPGxKIxR8cp19GvfhpIW1AJKD3OfKYuApNvIe9VfBH/ FETg== X-Gm-Message-State: ALKqPwdWTInw6XiAiVoD8VmxQzOhd98Ua2L+nRgyIE0iU171/JkyMh3C Pk1V+RsTmUXgT/3imrPJX5GdAg== X-Received: by 2002:adf:8756:: with SMTP id 22-v6mr12350609wrz.117.1526842456114; Sun, 20 May 2018 11:54:16 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id u8-v6sm3755918wmc.40.2018.05.20.11.54.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 11:54:15 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 May 2018 20:54:00 +0200 Message-Id: <20180520185404.29836-5-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180520185404.29836-1-klaxa1337@googlemail.com> References: <20180520185404.29836-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 4/8] httpd.h: Adapt structs to config file 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/httpd.h b/httpd.h index 6fb91bd..25cbe11 100644 --- a/httpd.h +++ b/httpd.h @@ -26,11 +26,28 @@ #include "publisher.h" +/* Supported stream formats, for now only matroska */ +enum StreamFormat { + FMT_MATROSKA = 0, + FMT_NB, +}; + +/* Stream Config struct */ +struct StreamConfig { + char *stream_name; + char *input_uri; + enum StreamFormat *formats; + int nb_formats; +}; + /* HTTPD Config struct */ struct HTTPDConfig { + char *server_name; char *bind_address; int port; int accept_timeout; + struct StreamConfig *streams; + int nb_streams; }; /* HTTPClient struct, this information is shared between ffserver and the httpd implementation */