From patchwork Tue Jan 7 05:03:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17225 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 23D3744B956 for ; Tue, 7 Jan 2020 07:04:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C1CE68A7CB; Tue, 7 Jan 2020 07:04:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A678568A604 for ; Tue, 7 Jan 2020 07:04:11 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id f20so22714396plj.5 for ; Mon, 06 Jan 2020 21:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rbikYdP5aBDuClR+rCjWFCKgulxLl33XewsBGjBk4To=; b=EMbnUAq+z+0NNPVFEdfgZNZacx/Q6xN26seILrNiftiCNWDEeDKVWduMuNMPcOCfTY IeF7cfjHN3jJB32+Kz4OxMc7jh92DY2KtIlxGEbtDJ/PfjHeUZ9u6N4yUl9SbQGeWKh/ YVYpkVYtDZsAs1w96FUaOLStnVKCYLp8gDF7ZiyrE9dOi2M1H9qeUrPj5Qp1L6oo7nls 18BeBw/XcWEJZfbDjCTL9aelW2c88nEGmXG+IFeZiMEb8WR/HhnbC/HAoKNSwKxC6aad 2tyMTW6yBprOhwTpXt29VU9J3QTJ/tCMufM39fW64jO/JrK+VE0vqd70OJqils20i9JG o9uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rbikYdP5aBDuClR+rCjWFCKgulxLl33XewsBGjBk4To=; b=B+8BiGZYZ7s6b65QqPSsWcqg5s5HcoRnFuc+2jdUSrrYN8kSqlUG3yi3Jy6H72D3Hr XliEDhj8C8ZrvyAWp5dRExbInfyYGgDjSuEkhwrxeBVq80okwDLCSVXI3OPTxQYUZn4k C0Dy5cd8oWyj5/DMgBOvq5ygwQdeZS8OVKoNPFMhNoFb9nHSeWwx9nUvtPxuxZ46reos 6YMS/pZuYBQ2u0+nCQAFZv0WtK8ygE0UN13pwUf8TP10Ip9uTvLQBmpxWPil0/TMi1l4 Gd4ZnRLNmbW5d3nsbdF4dta46GHHAYhkSn8Yvj3Uy18hDtFy7ecx3KMubVNIO4rCkVXZ yMcA== X-Gm-Message-State: APjAAAW/y/CqOaDY26cKtzG7kITlvNsbeODq+/agdcJZXl/YoGAd2ekg yQjT2gX9382yuYd3o6mJW/twP+4u X-Google-Smtp-Source: APXvYqz8MMUCpvGXnZafmLKhGEJZFSE4fv6JGuOZd2ebQiSjUVy4uPltpMVKz+5YRF1eO3YK4JynFw== X-Received: by 2002:a17:90a:f496:: with SMTP id bx22mr47639713pjb.101.1578373449846; Mon, 06 Jan 2020 21:04:09 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j9sm74096591pfn.152.2020.01.06.21.04.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 21:04:09 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jan 2020 13:03:52 +0800 Message-Id: <20200107050355.17503-5-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200107050355.17503-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20200107050355.17503-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 5/8] avcodec/h264_metadata_bsf: Fix for the incorrect user data with hyphens X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang How to reproduce: ./ffmpeg -f lavfi -i testsrc -c:v libx264 -g 25 -bsf:v h264_metadata=sei_user_data=186f3693-b7b3-4f2c-9653-21492feee5b8+hello -frames:v 1 h264.mp4 master: [Parsed_showinfo_0 @ 0x7fc8a0703180] UUID=186f3693-7030-4f2c-6030-21492feee5b8 [Parsed_showinfo_0 @ 0x7fc8a0703180] User Data=hello Applied the patch: [Parsed_showinfo_0 @ 0x7f969d408e00] UUID=186f3693-b7b3-4f2c-9653-21492feee5b8 [Parsed_showinfo_0 @ 0x7f969d408e00] User Data=hello Signed-off-by: Limin Wang --- libavcodec/h264_metadata_bsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 5de74be9d6..d96a50dbf7 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -381,7 +381,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) } else { goto invalid_user_data; } - if (i & 1) + if (j & 1) udu->uuid_iso_iec_11578[j / 2] |= v; else udu->uuid_iso_iec_11578[j / 2] = v << 4;