From patchwork Sat Nov 2 14:54:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 16069 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AF1DE44A0AF for ; Sat, 2 Nov 2019 16:55:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94E7068ADB3; Sat, 2 Nov 2019 16:55:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9032B68ADB3 for ; Sat, 2 Nov 2019 16:55:08 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id j22so8295717pgh.3 for ; Sat, 02 Nov 2019 07:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cE5f/QlJXgIpurU13iL/OGciLcaJVqIQKix9OZnwVkY=; b=koZoyHQXmNKOB3yxQefQ0w8KoQTMauBZSkxRr7iwYv7XTOHk1wPggy4jsz2f70oZcP AjufGof7QG3ZjFkBn6TxFcX3q2YgOxqAUSl5O+B9VvVl6yqycQbR/qO1UI9CsPUH3ATU 6YS2hODbzTlMqKTYXfAB9l2xAkt5CXTsL4ZYV0JdW/A+ecVqjP4Bogc+NKwVvL5R7eof wZXGpuaWJdKsVVPYNzuFgR5DnYh3IdGKBZt023wbwfBDtxA6d9VTOweMW7TAz8O58m79 xk3BKT4c+uyboXUK919+LAmywIO3QNVxBV+JAvnkuYSXwU52smRtM+gBQP+/LRr0Vvx8 aU1A== 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; bh=cE5f/QlJXgIpurU13iL/OGciLcaJVqIQKix9OZnwVkY=; b=BkM19JIWCh3aBBjx8Zjyd2Cxncv3vwtru/f/TBNVtgJKakyfqvr7kbjAT+1OBezPak IGcoHrFfYNLtuqbpxgkyuieDeE/M43/gKD2Q5WWWocsd6qwCTv6QilKZb1AW8iXemfLp YpkjU9D0RguZzL6ehvINFamOlLiut7doKHg3vCoMJt+7P6PlFtzNc1YoqutK/St+d6xP 8AytgqMbFKMRQpt6ESgGxVVsdZ4BN74I1tiz7YZYCer5LpibUpVH1YeC1elX+awR3Dze hMW6q7Z4DRtulnXLXx+Gj/0HFvmeyULEP3WrIW3u/KqEbyfVuLzVTmfkOYD5fjIxPqxo FhYQ== X-Gm-Message-State: APjAAAUjUVd4toLLof6OeYoX5+3U50wZdX6EVr6bo+qG8JxYf/xqOY4U qH20t3Dr6Kg1AIwq9/czDJp4bMld X-Google-Smtp-Source: APXvYqwqs2lEmG7Ydc7o+ntC0PWVrE+sKIMNF0w4OyfJsrzlZtghvSNkg24XsAHxqPanXHte9TgyGQ== X-Received: by 2002:aa7:8e0a:: with SMTP id c10mr20225277pfr.166.1572706506336; Sat, 02 Nov 2019 07:55:06 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id 4sm11434558pfz.185.2019.11.02.07.55.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Nov 2019 07:55:05 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Nov 2019 22:54:57 +0800 Message-Id: <1572706501-28512-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/5] lavf/hls: fix the log context setting in log message 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Fix the log context setting in log message Signed-off-by: Jun Zhao --- libavformat/hls.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index ac151d5..8ce1ad9 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -476,20 +476,20 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf return NULL; if (type == AVMEDIA_TYPE_UNKNOWN) { - av_log(c, AV_LOG_WARNING, "Can't support the type: %s\n", info->type); + av_log(c->ctx, AV_LOG_WARNING, "Can't support the type: %s\n", info->type); return NULL; } /* URI is mandatory for subtitles as per spec */ if (type == AVMEDIA_TYPE_SUBTITLE && !info->uri[0]) { - av_log(c, AV_LOG_ERROR, "The URI tag is REQUIRED for subtitle.\n"); + av_log(c->ctx, AV_LOG_ERROR, "The URI tag is REQUIRED for subtitle.\n"); return NULL; } /* TODO: handle subtitles (each segment has to parsed separately) */ if (c->ctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) if (type == AVMEDIA_TYPE_SUBTITLE) { - av_log(c, AV_LOG_WARNING, "Can't support the subtitle(uri: %s)\n", info->uri); + av_log(c->ctx, AV_LOG_WARNING, "Can't support the subtitle(uri: %s)\n", info->uri); return NULL; } @@ -1067,7 +1067,7 @@ static void handle_id3(AVIOContext *pb, struct playlist *pls) } else { if (!pls->id3_changed && id3_has_changed_values(pls, metadata, apic)) { - avpriv_report_missing_feature(pls->ctx, "Changing ID3 metadata in HLS audio elementary stream"); + avpriv_report_missing_feature(pls->parent, "Changing ID3 metadata in HLS audio elementary stream"); pls->id3_changed = 1; } av_dict_free(&metadata); @@ -1118,7 +1118,7 @@ static void intercept_id3(struct playlist *pls, uint8_t *buf, int remaining = taglen - tag_got_bytes; if (taglen > maxsize) { - av_log(pls->ctx, AV_LOG_ERROR, "Too large HLS ID3 tag (%d > %"PRId64" bytes)\n", + av_log(pls->parent, AV_LOG_ERROR, "Too large HLS ID3 tag (%d > %"PRId64" bytes)\n", taglen, maxsize); break; } @@ -1139,14 +1139,14 @@ static void intercept_id3(struct playlist *pls, uint8_t *buf, /* strip the intercepted bytes */ *len -= tag_got_bytes; memmove(buf, buf + tag_got_bytes, *len); - av_log(pls->ctx, AV_LOG_DEBUG, "Stripped %d HLS ID3 bytes\n", tag_got_bytes); + av_log(pls->parent, AV_LOG_DEBUG, "Stripped %d HLS ID3 bytes\n", tag_got_bytes); if (remaining > 0) { /* read the rest of the tag in */ if (read_from_url(pls, seg, pls->id3_buf + id3_buf_pos, remaining) != remaining) break; id3_buf_pos += remaining; - av_log(pls->ctx, AV_LOG_DEBUG, "Stripped additional %d HLS ID3 bytes\n", remaining); + av_log(pls->parent, AV_LOG_DEBUG, "Stripped additional %d HLS ID3 bytes\n", remaining); } } else {