From patchwork Thu Apr 13 06:29:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 41129 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1013602pzb; Wed, 12 Apr 2023 23:29:56 -0700 (PDT) X-Google-Smtp-Source: AKy350YtebyyegHNjClH7tGV/wUFqeaX6dXQud8G41jM99jrN4HrGbi6hzZmBOwOL7QHLklxOfQd X-Received: by 2002:aa7:c155:0:b0:501:d43e:d1dd with SMTP id r21-20020aa7c155000000b00501d43ed1ddmr1103490edp.33.1681367396438; Wed, 12 Apr 2023 23:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681367396; cv=none; d=google.com; s=arc-20160816; b=FgpqJpjO/JEL4QGFppR6XQpkCSJ2DaI6g2MPOHenpyiUNB8GJQECjzlAOBresVBbhW BtK2NbrmrtKXI9OMBzZIAkWl/WFpEOCk3Z2K5h8BAcKGGvcPHrbaPefxfOLXERKJIvk9 O66fwrC+2RhL4gAWSuQlKPcR++I+5X3tTvnhoNo2L1IzXFbgStSoG5ioVB0Ky02GLLJJ mqUrz5ArqPueYrO5wOtoSMUz/RsEaCk16miPtL8tdy//EydJAut9I85rKqb973ROzML5 ntdkVXJREm1pxceS58iVU0tpIt9lg4Ujg78f2qc7jBn94igMxHtJ4OD7MA7esaSArFZD Fytg== 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=JZ9eGtCvS2/rOUvkHu4eW4gHBBIRdv4UWafehVpw7hg=; b=tvVrYpnGLxQRrdqDlAp50ShJp6Fgvi0oQ1HArG9dQGHG7V6DxWAQdk+1d+Mn9gNuxM CsqczS4W2EjRozcFuR3sEAz+DokymtcBOV1UCZUBLJIVJb6xPo3UhwmCKH+5bIOFaRBg mfpSQ65k5aslRk9degf9qK5hcd66Nrgt/TaWPGoePUck84o0eD5qvmoovfMBysh+BPQ9 Y+xE3tckiyobqTVYCI6wWme5RYdBD3Nl4nvqtIy79jtFSaPiHntZB5rCilYedjIPmy2B sKeEuwKrmFCdjFmXIUfLPBV8SzjI2o/YPiGvbdQPVR2VVsHUJSXoDL6PB0tGB23fCvuh 65Ug== 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 r19-20020aa7c153000000b0050508fc766csi1045288edp.125.2023.04.12.23.29.56; Wed, 12 Apr 2023 23:29:56 -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 0976568BB5E; Thu, 13 Apr 2023 09:29:42 +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 53A1D689C13 for ; Thu, 13 Apr 2023 09:29:34 +0300 (EEST) X-QQ-mid: bizesmtpipv602t1681367369twq6 Received: from localhost ( [255.62.16.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 13 Apr 2023 14:29:28 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: b+hmI1kBZ28KI4RtA9tVkXs8XTfWa2jTL47thPhXbaCPDferYGG2PoNaZXPKC UZ31h9VFt+FssjW2vlu4xV5JO899BLMW9tJ9TEpnKeODFnlwyaJw5XxPGFSc3xzkDYAr30N HcTZGI7vFpfSi6pjhyiEVAJsmrn6mvhNPCg1IIMFVs2OFSV0dWvRUBbgLx8LYzQozBSG3ri vEoMP1RbMODu4G/p/Vm7LaZZQxR4T+L1eOKtphvzwHiumPu+uQ7aR02+eaiNqBWQcLmody3 yWjs18LTngATcy5gGkY5fy9FEy+RSn8vkVRjroJdJtyEBAGxpWyuy06wyEDH3MSZP+8vna4 o5P/UffvSO7VfqMgHCKEP66w5KjNFzu9S4m6zHBzXL5RmzivhM= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 2915969228331836286 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 14:29:17 +0800 Message-Id: <20230413062919.3501-2-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230413062919.3501-1-lq@chinaffmpeg.org> References: <1f4144d9-484e-43e1-958c-99b24e931907@app.fastmail.com> <20230413062919.3501-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpipv:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH v7 2/4] avformat/flvdec: support demux hevc in enhanced 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: /ulkHximMImc Signed-off-by: Steven Liu --- libavformat/flvdec.c | 55 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d83edff727..0b6218f65b 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,25 @@ 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'): + return vpar->codec_id == AV_CODEC_ID_HEVC; + default: + break; + } + } + switch (flv_codecid) { case FLV_CODECID_H263: return vpar->codec_id == AV_CODEC_ID_FLV1; @@ -331,9 +345,24 @@ 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'): + par->codec_id = AV_CODEC_ID_HEVC; + vstreami->need_parsing = AVSTREAM_PARSE_HEADERS; + return 4; + default: + break; + } + } switch (flv_codecid) { case FLV_CODECID_H263: par->codec_id = AV_CODEC_ID_FLV1; @@ -796,6 +825,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 +1101,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 +1164,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 +1265,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,9 +1277,15 @@ 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); - size--; + 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) { ret = AVERROR_INVALIDDATA; @@ -1267,7 +1308,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) {