From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 0BCC1451A6
for <ffmpegdev@gitmailbox.com>; Fri, 12 May 2023 03:59:44 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25E1C68C173;
Fri, 12 May 2023 06:59:37 +0300 (EEST)
Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.67.158])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 399AA68C163
for <ffmpeg-devel@ffmpeg.org>; Fri, 12 May 2023 06:59:29 +0300 (EEST)
X-QQ-mid: bizesmtp90t1683863964tcoqsrxd
Received: from localhost ( [103.102.203.204]) by bizesmtp.qq.com (ESMTP) with
id ; Fri, 12 May 2023 11:59:23 +0800 (CST)
X-QQ-SSF: 01100000000000Z0Z000000A0000000
X-QQ-FEAT: RFp2QSjOiS7CRNeKo+vK6o7V/zCOSkPSiYIImpiSc7nF9FInx6/xYupnvfEo2
b86gEWd9N2PTvHu7zdZ8tHBnz5y0crhaMTmVIQUQJ7nJatCGth/8QwfAhFF5xzm/DipqjrE
cgHK1qjslgK3Xvqz4MVZBfeGUrWopJx5P7csctsi+GN/CzuEYd4mn6iESjn9GcLOJG8ba5x
Dtcjflu6ipZiiEJr8bAsb2NRklYnHUYu/jaJ19T1LP4tOtnTcQC2hhCZuHtguCrkzlTUn+7
Anh2YndSZp33cuJllUPD0Hcqrjpuvm2WxORM22Ej9+TMubaJvzJuTXNmEJXSL9mRRkpzjNi
vzTArGPDMRoO+lY7thFZLDlbIvY29ImUR74X0BmX0+zir6uOfYbag5A68onQQ==
X-QQ-GoodBg: 0
X-BIZMAIL-ID: 16310214271832428492
From: Steven Liu <lq@chinaffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 12 May 2023 11:58:57 +0800
Message-Id: <20230512035901.22731-3-lq@chinaffmpeg.org>
X-Mailer: git-send-email 2.40.0
In-Reply-To: <20230512035901.22731-1-lq@chinaffmpeg.org>
References: <AS8P250MB0744C52EA32EAFF87E7399608F749@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
<20230512035901.22731-1-lq@chinaffmpeg.org>
MIME-Version: 1.0
X-QQ-SENDSIZE: 520
Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-3
Subject: [FFmpeg-devel] [PATCH v9 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Steven Liu <lq@chinaffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20230512035901.22731-3-lq@chinaffmpeg.org/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
libavformat/flvdec.c | 58 ++++++++++++++++++++++++++++++++++++++------
1 file changed, 50 insertions(+), 8 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index d83edff727..6a1e6e7ff0 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) {
+ 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) {
--
2.40.0
_______________________________________________
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".