From patchwork Thu Apr 6 12:12:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 41004 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1116961pzb; Thu, 6 Apr 2023 05:14:10 -0700 (PDT) X-Google-Smtp-Source: AKy350abSFWOTl3wYgWoKexqIqUwV6oYdmuGrdKXeKgEo/DeEDNoMtEylfr4QBdeCY5zJ/797MwC X-Received: by 2002:aa7:d511:0:b0:502:1c7d:deb6 with SMTP id y17-20020aa7d511000000b005021c7ddeb6mr4828279edq.29.1680783250654; Thu, 06 Apr 2023 05:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680783250; cv=none; d=google.com; s=arc-20160816; b=Gm8KxP+41tt7eEJtPgNVzqbF847lB18FI4jJ2Mw7f2q87FXooaUM6eT2SnXUciI2Ul YvIZqFlECFcGOsyX95ORzgHfen2iy6eIZMyArxBD8qmaxqU2JbOHGPZ9XmZIifb0Ka2I 9zJQ187rQOGjMSTykZ2XfjvMH+MJLMSAwaQcxCGmv6OKFqPfrY3F+2NkAD39oFsld2dl HO1Gja/Xt5mVVylEqsbCefhTC983BrP/EtD0r40Wn2Pf6Gpk9WF3WigvEbur1iGTV4c5 qLVQZJPP75WXLYwbwkDNMgM/fbro+fptdwtxy6IhaeD1qYFgRmD5cn4wB9zeWFV00YCh aabg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=QFUnXLkupE8ZEi9aljXdCJt/haJ/weuRkszNTqTWXhk=; b=Y947U8XDA+NoezAs0juv3PF7foYBEpcBSuAqZdr3+dIflnSJW7A50nUAVBlAcFM9sL UkGe4daX34j1dn09nx/M43m0zntZAX9F5fx+q4unmmu4sQx3Emzgs1zr58C/YM2ROFd3 JXAsjrLGZjJ+P6OC5Ll2i/c+WNFd5aaIc5KLOiiO50rdytwQCk+OwYUiQCS8dbIlsfJB nVmctz3QKm6cL4Oh3fld0mT3ncR8kqt+FG/fhm9xWN9dIYazYU1X7QR0dIzwzyglG0Da coIee0XaxgGH9KyuoHbEa2fRsqlYdkMtGf4bB18XeBh3Kn1aSSQbe/NNO3HYuBexI5fZ htBQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x9-20020aa7d6c9000000b004fd2d153c51si1175778edr.273.2023.04.06.05.14.10; Thu, 06 Apr 2023 05:14:10 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73CB068BD45; Thu, 6 Apr 2023 15:14:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.221.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 174A0689F35 for ; Thu, 6 Apr 2023 15:13:59 +0300 (EEST) X-QQ-mid: bizesmtpipv603t1680783164tzug Received: from localhost ( [255.142.31.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 06 Apr 2023 20:12:43 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: LE7C6P2vL8TtzfnThIunaW4X1raVaR3poFAgY70rev5f1eHPLJhP0nY/Df71U HDPTnzsDgEoH/KT761MkrmYqX1jA7Mu9wo5OH8rzcBM/Nd4o35Dbh7vHzmDx5nyYPyOqu0H lFyp5+NlteEJyyTREunrdaQEdxcqPfKKMb2QP0RCTxSVnkC7WG6vvdQxFRlIPeXE46LWs2Z NwtLN41pRpNSwTg8cm9G0jOj7PE2xL2ydXdJSPQmLkbu/mKLABumHA14TBy2+R2ht1diu3A 4BH1iKT60z3SLmfApbjsCwoN+qS7fq0z42q7o/1GRgPnXfiuLJUylncG4wzykhMQFPSrZ96 2EX0WciyB5zcNPZxH0= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 13798912804921273553 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Apr 2023 20:12:40 +0800 Message-Id: <20230406121241.86114-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpipv:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/flvenc: Add support for HEVC over flv in muxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4P+8Te+YD5zt Implements HEVC according to enhanced RTMP spec found at https://github.com/veovera/enhanced-rtmp And it has beed supported by OBS, Simple Realtime Server. And the Enhancing FLV documentation Contributors include Jean-Baptiste Kempf (FFmpeg, VideoLAN). So this should be support by ffmpeg too. Signed-off-by: Steven Liu --- libavformat/flv.h | 16 ++++++++++++++ libavformat/flvenc.c | 50 +++++++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/libavformat/flv.h b/libavformat/flv.h index 3571b90279..44d3b04ff9 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -35,6 +35,12 @@ #define FLV_VIDEO_FRAMETYPE_OFFSET 4 +/* Extended VideoTagHeader + * defined in reference link: + * https://github.com/veovera/enhanced-rtmp/blob/main/enhanced-rtmp-v1.pdf + * */ +#define FLV_IS_EX_HEADER 0x80 + /* bitmasks to isolate specific values */ #define FLV_AUDIO_CHANNEL_MASK 0x01 #define FLV_AUDIO_SAMPLESIZE_MASK 0x02 @@ -110,6 +116,16 @@ enum { FLV_CODECID_H264 = 7, FLV_CODECID_REALH263= 8, FLV_CODECID_MPEG4 = 9, + FLV_CODECID_HEVC = 10, +}; + +enum { + PacketTypeSequenceStart = 0, + PacketTypeCodedFrames = 1, + PacketTypeSequenceEnd = 2, + PacketTypeCodedFramesX = 3, + PacketTypeMetadata = 4, + PacketTypeMPEG2TSSequenceStart = 5, }; enum { diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 64ea554dad..15a0f573f3 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -28,6 +28,7 @@ #include "libavcodec/mpeg4audio.h" #include "avio.h" #include "avc.h" +#include "hevc.h" #include "avformat.h" #include "flv.h" #include "internal.h" @@ -46,6 +47,7 @@ static const AVCodecTag flv_video_codec_ids[] = { { AV_CODEC_ID_VP6, FLV_CODECID_VP6 }, { AV_CODEC_ID_VP6A, FLV_CODECID_VP6A }, { AV_CODEC_ID_H264, FLV_CODECID_H264 }, + { AV_CODEC_ID_HEVC, FLV_CODECID_HEVC }, { AV_CODEC_ID_NONE, 0 } }; @@ -492,7 +494,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i FLVContext *flv = s->priv_data; if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264 - || par->codec_id == AV_CODEC_ID_MPEG4) { + || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) { int64_t pos; avio_w8(pb, par->codec_type == AVMEDIA_TYPE_VIDEO ? @@ -535,10 +537,19 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i } avio_write(pb, par->extradata, par->extradata_size); } else { - avio_w8(pb, par->codec_tag | FLV_FRAME_KEY); // flags - avio_w8(pb, 0); // AVC sequence header - avio_wb24(pb, 0); // composition time - ff_isom_write_avcc(pb, par->extradata, par->extradata_size); + if (par->codec_id == AV_CODEC_ID_HEVC) { + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceStart); // ExVideoTagHeader mode with PacketTypeSequenceStart + avio_write(pb, "hvc1", 4); + } else { + avio_w8(pb, par->codec_tag | FLV_FRAME_KEY); // flags + avio_w8(pb, 0); // AVC sequence header + avio_wb24(pb, 0); // composition time + } + + if (par->codec_id == AV_CODEC_ID_HEVC) + ff_isom_write_hvcc(pb, par->extradata, par->extradata_size, 0); + else + ff_isom_write_avcc(pb, par->extradata, par->extradata_size); } data_size = avio_tell(pb) - pos; avio_seek(pb, -data_size - 10, SEEK_CUR); @@ -628,7 +639,8 @@ static int flv_init(struct AVFormatContext *s) return unsupported_codec(s, "Video", par->codec_id); if (par->codec_id == AV_CODEC_ID_MPEG4 || - par->codec_id == AV_CODEC_ID_H263) { + par->codec_id == AV_CODEC_ID_H263 || + par->codec_id == AV_CODEC_ID_HEVC) { int error = s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL; av_log(s, error ? AV_LOG_ERROR : AV_LOG_WARNING, "Codec %s is not supported in the official FLV specification,\n", avcodec_get_name(par->codec_id)); @@ -784,8 +796,11 @@ end: for (i = 0; i < s->nb_streams; i++) { AVCodecParameters *par = s->streams[i]->codecpar; FLVStreamContext *sc = s->streams[i]->priv_data; - if (par->codec_type == AVMEDIA_TYPE_VIDEO && - (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4)) + if (par->codec_id == AV_CODEC_ID_HEVC) { + avio_w8(pb, 0x82); + avio_write(pb, "hvc1", 4); + } else if (par->codec_type == AVMEDIA_TYPE_VIDEO && + (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC)) put_eos_tag(pb, sc->last_ts, par->codec_id); } } @@ -836,13 +851,13 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A || par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC) flags_size = 2; - else if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4) + else if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) flags_size = 5; else flags_size = 1; if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264 - || par->codec_id == AV_CODEC_ID_MPEG4) { + || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) { size_t side_size; uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { @@ -862,7 +877,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) "Packets are not in the proper order with respect to DTS\n"); return AVERROR(EINVAL); } - if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4) { + if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) { if (pkt->pts == AV_NOPTS_VALUE) { av_log(s, AV_LOG_ERROR, "Packet is missing PTS\n"); return AVERROR(EINVAL); @@ -907,6 +922,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) if (par->extradata_size > 0 && *(uint8_t*)par->extradata != 1) if ((ret = ff_avc_parse_nal_units_buf(pkt->data, &data, &size)) < 0) return ret; + } else if (par->codec_id == AV_CODEC_ID_HEVC) { + if (par->extradata_size > 0 && *(uint8_t*)par->extradata != 1) + if ((ret = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL)) < 0) + return ret; } else if (par->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { if (!s->streams[pkt->stream_index]->nb_frames) { @@ -968,7 +987,12 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wb32(pb, data_size + 11); } else { av_assert1(flags>=0); - avio_w8(pb,flags); + if (par->codec_id == AV_CODEC_ID_HEVC) { + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFrames); // ExVideoTagHeader mode with PacketTypeCodedFrames + avio_write(pb, "hvc1", 4); + } else { + avio_w8(pb, flags); + } if (par->codec_id == AV_CODEC_ID_VP6) avio_w8(pb,0); if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A) { @@ -982,6 +1006,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) else if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4) { avio_w8(pb, 1); // AVC NALU avio_wb24(pb, pkt->pts - pkt->dts); + } else if (par->codec_id == AV_CODEC_ID_HEVC) { + avio_wb24(pb, pkt->pts - pkt->dts); } avio_write(pb, data ? data : pkt->data, size); From patchwork Thu Apr 6 12:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 41005 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1117069pzb; Thu, 6 Apr 2023 05:14:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Y/L3RMCPGDXt+stQ5XFlDCN1FkxAjXxSNUYdAMhNczIeCnidcGl3Wxr10uHJlk+LxmEji0 X-Received: by 2002:a50:ff05:0:b0:500:58cb:3b05 with SMTP id a5-20020a50ff05000000b0050058cb3b05mr4933788edu.27.1680783260519; Thu, 06 Apr 2023 05:14:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680783260; cv=none; d=google.com; s=arc-20160816; b=OZg4enuu6Ry+bnADHuf9IS4awrNwu20t9J2GFnb2HgPsrapBbmuEFRoD1GnEfieee2 cob040PIFQ+lz4Vz0AKeOy4EEaHiNJnX7o6rDXlct4pwX5HubjPNWjr1khryCC1a3BiA aao/hHnj2gNUyJcEmsR4nOsHKoAbSeJSXkC4K94NKscHvhA7VOJQiAM3MzOv7RW843Eg Pqd1lWxPcb5O6eb9Si60pI+4CyL2tj9PvbCXri3MKUkT8v8tAfudaTbo1wRHBxck9p7M SXJQpgHDWHYf8SqXXfaivGNyIpt/A3++/joKWXvcPJibo3WzYH5eQx6Hjb3DFDAdJSrz zaWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:references :in-reply-to:message-id:date:to:from:delivered-to; bh=dmO/6MKnP1uQwdBbEAJY0Kc+G+eriNsJ9vttb61/Axc=; b=XP8NduyKbak0A0QZzUVlgrgxPDI+oNrNW14+gCA+OZ8kQX1OXYav3So+u11BcSXRTJ G63N8mtEEpto3RC4vCLAcF8nZred4w96CXOBh4X5z4h0BAKe9feKZtmFwiaH3NXVuIP1 8S3k1IO+0HoM4lX+NWK5n92UF0l2KAmZ5uXiLL4GIaEgrE1CHUUiGN/4VcM+gQIg30LY jzeoo8KmUHTvfpjc446qxAiCSHlMY21G5CZWli2ah+n+m6ZFfTBYmQkoqKhp16fbYawX Xc4OK8Qa6+hDkcTLL91Ug/3K8xggpYAIHnLbEIGyohRqlBo5feqX+gWFxBznByogBToP krqA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u5-20020aa7d0c5000000b004fd2b05171csi1009425edo.153.2023.04.06.05.14.20; Thu, 06 Apr 2023 05:14:20 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73B85689F35; Thu, 6 Apr 2023 15:14:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.67.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A13EB689F35 for ; Thu, 6 Apr 2023 15:14:03 +0300 (EEST) X-QQ-mid: bizesmtpipv603t1680783169to7m Received: from localhost ( [255.142.31.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 06 Apr 2023 20:12:48 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: jUz4x+AhIZn4klJWW6w8HrPVSs29x5BuH4PDgnQ2Ig8nyOgAVXt3R7ViBUk7X h4JS4ApqAG1usmi99xvM0U9Igc0m+7uv+5flq5I+tr3TQrd5cEBN4M1LYPfsPI2ssqQ03Xa rv7xT49zcnd/UZAESBRnSU3ZwvQqlZyU2MhOVepOvBOhCP/3tQkbyx+gj6wEXz3U7b6Ak7F pVGJLhS3rvs6OGtJyD/VUPAG0ZIX60BeKRxGTv//F/8KVvBzho4RY0Mj7T7ufSRQvnc8XSL Q61VojXbWwN1BEQHpZ//o1fErqk06F/L469v+daa1v6pPQyQqDj6b7HvMbT/JCMXVL4Wxbi 0QyAWLJhtVVwdN3vX5au7VpxjfCi950I8gf8SnMn9hN6JIAOCA= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 12748339108069634682 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Apr 2023 20:12:41 +0800 Message-Id: <20230406121241.86114-2-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230406121241.86114-1-lq@chinaffmpeg.org> References: <20230406121241.86114-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpipv:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/flvdec: support demux HEVC in Enhancing FLV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cDbmtjfqjpBY Signed-off-by: Steven Liu --- libavformat/flvdec.c | 61 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d83edff727..999bcdff6b 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -79,6 +79,8 @@ typedef struct FLVContext { int64_t last_ts; int64_t time_offset; int64_t time_pos; + + uint8_t exheader; } FLVContext; /* AMF date type */ @@ -302,13 +304,26 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, } } -static int flv_same_video_codec(AVCodecParameters *vpar, int flags) +static int flv_same_video_codec(AVFormatContext *s, AVCodecParameters *vpar, int flags) { int flv_codecid = flags & FLV_VIDEO_CODECID_MASK; + FLVContext *flv = s->priv_data; if (!vpar->codec_id && !vpar->codec_tag) return 1; + if (flv->exheader) { + uint8_t *codec_id_str = (uint8_t *)s->pb->buf_ptr; + uint32_t codec_id = codec_id_str[3] | codec_id_str[2] << 8 | codec_id_str[1] << 16 | codec_id_str[0] << 24; + switch(codec_id) { + case MKBETAG('h', 'v', 'c', '1'): + flv_codecid = FLV_CODECID_HEVC; + break; + default: + break; + } + } + switch (flv_codecid) { case FLV_CODECID_H263: return vpar->codec_id == AV_CODEC_ID_FLV1; @@ -322,6 +337,8 @@ static int flv_same_video_codec(AVCodecParameters *vpar, int flags) return vpar->codec_id == AV_CODEC_ID_VP6A; case FLV_CODECID_H264: return vpar->codec_id == AV_CODEC_ID_H264; + case FLV_CODECID_HEVC: + return vpar->codec_id == AV_CODEC_ID_HEVC; default: return vpar->codec_tag == flv_codecid; } @@ -331,9 +350,23 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid, int read) { FFStream *const vstreami = ffstream(vstream); + FLVContext *flv = s->priv_data; int ret = 0; AVCodecParameters *par = vstream->codecpar; enum AVCodecID old_codec_id = vstream->codecpar->codec_id; + flv_codecid &= FLV_VIDEO_CODECID_MASK; + + if (flv->exheader) { + uint32_t codec_id = avio_rb32(s->pb); + + switch(codec_id) { + case MKBETAG('h', 'v', 'c', '1'): + flv_codecid = FLV_CODECID_HEVC; + break; + default: + break; + } + } switch (flv_codecid) { case FLV_CODECID_H263: par->codec_id = AV_CODEC_ID_FLV1; @@ -372,6 +401,11 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, par->codec_id = AV_CODEC_ID_MPEG4; ret = 3; break; + case FLV_CODECID_HEVC: + par->codec_id = AV_CODEC_ID_HEVC; + vstreami->need_parsing = AVSTREAM_PARSE_NONE; + ret = 3; + break; default: avpriv_request_sample(s, "Video codec (%x)", flv_codecid); par->codec_tag = flv_codecid; @@ -796,6 +830,7 @@ static int flv_read_header(AVFormatContext *s) s->start_time = 0; flv->sum_flv_tag_size = 0; flv->last_keyframe_stream_index = -1; + flv->exheader = 0; return 0; } @@ -1071,6 +1106,11 @@ retry: } else if (type == FLV_TAG_TYPE_VIDEO) { stream_type = FLV_STREAM_TYPE_VIDEO; flags = avio_r8(s->pb); + /* + * Reference Enhancing FLV 2023-03-v1.0.0-B.8 + * https://github.com/veovera/enhanced-rtmp/blob/main/enhanced-rtmp-v1.pdf + * */ + flv->exheader = (flags >> 7) & 1; size--; if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) goto skip; @@ -1129,7 +1169,7 @@ skip: break; } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && - (s->video_codec_id || flv_same_video_codec(st->codecpar, flags))) + (s->video_codec_id || flv_same_video_codec(s, st->codecpar, flags))) break; } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) { if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) @@ -1230,7 +1270,7 @@ retry_duration: avcodec_parameters_free(&par); } } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { - int ret = flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK, 1); + int ret = flv_set_video_codec(s, st, flags, 1); if (ret < 0) return ret; size -= ret; @@ -1242,8 +1282,14 @@ retry_duration: if (st->codecpar->codec_id == AV_CODEC_ID_AAC || st->codecpar->codec_id == AV_CODEC_ID_H264 || - st->codecpar->codec_id == AV_CODEC_ID_MPEG4) { - int type = avio_r8(s->pb); + st->codecpar->codec_id == AV_CODEC_ID_MPEG4 || + st->codecpar->codec_id == AV_CODEC_ID_HEVC) { + int type = 0; + if (flv->exheader) { + type = flags & 0x0F; + } else { + type = avio_r8(s->pb); + } size--; if (size < 0) { @@ -1251,7 +1297,8 @@ retry_duration: goto leave; } - if (st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4) { + if (st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4 + || (st->codecpar->codec_id == AV_CODEC_ID_HEVC && (flags & 0x0F))) { // sign extension int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000; pts = av_sat_add64(dts, cts); @@ -1267,7 +1314,7 @@ retry_duration: } } if (type == 0 && (!st->codecpar->extradata || st->codecpar->codec_id == AV_CODEC_ID_AAC || - st->codecpar->codec_id == AV_CODEC_ID_H264)) { + st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_HEVC)) { AVDictionaryEntry *t; if (st->codecpar->extradata) {