From patchwork Mon Oct 31 11:53:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 39087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp865325pzj; Mon, 31 Oct 2022 04:53:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM61RJu78xmsYabdFVaWiVr4T4eRcOJTtUEVVeYWQxWExk+RjtLQ0oixtRrPDI/mS4WeFH0+ X-Received: by 2002:a05:6402:2202:b0:461:8143:1177 with SMTP id cq2-20020a056402220200b0046181431177mr13265717edb.210.1667217201475; Mon, 31 Oct 2022 04:53:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667217201; cv=none; d=google.com; s=arc-20160816; b=uowj4SE8ou7au/9Xl+qbHqY+ZU04oJ7F7U/NrbfaTz9sIVUvCc+oAa/E3GA9w+a8T/ ekTor+4THnNzvpaEEGO+WUObevQ4ac98/LyHsKieKTLC+IXdx4iTwRS7Sh1ZYJGz2uYi Ts/lascHuBBVIkjN8+8Zyw5EgE5xG8wS9+uKKoaItUL2K+clTZ9CpZi4l3FD2jTvOzDT gJ+Oxl0p17SAlMvR3VkSGDTaETNOANk5AAaHPbk/RqydaFAp9rDR+PYZqW+8mP/TI90/ QIY/1XeixDPC72uXSsB1yi/IhUv2CeT6WlUFPTPWLWPqTk0HA1nPVnutW9e6sIYf/8JE 4cVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=2GDHbQCQSXKacx4uSe4ti+0VEyfxBES4ZohQLOikILI=; b=UoRzcXM2ppmSDqWz6RLKuzzObQ1njnggnGNhDuzZhzTfBAoQ5AkwY+Mh/2o4fozy6r EPpH7MJ19XOEMzpQUqJcBdGhVflLOORmUE8QlCahW+cYeL3e3fBQJPgHy2artJnfUizW F2wYsXHM3q5lywrBpzLH0NRks82A7QedgMcy7QIJEJx4Ix4PJSzGE6ApJLS6MMPhEMWF yYDiGl9+h4/TTVuUjeYLMGVlcUQE/BFisjIrNhQ7Comam0t4PjpdBH2wgkl5fB6pzggd 8Bq+N54i53FjeygERPB74z/23XRIrHmmRf959Ut+7rkvwtFUCZjp/IQIomSHS1azk+0Q rJbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=P08VStCB; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sg9-20020a170907a40900b007763cc7093csi8340295ejc.884.2022.10.31.04.53.20; Mon, 31 Oct 2022 04:53:21 -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=@gmail.com header.s=20210112 header.b=P08VStCB; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECC0D68BE11; Mon, 31 Oct 2022 13:53:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f50.google.com (mail-vs1-f50.google.com [209.85.217.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FE3568BDA5 for ; Mon, 31 Oct 2022 13:53:09 +0200 (EET) Received: by mail-vs1-f50.google.com with SMTP id o5so10829710vsc.0 for ; Mon, 31 Oct 2022 04:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=DsIA8QE9RABU0U3/5UoGWKSG9CUFcByQN8V2n+D0Boc=; b=P08VStCBoOaKnqS5eNhtmjEApNtUp2FftoSnl2im9pHUZy9Hk2JDRj8wYHcQPU4fVR iCy2dr4p0x4BLp6jruKLVsTXkKUZ+YEl67iPOtSEbDXlS0Uluk1ayW31xa7+B8D9g3xe xElNJ/PGjaLyUFsfoj6s36534QfhT97E9zJzKhGynMr4WJC2ffemOQWAd5IIEIMs+ABV P2JkpXcOOx1rQvi7EmBx57KuO4jEmyoGhd/02GLSNRm/qEwxaJemb+G2fu/ZiFX/SUpc SgBKOYMjGIBwVhwRKAz9EBq7rrTMtY6/pXfUeQIcGVQ9EjGZ9RZ3EO2fdB09n6VUXtYw 4hJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DsIA8QE9RABU0U3/5UoGWKSG9CUFcByQN8V2n+D0Boc=; b=uw65JEK+y4u67ibputi/om7KNUpqJ+EI9St8rGY1ZXr9PBpe2/Tk6NflhyRahlY0ou CTUEwuNUmqVe8ntAiLgAOv6PClZH9ZJoXArLv0og+vA4+gcUJVNe2xu45ZlDYkNWgMB2 9tkOVOV6qFJng/elpCx+vt3wSr+dN/ePqu8j2FSutqY/f/glpwjqbRkDNT3JuI2hpfp+ EgXeNoXRXUueYBdaIm8bmHrUQ8pF8T5nPUAG1lDgXAeggjwFT2pI73smMylxL0EoAJFJ +veU9s1gb7h9v4TBMY5afWyFcnZ+HdGFudfPHgoxp5WUJHcVGbad0jkrPLQIHO0e03qE l5Xg== X-Gm-Message-State: ACrzQf07FVnWtbosCgodMPAMYJJHOeaKmc++cuC0OeCY4wEDY2YYNIOJ pUMnHYtZz6LpFn24hzuzQO0mWB2L23zxKmeHJN8LwlVK X-Received: by 2002:a67:8c43:0:b0:3aa:2da2:60c5 with SMTP id o64-20020a678c43000000b003aa2da260c5mr3640666vsd.57.1667217188105; Mon, 31 Oct 2022 04:53:08 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:612c:612:b0:314:ac6a:1eb7 with HTTP; Mon, 31 Oct 2022 04:53:06 -0700 (PDT) From: Paul B Mahol Date: Mon, 31 Oct 2022 12:53:06 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avfilter/src_movie: support unknown channel layouts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UqJY3i6kbsHT Patch attached. From 975a677906256f5f7a6da876a1eede21c5cb2a8e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 31 Oct 2022 12:55:17 +0100 Subject: [PATCH] avfilter/src_movie: support unknown channel layouts Signed-off-by: Paul B Mahol --- libavfilter/src_movie.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 711854c23c..2e30e54ad2 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -196,11 +196,15 @@ static int guess_channel_layout(MovieStream *st, int st_index, void *log_ctx) av_channel_layout_default(&chl, dec_par->ch_layout.nb_channels); if (!KNOWN(&chl)) { - av_log(log_ctx, AV_LOG_ERROR, + char *cl_name; + + av_log(log_ctx, AV_LOG_WARNING, "Channel layout is not set in stream %d, and could not " "be guessed from the number of channels (%d)\n", st_index, dec_par->ch_layout.nb_channels); - return AVERROR(EINVAL); + cl_name = av_asprintf("%dC", dec_par->ch_layout.nb_channels); + av_channel_layout_from_string(&chl, cl_name); + free(cl_name); } av_channel_layout_describe(&chl, buf, sizeof(buf)); -- 2.37.2