From patchwork Mon May 28 18:18:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9125 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2230345jad; Mon, 28 May 2018 11:26:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLCOxYOgsvrJDWUkwsKXVbeVMR3b0zgCHSb78e0GhY0Niyxi94q9izpYGIU6HCGp1Zgu2jc X-Received: by 2002:a1c:d4d2:: with SMTP id l201-v6mr8468923wmg.98.1527532008236; Mon, 28 May 2018 11:26:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527532008; cv=none; d=google.com; s=arc-20160816; b=U7dogPOFczcsJoc8BWbNChtW+Dc3pTjAwea91/AG5kqioY4iheyEk1fs7V+j1L1aPg XQMt75zOJDer62ge4L0uuSKVOs6j0hgvfRjxiY6DOLFqozSftq5WFEg67YtfUmaWKovz +AhAowj+bbUJwqsn9DZDiO/oxBf+ADVx33hU9BIhtkAcC/Pxk1cKQ7KxtDW0M59yizOI EII8t7nK65BY0r6lHiBYjS79zGJhfM0zNyt1wc1XLLgaY6pDPyllZLhjqOuCoCYQ6lJA eJowmvsSN3KaNMAzJgYG/ow69/jHXYBfJOX4LLkcrtXB0cQ2pOH0xR3on4saYmwU/8ne UASA== 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=RuW1LrYrUIjDOOnHG91KWld48G49HU6T9LvkJhDsKchG1VPE/nqy0JXKVMNji1y9ZS 26EBFlGFf/ORGsO4a4DNAVsWmADQ2vqzXAA9Ahjk94RhXLApjCSPnjMFZnAyfEGzq0+c Ng/93se/7eaFOG7eSo1WIawwWREFGX2cRC4preZFRbQyLe1oPMG28TMtaueJe5/JOmd/ 1isxnji5pkWnSVaRdcu8E7Gfa6fS9rMI/i4Jib4kyaBMNXft5WLouZ62AODbZ+lt3FTy iQ36OpQ9OuDhLnAfANbFoayXo/wc+ctta+CA+Grcpx7Of5rROtz/0NRDZ/bpUglEKQfl iTcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=R4o4WMjN; 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 c13-v6si21189827wrn.419.2018.05.28.11.26.47; Mon, 28 May 2018 11:26:48 -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=R4o4WMjN; 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 AC63268A38B; Mon, 28 May 2018 21:25:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C45C68A376 for ; Mon, 28 May 2018 21:25:51 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id y15-v6so21563429wrg.11 for ; Mon, 28 May 2018 11:26:35 -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=R4o4WMjNOYPDhU+ifdYpYq+LYNeVK86/CHdi/zVRp4fz37YLPBc09X5Y0fUe06Cz2a F9R+eRGwlV9J9sO4nbP8qTC8DruqqjfWauzyic+gh5Bh9W4y0/SHOdUR87qE/k7zh+FQ o5Owhj7EZj6fp+g5OsaohQKITwlcPIeJWu8NzlJIIw/W0EMMeXdH8RGhiOsJnuRViweD DWNtsHlYOib/Q5L44MJJ2uxCDy7xUizSyOUFzdlNtayMycZbUXf5C0keu1Bb4sTNm6Ax u8uAoZfw1MWwsn50Fr5GdJojwchMcU7wNDu8hzGc8poWUcnaTgSXFRpbnCEgi0bZA4dA wxqw== 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=Ho5IRKEa0/kWXwpgfikW8lgIrqyur1spZl6ZkOowoA7mTxWbamfL5284J7UtfQGMr0 tCNZu2S6nOY5Zw4zoiMC0wuBpbBmXlB74GpEQlXXit5i9bqN6GkXZcfd7ArZxYrZ/sNG ULP3ZCpcXfNLXcpeuwUAqouLzNwZyJIUggcQER2QfC9U+ZYsdpZU7c+3AqB9YqOPaNxj BJMVDV/tYGOwrCHeHIY7k/X2SFmGS2bnAoHWfOF5ee8/Uxp4r2tQdah0pgUW2O6A9WeH v15NwJvOReC8wE4RouJVzNvW2PKKFrAXJLYK7en4/tpzKyDbCdOtdV16YCcixWkae7Hf 5QIQ== X-Gm-Message-State: ALKqPwc3mnsReBz+HYKPGhcaCdWPZ3UO4ZoEsfPlM5Qt4Xtr/eK1Hl/O uPBXp7mViNiand1nfdq6/K/OmA== X-Received: by 2002:adf:a032:: with SMTP id k47-v6mr4283047wrk.202.1527531570112; Mon, 28 May 2018 11:19:30 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id p5-v6sm14649465wre.83.2018.05.28.11.19.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 11:19:29 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 20:18:55 +0200 Message-Id: <20180528181859.12182-5-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528181859.12182-1-klaxa1337@googlemail.com> References: <20180520185404.29836-1-klaxa1337@googlemail.com> <20180528181859.12182-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 */