From patchwork Sun Jan 15 20:59:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_H=C3=A5kon?= X-Patchwork-Id: 2221 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1075147vsb; Sun, 15 Jan 2017 12:59:33 -0800 (PST) X-Received: by 10.223.155.133 with SMTP id d5mr20341238wrc.149.1484513973033; Sun, 15 Jan 2017 12:59:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p70si10013704wmg.164.2017.01.15.12.59.31; Sun, 15 Jan 2017 12:59:32 -0800 (PST) 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=@protonmail.com; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77D6C68A3FA; Sun, 15 Jan 2017 22:59:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail3.protonmail.ch (mail3.protonmail.ch [185.70.40.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C76568A36F for ; Sun, 15 Jan 2017 22:59:13 +0200 (EET) Received: from B09B-8 (localhost [127.0.0.1]) by mail3.protonmail.ch (Postfix) with ESMTP id ABABA2F8 for ; Sun, 15 Jan 2017 15:59:20 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=default; t=1484513960; bh=B/VyHrTmNQ/OxDG4KUreHOo0/fyksISQf/NtFLlYIe0=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:Feedback-ID: From; b=ED5Tcb8//KnUezCFRZTjFc8fCvSUiJrnDvGpYiTxousCUefwEbICE8YhfDLrg2m3u ja+VQHzh1upPia/g4f9f3sEdZArpq4DpAhqg57ZeY8b81VuSKAI7/baOf+4O3i72T0 wl6JSnieG+oBJTJBFQ/2Ec1ALI15wPT64ZQ5j0gk= Date: Sun, 15 Jan 2017 15:59:14 -0500 To: FFmpeg development discussions and patches From: =?UTF-8?Q?Andreas_H=C3=A5kon?= Message-ID: In-Reply-To: <20170113204651.GB18399@sunshine.barsnick.net> References: <20170113204651.GB18399@sunshine.barsnick.net> Feedback-ID: Mx8CaiV20jk_fqXDN0fFpg3vRaGkb9VCTrYRnZNHwEija3aOdqvFspzl6ODkmHrlSKJSx29p-LzkuvS_96L02A==:Ext:ProtonMail MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=4.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,HTML_MESSAGE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail3.protonmail.ch X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] avformat: Add rtp_mpegtsraw (MPEG-TS RAW Stream output) 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 Moritz, -------- Original Message -------- Subject: Re: [FFmpeg-devel] [PATCH] avformat: Add rtp_mpegtsraw (MPEG-TS RAW Stream output) From: barsnick@gmx.net To: FFmpeg development discussions and patches On Fri, Jan 13, 2017 at 07:57:28 -0500, Andreas HÃ¥kon wrote: > +static int rtp_mpegtsraw_write_close(AVFormatContext *s) > +{ ffmpeg bracket style is different. The bracket style is identical to the rest of the ffmpeg code... !? > + struct MuxChain *chain = s->priv_data; > + int ret = AVERROR(ENOMEM); > + ret = rtp_mpegts_write_header(s); Why would you assign a value to ret which you immediately discard? Fixed. > + avformat_free_context(chain->mpegts_ctx); > + > + chain->mpegts_ctx = NULL; Indentation is inconsistent, throughout the patch BTW. Fixed. > + int ret = 0; > + > + ret = av_write_frame(chain->rtp_ctx, pkt); Same here with the assignment. Fixed too. Updated patch attached. A.H. From df0810cd82002e2741b1fbfc792979a43fa8f85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20H=C3=A5kon?= Date: Sun, 15 Jan 2017 21:53:14 +0100 Subject: [PATCH] avformat: Add rtp_mpegtsraw (MPEG-TS RAW Stream output) --- ffmpeg.c | 1 + libavformat/allformats.c | 1 + libavformat/mpegts.c | 2 +- libavformat/rtpenc.c | 6 ++++++ libavformat/rtpenc_mpegts.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 6d1e358..7e62538 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3231,6 +3231,7 @@ static int init_output_stream_encode(OutputStream *ost) } break; case AVMEDIA_TYPE_DATA: + av_log(NULL, AV_LOG_TRACE, "Using bitstream with codec %s\n", avcodec_get_name(enc_ctx->codec_id)); break; default: abort(); diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6a79b75..b58e178 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -269,6 +269,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(RSO, rso); REGISTER_MUXDEMUX(RTP, rtp); REGISTER_MUXER (RTP_MPEGTS, rtp_mpegts); + REGISTER_MUXER (RTP_MPEGTSRAW, rtp_mpegtsraw); REGISTER_MUXDEMUX(RTSP, rtsp); REGISTER_DEMUXER (SAMI, sami); REGISTER_MUXDEMUX(SAP, sap); diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 0aa0ad7..2c23a05 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2663,7 +2663,7 @@ static int mpegts_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 60, 1, 27000000); st->codecpar->codec_type = AVMEDIA_TYPE_DATA; - st->codecpar->codec_id = AV_CODEC_ID_MPEG2TS; + st->codecpar->codec_id = AV_CODEC_ID_BIN_DATA; /* we iterate until we find two PCRs to estimate the bitrate */ pcr_pid = -1; diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index efa63a5..e465501 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -82,6 +82,7 @@ static int is_supported(enum AVCodecID id) case AV_CODEC_ID_MJPEG: case AV_CODEC_ID_SPEEX: case AV_CODEC_ID_OPUS: + case AV_CODEC_ID_BIN_DATA: return 1; default: return 0; @@ -160,6 +161,7 @@ static int rtp_write_header(AVFormatContext *s1) avpriv_set_pts_info(st, 32, 1, 90000); } s->buf_ptr = s->buf; + av_log(s1, AV_LOG_TRACE, "Using RTP muxer with codec %s\n", avcodec_get_name(st->codecpar->codec_id)); switch(st->codecpar->codec_id) { case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP3: @@ -571,6 +573,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) ff_rtp_send_amr(s1, pkt->data, size); break; case AV_CODEC_ID_MPEG2TS: + case AV_CODEC_ID_BIN_DATA: rtp_send_mpegts_raw(s1, pkt->data, size); break; case AV_CODEC_ID_DIRAC: @@ -624,6 +627,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) /* Intentional fallthrough */ default: /* better than nothing : send the codec raw data */ + av_log(s1, AV_LOG_WARNING, + "RTP output is unsupported with codec %s\n", + avcodec_get_name(st->codecpar->codec_id)); rtp_send_raw(s1, pkt->data, size); break; } diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index 7af02e0..0e5a61a 100644 --- a/libavformat/rtpenc_mpegts.c +++ b/libavformat/rtpenc_mpegts.c @@ -143,6 +143,41 @@ static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; } +static int rtp_mpegtsraw_write_close(AVFormatContext *s) +{ + rtp_mpegts_write_close(s); + return 0; +} + +static int rtp_mpegtsraw_write_header(AVFormatContext *s) +{ + struct MuxChain *chain = s->priv_data; + int ret; + + ret = rtp_mpegts_write_header(s); + if (ret < 0) + return ret; + + if (chain->mpegts_ctx) { + av_write_trailer(chain->mpegts_ctx); + ffio_free_dyn_buf(&chain->mpegts_ctx->pb); + avformat_free_context(chain->mpegts_ctx); + chain->mpegts_ctx = NULL; + } + + return ret; +} + +static int rtp_mpegtsraw_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + struct MuxChain *chain = s->priv_data; + int ret; + + ret = av_write_frame(chain->rtp_ctx, pkt); + + return ret; +} + AVOutputFormat ff_rtp_mpegts_muxer = { .name = "rtp_mpegts", .long_name = NULL_IF_CONFIG_SMALL("RTP/mpegts output format"), @@ -153,3 +188,14 @@ AVOutputFormat ff_rtp_mpegts_muxer = { .write_packet = rtp_mpegts_write_packet, .write_trailer = rtp_mpegts_write_close, }; + +AVOutputFormat ff_rtp_mpegtsraw_muxer = { + .name = "rtp_mpegtsraw", + .long_name = NULL_IF_CONFIG_SMALL("RTP/mpegts RAW-Stream output format"), + .priv_data_size = sizeof(struct MuxChain), + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_MPEG4, + .write_header = rtp_mpegtsraw_write_header, + .write_packet = rtp_mpegtsraw_write_packet, + .write_trailer = rtp_mpegtsraw_write_close, +};