From patchwork Fri Jun 2 07:31:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 41944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp1036996pzb; Fri, 2 Jun 2023 00:32:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6pFkbC9RYoMX8t1IuRRTvij1fm4+k/Go0hf9HC717WXfFZ12k74NMsMVSbCiHDNgPRyXVu X-Received: by 2002:a17:907:6eac:b0:974:6026:a316 with SMTP id sh44-20020a1709076eac00b009746026a316mr1219895ejc.19.1685691128681; Fri, 02 Jun 2023 00:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685691128; cv=none; d=google.com; s=arc-20160816; b=XghDsPmGCB/RhWaAQgwtsMX4pTB31mZznMMwP+RIUStJeGh/sIZ65rrmm+KX5xnWxj DJfYwZFpw1uHt4plPyXZQjMyLq91DdSfdnArZ0QnKkWp6u24ft9UQdX8Saff5B7Znxqe bkeTv1X5NJi0m712yKwbqSmMkYGRza74Rv30L9OEnJJaMGsI+9/80HxpRMIwkpegh3P/ y/KmiiodiOEYdyb3w2Z0A2WusAP7mjiiOlFgELX/gc9rvIR9AqrP/lwRF34VUprNmgtg 4pavQgr3aQW0exDBb2r1yQLqVzukUm+SnlAOus/ocBllRcrjKSfvcZUDcIXzQraMB4VH SvgQ== 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=ygUb60Tr5LbPnhiS1As+hL+qX45KII+ocpY9X3Jq4TI=; b=L4b28Cx2u4/cccz62dRFTTGkYdEYgX1AOSGv9k5ivnaBF7fgmW4nGkNTC3OPZGiYXL xdhqa00JhUjkJjQoZRtUB2z5f8871jV2TNKdpGtU2Xt7Uj8SD4eRM/9MLvOvXzRd0gFH yBuMW7QWvrAV7lIBakmQKnhg7d3y7ISMliEJj+neHbRfGH0HqzKYbwf7pO70bswSl86b 1SWF2yzCkN9l8YeR1XD6NfGlfNSgPAx3Z9u5MWvFR3VeZ+x+0lqszqmuq40PQU17S+tV /Oo9wt71icEIgg/CKjlTbcxy4wGhNYsMX0oB3mlrh/kXgySedqxmaQyMUxTHTictNzdI viLg== 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 p16-20020a17090653d000b0096f643f4c21si415713ejo.615.2023.06.02.00.32.08; Fri, 02 Jun 2023 00:32:08 -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 1190968C307; Fri, 2 Jun 2023 10:31:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bg2.exmail.qq.com (bg2.exmail.qq.com [114.132.63.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9699F68C2DF for ; Fri, 2 Jun 2023 10:31:36 +0300 (EEST) X-QQ-mid: bizesmtp70t1685691083tlmqdgy7 Received: from localhost ( [103.102.203.204]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 02 Jun 2023 15:31:22 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: NEQNbzYfqF6fLPZy6mMNMY0sA64u6/mww9JarZ/2u65nkIbcqiV0WVRCZO5q7 6wUCvznZeyBvmDhnXpVq/nBJVKH8D0SI1TYsg8jotueIDZTNedYVVjTVbCQ3OrA8KDeI6pA wxKY9CMdaVKlekjNt9dwsaDYkqoLFIQUmWrsuWjvUfZk/KxDlaKT7VI4AMNP8w4QI1k+R0d LJL1VN5MbrXqEE1UeRIfJWMzuqRUotSM+dTbv4ybc0zYIBHtCQTHQHCrl0Ew3Z24QStJMGC aajqFf9aXxQfDgxqGC0OGbi6bFWk+LYYbDFa2cNQOsfij5cbu0klmVi63NqJfJYpWY7nUWE RfeK6XPr1MUFDq6Y30+vM2JFvEdOS8WRfNJcrusxre+dS7BO9yP+B8Jboua2Q== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 17500562472029918716 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2023 15:31:05 +0800 Message-Id: <20230602073109.14086-3-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230602073109.14086-1-lq@chinaffmpeg.org> References: <20230602073109.14086-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-3 Subject: [FFmpeg-devel] [PATCH v11 2/6] 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: aVtcKf8Pd8GI Signed-off-by: Steven Liu --- libavformat/flvdec.c | 58 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d83edff727..c8e6cadf1c 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,16 +1277,23 @@ 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 && stream_type == FLV_STREAM_TYPE_VIDEO) { + type = flags & 0x0F; + } else { + type = avio_r8(s->pb); + size--; + } if (size < 0) { ret = AVERROR_INVALIDDATA; 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 && type == PacketTypeCodedFrames)) { // sign extension int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000; pts = av_sat_add64(dts, cts); @@ -1267,7 +1309,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) {