From patchwork Thu Feb 25 14:05:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25985 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 F32D544A8D8 for ; Thu, 25 Feb 2021 16:05:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B89CC689A63; Thu, 25 Feb 2021 16:05:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70761688126 for ; Thu, 25 Feb 2021 16:05:13 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id h98so5343110wrh.11 for ; Thu, 25 Feb 2021 06:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sUrKrtP6frK2SgJahcLg3ydsyLaOKLawOqCbGKPYFTA=; b=uTcSpAFunNRQTTW9tBZ+iGPk15NxWkEMSXUZF7Lc4PhgBcXRJYmA4VDsrThVOUL35t lSoQ7w6HefVhwF1fhk9sf3VQIlQAeCjfuT8OtsJNRS4Ryy3Qj+1oCtueMSLSrdZAcDye ejKwu9RQ6kObAQ5BuNN3QLU+jjtH4u75ERVmVF/Dqnc08F6h90ckKzcod/nzg7dAdlcl vLtNZ2/tEjSW7BxtVk9YQRj1kl420bAgbWwDuxy1TtE2755K8+cBCs6EeGiRdWvKHrH3 KnBKRhiiCmlN2oYBcXK6ozHDwuggaKuOy5oAzM2ZEE+OXzPyhu636zlmFp4BMEyp8cmB Bgtg== 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:mime-version :content-transfer-encoding; bh=sUrKrtP6frK2SgJahcLg3ydsyLaOKLawOqCbGKPYFTA=; b=GfW0+8BanQ83o2NsgN1GawZNM5rhvGHlK1bwmW2wVgKma2KGe+bPB3+Qd2536OygXS 4MQ9H0VXMjGpxobwIsODSW3GdSAA7dChAr0Ocs85xVy/Gn5DVe3IlE813bsBTMOre2ck S50tD5Jv+aPyv1p6776fra7TD9KT1+khUsohhaW7hOf+xr6xntM3azWYAQI9XuC6WAnd ADdndExcbJ6pZrN64qUQbPwWP0DCZCHyWUBFRNTtBe8Us7tA1RL6mcUXDUDCdqTmCpxv xecMs0L8iSjS/ISD6s68Io8b849/9sT0KzA8x6w+9nXhBrqvd1RbZqOH5GrEZNGTgg/K AcFA== X-Gm-Message-State: AOAM530D6WHFXma2P6iPHjHnwi9mE1sTo66ROiCKVavjBj04U27EibTz XBiQ7NzZRPdCR+RLkD+AlZVlSKVTmbo= X-Google-Smtp-Source: ABdhPJwU3sIgXhREaQVCXzvm0ae1F/rwQR7jJvnROTylXS/FOSNHqAZ/CgHmw8FcNyti7UIFF6l9qQ== X-Received: by 2002:adf:a2d3:: with SMTP id t19mr3670124wra.299.1614261912519; Thu, 25 Feb 2021 06:05:12 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id j11sm7952229wrm.13.2021.02.25.06.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 06:05:11 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Feb 2021 15:05:02 +0100 Message-Id: <20210225140505.1249855-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/wavenc: Improve unsupported codec error messages 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- The actual aim is of course to remove a nonconst AVCodec. libavformat/wavenc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index b65b8b0940..078b7fcd9a 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -159,9 +159,8 @@ static av_cold int peak_init_writer(AVFormatContext *s) par->codec_id != AV_CODEC_ID_PCM_S16LE && par->codec_id != AV_CODEC_ID_PCM_U8 && par->codec_id != AV_CODEC_ID_PCM_U16LE) { - AVCodec *codec = avcodec_find_decoder(s->streams[0]->codecpar->codec_id); - av_log(s, AV_LOG_ERROR, "%s codec not supported for Peak Chunk\n", - codec ? codec->name : "NONE"); + av_log(s, AV_LOG_ERROR, "Codec %s not supported for Peak Chunk\n", + avcodec_get_name(par->codec_id)); return -1; } @@ -325,9 +324,8 @@ static int wav_write_header(AVFormatContext *s) /* format header */ fmt = ff_start_tag(pb, "fmt "); if (ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0) < 0) { - const AVCodecDescriptor *desc = avcodec_descriptor_get(s->streams[0]->codecpar->codec_id); - av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n", - desc ? desc->name : "unknown"); + av_log(s, AV_LOG_ERROR, "Codec %s not supported in WAVE format\n", + avcodec_get_name(s->streams[0]->codecpar->codec_id)); return AVERROR(ENOSYS); } ff_end_tag(pb, fmt); @@ -553,9 +551,8 @@ static int w64_write_header(AVFormatContext *s) avio_write(pb, ff_w64_guid_wave, sizeof(ff_w64_guid_wave)); start_guid(pb, ff_w64_guid_fmt, &start); if ((ret = ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0)) < 0) { - AVCodec *codec = avcodec_find_decoder(s->streams[0]->codecpar->codec_id); - av_log(s, AV_LOG_ERROR, "%s codec not supported\n", - codec ? codec->name : "NONE"); + av_log(s, AV_LOG_ERROR, "Codec %s not supported\n", + avcodec_get_name(s->streams[0]->codecpar->codec_id)); return ret; } end_guid(pb, start);