From patchwork Fri Feb 23 00:19:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 46450 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp672372pze; Thu, 22 Feb 2024 16:20:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWeEpQSPgREHqBJtlt8GOs3dHx4x7WTQkCViMGL1xk4cu5Ox29bWvo2440zPCzR4OL6SDKEU75seE32jMYvrrlDoMorGjPgzPQ5Pg== X-Google-Smtp-Source: AGHT+IEdrmaL2ts4fWnEOKVtGV6trabx/i/dRiuEfPpyCNyKYSXlWkX5VyFCA6/OC42WB62AzzdS X-Received: by 2002:a17:906:19cf:b0:a3f:5fa9:d772 with SMTP id h15-20020a17090619cf00b00a3f5fa9d772mr222266ejd.37.1708647601828; Thu, 22 Feb 2024 16:20:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708647601; cv=none; d=google.com; s=arc-20160816; b=It7eHmLslO+sxeTwyCEFDc0uXFrIMQw0Qv4oMlI7JvDfNLhs7p9WCunNQmfjMNZFfK Nt8/aG7ee91whfU8B9mXAMuKS4ywslU1yj/AZoy/2/uFJTogtVavirPcJsupeRnOHz6j VeR/PEpxEgNdgxo8PicXs9gqQRBzKvj5FuwAAn11rWMz/d7ijMLNpdmvG75+LxGmacGR HssWCqK+ypFLViTFt7huTKJlrXAYEuTa2vKakL6IWPMKvnXDKsmEBxFIS5Dwggw5UbV1 Q9jgmLfzIjHgQdfkg+Fj6+rWZ5wlGkLGE6Ddf/MFp5iPvTgzA3ZjCnpgxnOUDmZnQChW 2sIQ== 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:mime-version:message-id:date:to:from :delivered-to; bh=hf5whjiSqfoVERxs0kTLHBs7DUA42OeYZijSe25cPk0=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=p6mMjUcbmNpzNZAfaOvX3K8ENi1PBEa0vJDRS/KhKZAcGrHIsxsFfwU+OdCSyqdFQS Bt1Y6y/8OsSe4xf9aGaTdABNdDabbkzPbVgE40nC3zOq6/ezmPt579rID9BtlNoVXAZu mgVfC1ipMjq/C0ydnlXqFnWNZsV2oRAnOOGpufTdZ93fPuL6UVCBh8DmMn6mxc7bTHVJ dT64vE8yDIotPCWfZxLwV45RDEv7FCsFe7fo0n+Rv3LZ7DguEHvzXzW6UQXJVBLAIrAv DsfzeV2B574xAN8Cjcrp5s5FnPUPjJxAE7sCHgm1AyIZY3YYN8kiEhQh1PP9h+RpDkon M0TA==; dara=google.com 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 nb32-20020a1709071ca000b00a3edeba32f3si3456735ejc.555.2024.02.22.16.20.01; Thu, 22 Feb 2024 16:20:01 -0800 (PST) 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 2B88268C0CC; Fri, 23 Feb 2024 02:19:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFD3D68AC1F for ; Fri, 23 Feb 2024 02:19:51 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 56505EA000; Fri, 23 Feb 2024 01:19:51 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gWYOI9Dh1o_x; Fri, 23 Feb 2024 01:19:48 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 0117CE9FFF; Fri, 23 Feb 2024 01:19:47 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 01:19:43 +0100 Message-Id: <20240223001943.31168-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfenc: add h264_mp4toannexb bitstream filter if needed when muxing h264 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T6a8yG5iQO1w Partially fixes ticket #10395. Signed-off-by: Marton Balint --- libavformat/mxfenc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 61ed6fc3db..adc31c1cf4 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3542,6 +3542,16 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *pkt, return mxf_interleave_get_packet(s, pkt, flush); } +static int mxf_check_bitstream(AVFormatContext *s, AVStream *st, const AVPacket *pkt) +{ + if (st->codecpar->codec_id == AV_CODEC_ID_H264) { + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + AV_RB24(pkt->data) != 0x000001) + return ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL); + } + return 1; +} + #define MXF_COMMON_OPTIONS \ { "signal_standard", "Force/set Signal Standard",\ offsetof(MXFContext, signal_standard), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, .unit = "signal_standard"},\ @@ -3623,6 +3633,7 @@ const FFOutputFormat ff_mxf_muxer = { .p.flags = AVFMT_NOTIMESTAMPS, .interleave_packet = mxf_interleave, .p.priv_class = &mxf_muxer_class, + .check_bitstream = mxf_check_bitstream, }; const FFOutputFormat ff_mxf_d10_muxer = { @@ -3656,4 +3667,5 @@ const FFOutputFormat ff_mxf_opatom_muxer = { .p.flags = AVFMT_NOTIMESTAMPS, .interleave_packet = mxf_interleave, .p.priv_class = &mxf_opatom_muxer_class, + .check_bitstream = mxf_check_bitstream, };