From patchwork Mon Aug 6 07:18:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Motoki Shimizu X-Patchwork-Id: 9911 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2941146jad; Mon, 6 Aug 2018 00:18:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdJZfTZuzoyaaLpBxC1oyI+Lx38VIGmROsYd+Bq3NqwPLKgtIKAg6xUvCLMFisJ5hkarMhy X-Received: by 2002:a1c:6f88:: with SMTP id c8-v6mr10619232wmi.49.1533539937173; Mon, 06 Aug 2018 00:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533539937; cv=none; d=google.com; s=arc-20160816; b=EMvOJuS1Q7wtCLptf7IAO7aBnEt6J9EwdXFbxOjpoKH99J/fifagGmik4vnu6DuN0k iyyOHDSRTFehfcNvD7k9xmqzOu6bC6lpAd/CrDL2oBn1cRs9kBS2fmeS1Uqfiktx96Yl C66aKj+zk3QKXGYa06A+RMDgvLtfDyOCMyxSHSensvYkEYJpjwfJ2sv71kfrQioJ6swg KoHewCgdagB623AFCFBiNgJ5ktIJVcZEgTdIhFRRICJSoMbK+TyN43cEQ2KqC2tvWVEi Ic+7TjnXDaBqIf357QtMnsyvfnejROLISiHUIjzFoKooVdEOXeaF2xQLC+tEaxZPMsX9 /b1Q== 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:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:to:from :dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=ug3M/ZspYTNJEGf0t3gDHRFLqSREH1N2CdeUNXprx4o=; b=roGCBhrtqvaeNCzf1MoxLqpJsbMR2Y9Pw8/RYpJ2gzAo3DamUp9wcu3cjm0DCBVzh4 fWAjMoCfg0z/S65c1/gHb0aU1ms3L8pprtuhK0qcMgo1WpzlWh8mArH1dzBDqK8BHL2I NQE97awv+H/wJuqM6MrEcXT+/7HmVa+CpNawKP6tFTe698FktndCF7RHe6h6d2Gi3EcE vW8+AZn4FGcl/bevuZ9MVBbVj3WEKOzb8K5oyCPQh4COQmzWqKtKPsbmpyhMIjANfuXj v8LUifu9d7lhHd4/fW0FCOE5gS7GSMTAbVMVFtbmn4YrXfp6k8qAVjNdkHLJnRQyg2P4 fHow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@yahoo-corp.jp header.s=default header.b=b5UKY3PX; dkim=neutral (body hash did not verify) header.i=@yjcorp.onmicrosoft.com header.s=selector1-yahoocorp-jp01c header.b=iP4wPXkx; 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 k82-v6si5276839wmh.214.2018.08.06.00.18.56; Mon, 06 Aug 2018 00:18:57 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@yahoo-corp.jp header.s=default header.b=b5UKY3PX; dkim=neutral (body hash did not verify) header.i=@yjcorp.onmicrosoft.com header.s=selector1-yahoocorp-jp01c header.b=iP4wPXkx; 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 02FC468A260; Mon, 6 Aug 2018 10:18:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from obrelay03.is.kks.yahoo.co.jp (obrelay03.is.kks.yahoo.co.jp [114.111.94.244]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68C46688286 for ; Mon, 6 Aug 2018 10:18:27 +0300 (EEST) Received: from corp-ob06.is.ssk.ynwp.yahoo.co.jp (corp-ob06.is.ssk.ynwp.yahoo.co.jp [182.22.89.23]) by obrelay03.is.kks.yahoo.co.jp (Mailer-Daemon) with ESMTP id w767IhMN019448 for ; Mon, 6 Aug 2018 16:18:43 +0900 Received: from yjwex2cas03.yjoffice.local (yjwex2cas03.is.bbt.yahoo.co.jp [172.22.15.55]) by corp-ob06.is.ssk.ynwp.yahoo.co.jp (Postfix) with ESMTP id 6DCD1120043 for ; Mon, 6 Aug 2018 16:18:43 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo-corp.jp; s=default; t=1533539923; bh=wbGCUgRZOB//62YCXVExbEOO3jbR9jlvHtCYl3Ai2Cw=; h=From:To:CC:Subject:Date:References:In-Reply-To; b=b5UKY3PXvpIZNCbQb//KPEcSBwgf/jzyWt16jKEsf41qPTepo5BiE6H6HKDKnlmbM zFLoivDRLEftWeFG0aTwTg3oVqzwAa9kYMEWpNMJio8g2zGJpEOQRUXS+bGQPTYQSo 2wpzOQfDB6VJDCUqngRv3oe5TwCsiWonm+T6avGM= Received: from yjwex2cas03.yjoffice.local (172.22.15.55) by yjwex2cas03.yjoffice.local (172.22.15.55) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Mon, 6 Aug 2018 16:18:43 +0900 Received: from yjwex2edge04.yjoffice.local (203.141.54.61) by yjwex2cas03.yjoffice.local (172.22.15.52) with Microsoft SMTP Server id 15.0.1293.2 via Frontend Transport; Mon, 6 Aug 2018 16:18:43 +0900 Received: from JPN01-OS2-obe.outbound.protection.outlook.com (23.103.139.149) by yjwex2edge04.yahoo-corp.jp (203.141.54.61) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Mon, 6 Aug 2018 16:18:37 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yjcorp.onmicrosoft.com; s=selector1-yahoocorp-jp01c; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wbGCUgRZOB//62YCXVExbEOO3jbR9jlvHtCYl3Ai2Cw=; b=iP4wPXkxgbHYzcWHCBSK9UuBw9rnSunQoxmX7Gey7XPGj6pYu3+ldsaGmDP2T4TW2q57pnvP/A43iaBud10uuaqeWc4GttOLdgS4xgaNXyXQjyvlOy4LpHEa53d4xuvar9oMkGSitDVj4Ck1Zj2it4n0oFOuAGYZSyfyIh14bco= Received: from KAXPR01MB1285.jpnprd01.prod.outlook.com (10.171.238.135) by KAXPR01MB1382.jpnprd01.prod.outlook.com (10.171.192.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.15; Mon, 6 Aug 2018 07:18:42 +0000 Received: from KAXPR01MB1285.jpnprd01.prod.outlook.com ([fe80::744e:51f0:7a0e:170c]) by KAXPR01MB1285.jpnprd01.prod.outlook.com ([fe80::744e:51f0:7a0e:170c%8]) with mapi id 15.20.1017.019; Mon, 6 Aug 2018 07:18:42 +0000 From: Motoki Shimizu To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Fix: Branch condition of KLV metadata AU header remover. Thread-Index: AQHUKs1dYYxGt7h2DkuZFB/9wNK65aSyVQEQ Date: Mon, 6 Aug 2018 07:18:41 +0000 Message-ID: References: <1533261416-12220-1-git-send-email-moshimiz@yahoo-corp.jp> In-Reply-To: <1533261416-12220-1-git-send-email-moshimiz@yahoo-corp.jp> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=moshimiz@yahoo-corp.jp; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [211.14.8.248] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; KAXPR01MB1382; 6:2pyxrMoJNnxLq+V34iWV/nW9DYS0m3w6bztub8LU5jXoegeYJrojOfV9XCOq87lWMhlWWs0eAArcQrz8HD7AAW7vvYqZW/yvtwoGI7zYFKyLKL3YRrdSnqb44RxUIcKBUPKh06GxHCIlEVMxoAoEsoqYW0V+fWlSgdk5k+dQAYIscIyD3SdLfdt6knUMh4Ch2tRm0t4vrZT8wdSH5UYxmBnUtTYq3yIFcxkpIE48uBzR2cUF4uj7i7jLdiSs7c22bY38vbnPwnVCLNlU9CckS/rwQ9vu8ga2mwXZN0pffetsZrPG28DMqLoLLyBIlXkCudNy6gzl9KnQutPqFJJy2Pe9qX46OIvd3vqTNjBtwWDKy4ZeG+kQ3SRTikLtAR9qRUxvZHjMxE629Xqtl+j7lAM1w0wsUeF3hLoz0iDQ1VVJnjmxrLDf4bLBa7961ilTJa8D6D+Nb58+A7J82849yA==; 5:6T3ABQ5elkF2ueTQD2q/lRcivtbAWhZzc93AnEJxlhE/E+SUP80wtSlFw56iIsyGtYsdE0vUbO4Sk/MCcfx5lrq02erQsH1AQabmbCubVPDNGlsVVu4PDchHaVzm7KtvPm7cbNtKXdI5LswZthaszKfu5GVom6SaobL7Ow7rnMc=; 7:v2stkrYQPwDXdxitCApN+9wqYzhiY5rJ8zp+I6yG4YqlD+4q956TIGk3zZc8B2NqJOqKL9lm/1C1EWOOH4XIfMv7KcXwCzFSZnNmNUEWRaS9jCPHrzbDwhjHXtw4PM3/HWvL28XgmctInVuQWo4XfJplzn/QVa7Omp51q4AAUTkyaXsczpqRZ+FTNKitgHRN6xIJELdW1DRxarKX4De4mIcuSgz7HhN33UHoa3NnXbDrRFw7weRyEPcaA6IEIVjN x-ms-office365-filtering-correlation-id: 87b2dc2a-59f2-491e-bf68-08d5fb6cd6bf x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:KAXPR01MB1382; x-ms-traffictypediagnostic: KAXPR01MB1382: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:KAXPR01MB1382; BCL:0; PCL:0; RULEID:; SRVR:KAXPR01MB1382; x-forefront-prvs: 07562C22DA x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(396003)(136003)(376002)(366004)(39860400002)(189003)(199004)(66066001)(476003)(86362001)(8676002)(486006)(55016002)(107886003)(99286004)(68736007)(81166006)(81156014)(446003)(305945005)(2900100001)(53936002)(316002)(2501003)(14454004)(11346002)(25786009)(2351001)(85182001)(5640700003)(9686003)(6436002)(74316002)(478600001)(7736002)(76176011)(105586002)(5660300001)(6116002)(4326008)(8936002)(14444005)(256004)(3846002)(106356001)(97736004)(26005)(6916009)(186003)(33656002)(6506007)(102836004)(74482002)(1857600001)(5250100002)(2906002)(7696005); DIR:OUT; SFP:1102; SCL:1; SRVR:KAXPR01MB1382; H:KAXPR01MB1285.jpnprd01.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:0; received-spf: None (protection.outlook.com: yahoo-corp.jp does not designate permitted sender hosts) x-microsoft-antispam-message-info: TL2dJpkLkZvFhU1ycbbp8yKn4VcLof32ZCTbDqE3U8rOByzeMi3qRwvcwSLinHD9D//d2FN0sCJCMnWQOcyDpn3B6JjHT5FPfCLWxyd6Wz7S0yXfKb1itDftEo3JoNNUvG7v7Wv9aP4/CoeAbspKeeYkX0zvOdRNfEy8gVJ2e4Qc5sTknXjAvBRx4g1xe2iuPASRAwTDpAGciXYERnwUeSifD61vIy9ytZ2kbhKc/9pTo2glljH9zmFFylJhEN52eIEK6/xRK60Doni3xe4K0faXr3Jtlwzxtl4F3WAeb+c2IhrEYQxis01rLgDNtnZJ1jscAvEDRZc/bbJ8H4TsDWyKLPt4J8uqzZjPXl4QtzQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 87b2dc2a-59f2-491e-bf68-08d5fb6cd6bf X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Aug 2018 07:18:41.8922 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: KAXPR01MB1382 Subject: [FFmpeg-devel] [PATCH] Fix: Branch condition of KLV metadata AU header remover. 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: Motoki Shimizu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" KLV metadata access unit header remover has an effect on the other unrelated Packetized metadata. Branch condition code should be modified to check the codec_id. --- libavformat/mpegts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.8.3.1 diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a5cb17a..bc6bdc6 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1208,7 +1208,9 @@ skip: p += sl_header_bytes; buf_size -= sl_header_bytes; } - if (pes->stream_type == 0x15 && buf_size >= 5) { + if (pes->stream_type == 0x15 && + pes->st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV && + buf_size >= 5) { /* skip metadata access unit header */ pes->pes_header_size += 5; p += 5;