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 ESMTPS id A506A4DD02 for ; Thu, 24 Apr 2025 03:39:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C4AC68B522; Thu, 24 Apr 2025 06:38:58 +0300 (EEST) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79ED268A76F for ; Thu, 24 Apr 2025 06:38:51 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b0b2d0b2843so381785a12.2 for ; Wed, 23 Apr 2025 20:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745465929; x=1746070729; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vmyn3w08iFNqvLRu0VEir1Ql38p7Abh36FVEwCUqXIo=; b=V5zdbv0mqNxNKAmodHAqKggi89FUlFAlDS7O/Ft7WZ7soYrgFE+4ZNAMVHSJEdJ4eP oh5vSR7c85UtD3SY/hK5X6hMulYlr/z+X/qGepJ3V9gXeyd6Th7ZbyrzuCUFp/ynE0nI NPHhLSHagWYxl/ZHfVrMI+WBn+USCdmiQKWzYTyepR3/VtD4ai3Iysb+Lf0NEnS9n3f4 07dmsLW/Gx/b8eb2bnIiIawb3o4S6KRU6us4UKi3sw4Q67dgsTrYwZ5NOACk9yR6HCi+ VkoMJaCLhcwbvASs5xIoQJYEjPw0XDIYebWsj+nIfokLn6iNOZzia1MaqA2sDl/fKe3A FlNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745465929; x=1746070729; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Vmyn3w08iFNqvLRu0VEir1Ql38p7Abh36FVEwCUqXIo=; b=ltbGDRhkEu1LdHYME5OhNgz7j9fn6umdOBtRsyV/Oe+KvGDcru6kHI2NlBeZu1KCzl +LbFnW7ZuiAG6HxlLNbssfFdYq6Bj65B+S1QXhqyUFkTmEKTtETYPtJGi6wcOJFuWhw9 hGo0rV8qNLy7CBTCIDkLKfZ3PfsuFyzRvYQ09cP2e3OXNCbQU2dpL88h4OjDVDVkOrAy v5b1pgrDU8C1uDOR/FEj5l5bifEUrxXJwz+nurJ+s+SPCTagFerimu+UXIm8EaBMZnxV 3LjWpEFG1YLHW4NsqoN2j6Mo6QGXqF40BQyZ4EZQaeEXx248qXPT579mOY9sisR4RlvN ItLg== X-Gm-Message-State: AOJu0YywGRUCTaltqJ7rHurlos/p57ASzgTgokSbmGXGvqljUaodPcPt sir6sBzq2EZT6cgMQn6pXrHF5UITxNYyhd9k6DHyeiwiOk4QveRNjlrv3w== X-Gm-Gg: ASbGncvj9tsbyaHkrBMmTeihgTf7TbubfM2WqmJ8icLVeS1hjvsCtyDA+KQ5tnASoLY ffQVCDOiVSpeimSjzK+IHi5KFQ4sldI9X1tHn7V0yQ+rdM4jQlbM0uoWBPo3ptkmhhxDydW6qbI 5FgBLUQ6QfD9gf6CL/jPvg9Q0Vm0zOdOZQ46F9IJKihktrZHnoLecX1SzXCMWLuGEtRhDYkf1To IaLZTEy4+rClT9ZHA49KEhJmljW3XerXYfQxjROPCmQ1HUNsWlI+BByrohnsmPE0ATBGWR7IlT2 Yoc1CbporbWEdkPDpFVRBEtRNaI7i/eV6Q2AmUo/jmTadBTj9GsexIPmAX7Ne4UV X-Google-Smtp-Source: AGHT+IEiaauJfzO7ZNhYiH4YNR0/4ekY6KCoIqJslM26jpNXWadpz4loF1DTwOlrFyQ7Zj0A28g4Dg== X-Received: by 2002:a17:90b:5847:b0:2ff:5e4e:861 with SMTP id 98e67ed59e1d1-309ed34bb12mr1866688a91.24.1745465929359; Wed, 23 Apr 2025 20:38:49 -0700 (PDT) Received: from localhost.localdomain ([114.94.86.10]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309ef1475c1sm166765a91.45.2025.04.23.20.38.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Apr 2025 20:38:49 -0700 (PDT) From: jiangjie To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Apr 2025 11:38:37 +0800 Message-ID: <20250424033837.82339-1-jiangjie618@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/bsf/h264_mp4toannexb.c: change extradata to annexb if this is avcc. 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: jiangjie618@gmail.com 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: if get AV_PKT_DATA_NEW_EXTRADATA in AVPacket, this bitstream filter will return an error. ffmpeg -i rtmp://xxx/live/xxx -bsf:v "h264_mp4toannexb,h264_metadata=aud=remove" -c copy -f null - --- libavcodec/bsf/h264_mp4toannexb.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/libavcodec/bsf/h264_mp4toannexb.c b/libavcodec/bsf/h264_mp4toannexb.c index dda064287e..4cd002d166 100644 --- a/libavcodec/bsf/h264_mp4toannexb.c +++ b/libavcodec/bsf/h264_mp4toannexb.c @@ -252,14 +252,21 @@ static int h264_mp4toannexb_filter_ps(H264BSFContext *s, return 0; } +static int is_annexb(const uint8_t *extradata, int extra_size) { + if (!extra_size || (extra_size >= 3 && AV_RB24(extradata) == 1) || + (extra_size >= 4 && AV_RB32(extradata) == 1)) { + return 1; + } else { + return 0; + } +} + static int h264_mp4toannexb_init(AVBSFContext *ctx) { int extra_size = ctx->par_in->extradata_size; /* retrieve sps and pps NAL units from extradata */ - if (!extra_size || - (extra_size >= 3 && AV_RB24(ctx->par_in->extradata) == 1) || - (extra_size >= 4 && AV_RB32(ctx->par_in->extradata) == 1)) { + if (is_annexb(ctx->par_in->extradata, extra_size)) { av_log(ctx, AV_LOG_VERBOSE, "The input looks like it is Annex B already\n"); } else if (extra_size >= 7) { @@ -294,9 +301,16 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) extradata = av_packet_get_side_data(in, AV_PKT_DATA_NEW_EXTRADATA, &extradata_size); if (extradata) { - ret = h264_extradata_to_annexb(ctx, extradata, extradata_size); - if (ret < 0) - goto fail; + if (!is_annexb(extradata, extradata_size) && extradata_size >= 7) { + ret = h264_extradata_to_annexb(ctx, extradata, extradata_size); + if (ret < 0) + goto fail; + av_packet_side_data_remove(in->side_data, &in->side_data_elems, + AV_PKT_DATA_NEW_EXTRADATA); + av_packet_add_side_data(in, AV_PKT_DATA_NEW_EXTRADATA, + ctx->par_out->extradata, + ctx->par_out->extradata_size); + } } /* nothing to filter */ -- 2.49.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".