From patchwork Tue Apr 7 21:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18764 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 0F97D44AF3F for ; Wed, 8 Apr 2020 00:46:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEAF468B6C7; 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-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D37B768B5F3 for ; Wed, 8 Apr 2020 00:46:26 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id s8so5552370wrt.7 for ; Tue, 07 Apr 2020 14:46:26 -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=MkZVzQ3hMzc5P6bPFI1syKsW2nAFxqcu7sHt6+jKffc=; b=RyMBFIi83gFA1BBGTXn1TKKxVYzbCZJ01y+5pUKhSWY5RPo3RwTEt+Ylel5DoPhFQz njTlWCAe3CnprGLSUFWBAK2I172JloGTt7gteFT9HpZ+AjDjU6O/0v8V7u8/2ovaAVSp X3J3h4R3ziM0YG9y8BSD345Rrkda/Tjtnvlft0ICocE0edlfSb5nKLoXkMs/n7sBkS2/ 5pYIzhWWS0bBuv7PahGRvdTAqYV7Mk0kjiPcpaEV84IX08SqgoC+UmCFHnD1xf+l3HgY jlscgclWgZMJFiMMMFle0CrljGFWo9+1i2qFjit56HEpDJAalGZwwiseJjIrCbdSSjLq c1hA== 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=MkZVzQ3hMzc5P6bPFI1syKsW2nAFxqcu7sHt6+jKffc=; b=BNxh+YGwWn3aNqxKQ/X/UhZvIWiRPDlWkI8z06wamw837pvDUg8Hk1OuHhO5UqgQ76 rorliHihPuOoVXc5a77xM9inuYX1Bv0G5w/sjsAWmB2aXcfnd7w7S+ZXh/vwXWGhVlg9 nHeRM+JJmz+LXo1jajHT3PD+m0OKRU43RBxmO2Y/SFdt08ZymEBbvDjEfBzC8Qc4LLvd 28hcW/3sXlHM2swwpm84rkuBkQRzNbCmCAyld0VXjpZiaJeWeGkKsw0c1+gqHs8PyxJL 4Tu6zzFIsV1mEaiWRN3Ciq+R4WhB+C4FSupJylXUiai4UP4c2kl8kasvPugOkevSI6DY jsyw== X-Gm-Message-State: AGi0PuaYd/UPaXEZ2GGL/cgjuzcu+tM87COfFXvqpiN2pLxWBwXYmCTr dqqA8hZCGCqqk4S32bbAgQorVS6c X-Google-Smtp-Source: APiQypICGMxFO3wJL0/Nbsrxrik9v/tC7tF7ZCBK4oMQmWUZjAhjJi+aJqmiIqbY2YSMlB/2ysZ2CA== X-Received: by 2002:adf:f808:: with SMTP id s8mr5214436wrp.219.1586295985881; Tue, 07 Apr 2020 14:46:25 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:46:02 +0200 Message-Id: <20200407214603.19798-8-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 09/10] avformat/rso: 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/rsoenc.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 850f250b80..554b0bfbf8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -444,7 +444,7 @@ OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o OBJS-$(CONFIG_RSD_DEMUXER) += rsd.o OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o pcm.o -OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o +OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o rawenc.o OBJS-$(CONFIG_RTP_MPEGTS_MUXER) += rtpenc_mpegts.o OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_aac.o \ diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index 3159f0c427..beba94b2a7 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -22,6 +22,7 @@ #include "avformat.h" #include "internal.h" +#include "rawenc.h" #include "riff.h" #include "rso.h" @@ -63,12 +64,6 @@ static int rso_write_header(AVFormatContext *s) return 0; } -static int rso_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - avio_write(s->pb, pkt->data, pkt->size); - return 0; -} - static int rso_write_trailer(AVFormatContext *s) { AVIOContext *pb = s->pb; @@ -103,7 +98,7 @@ AVOutputFormat ff_rso_muxer = { .audio_codec = AV_CODEC_ID_PCM_U8, .video_codec = AV_CODEC_ID_NONE, .write_header = rso_write_header, - .write_packet = rso_write_packet, + .write_packet = ff_raw_write_packet, .write_trailer = rso_write_trailer, .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, .flags = AVFMT_NOTIMESTAMPS,