From patchwork Tue Apr 7 21:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18763 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 1A14344AF3F for ; Wed, 8 Apr 2020 00:46:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06CFA68B6D6; Wed, 8 Apr 2020 00:46:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1C2268B6B2 for ; Wed, 8 Apr 2020 00:46:25 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id g3so5601258wrx.2 for ; Tue, 07 Apr 2020 14:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=avIwyK79L1N/7VV1aaKJ9+NcBmGHxUu2vrJ0ayIAGaU=; b=aoL88IZLBGTsGeUOLUAhOBZwJ4JbhJIfCm0u2ai4WG4fUoyXaQMONW4XAbpd7MwqoA Uald8CFjz+WH9yL8xU1KO4Q/vEaRcdqbD5ANuS52uFY29/Lih2xxeCfMibcF+HwjLsIU mHYTNNV2Nl5Widwetc3yr0OFP2wKFLEZKpJIVXsrFkmqZyrksUpkJzyB6YTwjCNrc1U4 ycgSdWXZV03EOublZ9fjUoLcjGHaOKzmrrgni03bcZHz3NeebgRCnYTnRRiXDHVYoYZy v6pGKZgj73Iy6PTFjNiWJfJJsadukfNvOURqNRq86d9f1nt5HvmVxpojVGiQVbir4Y3n wvWg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=avIwyK79L1N/7VV1aaKJ9+NcBmGHxUu2vrJ0ayIAGaU=; b=BRm0nx52LOEG0ioJGDk9wO3qnjty0nAvaSwggIR3DOQxj93OESXceO7q/aoGh1jVgf 7bHmVzf/caNfDF4UVqt+O1c9PI92ZmmQgN+v0ZRwQsKPpBjWn8PU8BLXZz2fZPVW1gFe By5O1K5Na4n5+pk0ORep8V5+45VABm3PhWgYh5/2G098jbHybCY+1UDsYLxcjBGxxq/0 Yqw/mFVf0MJqAiCWe1+aPXCV6dyTJLM/7mcRgoEohpypOCc9IQeTC6BSG9N/Ek/ZYrbM 2vMF38Q5axWjfkD7dMafaS83c600nbcr4wA9pa1ce3cDdxWxC+iZTSCk++b9lt7l3uxf dEVw== X-Gm-Message-State: AGi0PuZELehm6Sd8N/5DdIScuco8oCwRXNai8LqJrZR0nd8U4EeEN6bm i+UWTGk9skrMW3djyza6aKVIWg6H X-Google-Smtp-Source: APiQypLiIpLWDjNv1qGHk/UML9cCjgNj/nfawp32Am04F2J1B4voe0fsLa/dFKwvjYhXIE07bEkFvQ== X-Received: by 2002:adf:d4ce:: with SMTP id w14mr4964998wrk.135.1586295984902; Tue, 07 Apr 2020 14:46:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:46:01 +0200 Message-Id: <20200407214603.19798-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] avformat/amr: Don't reimplement ff_raw_write_packet() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- libavformat/amr.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 09d5c7df4b..850f250b80 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -87,7 +87,7 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o -OBJS-$(CONFIG_AMR_MUXER) += amr.o +OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o diff --git a/libavformat/amr.c b/libavformat/amr.c index b8a5debb16..e4f8e4d860 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -29,6 +29,7 @@ Only mono files are supported. #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" +#include "rawenc.h" typedef struct { uint64_t cumulated_size; @@ -62,12 +63,6 @@ static int amr_write_header(AVFormatContext *s) } return 0; } - -static int amr_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - avio_write(s->pb, pkt->data, pkt->size); - return 0; -} #endif /* CONFIG_AMR_MUXER */ static int amr_probe(const AVProbeData *p) @@ -296,7 +291,7 @@ AVOutputFormat ff_amr_muxer = { .audio_codec = AV_CODEC_ID_AMR_NB, .video_codec = AV_CODEC_ID_NONE, .write_header = amr_write_header, - .write_packet = amr_write_packet, + .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; #endif