From patchwork Thu Aug 24 11:21:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 4818 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp382223jao; Thu, 24 Aug 2017 04:21:44 -0700 (PDT) X-Received: by 10.223.188.16 with SMTP id s16mr3462944wrg.311.1503573704253; Thu, 24 Aug 2017 04:21:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503573704; cv=none; d=google.com; s=arc-20160816; b=aBwNRXehnqsH5XPx7033QtUu7I+rN10TrcQes3561HLtBPz8lKNnBYJ/QZnsuTyhnd DFGcD5eIJt5Qs1gVrHSWKnf4LEZH8vpos5TngFxOZdvb9QGTiRmCpBniQLMzsORAEC8t 0+D3Q62UaX2G1tKPrXgSjDVDXzHkq6kpeVqTbltbQhumJHML8wcg66eBQPv+IUo2EpCx CfnCEGHfjpNFknP9QUfXy4kR0woHCp+ciE6oqNyb7mFk9YXSULmSxMK8kFRPMctAJskR OQhWgK5Wjxz36xOc3ThH7zOteAONpa4Tql+W3cj2scQML9wf8T6ZeJkcQdHzAIlqcjMr flWg== 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 :arc-authentication-results; bh=4aTRhcjZEvDzAr+iDc3Z2EodEGzj8jyd1MpEF1t6ANU=; b=L346PLxqUfjNFIafJnFM96ZHNJbSuRdUZ0hcuI7PTDcy98nT1sJd4q9L8TFJtkGtNC QjH8gmJu1G7s8VVnUIlQlfaXHecZo1To+zDElbKXcMt0fLU5D2b4j0fzDSs8OUlViGwJ VvqausPrm/lYQsj2CEC7csMkwHWHqT2mE5BIsPXlepd9q7iRP7Hq4N5gN0HMOjQ808jx eVUcF16B2ykeZIsb5RRQiDkpiLLxfwxvmtWkvVJHNsu57J+xWdU3tLmBt0cA2rz883M0 JW5Ieplmy0juWBGjED4Rwn9AwlNp2mvHs4Dt2gfrfUIbeJ/YYObUy5kD9x+ho9hrNMww zQLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qkFHjYqM; 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=NONE 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 n65si1441845wme.81.2017.08.24.04.21.43; Thu, 24 Aug 2017 04:21:44 -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=20161025 header.b=qkFHjYqM; 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=NONE 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 8ADAE689D08; Thu, 24 Aug 2017 14:21:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f42.google.com (mail-oi0-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B67D9689B11 for ; Thu, 24 Aug 2017 14:21:26 +0300 (EEST) Received: by mail-oi0-f42.google.com with SMTP id t196so2294513oif.3 for ; Thu, 24 Aug 2017 04:21:35 -0700 (PDT) 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=gC7qYwL1ZJ2BuNqO+1k5VsoXrznQFOQJn4xG+y3CNf8=; b=qkFHjYqMQQ/pUZ9B9jqHh2qqudvroyBcMlk/sgRG/8WbikVwEvKSfotiIgXg56k4Tz nXUWQWDCAqaPcHSxM90aIxhETBFa3iEfArQfEiDVRZS1yKWZuyPRFgfz3hzcXb0fUdT1 WtILg0/9L5cF0t5vsOQ20Wzs9uGtsPJqMKEdb4dCFNX8boWjCk1Bu2ulmh5n+J7pkWy6 tfwB7tA1vV1lv0l+JiOtF6382Dab1sIZ7907CB+5MrqqSTe39uDRL8DU9tYRBh6l849j 3cbJMmHcEgW6QjGoALM+JwR2/mOKlLxKhNshMIESZ5TBKzpT9q7b2JeU7Iz8aiIAXcTX VELg== 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=gC7qYwL1ZJ2BuNqO+1k5VsoXrznQFOQJn4xG+y3CNf8=; b=b8zkkmiexV1xCkiamzoPmfGvBB34388D0uR5HuRlSiaFZ5i84Wn1HR8IIeFv0ZYe6+ dlxKpMEtm8ZgukIU/QSM1NNBPOGNt14GP/ldWDW90Cc61kZcceRvXWhZJK++P2gEDzgn HdAZBcd5oCh6bJ36AEOM5tssENB0rB4pzEFnQjEGXZgbYSUnxhiWxpljD7EFiV6YMBCk hCgcl49V1uOczH9Qq75TfoEkccQ8nPWsJs0fxvobtWUVQdQlPczX98bZ84ZOGUw7kvBg BOSdx0rxPNZFHM6NECFqxSqlxqmJx253w0mQe4a7OHVGO6NwPsnMlxrH6iXtwlq7Tyg/ vnhA== X-Gm-Message-State: AHYfb5hQbs2nWyupjh04+07f+Ldm6K+Jq2d7rW22pjuUV2e1e2eoEum8 4wklSzuDCV6Zoq3V/3Q+2DSwUF4gWg== X-Received: by 10.202.237.65 with SMTP id l62mr7080402oih.167.1503573693726; Thu, 24 Aug 2017 04:21:33 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.11.150 with HTTP; Thu, 24 Aug 2017 04:21:13 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 24 Aug 2017 13:21:13 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/rawenc: Add G.726 muxers 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 makes creating G.726 files slightly easier. Please comment, Carl Eugen From 9c6effa57ba37d8881a213da66e23e6c25c46665 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 24 Aug 2017 13:06:06 +0200 Subject: [PATCH] lavf/rawenc: Add little- and big-endian G.726 muxers. --- libavformat/Makefile | 2 ++ libavformat/allformats.c | 4 ++-- libavformat/rawenc.c | 24 ++++++++++++++++++++++++ libavformat/version.h | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 8e2afb7..9f8cdb5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -189,7 +189,9 @@ OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o OBJS-$(CONFIG_G726_DEMUXER) += g726.o +OBJS-$(CONFIG_G726_MUXER) += rawenc.o OBJS-$(CONFIG_G726LE_DEMUXER) += g726.o +OBJS-$(CONFIG_G726LE_MUXER) += rawenc.o OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 78ff2eb..2f25e59 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -132,8 +132,8 @@ static void register_all(void) REGISTER_DEMUXER (FRM, frm); REGISTER_DEMUXER (FSB, fsb); REGISTER_MUXDEMUX(G722, g722); - REGISTER_DEMUXER (G726, g726); - REGISTER_DEMUXER (G726LE, g726le); + REGISTER_MUXDEMUX(G726, g726); + REGISTER_MUXDEMUX(G726LE, g726le); REGISTER_MUXDEMUX(G723_1, g723_1); REGISTER_DEMUXER (G729, g729); REGISTER_DEMUXER (GDV, gdv); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 26baa85..aa491a4 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -196,6 +196,30 @@ AVOutputFormat ff_g723_1_muxer = { }; #endif +#if CONFIG_G726_MUXER +AVOutputFormat ff_g726_muxer = { + .name = "g726", + .long_name = NULL_IF_CONFIG_SMALL("raw big-endian G.726 (\"left-justified\")"), + .audio_codec = AV_CODEC_ID_G726, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_G726LE_MUXER +AVOutputFormat ff_g726_lemuxer = { + .name = "g726le", + .long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right-justified\")"), + .audio_codec = AV_CODEC_ID_G726LE, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_GSM_MUXER AVOutputFormat ff_gsm_muxer = { .name = "gsm", diff --git a/libavformat/version.h b/libavformat/version.h index a8cf4c1..94081ac 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 77 +#define LIBAVFORMAT_VERSION_MINOR 78 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 1.7.10.4