From patchwork Thu May 31 22:20:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9211 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp163693jad; Thu, 31 May 2018 15:28:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLi834uW3+BTcTnrCkWnFnanmxXSz9ckgC1q1uwdXYVI2ORedm53hu2qU/y5sit20t2Ukx6 X-Received: by 2002:a1c:ce0e:: with SMTP id e14-v6mr889820wmg.87.1527805688504; Thu, 31 May 2018 15:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805688; cv=none; d=google.com; s=arc-20160816; b=We6bzjaWordTyJEzBblZHoUS8XLEgynv9TaLiNHC69r/hRt/6EKQN+WKDaeqMCW7+k 2/3CD7PfjI4sG9x6+eR5DyKMrTelD+/aYwcqwSVRotr2I4Csb9Vs1kAS4NrlRmeAUFWx tJ5ysoTwDWhAnAEqnkho5ldBfSxqU0qNIGqu9TNHn/A24QDUgbhsw4eeFIwtvEEi7i78 7gwhoYa8xYg5fxquRWMkw7rXzSDHXnTbdTK7/1ZFc9CQFo3JeOdxJNFr6Xtiq4aMcHif MqBfgOBSUeYJZu6buUt5OaZOotZuRxDma+rI8ElIk8O1FPmGY+Psh9nB/ndQ42zh7lIR wkgA== 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=l4oxKbAsmHptjGuL0cKxwbEoDe/Ty0bJL7UXCucDR3uSv1OU51xBhzL4YUebbFD+tg Rn/Qu+1tug3VUGzvLGbw2XnDqFtPgw9UIXc7lWDplZrA83UHl5sI8fVQbtzvh5zTNv/J KN9i1kPMhgicpc1M6XNkNa1oq8ZlmCz0OUwD2IpHexco3L31EAF0BuyqILhzwjuYOTKa XaOhk4HRPWwERhI496ViFVz/6oCInAfTTXZQ1cb1O9u9/HBrdc+9naEFu1cNh8UGz7NE ROSMKCVa6nIsgcGuKvslJ+Um/8j7uAxLpJJxc52She99/7ew28NFq/rm9W3XL9ODroWB DEDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=CYfRmV3t; 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 k26-v6si34434794wrf.11.2018.05.31.15.28.08; Thu, 31 May 2018 15:28:08 -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=CYfRmV3t; 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 03CCE68A57B; Fri, 1 Jun 2018 01:27:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C03868A507 for ; Fri, 1 Jun 2018 01:27:04 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id v131-v6so37309974wma.1 for ; Thu, 31 May 2018 15:27:49 -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=CYfRmV3tUZG7c0c585yJbrH+pUPArHoZToify+mq6rToNHhgwZ5fWOxR8ljaZ9pf9u 9TEmubusg14wZoe7hLxoAFGdM9YoaDhWS6+cNuTIlpMFNpcRlsg0POy14bSFRSLyusEQ SbQD0f3E0b87V1c3wd7/yt12+pIe+63yLDTpywX4thLcjrOND4cSoXgpr/k/UxsJhtMO wd/wthLsoi3PRYru+lGZRQy4SdL/ZAp9jpzjuwEb/4IPDBedP8lq3Vo012IuEMJTK08h D7Hkbj7rafq82kY/4s+UEkwLr5TnEOB5nilzJeWjPCXCFSLAX3i/NMkMV7r7IiBsFNld baLA== 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=nf4YyVGqSgA8oQmKi07x16YbJOj7Rg18TkFtG/cFjkvAnEeAAY8AOMZ4CvIyPvaw3J 8Q9Q5ZpzSAPm93iR2RTd9nyorTNs6cw7s5Tsw0QELgflaU+zcsuLs2WqPQRpVU26su8p hNXjiw9qFXSQyQa97d3MI+crxmXtItW3uuI7/wE7lFxOqT52yRh1zZ1xKW/Zh8gAtF8u +q7UFdwRjGe4k4wPSxcbV/semeOPbq2VWqkcK3mZ2hm6tieeEDb+99ZXGgni3nG05cF+ jhLcc9deESNVhkUa/fVv5Po/lQfTWmuMM3JYj86qKhr3VpHmxQsTTaA0rxRjlg/eXlW5 nxrA== X-Gm-Message-State: ALKqPweElG1y6OuhdZJoJZdOu0ZUWNFsnd29Aleet8ClT98WJb0+HXW4 19j78hgE3em1CL4lyVP5gkaIJQ== X-Received: by 2002:a1c:5e85:: with SMTP id s127-v6mr1026248wmb.123.1527805247645; Thu, 31 May 2018 15:20:47 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id 72-v6sm38288429wrb.22.2018.05.31.15.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:20:46 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:20:28 +0200 Message-Id: <20180531222032.30111-5-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222032.30111-1-klaxa1337@googlemail.com> References: <20180528181859.12182-1-klaxa1337@googlemail.com> <20180531222032.30111-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 */