From patchwork Thu Oct 19 07:39:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 5626 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2267817jah; Thu, 19 Oct 2017 00:46:13 -0700 (PDT) X-Received: by 10.28.126.196 with SMTP id z187mr803621wmc.69.1508399173426; Thu, 19 Oct 2017 00:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508399173; cv=none; d=google.com; s=arc-20160816; b=zoB8/pkgTNtbpPONFC5PcLi16gLQfzuhCM6gQrfLRQyTMn64jVr7Bsgv9a8EQuQmMD t9eh9R3Qsl//f8Gv0SzjxLrCVEUWbGGt+cypIlb0MmZjgwHHFg7eEccE5aPRQuKaspPy m5LWeCF8YMoYC/KObdLAtn7ZPRrxZC2bRFW2Nl/QB64S7bFBu6ZzFKiG68OeehWiHGEp g4YM0wpbv9M9BRYSdBEJb5UYzcKbUJgKeYbd2bf6kU6KY5uRDqgV4YSM9SNKTH6tzbO3 vTu3WmownM5pNt73uKsaFcGTxvNDxmcteKCE5wm0BRRqg22V3mk6VrOvaLIt5H/oKSrz /XXA== 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: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=FSFNYoj9trdBTrO1sR0T0hSZBFtfBjY1OU0J6YA6LKE=; b=0+i1nbOuKaqRKN+unUwAxVGgNSgrHrxTbAOFwDkgzj0e2avNMXej0f53ZS85Jjjm8L FJkEY0M4/ldXS7FkNrOEpT7y2bBGciLEu8xv3wo/WRzCstYREq9EvE3QEd+Qppsm9bGO wB2JVGgw7sblxR2sPYSDLheisQ1w5HV62mcF1ntltGqNhs8OSURZ/2iwvl/3I0OLFnHQ zcATCNaOsPzZXGDrNOdaXGwRfnMJ2Rgp85Pp5jKSLVC1aSkmDJLUAOoSxxyM7rzzNEs/ Q06wd7r1NxmAP+ppopRN8qCAWLA/STur1ru3yci9vKf895Hxxp2dN8FdxPXRaMtEY2+p zWfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tJ65XvrY; 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 y124si583808wmb.68.2017.10.19.00.46.13; Thu, 19 Oct 2017 00:46:13 -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=tJ65XvrY; 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 D3880689A3E; Thu, 19 Oct 2017 10:46:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A89206899ED for ; Thu, 19 Oct 2017 10:46:04 +0300 (EEST) Received: by mail-it0-f65.google.com with SMTP id r127so8779294itb.5 for ; Thu, 19 Oct 2017 00:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=B3Tj4WrRmN18kxhbbGoSOK2U0AUwXrArrF6sLhDpHig=; b=tJ65XvrYD5hmRS3rLWh3WrIbKXDyfrXyMZoqtAztLBNOBi6YfETfrJtS3jxF1HXJAt iyGyTPwoJ0XWVsR9nE7MUKkUNvvK660tz+s8abcaX7otlhbWSWzzZicTb9knMV84WO0d nS7KKc1lD21sYNbpvqy4n4WrDm5Jyd5spHA/LA1mCA/kVJs8A6yfKrTEYynXDNox+BYQ ZbpMTD1UsyUaBK7k5D6jkT2oD/sec6ro4lu2jXAQY2YQ/jtrCyDHd4SC73d0OOipnslV 0dGaik0HNVmy/PuLHjBs5g5PsHkpZcIU5M22mzQmdNdiBzSMf4IgMI7Zri1umSSEB2Vr 5K/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=B3Tj4WrRmN18kxhbbGoSOK2U0AUwXrArrF6sLhDpHig=; b=UyDogeWWUAWssaQCKFDMNL6gARsKyjFyw/eXE0N7SltZSbVfyguevyLEhxk9dCxUqL 2F2tvY4CAEObQmkp6iyiBxM/08b1XfnD8LmcqkccYvzHnkNRxU/hgyPwHl9jxjiyeyOc is/qr3QfOlJ4WXE1G0EUd+iCmFMhXnKs/K4IHBtTpZc8pRmOg13tqFMzR6z9D+cXcRVN 9eUfwh7o/bLqCsBKD88bKnEliH3GTNHyd0afvSje/i1zk3ke/9U0Ul6rQ8AfMd7LfNA8 lch+SN04Es3JWgBke9gyWwDWo8AqsIiBdgHEemaVGFtG460dUzqhX3ebMqHkw7YoFMjp OCYA== X-Gm-Message-State: AMCzsaW9w8YSgOdVWvcRb+O0TXUBoEat4FVQkRVCijqc/pFO8X2RsCtR mvh7bo6Xlyow6FIkj4lYM/htdMJp X-Google-Smtp-Source: ABhQp+QOZVZbSqSVGciw9iGujBk4Vsy3eE1SNRhdRwO//UWrfDXpBHyhp5jmFx+faiW34JMAiRWZTA== X-Received: by 10.36.118.210 with SMTP id z201mr1302276itb.78.1508398801099; Thu, 19 Oct 2017 00:40:01 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id v4sm6700186iod.17.2017.10.19.00.40.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Oct 2017 00:40:00 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Oct 2017 02:39:45 -0500 Message-Id: <20171019073948.23683-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/4] lavf: add MP1 muxer 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 13 +++++++++++++ 3 files changed, 15 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index d955a8b12a..2522a3e768 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -296,6 +296,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o replaygain.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o rawutils.o +OBJS-$(CONFIG_MP1_MUXER) += rawenc.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 405ddb5ad9..32e9a979bc 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -189,6 +189,7 @@ static void register_all(void) REGISTER_DEMUXER (MM, mm); REGISTER_MUXDEMUX(MMF, mmf); REGISTER_MUXDEMUX(MOV, mov); + REGISTER_MUXER (MP1, mp1); REGISTER_MUXER (MP2, mp2); REGISTER_MUXDEMUX(MP3, mp3); REGISTER_MUXER (MP4, mp4); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index f640121cb4..1a30ba6c05 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -361,6 +361,19 @@ AVOutputFormat ff_mlp_muxer = { }; #endif +#if CONFIG_MP1_MUXER +AVOutputFormat ff_mp1_muxer = { + .name = "mp1", + .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), + .mime_type = "audio/mpeg", + .extensions = "mp1,m1a", + .audio_codec = AV_CODEC_ID_MP1, + .video_codec = AV_CODEC_ID_NONE, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_MP2_MUXER AVOutputFormat ff_mp2_muxer = { .name = "mp2",