From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 25D28453C7 for ; Sat, 29 Jul 2023 00:26:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB47868C949; Sat, 29 Jul 2023 03:25:59 +0300 (EEST) Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02CC568C5D1 for ; Sat, 29 Jul 2023 03:25:52 +0300 (EEST) X-QQ-mid: bizesmtp68t1690590347t885baph Received: from localhost ( [210.13.66.106]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 29 Jul 2023 08:25:46 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: 3M0okmaRx3j8+71mNC4P8Opum6eJpYxWrZhBCLfzf6+oGl48xYqgT5cmzVEgT X/QeKbd9UXckqNXrsGjC18kc1BMzqt03kVUgAozHKCSJDJdnRGLUMrJ1mUR3xsx2Ec2xfsK 4jE1OsQxxSbk8O9Vrsv8r/trNkVdVCiq66J0p+KHjJz55LGEqrb24Wts+La1rRlVS5rCG4d n9aJBVZsp0vYYif0NXcNXsvOARKlDO6EGxMtw1lVZ7qjZMgQRllMt8L4TzNBns2b8wGEdgz 8ocFcxUe2S/QL622L8Henz2V9YY25HluPn0yIbrL3H5bVDimC0eMOZS+sQ0uBQqohK0XrNH Z7Bn42R8s2E+rAB6KQ= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 7800779898936656113 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Jul 2023 08:25:42 +0800 Message-Id: <20230729002542.51521-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20b0c9a1-8364-21eb-10f0-1f13736a1c2@passwd.hu> References: <20b0c9a1-8364-21eb-10f0-1f13736a1c2@passwd.hu> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-0 Subject: [FFmpeg-devel] [PATCH v3] avformat/flvdec: move read fourcc output before flv_same_video_codec 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: read fourcc for video codec after VideoTagHeader read. passed as parameter to flv_same_video_codec. Signed-off-by: Steven Liu --- libavformat/flvdec.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 3fe21622f7..e3cceba5d0 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -35,6 +35,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "avformat.h" +#include "avio_internal.h" #include "demux.h" #include "internal.h" #include "flv.h" @@ -304,27 +305,22 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, } } -static int flv_same_video_codec(AVFormatContext *s, AVCodecParameters *vpar, int flags) +static int flv_same_video_codec(AVFormatContext *s, AVCodecParameters *vpar, uint32_t extent_codec_id, 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; - case MKBETAG('a', 'v', '0', '1'): - return vpar->codec_id == AV_CODEC_ID_AV1; - case MKBETAG('v', 'p', '0', '9'): - return vpar->codec_id == AV_CODEC_ID_VP9; - default: - break; - } + switch(extent_codec_id) { + case MKBETAG('h', 'v', 'c', '1'): + return vpar->codec_id == AV_CODEC_ID_HEVC; + case MKBETAG('a', 'v', '0', '1'): + return vpar->codec_id == AV_CODEC_ID_AV1; + case MKBETAG('v', 'p', '0', '9'): + return vpar->codec_id == AV_CODEC_ID_VP9; + default: + break; } switch (flv_codecid) { @@ -1065,6 +1061,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) AVStream *st = NULL; int last = -1; int orig_size; + uint32_t extent_codec_id = 0; retry: /* pkt size is repeated at end. skip it */ @@ -1117,6 +1114,15 @@ retry: * */ flv->exheader = (flags >> 7) & 1; size--; + if (flv->exheader) { + int ensure_seekback_status = ffio_ensure_seekback(s->pb, 4); + if (ensure_seekback_status < 0) { + av_log(s, AV_LOG_WARNING, "Could not ensure seekback\n"); + return ensure_seekback_status; + } + extent_codec_id = avio_rb32(s->pb); + avio_seek(s->pb, -4, SEEK_CUR); + } if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) goto skip; } else if (type == FLV_TAG_TYPE_META) { @@ -1174,7 +1180,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(s, st->codecpar, flags))) + (s->video_codec_id || flv_same_video_codec(s, st->codecpar, extent_codec_id, flags))) break; } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) { if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) -- 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".