From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6E2F646FAB for ; Fri, 25 Aug 2023 09:04:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC01D68C679; Fri, 25 Aug 2023 12:04:15 +0300 (EEST) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62D1268C158 for ; Fri, 25 Aug 2023 12:04:09 +0300 (EEST) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 37P943ls019456-37P943lt019456; Fri, 25 Aug 2023 12:04:03 +0300 Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144]) by mail9.parnet.fi (Postfix) with ESMTPS id 9B737A146A; Fri, 25 Aug 2023 12:04:02 +0300 (EEST) Date: Fri, 25 Aug 2023 12:04:01 +0300 (EEST) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <20230825053027.6610-2-lq@chinaffmpeg.org> Message-ID: <60982037-99ea-942-76ad-59f1238c631d@martin.st> References: <776917a5-a1fc-457b-df47-c3d76ecb112b@passwd.hu> <20230825053027.6610-1-lq@chinaffmpeg.org> <20230825053027.6610-2-lq@chinaffmpeg.org> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH v2 2/2] avformat/rtmpproto: support enhanced rtmp 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: Steven Liu Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 25 Aug 2023, Steven Liu wrote: > Add option named rtmp_enhanced_codec, > it would support hvc1,av01,vp09 now, > the fourcc is using Array of strings. > > Signed-off-by: Steven Liu > --- > doc/protocols.texi | 6 ++++++ > libavformat/rtmpproto.c | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 41 insertions(+) > > diff --git a/doc/protocols.texi b/doc/protocols.texi > index b3fad55591..bd2b25e502 100644 > --- a/doc/protocols.texi > +++ b/doc/protocols.texi > @@ -896,6 +896,12 @@ be named, by prefixing the type with 'N' and specifying the name before > the value (i.e. @code{NB:myFlag:1}). This option may be used multiple > times to construct arbitrary AMF sequences. > > +@item rtmp_enhanced_codecs > +Specify the list of codecs the client advertises to support in an > +enhanced RTMP stream. This option should set a string like @code{hvc1,av01,vp09} > +for multiple codecs, or @code{hvc1} for only one codec, > +set codec fourcc into fourCcLive property into Connect Command Message, > + > @item rtmp_flashver > Version of the Flash plugin used to run the SWF player. The default > is LNX 9,0,124,2. (When publishing, the default is FMLE/3.0 (compatible; > diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c > index f0ef223f05..ea25454362 100644 > --- a/libavformat/rtmpproto.c > +++ b/libavformat/rtmpproto.c > @@ -127,6 +127,7 @@ typedef struct RTMPContext { > int nb_streamid; ///< The next stream id to return on createStream calls > double duration; ///< Duration of the stream in seconds as returned by the server (only valid if non-zero) > int tcp_nodelay; ///< Use TCP_NODELAY to disable Nagle's algorithm if set to 1 > + char *enhanced_codecs; ///< codec list in enhanced rtmp > char username[50]; > char password[50]; > char auth_params[500]; > @@ -336,6 +337,39 @@ static int gen_connect(URLContext *s, RTMPContext *rt) > ff_amf_write_field_name(&p, "app"); > ff_amf_write_string2(&p, rt->app, rt->auth_params); > > + if (rt->enhanced_codecs) { > + uint32_t list_len = 0; > + char *fourcc_data = rt->enhanced_codecs; > + int fourcc_str_len = strlen(fourcc_data); > + > + // check the string, fourcc + ',' + ... + end fourcc correct length should be (4+1)*n+4 > + if ((fourcc_str_len + 1) % 5 != 0) > + return AVERROR(EINVAL); If we trigger this error, we definitely should tell the user what was wrong. 'Malformed rtmp_enhanched_codecs, should be of the form "fourcc[,fourcc..]"' or something like that? (Would it be better to use "frcc" or just "hvc1" or something else there, to show that it needs to be exactly a four char string for each element?) > + > + list_len = (fourcc_str_len + 1) / 5; > + // write the fourCcList field name > + ff_amf_write_field_name(&p, "fourCcList"); > + > + // write the fourcc array length > + ff_amf_write_array_start(&p, list_len); > + > + while(fourcc_data - rt->enhanced_codecs < fourcc_str_len) { > + unsigned char fourcc[5]; > + switch (AV_RN32(fourcc_data)) { > + case MKTAG('h', 'v', 'c', '1'): This feels a bit convoluted to use AV_RN32 + MKTAG on data that is already just a string - just using strncmp(fourcc_data, "hvc1", 4) would work just as well. That doesn't fit quite as neatly into a switch, but would be a more unwieldy if statement though. > + case MKTAG('a', 'v', '0', '1'): > + case MKTAG('v', 'p', '0', '9'): > + av_strlcpy(fourcc, fourcc_data, sizeof(fourcc)); > + ff_amf_write_string(&p, fourcc); > + break; > + default: When this fails, the user definitely needs to know what was wrong, so we should print the string that didn't match the expectation. E.g. ("unsupported codec fourcc, %.*s", 4, fourcc_data) or something like that? // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".