From patchwork Fri Nov 24 11:27:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6332 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2019213jah; Fri, 24 Nov 2017 03:28:01 -0800 (PST) X-Google-Smtp-Source: AGs4zMYB9EsSYzw9FlyQ/+gLAHjgvJYMGNO0YO6PapZKY/GLzc7OgAhqWxN4lhmrpmoavtW8k7Ms X-Received: by 10.223.175.49 with SMTP id z46mr1814166wrc.12.1511522881354; Fri, 24 Nov 2017 03:28:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511522881; cv=none; d=google.com; s=arc-20160816; b=GXDEOrQn97AAykK6iyOrk5wOt2TLVvMVMIclTwr1DPI3KADNgpfecBQALUIVYrf8m5 dv/TA+INc7KkCUxxF9UC8JWtpFpIuyFB2y7hyIyYEjpDR0+epJIPFEStTVvC0oOj0HsH OPovlCaBmgO+ntcdgTGzNhwqMxgaGzYfMFviMXLJHRoRMthO3BGmH0so9uYjP4I8ebOi Wcpd/oVd+IodLZZDGwdWrxJHip0lAG30vw4r/CegFE02pEH17cVTLBwwmalt9BOfBp2v DRY/YhGIGcXzpleUtc7A1CsrYxpM3Fmfj3KSKHAwjOjogRGNbvB+dbNP63kDRsqCRYTY QsQQ== 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:feedback-id:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=JOY9ajZoIXMVkhkoBdOG+4LL2daMEwYWWX0tMYAGJ8A=; b=TswgjqazjDCtgyVVOnjVgbi1DjzUSBwZcdEe9FQtA4+0FgdzPkUUAot1QAdQARgamj dZknQJesA2lAIlgdoeTJvQ29zoBn0VHYD2yBEOMzX4V7VVu/ouy5WevslVIgMSQaUqBU L1z5u5g2cVritiq3TspPanAe+A4y7wwCUmApBrDPp5iYS5X13sNH1hYM2K93FM6Rq7dZ grHGrOvNpc1xGe+qBW3L9Fd+agAtDoNTqfl+sZCCrefbAtZwHveeeV/SHUle8uC2WJrj pw3vrzbfcBcqqA8sEM/5nnsCePyiPS0d1QhuwYE0InadMiKgjvWNDKI3gLFTtHNPPzpE SHcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=RbcVvp3d; 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=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q34si16748806wrb.208.2017.11.24.03.28.01; Fri, 24 Nov 2017 03:28:01 -0800 (PST) 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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=RbcVvp3d; 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=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04E5368A1F8; Fri, 24 Nov 2017 13:27:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5002B689EC3 for ; Fri, 24 Nov 2017 13:27:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1511523778; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=1O7ProgscnrdM92YupfaaDGnLjIRq7l5ko6gqmZhy9s=; b=RbcVvp3d w0HZIUnFsn2QlN6ag2mH/Hehw7NmIDfdB1KokOHLCzDQBSBCEzU39sY6q+DQHqlNycIPCib1aNySg XNT2+Ox9zh15cnOvkJH0cD4IMOS98UEeyJoj/labKDvugNuSFUrjRJ60/aaj69QhX/oAjUoexlEuP 4swC6xjMdNDpNnoTXzP7k5PzM3GNnm+AHFg+jELkwfE+wgOyzsKZl8EcztlU39si3cnl1G1lw23xq lbl+F4za3jw8xd/IOHjA/gRkJ5vYOTYaEtqnVqedWh36wRTunehXvFE0NHNwzqqsoU+wBntJmcubL XJMC+3VIFBWKpVc4STg6pPTOOQ==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2017 16:57:34 +0530 Message-Id: <1511522854-6546-1-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-Smtpcorp-Track: 1-mC96NmFjLTLO.GEm13d7Mj Feedback-ID: 337386m:337386asVRLGB:337386sjC1FQ-nO3:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: Added context to av_log calls 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: Karthick J MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also removed a redundant av_log call --- libavformat/hlsenc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 30ccf73..379a4ec 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1057,7 +1057,6 @@ static int get_relative_url(const char *master_url, const char *media_url, if (p) { base_len = FFABS(p - master_url); if (av_strncasecmp(master_url, media_url, base_len)) { - av_log(NULL, AV_LOG_WARNING, "Unable to find relative url\n"); return AVERROR(EINVAL); } } @@ -1096,7 +1095,7 @@ static int create_master_playlist(AVFormatContext *s, &options); av_dict_free(&options); if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to open master play list file '%s'\n", + av_log(s, AV_LOG_ERROR, "Failed to open master play list file '%s'\n", hls->master_m3u8_url); goto fail; } @@ -1118,7 +1117,7 @@ static int create_master_playlist(AVFormatContext *s, ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name, m3u8_rel_name, m3u8_name_size); if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n"); + av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n"); goto fail; } @@ -1132,7 +1131,7 @@ static int create_master_playlist(AVFormatContext *s, } if (!vid_st && !aud_st) { - av_log(NULL, AV_LOG_WARNING, "Media stream not found\n"); + av_log(s, AV_LOG_WARNING, "Media stream not found\n"); continue; } @@ -1144,7 +1143,7 @@ static int create_master_playlist(AVFormatContext *s, bandwidth += bandwidth / 10; if (!bandwidth) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "Bandwidth info not available, set audio and video bitrates\n"); av_freep(&m3u8_rel_name); continue;