From patchwork Sat Feb 16 19:20:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12084 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 1481344962D for ; Sat, 16 Feb 2019 21:20:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E30CA68A728; Sat, 16 Feb 2019 21:20:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f180.google.com (mail-it1-f180.google.com [209.85.166.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6946968A71A for ; Sat, 16 Feb 2019 21:20:09 +0200 (EET) Received: by mail-it1-f180.google.com with SMTP id f10so8543547ita.4 for ; Sat, 16 Feb 2019 11:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=wRAp0M1XDD3gxwQW9PTXgCPg7Gag2xdhOgQuCOJJTug=; b=VZ3KWaYB5VtCT9z3xPr00a8SqnWXqGWqYb84kFEKDFu/HzOZ1zFkB3a8DeJLa2Pqd/ RfnJGqKKwKLEdTXl7e7bPFNWe59SzgNrzSfH7nvWFa6csuNpv/rUbyRyNMhgDKLU3viN nqqCy0LU4VLNbjOtGE1NjsiwP0SYUiTZvJzyg1rK/8XsUYSgom7JU1FsgrClhCB5rbQq Usm8BE0bQqhxZl3ZW/+Xr4Cjxwtq4VnKSZg1o2ZmsA1wwQPbVOGHq9RTUPyFQx5KJBkn Le0dCcsYwLmoOnj6b3Cr+NTbxalb5b592th6tvvvtwzbVzRJLHDtWw57zVw19Y/VJvTw AVVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=wRAp0M1XDD3gxwQW9PTXgCPg7Gag2xdhOgQuCOJJTug=; b=ub1icqpbnIGqzz41oz/3AIt7bXmPpQqVsWpnjO4ur85zqHs+4tcLNX+8XdbGT5ri78 pABMiltQLLOFJMaQDqfSB9x/CZQxcI6I62aitbcOOrjO7DhsKuIQvSTR6wI4rFfAPFVK kXrdkWQeldWXIZS7VxTeryK33KxYh98Eggj7GKCf7t4UbPI2ruezP3oHLtPt9b0O5jiV FtzTx+KyzRwD74QjaTFhxoJMOxC84oWMvkfmsAG+1/gEHzpimQbyAktWe2aCqaa3k3+E VfiE3dvFD0/VmmKU9frmANCPcFFAGF+hgPRr0bw+VHl6y3awlHVq+cOrTCGCdvem8p45 wZnQ== X-Gm-Message-State: AHQUAuZao35wLSHecRmhvYldTpU4k5aqg2lqTTxLYCD4JfunxfLBS94I 9dKhiMrh1iy8KoO2FzpOu8k5cEHAhR9+I50g45gimQ== X-Google-Smtp-Source: AHgI3IY/DWnRGghApooq7IDqylGvNfKjdKM/J/HQ5iFq2IgFDIkuK3txhNuC92uqqBZaICJF8dQ1b2Ncma4ChXr1uFM= X-Received: by 2002:a5e:9707:: with SMTP id w7mr10662796ioj.49.1550344807911; Sat, 16 Feb 2019 11:20:07 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:940e:0:0:0:0:0 with HTTP; Sat, 16 Feb 2019 11:20:07 -0800 (PST) From: Carl Eugen Hoyos Date: Sat, 16 Feb 2019 20:20:07 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/libgsmenc: Force mono and use 13k as default bitrate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch slightly simplifies gsm encoding. Please comment, Carl Eugen From 49e711e0a27e09cff014c0bd5de6783fa1c3330c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 16 Feb 2019 20:18:07 +0100 Subject: [PATCH] lavc/gsmenc: Force mono and use 13k as default bitrate. --- libavcodec/libgsmenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index c9e7ba0..fdb11c7 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -114,6 +114,10 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return 0; } +static const AVCodecDefault libgsm_defaults[] = { + { "b", "13000" }, + { NULL }, +}; #if CONFIG_LIBGSM_ENCODER AVCodec ff_libgsm_encoder = { @@ -124,6 +128,8 @@ AVCodec ff_libgsm_encoder = { .init = libgsm_encode_init, .encode2 = libgsm_encode_frame, .close = libgsm_encode_close, + .defaults = libgsm_defaults, + .channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .wrapper_name = "libgsm", @@ -138,6 +144,8 @@ AVCodec ff_libgsm_ms_encoder = { .init = libgsm_encode_init, .encode2 = libgsm_encode_frame, .close = libgsm_encode_close, + .defaults = libgsm_defaults, + .channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .wrapper_name = "libgsm", -- 1.7.10.4