From patchwork Tue Jun 4 05:38:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13398 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 6E85F446FA3 for ; Tue, 4 Jun 2019 08:46:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4820C680BD3; Tue, 4 Jun 2019 08:46:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 368ED680401 for ; Tue, 4 Jun 2019 08:46:07 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id x7so6895446plr.12 for ; Mon, 03 Jun 2019 22:46:07 -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=RHAuXbPdeoaSnwmHREfN8mffkQ3vNUogruXkSxCrWq0=; b=nUB9SfzEcTPUkFXFaqB1FT9VHwA9Bym5/AP5WI3/kfyiZfcPRVRAOqMhF0LrewN2h1 9FK0G7JCbw3awHDKlNZzrQiXXJMbfP41iHzjKoqTpadJv+6exk2QZo/vc47MRHQ9ZqJQ yI9IO8zyhN/x8bCNkfyPZ4S4IoCqWYuXgM1TWxPkFDe9EFa9Fo4phuvWG9eAtzY1c6l7 d3/1hY6ICe60TsvPUEEXvutj+6qWaxXnVuoT7cl5unmiFjctiPkjn8JOXgcd8cHkufSh DljrMIUWY9d9MEhv0xjiKvQPoD4F6AU5XdtZIhSYDv3WBiDLf15K+lD1BA449iERFQbn lxmw== 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=RHAuXbPdeoaSnwmHREfN8mffkQ3vNUogruXkSxCrWq0=; b=q/ki4TKuHrYK2NuCuBXNuVJs8RawVoNH+pVLf8Y1vS7xgxsdCjWavS/vxkjK5/mH61 7QTWZxv70dzcN+HbejrH/WCTNBbwsPow7Cqd9YgHzm+DI+wZwoETKthz+hcHNMUkjXIq oxwQyWoMDIWYMTTu0XtDxAEHBzZ4QCYjGeAnLSpwWa5N+LlII+aaC5dZ6Uch0DIPhTe3 BtojEDxOhRW3uHk5TZHQnLUHwjeTJcFEIxDkT9UI0TqYbcOwOFx3X9Sh8fwfo9dVYCef /Uip+L4qZbFliuoTDNoik03cKTr/MM7JERQju8nLdfr8rNaKiHGCsOw4ccER/XM+6vpG jspQ== X-Gm-Message-State: APjAAAUAUm7tRvt7rjXFFAT+FMClMkz7g3ioyCPG51JW6ljrvgvgL1lF qeGTczzBV9OIzCJahuCfKe7nrBTU X-Google-Smtp-Source: APXvYqwkihF3+ONgQIcsnnRy089WFHdYM/TIiszUnNq2TI745AZiA31tCGNka4BLJpsbMWqg72307A== X-Received: by 2002:a17:902:728b:: with SMTP id d11mr4645559pll.78.1559626729066; Mon, 03 Jun 2019 22:38:49 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id d10sm18180854pgh.43.2019.06.03.22.38.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jun 2019 22:38:48 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2019 13:38:40 +0800 Message-Id: <1559626724-16376-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/5] lavf/hls: Update av_log() 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 Pass correct pointer to av_log() and update some error/warning message, it's will help the debugging Signed-off-by: Jun Zhao --- libavformat/hls.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 19ea88e..1b45fe2 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -476,17 +476,23 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf * AVC SEI RBSP anyway */ return NULL; - if (type == AVMEDIA_TYPE_UNKNOWN) + if (type == AVMEDIA_TYPE_UNKNOWN) { + av_log(c, 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]) + if (type == AVMEDIA_TYPE_SUBTITLE && !info->uri[0]) { + av_log(c, 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) + if (type == AVMEDIA_TYPE_SUBTITLE) { + av_log(c, AV_LOG_WARNING, "Can't support the subtitle(uri: %s)\n", info->uri); return NULL; + } rend = av_mallocz(sizeof(struct rendition)); if (!rend) @@ -1202,12 +1208,12 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg, if (open_url(pls->parent, &pb, seg->key, c->avio_opts, opts, NULL) == 0) { ret = avio_read(pb, pls->key, sizeof(pls->key)); if (ret != sizeof(pls->key)) { - av_log(NULL, AV_LOG_ERROR, "Unable to read key file %s\n", + av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s\n", seg->key); } ff_format_io_close(pls->parent, &pb); } else { - av_log(NULL, AV_LOG_ERROR, "Unable to open key file %s\n", + av_log(pls->parent, AV_LOG_ERROR, "Unable to open key file %s\n", seg->key); } av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url)); @@ -1419,7 +1425,7 @@ reload: reload_interval = v->target_duration / 2; } if (v->cur_seq_no < v->start_seq_no) { - av_log(NULL, AV_LOG_WARNING, + av_log(v->parent, AV_LOG_WARNING, "skipping %d segments ahead, expired from playlists\n", v->start_seq_no - v->cur_seq_no); v->cur_seq_no = v->start_seq_no; @@ -1800,7 +1806,7 @@ static int hls_read_header(AVFormatContext *s) goto fail; if (c->n_variants == 0) { - av_log(NULL, AV_LOG_WARNING, "Empty playlist\n"); + av_log(s, AV_LOG_WARNING, "Empty playlist\n"); ret = AVERROR_EOF; goto fail; } @@ -1815,7 +1821,7 @@ static int hls_read_header(AVFormatContext *s) } if (c->variants[0]->playlists[0]->n_segments == 0) { - av_log(NULL, AV_LOG_WARNING, "Empty playlist\n"); + av_log(s, AV_LOG_WARNING, "Empty segment\n"); ret = AVERROR_EOF; goto fail; }