From patchwork Thu May 31 22:24:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9201 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp162437jad; Thu, 31 May 2018 15:26:27 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJQ2ECtPauAW/dWtA8yIN7n2tvZFI7aLhD/gv4SoQwcOQA28BY74KHUE1c/OzTO8bYJ0hlZ X-Received: by 2002:a1c:3b54:: with SMTP id i81-v6mr911597wma.122.1527805587526; Thu, 31 May 2018 15:26:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805587; cv=none; d=google.com; s=arc-20160816; b=q+HDn7Sxedf5o5N6hibRmWFB1MEzPR0lbkXG9wqYlFK2M9DP1xRCVY9aFk5IRgZ2+X 7f6N3EwgVM2+DiJlL3ZXIGscSm0+hxyhhlNyeIVo6rKkRR+i9pQ5Ma+4HXNfAGTctRmW Ww1wNstiojBbxztz6vIzerOwYNEvHbHeAWg39w9zrHj+2n0ZQnPMaNhm4n67pfyguwew 4hBLwj4DMcaa1o9X6iI7JOduIpIZTQjTiLi3VU+jUo/WAb4VTJTvQ2K6TtX9DRgOa3Zl Swh4hrCx1CfyVKBQ52UGG0iSQ+UR8x8QwY+n8dIiRLhg7/rQymgF1sJbiyWCycQ7UGs3 4SOQ== 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=7nk0Hja9ZKIxUQmt+4tcSOFUTFaVu68p6a0fd3w5668=; b=cBzRdTc8YKJ6tYCQAwWO0Si1iAaE4KW6fJYRT+UfJ/5mGbZ9CCh4F8ZTsZRCFxusXz r1m59MSIpfwRhe/HsaAPb6k4sVv7Tm00+vYp3Jz4JsBOO2lHu4Q6TnauLLB8Moqb1nzE lbUT8ZwVAH5V8hJC1rV/+Oiq99EZE/Z5yc2pCouXUyJ9Veip2p00K5LT4VRCDHHH+S7o Homri2/h0OxOhfXX1iNWO8SauuuQqESLF9qBv5KzHRKwfS/vP4hPQsfHV9hVCNp8WkKe s+C7cdQwhVtsRF5CCsMnEPcdZ7NNPBgbhembOwbsqm9YFtXOZmvIXbtlZ9GMzkFLLPww gdmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=G/SxmQkj; 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 k124-v6si325199wmf.127.2018.05.31.15.26.27; Thu, 31 May 2018 15:26:27 -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=G/SxmQkj; 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 8FB9368A4ED; Fri, 1 Jun 2018 01:24:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 892F268A48B for ; Fri, 1 Jun 2018 01:23:58 +0300 (EEST) Received: by mail-wm0-f54.google.com with SMTP id v131-v6so37301374wma.1 for ; Thu, 31 May 2018 15:24:43 -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=JraU3DRL9DRx0gfXnCdAzjZKTHQeuFZPKbVm3hzWaTM=; b=G/SxmQkj7FQHExz6hLL7tVlsGCzbvv0QZC43mY+7B8vYlbdKfErutAcOO3AT2i2QCP x/2J4AA66fItnvDNN7gUJTTAWDjGnL9QoBZfmPVWKwDQD7xSmjg4rOK72368l1+jLEJ6 UP+4Ii7EwP2vDhzCZycXlRYVDsCwEcU/NxznOZK76NW9W+UWPSPU8scoRQ4sbVivNqRH QXVPBybd6HQP2G9Hy0qMsv8WHPb8GCAjS6Wj6nzuLqxjMaZLUTnGHr+NJiKNC1XPu1h+ ZSu4SxRBcMow/w5QVZl8lU52CvhOWpSwCP5RJe6y8visH4snspgLzYksZRNNc26N7jVY 3qMQ== 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=JraU3DRL9DRx0gfXnCdAzjZKTHQeuFZPKbVm3hzWaTM=; b=XqcVEVIXt4EOgi7ZiNLzNFPfrYgNfzHm7VCWz6vtpGtsi/CRL7xPb2dJ1fl/j0WX4j vQRScFnsOzTaj4gtO51RpmbbpQYctQNAkm2M2CvviJK7qyLEAh4jUUUeskyVuth4nIGR rHOWB6NoC5Tt4DdXMslSW35aRteZebE/nFS0d4VGcMVhRUeBA1IkPWijkdbAyNM43EwP +TCFNFgE2ZUW894COn7gd3ZjOnGkYr6of02i3Ht4rOOPgPh1UyJtjR+Byd30nQJMceSS mHf0mENkUcI+zd8M1B3KgmP0gD7U5BQm7IKDBVWACKPyUlVhfGSSeD5RBZZJH7m1wcaS SCIA== X-Gm-Message-State: APt69E2S9TpVBfs/lGJ5UQNDS3wVBy04Epftvj2GDjzoomlIB8Vd+7WW b1AGA1HbX9thujb6XK7MsHomKQ== X-Received: by 2002:a1c:bfce:: with SMTP id o75-v6mr910689wmi.122.1527805482962; Thu, 31 May 2018 15:24:42 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:42 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:24:07 +0200 Message-Id: <20180531222415.24966-15-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 14/22] ffserver.c: Add some logging contexts. 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 --- ffserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ffserver.c b/ffserver.c index c6e8516..6f76c3e 100644 --- a/ffserver.c +++ b/ffserver.c @@ -224,14 +224,14 @@ void write_segment(struct Client *c) avio_buffer = (unsigned char*) av_malloc(AV_BUFSIZE); if (!avio_buffer) { - av_log(NULL, AV_LOG_ERROR, "Could not allocate avio_buffer\n"); + av_log(fmt_ctx, AV_LOG_ERROR, "Could not allocate avio_buffer\n"); avformat_free_context(fmt_ctx); client_disconnect(c, 0); return; } avio_ctx = avio_alloc_context(avio_buffer, AV_BUFSIZE, 0, &info, &segment_read, NULL, NULL); if (!avio_ctx) { - av_log(NULL, AV_LOG_ERROR, "Could not allocate avio_ctx\n"); + av_log(fmt_ctx, AV_LOG_ERROR, "Could not allocate avio_ctx\n"); avformat_free_context(fmt_ctx); av_free(avio_buffer); client_disconnect(c, 0); @@ -380,14 +380,14 @@ void *accept_thread(void *arg) avio_buffer = av_malloc(AV_BUFSIZE); if (!avio_buffer) { - av_log(NULL, AV_LOG_ERROR, "Could not allocate output format context.\n"); + av_log(client_ctx, AV_LOG_ERROR, "Could not allocate output format context.\n"); publisher_cancel_reserve(pub); info->httpd->close(server, client); continue; } ffinfo = av_malloc(sizeof(*ffinfo)); if (!ffinfo) { - av_log(NULL, AV_LOG_ERROR, "Could not allocate FFServerInfo struct.\n"); + av_log(client_ctx, AV_LOG_ERROR, "Could not allocate FFServerInfo struct.\n"); publisher_cancel_reserve(pub); info->httpd->close(server, client); continue;