From patchwork Fri Jun 23 21:42:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Swanson X-Patchwork-Id: 4097 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp316736vsw; Fri, 23 Jun 2017 14:49:04 -0700 (PDT) X-Received: by 10.28.142.144 with SMTP id q138mr6725109wmd.28.1498254544129; Fri, 23 Jun 2017 14:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498254544; cv=none; d=google.com; s=arc-20160816; b=uW5/ACsrAR2908er90xuoSXo4m4bcONQbiBwRiYWcm97RkvmBYhaKvlIdi4D8GUiNG 7AOQgM96lYi7JX3nC2b3ITK779hHLJAdGFcmXjS9zRhnYjCVaOWqUDHA621vdkMorFa5 Kl6cdm5GvLvQboUQNuz3ri1CRQNZWUAScTdQwGQjuUImeZ6cIG7a5DxUPoVc031NPKt6 +DQQGb6jyS7ocy8Q27qJ4xSo98KpzZKobStvDvtDYp+CmpwR+8jKqJIN6N+YbEywjpLa 2VK/feSHiwZ/oGruA36BZNiRq26fudNhJouZueIEzF/mvOvSc9H6ht1zWc+aXjBqu/AT U7MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=7pE3IYiYFR53nWelp0Za9ypFa5lJDYDO60h7Bko1jK0=; b=vVskBcnIszWvEe1BSm/8vKtgYwOnqMhmz1RVO4eFG3bPREJqWTRPDuwljQ6dFz6DD6 LklqOWHF0q6oMCrb5aybvjfc2kozf6jMkDDXRDroDYC1Oxs4YLvWxSPTNHWukbZUDN2q yPdjzIhBp/Ggd3ojZT3wzFE39X/3C02rcVeDMLEcRr+XSe1tOgw103f1+B8DU7Xa6E/g 4el564eoxTtBkSTuMLUJi7R4KHYDuvfhYXZ8Gz+bX3DFT2nnJQmZq0mUn3ax7xDCCDfQ iJDMAVwtQVOzCLbaBJsK0ltoX/i03O2wG1hid6LcrjIKRMGQDrqFFEu9IsNlXtN91QGc q4gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ylo-ph.20150623.gappssmtp.com header.b=hFf1Qc6G; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o105si6104648wrb.186.2017.06.23.14.49.03; Fri, 23 Jun 2017 14:49:04 -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=@ylo-ph.20150623.gappssmtp.com header.b=hFf1Qc6G; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40716689FBA; Sat, 24 Jun 2017 00:49:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f42.google.com (mail-it0-f42.google.com [209.85.214.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86379689E1D for ; Sat, 24 Jun 2017 00:48:53 +0300 (EEST) Received: by mail-it0-f42.google.com with SMTP id v202so1031141itb.0 for ; Fri, 23 Jun 2017 14:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ylo-ph.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Ly5vhfi232mZf0l5Pwkan253OjqbqsKvWO4y4Uc1f0o=; b=hFf1Qc6Gsevz5DPotueTD+X/MWz6agSoNZxmHzT42qMa1kRb46n8F+LNqrw8OiwXT0 sYmY0QDWXYPdr7O5jwaOrnDaVr8Egm7+FcZ8wxvqFLwQxwRXlWvFbyjopzuGNTRJmBKi wFkLZINJEtPog3k8v42Tqd6lHXJ+EmLwKnYJKj9xBd+7bpfOBrIOjNuBjAtExZpzs9z3 SbWObKkLvGhjW3KBe4KCKJlDQ/+HsCPmWi2hNS7TgIwzBJhzHygOpvqDLtO0vz18Smd4 meNsF2DsfXpx4mfMO50x9GoZSXdQXlb3/Nch/je6QzyLvmZxO7wH21K4AjGt5R3RjPv5 F2iQ== 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=Ly5vhfi232mZf0l5Pwkan253OjqbqsKvWO4y4Uc1f0o=; b=C7sKDxPP7GQwsSi4vSH/HbrePh/XqRA5crvseS0E2O+9DK7ownvlOunC6xpxoBKs+P rdmkfgvo/dk8+ON/9GYZZEIzncdW7ABl9axw46x1vu2rBXdL7uGS5PKWn2LuWgPruGu5 gp/2PZKw9sRQ3mVa0guQ/JzGALLRLsCu0FQSoGnS8EcqLjsGxusm0Ev44zpEDsir7EuO CxIwsKQSDAlKCKstNIZ5FCmnPwOWa7xVIeLqcvW/8zHG8uuvcrFlxaOCNT9O2W+SmO9t cLjNsiScBcxOFC8nAIt8zNMcd4p00gBoaOKFYutUKuLUhKBlLWm45AiEoH/oBYqbS728 rJQA== X-Gm-Message-State: AKS2vOxJ1RzRjEQAUxpkvXpmItmxxSllhgPmet8vkwVzj1zVPlBrsZD2 8alQsFHcyfNM6J7e2RC0qg== X-Received: by 10.36.103.74 with SMTP id u71mr9153739itc.40.1498254166119; Fri, 23 Jun 2017 14:42:46 -0700 (PDT) Received: from kswansonOSX.mpr.org (remote.mpr.org. [192.203.201.3]) by smtp.gmail.com with ESMTPSA id 88sm1910721ioi.5.2017.06.23.14.42.44 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 23 Jun 2017 14:42:45 -0700 (PDT) From: Kyle Swanson To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jun 2017 16:42:35 -0500 Message-Id: <20170623214235.31747-1-k@ylo.ph> X-Mailer: git-send-email 2.12.2 Subject: [FFmpeg-devel] [PATCH] avcodec/g722enc: force mono channel layout 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: Kyle Swanson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Kyle Swanson --- libavcodec/g722enc.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 01a3db26fd..473646f45c 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -61,11 +61,6 @@ static av_cold int g722_encode_init(AVCodecContext * avctx) G722Context *c = avctx->priv_data; int ret; - if (avctx->channels != 1) { - av_log(avctx, AV_LOG_ERROR, "Only mono tracks are allowed.\n"); - return AVERROR_INVALIDDATA; - } - c->band[0].scale_factor = 8; c->band[1].scale_factor = 2; c->prev_samples_pos = 22; @@ -381,15 +376,15 @@ static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } AVCodec ff_adpcm_g722_encoder = { - .name = "g722", - .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_ADPCM_G722, - .priv_data_size = sizeof(G722Context), - .init = g722_encode_init, - .close = g722_encode_close, - .encode2 = g722_encode_frame, - .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, + .name = "g722", + .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_ADPCM_G722, + .priv_data_size = sizeof(G722Context), + .init = g722_encode_init, + .close = g722_encode_close, + .encode2 = g722_encode_frame, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, 0}, };