From patchwork Wed Nov 4 17:17:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 23393 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 D71EB44B5E7 for ; Wed, 4 Nov 2020 19:18:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B125D68B31D; Wed, 4 Nov 2020 19:18:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EA6668A466 for ; Wed, 4 Nov 2020 19:17:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1604510267; bh=Yqy4no7KhraMfgTKUuaFv/agVQyoiUbgRwtmrhbcIWg=; h=From:To:Cc:Subject:Date; b=OnMR9MJj2O2jj9ZpNpLurUyWm2hUXqIpTN0XO7gUc6IoMqoJl7wbD94Qg6kf5ET5R 4sxixBIiEzSJ7lcOQTyB8S8fBPXiOE3hV9AclkuUhDzRXjvzUSywyqr4ZvkEnkU0ea sKsOE6tG9R9rKpUnB0DhIDA/zK9IR7vcrb+FshK4= Received: from localhost.localdomain ([27.46.80.11]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id 46E2B086; Thu, 05 Nov 2020 01:17:46 +0800 X-QQ-mid: xmsmtpt1604510266tfm7cfxl8 Message-ID: X-QQ-XMAILINFO: MBfLk4JATLulYjGlELb85JuZGOqXu+dRV7Ldq35kSlBEFQj7XodUZtFpK6+ZZC N3WLePtCL1v0Hb8iWPb+tlLaoqF7Q9zXFSbcCAnz3k6wC+eEDTnbiak4xMN3y21xQc7F0wuffCv9 2lsiTfbFXkYPnqoUq1iKzvHGGmWQIUQjKX16zlWBLYAeDOUutzU1IKz1t5ZHxywiN3HSvOXS8iX0 cKHc9nf8BYyt5JWm8b6fWuXiw4X8+etm4VDiqQ9HsEW3WoAuZw/i26P3xsuunXjXhenTrP4Igq8Z p+yb23f8+YLKvJpU+hqHQGzWYDcNuIHhHlFGAW8If1QL7TpfZdGts0Hoqhffx1GiA6seFb71NFg2 wDCpmHifEzoCR44eeOkOIRKl72FT808zVe96iJ28mz8QHwxcj1f10O4qxkmc6GF4z5Wo06ylADzD sQdx1RJO27UkHCWEh0cxNil2dT2U3fW3hz5vvDulIbix3XCFWO5f2WuOE8RRM6kT1nJBommihFgn YO5lrm9NZ//eDSaS0ia/FQDXXisGmhpbq/mt1DzuRy2d8grJ1z3LmThD01A3Hlu0e2qajGzxy1IT m3VIU51nIXmG17nA+C5KSGL8JXAlL6ZYZogqEuxF4oVdS0MvBsUADKJc37kAMvAXItn6w+A8AKeE eyrljMmrp0jcJGrr70dEjs4v+kxaiA7gIJaNjKXOVWjd4zwlQ+Et+/zwMbYtPgyeVhGb1R7FW3r0 95tqEEObEn1os+p09fgNZAFT5gEPWZGeOJQoIXjR5u3jfT4aQXT6y1u85vOYe6yXljmm91LBJHR7 AWnh3rXtgTjBQj8OK7T9avEHkqJYuAbzU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Nov 2020 01:17:44 +0800 X-OQ-MSGID: <20201104171744.88249-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/rtpenc: add option to disable STAP for H.264 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use non-interleaved mode but disable STAP is a valid use case, for example, the receiver doesn't support STAP. --- libavformat/rtpenc.h | 2 ++ libavformat/rtpenc_h264_hevc.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 62dc9ab10a..931287cbb3 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -70,6 +70,7 @@ typedef struct RTPMuxContext RTPMuxContext; #define FF_RTP_FLAG_SKIP_RTCP 4 #define FF_RTP_FLAG_H264_MODE0 8 #define FF_RTP_FLAG_SEND_BYE 16 +#define FF_RTP_FLAG_H264_NO_STAP 32 #define FF_RTP_FLAG_OPTS(ctx, fieldname) \ { "rtpflags", "RTP muxer flags", offsetof(ctx, fieldname), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ @@ -77,6 +78,7 @@ typedef struct RTPMuxContext RTPMuxContext; { "rfc2190", "Use RFC 2190 packetization instead of RFC 4629 for H.263", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_RFC2190}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "skip_rtcp", "Don't send RTCP sender reports", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SKIP_RTCP}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "h264_mode0", "Use mode 0 for H.264 in RTP", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_H264_MODE0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ + { "h264_no_stap", "Disable single-time aggregation packet (STAP) for H.264 in RTP", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_H264_NO_STAP}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "send_bye", "Send RTCP BYE packets when finishing", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SEND_BYE}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" } \ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m); diff --git a/libavformat/rtpenc_h264_hevc.c b/libavformat/rtpenc_h264_hevc.c index 0c88fc2a23..faa550abb2 100644 --- a/libavformat/rtpenc_h264_hevc.c +++ b/libavformat/rtpenc_h264_hevc.c @@ -65,7 +65,7 @@ static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last if (codec == AV_CODEC_ID_H264) { header_size = 1; - skip_aggregate = s->flags & FF_RTP_FLAG_H264_MODE0; + skip_aggregate = s->flags & (FF_RTP_FLAG_H264_MODE0 | FF_RTP_FLAG_H264_NO_STAP); } else { header_size = 2; }