From patchwork Thu Apr 6 12:24:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 41006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1124810pzb; Thu, 6 Apr 2023 05:24:37 -0700 (PDT) X-Google-Smtp-Source: AKy350aoDTTcPPN1JpcC+cUTUdmnmdIU7KumWCLdBkGxe2Va/v6/p8qwnkqkEyECCSK6m2f9HRLo X-Received: by 2002:a17:907:6e17:b0:922:ae30:3c23 with SMTP id sd23-20020a1709076e1700b00922ae303c23mr6810644ejc.18.1680783877425; Thu, 06 Apr 2023 05:24:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680783877; cv=none; d=google.com; s=arc-20160816; b=hMelnymGet3mGvWC7RBFtG2lWE9NjpSv+DJMwrkOLFLYgGml9KpeIjQVxy5cExUF4z qa6S1cZ3ZqTsStLeDwgxVpGBhrTphGBE/KvYcmEg8RShW3DiNnCDUggTP/Es+57sWX8F F1yY7BE5Sm2JuqFpSOsRWkvb2V88NENrH8hFJrspxLyz3OWtrvAe+R36tszyTRrmLXjq L4k+Nl/OIFM0jsh7/a2tzjspoTB7LXt4BprnqudipJK/3m9S8s8DaAEUV27uhcwgW9+F mYvf8uId4kiDSEwpovcTghCdRWC3jLXH7fdt83erFYHW8OQ4ugCGtbCeckLI2lov+zep PSCA== 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=Tn7xMgXeuKhjNdReSXJTNPJHk19dWAU19HhdR/f4/Hw=; b=dOEjhMG9Ip4vUhJG8RNmUfXFYGrhqYM3W2ORwFQYLBEF5wLX+EraBkxaEaIZPca4uG NwAkTXt8hwv6rLb1uQUSqGvUWB1Vt6v6zSHXdao8BKECzG8wo8ZGVfo5Sxv1sBtZTiC1 /DCr7vNssAJnWYjBLgl5o2SgcBlJd51kw7gv5fnodpG9LdxjcoCZ1QjiDqQ7XMETwFnj jxD/0oZdyWWSrBrohpelQdYCIcXvx/kOgdtkKV5mSraMIiekqZSnI/gjE1/9kUwNPTpt PCS3XYhW3T52YehTxuST0Q73eWwFHMe9SrO1ZkWX+lrlxFdZ7wDrNGOT6n79EYgxo9g/ WlHA== 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 kq16-20020a170906abd000b0092fd743c0e5si1025797ejb.184.2023.04.06.05.24.37; Thu, 06 Apr 2023 05:24:37 -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 41FDF68BD24; Thu, 6 Apr 2023 15:24:34 +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 D38E26899F1 for ; Thu, 6 Apr 2023 15:24:25 +0300 (EEST) X-QQ-mid: bizesmtpipv603t1680783859t4x7 Received: from localhost ( [255.142.31.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 06 Apr 2023 20:24:18 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: /+iK7ZpVlLRqHOELbKNSTEFcGXQN6ZnLS5EJWiJbSrUHQSQzrXUofuOYFQwHA hYPc19tpZXWUCfpOMJNn4zar1Z/EIskiTJks7elwtUJ7mRbE7+TLXJa5ODTV5YqdXuuEwjk 99zJGAmjxH2374Nx+/cvxJNfyuJ6XSTxlr6AZHIOrgXwRfDg8IbtG/mdZll68oZKTAQFddY Bhbd3Pg3YdUkMRVW/zypKWDz92pr7aLx/uZLFKnIIy4B8mtKP1Sg4VNiTOP8JP4rxin4UlJ 76RfRyRSLyqQHD3cbhNeW2gUdGXuDzLT18nyRdB7BPBZIObErPMpNFMTZE6lR39xnri9rDy aMEdrZemVnXyKCLD87UeB5DMPpMC4B3uoe/alOx+0RX0C+h+mxPZqoGEmY4PQ== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 15157371291724161710 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Apr 2023 20:24:16 +0800 Message-Id: <20230406122416.93934-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <6477ddb9-51ae-1ba8-961d-97d3b10c847a@gmail.com> References: <6477ddb9-51ae-1ba8-961d-97d3b10c847a@gmail.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpipv:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH v2 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: 2G/0DIT5cJBd Signed-off-by: Steven Liu --- libavformat/flvdec.c | 63 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d83edff727..8060c43772 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 +348,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 +403,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_HEADERS; + ret = 3; + break; default: avpriv_request_sample(s, "Video codec (%x)", flv_codecid); par->codec_tag = flv_codecid; @@ -796,6 +832,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 +1108,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 +1171,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 +1272,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 +1284,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 +1299,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 +1316,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) {