From patchwork Wed Nov 24 15:27:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp10608033iob; Wed, 24 Nov 2021 07:29:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvAlWLbEQPxsRtAEt+7CIHGW+Ip/qnljHVwryJlagt5DgQeEuJIK2MwY6taxZ4Tv7m7uZH X-Received: by 2002:a05:6402:b26:: with SMTP id bo6mr25318192edb.207.1637767767105; Wed, 24 Nov 2021 07:29:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637767767; cv=none; d=google.com; s=arc-20160816; b=YxVapVbPw2S+aNq64DGTQ3IWvJzjDwAJWyaCZbbzXfDCvmTcmVr3lwKgEHVBuxaTew TCcL/SDQEZ9CwYeh5oucE9+VAYjO2a5BxAbFzllJWtM3hfIay6bSnHqK/qzdG2/Uool0 BjtMXch3powsgFydsKziH4VVcCh+UKc5frk/N/SDhBI5IaIaV/I/WjiUw5O7LPibzd7r 7vI4mXv3kSW8aNfp2JNnnCWwtZcyoRdvmVItnWo7qpiOqdjr6JW3F0vGoK97HwJIew3a qWrjGCb+TZGaQtHeN8CTBx+cpWQbE6feVJ3PmGaHr4XAmh51dLxK8jdBNtl+BFt3zc5O Cawg== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=w8jIsOBvhM6yiwsxzP1KgVm3aO8awxSqZwNVeD0+9go=; b=SNjdwhE89wdIFagNgEXA6e/SSfdgEMhG2guWCW71laPyb4YN7ecc3UUcizLXaJ4b9Z NqV7ft1TJp6xm2tV0doGZ+cB9FhMoL/yxBlb+ElI4Vx6t1pZ6GZRm90oT14dL+j2+WJS sF4MM9I5L/Upn9aAyL4vBjIo/4Ig8xNyaAQgY3ur8tXCq3MMn6ZxXoIDSfQulQte8G91 +ciLhME+ZC1HT6Z8G9IRAzSaoPfu6v63JNfZeS+SGSCGPYlw6+BUjGY4+uiJzY+qaNbW +VJdD+vNqMAfqv9vCBeFJF8ftM+jGN2b5kLhS4P3gU9FU3XqwcY8gm9chGQFL7b6+Ejd o4jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="COKk/+lY"; 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=QUARANTINE 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 y15si201772ejp.478.2021.11.24.07.29.26; Wed, 24 Nov 2021 07:29:27 -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=@gmail.com header.s=20210112 header.b="COKk/+lY"; 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=QUARANTINE 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 B9FCA68A8F5; Wed, 24 Nov 2021 17:29:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75D2A689DEB for ; Wed, 24 Nov 2021 17:28:53 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so5335127pjc.4 for ; Wed, 24 Nov 2021 07:28:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1fkzh5gJrUnYAzYrgAxJVyvpwf5sME2Aj4if9fVfgEY=; b=COKk/+lYx5QzkGvHMNAeVXQYR3iGJHB/+LWImG6XrreRvuQ5Jiw9JP++E+mqlLRznG 2RVZbV+oskw57HztlkaNHxTdMWMGBSAt//VnfdUKn5BL74O2vZRKTC39XnfjWR30Rbli hNBRmrmIjMPy5oiu4OzC2C/j3xsUWRPtz4VcyjZJqt0D3oASL4KCZfyCJdVk5djnZ8PH VJqbOoNiq9MvKXnMwWZdszcgp8f97VBMg3aHRwURHhHqTa1Ur9E6nEInHRuk+dvNVIzg fDOZE+QMYQQzsK51jc8BakJajeY8IRXlz9Ctmw+dGlCKU5W9tF+96TW8Pblx0NKGCwp5 6bLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1fkzh5gJrUnYAzYrgAxJVyvpwf5sME2Aj4if9fVfgEY=; b=AkXe7RVfHPzfxagIh3PNiRpZkcCSczOG5+MRfjE0j0cmOzDynL3M6iPdh60BAPDf/U 9aTx4WfybbPqy8npr+PwVMU3nFkNF+I0wWfKUn0rLMQWaKQu01NNAdVzGj9kXW88HP16 Zg+487Bb2M9+kxA+cTjJ4JZscHZe9qbVb9sMswl6a4OmmfvXxxyBneYuP6re7YApK3fk vK0wcHE0e5TVGQ0k8IFlW/Iy2pHKTqS1Sf8ry6AyWxLJAcWO4UpbGPQ7YoefZ9yEMvnK 5i2n725kkt1SY65abqKLlAU8tgfVqXIRpa0jANvdQiM4K3LyDaIRgiT/DJ392Tm9uCL5 rvUg== X-Gm-Message-State: AOAM533F6NfB9zG2cwqfPbLSy4C0GnS8CUeN+S/m3DdvbJxh1bcC/a23 6wR7itZqgisbwgPyrq3Lu+RGEee6dUU= X-Received: by 2002:a17:90b:3a85:: with SMTP id om5mr17127213pjb.28.1637767731493; Wed, 24 Nov 2021 07:28:51 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b6sm83842pfm.170.2021.11.24.07.28.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Nov 2021 07:28:51 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Nov 2021 23:27:41 +0800 Message-Id: <1637767665-6777-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1637767665-6777-1-git-send-email-lance.lmwang@gmail.com> References: <1636712536-13114-1-git-send-email-lance.lmwang@gmail.com> <1637767665-6777-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/7] avformat/rtpenc: adds partial support for the RFC 4175 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: O7j2SupXOjOv From: Limin Wang Signed-off-by: Limin Wang --- Changelog | 1 + libavformat/Makefile | 1 + libavformat/rtpenc.c | 4 ++ libavformat/rtpenc.h | 1 + libavformat/rtpenc_rfc4175.c | 116 +++++++++++++++++++++++++++++++++++++++++++ libavformat/sdp.c | 25 ++++++++++ libavformat/version.h | 2 +- 7 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 libavformat/rtpenc_rfc4175.c diff --git a/Changelog b/Changelog index 31a0d5e..2035c27 100644 --- a/Changelog +++ b/Changelog @@ -31,6 +31,7 @@ version : - varblur video filter - huesaturation video filter - colorspectrum source video filter +- RTP packetizer for uncompressed video (RFC 4175) version 4.4: diff --git a/libavformat/Makefile b/libavformat/Makefile index 3d6c8ef..a19d2e0 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -482,6 +482,7 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_jpeg.o \ rtpenc_mpv.o \ rtpenc.o \ + rtpenc_rfc4175.o \ rtpenc_vc2hq.o \ rtpenc_vp8.o \ rtpenc_vp9.o \ diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 2a1c176..4f115cc 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -84,6 +84,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_RAWVIDEO: return 1; default: return 0; @@ -619,6 +620,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) case AV_CODEC_ID_MJPEG: ff_rtp_send_jpeg(s1, pkt->data, size); break; + case AV_CODEC_ID_RAWVIDEO: + ff_rtp_send_raw_rfc4175 (s1, pkt->data, size); + break; case AV_CODEC_ID_OPUS: if (size > s->max_payload_size) { av_log(s1, AV_LOG_ERROR, diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 62dc9ab..70ea85b 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -95,6 +95,7 @@ void ff_rtp_send_vc2hq(AVFormatContext *s1, const uint8_t *buf, int size, int in void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_vp9(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buff, int size); +void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size); const uint8_t *ff_h263_find_resync_marker_reverse(const uint8_t *av_restrict start, const uint8_t *av_restrict end); diff --git a/libavformat/rtpenc_rfc4175.c b/libavformat/rtpenc_rfc4175.c new file mode 100644 index 0000000..6fa34b6 --- /dev/null +++ b/libavformat/rtpenc_rfc4175.c @@ -0,0 +1,116 @@ +/* + * RTP Packetization of RAW video (RFC4175) + * Copyright (c) 2021 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "avformat.h" +#include "rtpenc.h" + +void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size) +{ + RTPMuxContext *s = s1->priv_data; + int width = s1->streams[0]->codecpar->width; + int height = s1->streams[0]->codecpar->height; + int xinc, yinc, pgroup; + int field = 0; + int i = 0; + int offset = 0; + + s->timestamp = s->cur_timestamp; + switch (s1->streams[0]->codecpar->format) { + case AV_PIX_FMT_UYVY422: + xinc = yinc = 2; + pgroup = 4; + break; + case AV_PIX_FMT_YUV420P: + xinc = yinc = 4; + pgroup = 6; + break; + default: + return; + } + + while (i < height) { + int left = s->max_payload_size; + uint8_t *dest = s->buf; + uint8_t *headers; + const int head_size = 6; + int next_line; + int length, cont, pixels; + + /* Extended Sequence Number */ + *dest++ = 0; + *dest++ = 0; + left -= 2; + + headers = dest; + do { + pixels = width * xinc - offset; + length = (pixels * pgroup) / xinc; + + left -= head_size; + if (left >= length) { + next_line = 1; + } else { + pixels = (left / pgroup) * xinc; + length = (pixels * pgroup) / xinc; + next_line = 0; + } + left -= length; + + /* Length */ + *dest++ = (length >> 8) & 0xff; + *dest++ = length & 0xff; + + /* Line No */ + *dest++ = ((i >> 8) & 0x7f) | ((field << 7) & 0x80); + *dest++ = i & 0xff; + if (next_line) i += yinc; + + cont = (left > (head_size + pgroup) && i < height) ? 0x80 : 0x00; + /* Offset and Continuation marker */ + *dest++ = ((offset >> 8) & 0x7f) | cont; + *dest++ = offset & 0xff; + + if (next_line) + offset = 0; + else + offset += pixels; + } while (cont); + + do { + int l_line; + int l_off; + int copy_offset; + + length = (headers[0] << 8) | headers[1]; + l_line = ((headers[2] & 0x7f) << 8) | headers[3]; + l_off = ((headers[4] & 0x7f) << 8) | headers[5]; + cont = headers[4] & 0x80; + headers += head_size; + + copy_offset = (l_line * width + l_off) * pgroup / xinc; + if (copy_offset + length > size) + break; + memcpy (dest, buf + copy_offset, length); + dest += length; + } while (cont); + + ff_rtp_send_data (s1, s->buf, s->max_payload_size - left, i >= height); + } +} diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 1200e55..cc04d70 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -660,6 +660,31 @@ static char *sdp_write_media_attributes(char *buff, int size, AVStream *st, int p->width, p->height, pix_fmt, config); break; } + case AV_CODEC_ID_RAWVIDEO: { + const char *pix_fmt; + int bit_depth = 8; + + switch (p->format) { + case AV_PIX_FMT_UYVY422: + pix_fmt = "YCbCr-4:2:2"; + break; + case AV_PIX_FMT_YUV420P: + pix_fmt = "YCbCr-4:2:0"; + break; + default: + av_log(fmt, AV_LOG_ERROR, "Unsupported pixel format.\n"); + return NULL; + } + + av_strlcatf(buff, size, "a=rtpmap:%d raw/90000\r\n" + "a=fmtp:%d sampling=%s; " + "width=%d; height=%d; " + "depth=%d\r\n", + payload_type, payload_type, + pix_fmt, p->width, p->height, bit_depth); + break; + } + case AV_CODEC_ID_VP8: av_strlcatf(buff, size, "a=rtpmap:%d VP8/90000\r\n", payload_type); diff --git a/libavformat/version.h b/libavformat/version.h index ae2b873..0705ee4 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 #define LIBAVFORMAT_VERSION_MINOR 9 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \