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 3CFE94AEDD for ; Thu, 24 Apr 2025 12:43:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 448B368B2B0; Thu, 24 Apr 2025 15:43:10 +0300 (EEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 741D3688001 for ; Thu, 24 Apr 2025 15:43:03 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7370a2d1981so700246b3a.2 for ; Thu, 24 Apr 2025 05:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745498581; x=1746103381; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+heOkZrjIo+5yEsuIAKLTnyZwA9m5mZmKUYyEoPsv2Y=; b=RCaaJR5QcNvIP/fJzKlf+8da8KkfSYmMwaHhHC9LUbifoxUIeU5zlzOuv1YdjVTiRF +NTjFF+jv4n3gP+DSF0pBHblDy6TALmEXR9hWwsSDHhFd+zXibzx3KCDpD/7QhEO/hHo kOIUwpeLRCnKSsOVQqeOl5o2o5IWOLXlumziJWM0dUCraeEgUSy2pIkIcZy5pgP3KCHe HjDxmF7TtUv0PaP7cEaz5zQFTyBcLI1LvdYSIFaWVHw2N/5zULSzQmh0fzsO9aWCMx/7 qvCvSub6YKJ/RNnYRHibRL9yw1HLKqcvQLFFnmsOISSIg2iKcS0HDzCvkyN+v3dDPBRO ItYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745498581; x=1746103381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+heOkZrjIo+5yEsuIAKLTnyZwA9m5mZmKUYyEoPsv2Y=; b=PERlj4SPcFPgT51uOky9QgMg39PrW5pQp918v/SbDMhmlngMQQBhNYK4BO+vPyvMQ0 vzeNkmxRPLjd6I7HKeG+XqrK+iIWGezkfvsQmlG+lotU2R41rODE9hUbJdzQK6H3c+5q 4q6ZVMC3FnbfRPjFS55soVXPB4S73LAHN/uF039dhuG7G9vOT7oe+vsVS6fc1cWMQhMK viV8aZkshYsScdMSu/x1yRYGpMx1+0waNbfDdsmu/wD7vMQn2SGQfxuKbgkHDL6irWBn Q0ai/QMpmzB2gyM+QnvHq0KInI6V3/4nK4Co1xUdn8ZmAtMF9O0S+8PVHSRypmvIlh8H TShA== X-Gm-Message-State: AOJu0Yw8ZvkrTC0IBfy76rcmkoCz6/QR9i+DkQD8ZGUGHnSdr+R9IE7X ZeCyAaLcJna/LQgQ4Ycjxgdw15zCXFr9gibRr6vOmQmHW8XF3v1TFV923Xr8 X-Gm-Gg: ASbGncsPc74WZWtFLJogj463rYd20wAqbBvYCfVenP5IrK5LC8gW1Cv11+X+35PPOSc fujuRCORghwdGO8IIoDEewsCo4m9t+IRy/swoJL5oFsnjsCpuPWGcvonPPFyB1vzHIqJeuOLm/H 0cACk1DwtYPI/F9jV3C4OEw/dOApQbTI0FCSj/e2RT99AEo29krRTpoaMsxJY+vje2T8o0mQYSL HvU46rpk0qdBq13z9eIBe5Z8YmMzHezK9rALpb4xlfedR8GzYvhT5b9fZ3Jb/zZ3iomBJxEDHvD PKeVAojF7Fr7igapQDhC43UvD0ecHDsGrViMgMh1WAD0PANpA+r2f2aWQUmV1GQI X-Google-Smtp-Source: AGHT+IF2dFNMTvLUiH3cLN3Vo506nn2zRJvn8KTjHHxR9eeL9nAl84HNkASYrpKCRRG7RH80iljsAA== X-Received: by 2002:a05:6a00:1d1a:b0:736:5f75:4a44 with SMTP id d2e1a72fcca58-73e24afc942mr3119742b3a.22.1745498580981; Thu, 24 Apr 2025 05:43:00 -0700 (PDT) Received: from localhost.localdomain ([114.94.86.10]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25912fb9sm1274085b3a.34.2025.04.24.05.42.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2025 05:43:00 -0700 (PDT) From: jiangjie To: ffmpeg-devel@ffmpeg.org, quinkblack@foxmail.com Date: Thu, 24 Apr 2025 20:42:50 +0800 Message-ID: <20250424124250.71553-1-jiangjie618@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424033837.82339-1-jiangjie618@gmail.com> References: <20250424033837.82339-1-jiangjie618@gmail.com> 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 ++++++++++++++----- tests/fate/h264.mak | 3 +++ .../fate/h264-bsf-mp4toannexb-h264_metadata | 12 +++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 tests/ref/fate/h264-bsf-mp4toannexb-h264_metadata diff --git a/libavcodec/bsf/h264_mp4toannexb.c b/libavcodec/bsf/h264_mp4toannexb.c index dda064287e..42a5a274bf 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); + uint8_t *data = av_packet_new_side_data( + in, AV_PKT_DATA_NEW_EXTRADATA, ctx->par_out->extradata_size); + memcpy(data, ctx->par_out->extradata, ctx->par_out->extradata_size); + } } /* nothing to filter */ diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 00b153cc93..7b3e865955 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -231,6 +231,7 @@ FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4to fate-h264-bsf-mp4toannexb-2 \ fate-h264_mp4toannexb_ticket5927 \ fate-h264_mp4toannexb_ticket5927_2 \ + fate-h264-bsf-mp4toannexb-h264_metadata \ FATE_H264-$(call DEMMUX, H264, MOV, DTS2PTS_BSF) += fate-h264-bsf-dts2pts @@ -441,6 +442,8 @@ fate-h264-bsf-mp4toannexb-2: CMD = md5 -i $(TARGET_SAMPLES) fate-h264-bsf-mp4toannexb-2: CMP = oneline fate-h264-bsf-mp4toannexb-2: REF = cffcfa6a2d0b58c9de1f5785f099f41d fate-h264-bsf-mp4toannexb-new-extradata: CMD = stream_remux mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov "" h264 "-map 0:v" +fate-h264-bsf-mp4toannexb-h264_metadata: CMD = transcode mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov \ + h264 "-c:v copy -bsf:v h264_mp4toannexb,h264_metadata=aud=remove" "-c:v copy" fate-h264-bsf-dts2pts: CMD = transcode "h264" $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264 \ mov "-c:v copy -bsf:v dts2pts -frames:v 50" "-c:v copy" fate-h264_mp4toannexb_ticket5927: CMD = transcode "mp4" $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 \ diff --git a/tests/ref/fate/h264-bsf-mp4toannexb-h264_metadata b/tests/ref/fate/h264-bsf-mp4toannexb-h264_metadata new file mode 100644 index 0000000000..d3ba7f1886 --- /dev/null +++ b/tests/ref/fate/h264-bsf-mp4toannexb-h264_metadata @@ -0,0 +1,12 @@ +a48f175bf3458410d1dd1907682b92d3 *tests/data/fate/h264-bsf-mp4toannexb-h264_metadata.h264 +4642 tests/data/fate/h264-bsf-mp4toannexb-h264_metadata.h264 +#extradata 0: 38, 0x84d70914 +#tb 0: 1/1200000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 256x128 +#sar 0: 1/1 +0, -96000, -9223372036854775808, 48000, 2331, 0xc97509cb +0, -48000, -9223372036854775808, 48000, 64, 0x6ad91f4e, F=0x0 +0, 0, -9223372036854775808, 48000, 2203, 0xe376d2a9 +0, 48000, -9223372036854775808, 48000, 44, 0x687a10ea, F=0x0 -- 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".