From patchwork Sat Mar 19 01:03:33 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: 34850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2241351nkb; Fri, 18 Mar 2022 18:01:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyn0AsfBm6OsPExmNu0uH8wjr9OqZbeSetbRiNwwXb2nN+QG4Ysnm6Dw1EWE0nSC00HV/Vu X-Received: by 2002:a17:906:f956:b0:6df:d816:264b with SMTP id ld22-20020a170906f95600b006dfd816264bmr468511ejb.354.1647651710120; Fri, 18 Mar 2022 18:01:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647651710; cv=none; d=google.com; s=arc-20160816; b=E43eFz4OWiYQbLZl3AJ9zjjH6xV1NgVq2SEhKNc7RjBTAviaywve7XIQxQOEHlU+8w sASvPzVxsI26q4wdckAUFDI+wrJFVtRX2OD3GUmzNqrDMSsMB6QWlWlH1nicig18qLii hqvsLqcIdr45YR3F7sDD1xO+KXNLA0qjWqFdOWihKqHyfed8oY5IX3HqBm1LlMY3zdCb CGI+91TwZ2iqiUNmJgFMqMg4bxwlTgrSEymMB4GRfzTErvMJJWCwKh7WAkgUGs3GYzcA hbNv6dbli6OQOjiDSDAKjHhu+XX0sqSnn4PHKgMAhbZefifbZNTD3rl1P3Q17ealwNC5 cbVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=8agUdB0xEg3+QJYMk3MJUUkBlbztTttLt1p35QS9YBg=; b=WET+09XjCTVUXHu7L7wZO+FgD21khHjmwxoMQUFJrCgHZunuvcOUtzsXYyzcscIWnC 5iGlDRM7xhz0eddx4h72jMrzxsUOwwgbIYLp+WfaDbSSqNYIaCgu6Ng5AhaNFowGWhki MW3HNyLcJ9XvLy6oPqUQtz6KYJNbcGKe+O/D3Qkpin6E8YhgCe7D7vx+IJkoyiltph8H 8J7SCixGjnjU+Aiz8n8nMWuMbWyqPX76cHnfmEW4hKTF4d0G4XFTgGlminV+TwnQpcaE krCXKyE2H5dA2mhvfXVOAYA6h09pmAUDp8V+zMbl5GbJ5CrEcZVaIfLuQ40EF2cJTEQf MJSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l78ZJ+Gi; 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 sh31-20020a1709076e9f00b006df76385cfcsi2641232ejc.412.2022.03.18.18.01.49; Fri, 18 Mar 2022 18:01:50 -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=l78ZJ+Gi; 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 C52C868B08F; Sat, 19 Mar 2022 03:01:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E70268AE62 for ; Sat, 19 Mar 2022 03:01:38 +0200 (EET) Received: by mail-wm1-f51.google.com with SMTP id q7-20020a7bce87000000b00382255f4ca9so7502342wmj.2 for ; Fri, 18 Mar 2022 18:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+BDPWcE75WL+VVjFdtQ/wunDsWPXTTA2L+GKpKQcLAg=; b=l78ZJ+Gi8UcBRgiBFMlDU05dBhYtwE9Q0w9zx2kXKNkb1TKe0ZZRIxPmnHr/7rmxSb eYClVLGTZcrtVFonUJkGHVeXVTN5iqkXxbQxT/dKkgPaXLaAzf/tOGO9UvTT2li71U+X kH5J8PtCg0SQF/ZDk6w4dZqJTkT6ndfNz65Y4+0e/UwSkwLdUwBQd0xxxxPvynpWcs8n XNz724WTOnEC42hhfQFn1aRnsIu6Z3kDMy6ZnMZCsfx7tvXxs/rQzqodNWw0Ba25srdf TIuGJ0FurQPqjiyZxFnqIjl27FynychNHpTUzyGpSu3PA/AA1nYKiOSmG2yYUXwUuK5d JiZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+BDPWcE75WL+VVjFdtQ/wunDsWPXTTA2L+GKpKQcLAg=; b=vck7zVawRK/ZdGYGuPaIHZG+QQWFnILUnEZR+qxwUUHW4hAdEqIiBCTXy/mj5xdWGp yxjYbKY8pqR9e0ej+kqCgg1lefoVHHHHbCvKkQwCI4GZeIy7Lnz4J2lG1Jh93JmaajYB qkbdkxhLAfh+dcY3c220fJ0gd8K80Xs7/Lzaa/83Ux1Fs4grg9nKaDs34P1flq+TZyjP YznwQirJvvGCh/q/6caMVE+it6qwziFUWiIq+fE3OOb8pqsCnOf17oa69zZ6pxgpE46v 3CFgishEx262ORwLA7Qo7w0WkFom5OI3MYGYMqfFN2p0KabcOGusj1K8KXP1DsV7L/Np JBmw== X-Gm-Message-State: AOAM531VIhXLi5yt+sIzwLHt4s/juKaSSf+1y6mkXHNw8wQT9uVadEZm RORaK+bkUlBBd2OPt4qcIrOQzCPw7S8= X-Received: by 2002:a05:600c:19d1:b0:389:d567:e9a0 with SMTP id u17-20020a05600c19d100b00389d567e9a0mr17464405wmq.137.1647651697829; Fri, 18 Mar 2022 18:01:37 -0700 (PDT) Received: from localhost.localdomain ([95.168.121.2]) by smtp.gmail.com with ESMTPSA id z5-20020a05600c0a0500b0037fa93193a8sm9350206wmp.44.2022.03.18.18.01.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 18:01:37 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Mar 2022 02:03:33 +0100 Message-Id: <20220319010333.35910-1-onemda@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/g723_1_parser: keep avctx channels internally if value is > 0 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: hA+pMlyITaHE Signed-off-by: Paul B Mahol --- libavcodec/g723_1_parser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/g723_1_parser.c b/libavcodec/g723_1_parser.c index 2ed1a8ab19..03c165ce55 100644 --- a/libavcodec/g723_1_parser.c +++ b/libavcodec/g723_1_parser.c @@ -26,6 +26,7 @@ typedef struct G723_1ParseContext { ParseContext pc; + int channels; } G723_1ParseContext; static int g723_1_parse(AVCodecParserContext *s1, AVCodecContext *avctx, @@ -36,8 +37,11 @@ static int g723_1_parse(AVCodecParserContext *s1, AVCodecContext *avctx, ParseContext *pc = &s->pc; int next = END_NOT_FOUND; + if (avctx->ch_layout.nb_channels > 0) + s->channels = avctx->ch_layout.nb_channels; + if (buf_size > 0) - next = frame_size[buf[0] & 3] * FFMAX(1, avctx->ch_layout.nb_channels); + next = frame_size[buf[0] & 3] * FFMAX(1, s->channels); if (ff_combine_frame(pc, next, &buf, &buf_size) < 0 || !buf_size) { *poutbuf = NULL;