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 ESMTP id 2DD44425DA for ; Tue, 22 Mar 2022 02:52:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D24B68B022; Tue, 22 Mar 2022 04:52:45 +0200 (EET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED0FC68A7A1 for ; Tue, 22 Mar 2022 04:52:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647917563; x=1679453563; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=h4XScuDTyCmAwx650/PpdGmMYPKUdPH/g700aZ5xHec=; b=Pd3Og+2M3uLKmrp21q3IZaba8uAfaF/h7Zt0rYx9Sgb4h0YX6XBIyBla Ljmoylbhe05IJcPAfrC+0OZ8OwzP5gHytRZhnoo/ClVL2rzoNfDAtbZ4P 9KcFe6E/Empb8YzaCxh3lnb+u6+wjOl0oBhSZMFHBWhpZVd1E1nBkYiWq hYanzXcXKMt7xGnriXDdEnmqGkJRbqZTiYCsi7UjVi76j4dmOe4ObGLmo YyYud7tJD5pSXR2WUHT+LxjlClZs8w2RxoN2UAThCg0bP3HVZRL8uWfa4 IhetKLJIFUU5E4rDcCK9hk4yv7PxethuJ0QBA5GJUSNzXobIxfSrkrZCX Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10293"; a="318416046" X-IronPort-AV: E=Sophos;i="5.90,200,1643702400"; d="scan'208";a="318416046" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2022 19:52:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,200,1643702400"; d="scan'208";a="615865440" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga004.fm.intel.com with ESMTP; 21 Mar 2022 19:52:35 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Mon, 21 Mar 2022 19:52:34 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21 via Frontend Transport; Mon, 21 Mar 2022 19:52:34 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.21; Mon, 21 Mar 2022 19:52:34 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hCiTQvnZXlO2sK8b0ix+HuZ9tBfnV8aLxpTM1AHClxvPqFzsTBs35qu/nShWaUtSHQGBtemLYJscY3TuxkyabVW2VOFWwLxCmoyMfuPD2MQE4NshD/pY17VJOv/lsYqPhvtlQw9Cij+e9093Gq8DkR9Z2/FtS5Wr6if2FlDT/Q1DRANLMfdy27D6GaiBzUcmvDwTwqVrD05QHVpTVy1+w+yJzCle2oAApg0ceen9esSAExQDN2cXp9ooaTw1qWSUkYp4CGRCCWq6knaEBDDXT1bEmmhLGsAlwusRoN97oZKEkBvxn2Ix8HVPcsngM8R8H4xK8R1Fgyc/q2ccbWNQoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h4XScuDTyCmAwx650/PpdGmMYPKUdPH/g700aZ5xHec=; b=H0s4jHj7zxgTtDfqtRaEio4jmxGRmtLUseQxdlJpBGHbgBMftB6MY/oS6in+L7O3ZaTkzTQlEukB74BEf3oFBMHl69AZ8Hw8W99/M7elBHkAADUVyeafo/mryPYfiMFZZH9Mq6xLxNCBSLMV85WiK3W5ypezm3+TKTlehsofCJL+kjthDLGKLibVB5uQzNAjXq8kQUcAHo4CuXnOIPfR1Hw6+37/2cYyazbeCT3yCPxFtpUmnSpPzoVDByrqGAQgW/KNUO5c/RjZ/kd/wetkim4G0R6fzH7SpMFc0R+xirGItvJnbV+UTwgYkcC3tbG2h1f5ydyAIlad+NQkjn89Nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by BY5PR11MB4434.namprd11.prod.outlook.com (2603:10b6:a03:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.15; Tue, 22 Mar 2022 02:52:32 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::c0b8:e06a:3d29:da25]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::c0b8:e06a:3d29:da25%5]) with mapi id 15.20.5081.022; Tue, 22 Mar 2022 02:52:32 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel][PATCH] libavcodec/hevc_mp4toannexb_bsf: insert extradata before non-AUD unit Thread-Index: AQHYOclKapGYrOxJwEmaLJ1xnnGd+qzKvCyA Date: Tue, 22 Mar 2022 02:52:32 +0000 Message-ID: <59bb8025c87eaa1214f479b6417fe94434fe37c8.camel@intel.com> References: <20220317063546.7429-1-haihao.xiang@intel.com> In-Reply-To: <20220317063546.7429-1-haihao.xiang@intel.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f972c94f-fece-4af8-ee16-08da0baf0350 x-ms-traffictypediagnostic: BY5PR11MB4434:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YbiUvY9CgvLzFb1SR7LB4VxNfpV7LhIzIxSM4vxv6eaKFYIdOvHfvKlJ+gnh6OiPAF5LM3Vl+Szy9n6SDJUcgLUYMMlbNqZaKtpYSe+lNfUpQQ9tLLUzDfgiXg9GRq9lKu7W05LkasvtEdT7ohPxYd/WRDrplKjeP31pSrZuaQrpPPMwvf/p2+5TDZk6YM76QmVYG5A2sKSd/hHm9aaWGq9koPhr+GqWQNW4LC+w8YZkeJRe8UnEtVV0IOm4v4aUeYvpXNf9AoGwE0KUv6hHXLuhXQ8yMGRtm4NqCA63Olfrjm4WjFDquh2ZyPl1g7gse5HFVvsUxvn64B7QYkxDXYv6ow4bgSYoTR4Co9sBkxx5splGjadZQHka/4blovNIUXluuqG31yO46bDEJcGYMoqodvnqVEjPWA6CGsqzeicnJXyc4gw5BJZR/lbckEU1NzaLvRgk6fYwlw/OulczJFtGSiIkaydalGpLO+5F5o4k6UksBgAGaDfcS0aArzYQSA2Etkt5YwA3Yfs75HrXtwugYt6LB7q/f2adZSmayr3zuu9W1AKd2faX8C4xLP+1CmrNEiwH/wcEj1HJ8W/hmQBw9CprQYEK4RFp+XPSQHl02GHPs5RClbwZzxMJ0JeY0kJnk9zWKdL7DN2QhAa++fCdXCVG3AC+qx6FIbgP5kTgiS6ErgabQkvHHV0REikkyLCis9aFUbPLskc/A7q1YfDbL215m/mn3Wua+H+4h6GRJpXDbXWCYpJxodc8pYmfXEp44TGXlQphWTb1xxM9/BSbnikld3sH3sERzyj4iFVaQ+IX7cT3TaYbNL3ciDyQ x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(5660300002)(508600001)(86362001)(186003)(26005)(66476007)(6506007)(6486002)(66556008)(91956017)(64756008)(66446008)(83380400001)(2906002)(36756003)(38070700005)(8936002)(2616005)(966005)(71200400001)(6916009)(6512007)(76116006)(8676002)(66946007)(82960400001)(122000001)(316002)(38100700002)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?TGR6blpEYjJhUkNYeEtMNkU2M1pGVXF4Q2VXM1o5ZWtNM2l4VWlFS25tMnNL?= =?utf-8?B?VlpST3J0bzVaeUhZbmE5cGR4YVl5NUVLSFhzSnBGWXo0eFowdlloMzQ1UURW?= =?utf-8?B?YkgrTzVLbkJydDd2T3lCSlQ2QWpNcGEvZ1JtNWlQZ3hZay9GbEIwanhaZWYy?= =?utf-8?B?c2lsaUFWM3p0V2d6U20xU2FiSEVoQi9tUGpFb3ducVl3VDF6RGV1dWFLbUpD?= =?utf-8?B?UkozeVplbXFXckpza0MrVEdjRUluTTdGSjJ1cjF1bE55ZFEvcDlTc0ZKMnVv?= =?utf-8?B?ZFYyU2dqem9RWFVhekNzLzNTRnZZVWllbVpwR0tiRnFkYlRlYWthaUJwUmxx?= =?utf-8?B?ZktuSWRZK2ZkWlQyWkZ0YUVVTUpQQkJ0NHJBQkFyMkVRSURDWHk3eURGUURZ?= =?utf-8?B?ZmxTRHhLYnRjQitzNE9qcW1mYXZTZlhVNGwrWXRDNnZDSC9WRktvcGpNRTQ1?= =?utf-8?B?MUhUMWQvOWxncUtwTTJwM3Fwb3ljYTBLSzFXNGxweHJsUkd3VXhMQ3dBNCtR?= =?utf-8?B?K0x3TmpTMFJpZXQyd3J0ajRYWDJsUlQxcm02Y1NDRGJhb0dFR012TTc4ZE5a?= =?utf-8?B?ZzZ0NVgyZ2lGNndGR3F5Rmdvc0RNQkJKOU8vR0k3S3FidFh0YmJJUEpSNVRr?= =?utf-8?B?NXBKNktDNWwvSWZhSUMxTWNwVEtaQnFBL1loTUZ3VDNoeCtoM0dQRlQvREY2?= =?utf-8?B?QzJvb2VsNyt0ZEk1WHNWMjhpZGg1ZGluOGtVRnBUSTAzREx0Yml1Y2dLeVRx?= =?utf-8?B?OWd6YXVFUUpqYVlBTno5c2Z2azRBM2x3cmNqTkJTWjQyZnZNcTNtODRkSXY0?= =?utf-8?B?QVlCS215cWNGMXc3M0w3QWRGRVRTNmdwS3hCVlFFejZsSVFyRnRKdXJTQmVr?= =?utf-8?B?TjhwQUJGYjBDTWg1VEdZWUs2ZGtDbCtiYlNUbHA4am0rSFV4bFVzWXFSTlEv?= =?utf-8?B?VVdSaHZqYlZ6Uk9rWVY3UkJIQWdJeFpFRXdURzZEdVozNnFIVGFIR0tCTnpa?= =?utf-8?B?MVFEMFhZd3JGbHN0VFdIcWFvL3MyeE55bDQ3T05HUmR1eUEwZjZ2UWFJUlE2?= =?utf-8?B?Ry9lTTl2VG1BaHdiTnkxNmgrbnZQaXV6cE1zL2ZKdTdwWXR1T0xpZEx5b1I3?= =?utf-8?B?bnZCYWEyK1pMbmlid3dxR09qOEh4Y3BhYkpPajgvbUJZaWVYYnNNcnpJOVNF?= =?utf-8?B?aXZIS0N1aDdXTUtlN3p2TnlMUDg5NXZGd3BmVjdmVXkzYUJHUXBKQ3lKTkV1?= =?utf-8?B?V0V6NTNZQndiRTlsaVBRSWZNM3paSCtKWHVGemNua1ZDZmNCQ09URjh2VFFm?= =?utf-8?B?UkJxalFSazBYNFBzVzQrVktuaXV2aTBEUVp1bjVlbERXRkdwQ05BdE1BbzM5?= =?utf-8?B?NFpYYVovc2tmenkwM1NFUGtSTy9ZdUU5NWZsVXFIQVJBeDBURjRhZVJ6Tk5z?= =?utf-8?B?OWlSZnZwZWlZSVI5T0xDckxvK3RBV1JXZnFZajdpN3ozNkpxbHdySmpmSktn?= =?utf-8?B?ZFJrMElyYjJITWVwbmJOSXpqbFVJOHllQUtyVHpmb2kyc2ZPSERLTlVYRkV0?= =?utf-8?B?SExmLzBKb2ZydjlGY2grb24xRkQxUTlyUm9KTEN3bXhPcGI0dUw0UldBRGp4?= =?utf-8?B?S2FGL0hpV3VHTGcyem5HZHJra0pqei83ZmF0M2x1WmcvUXdyS3V2c1drcm56?= =?utf-8?B?THVoWVN6WTdwSExFc1RSQ2ZrZm9RVy9ReHpGZWRrcng4L2VQZ3VpRkYwZW9t?= =?utf-8?B?b1RNdDBOY21jVkUrZytQbFlDMUZ6bnowbHJtdWRucGZNaC9NUnpUS3UwM1I5?= =?utf-8?B?OGtiZVYxY0VaekZSUGRaaHRXRW9XK3pFKzkxVW4yWjJ2dUpMNVUvcHppQnQz?= =?utf-8?B?MFhhK3lIR1R0R1JMaUszOERMY2g4Y1I3R3h0MEQ1b1dhby9XSjl1SWxrWlpL?= =?utf-8?B?anZHRElwUDBaOWc0M2FIRW9Ud2lTektmckxWNW1HNGpQcE9FdkZEc1JVaUtP?= =?utf-8?B?RFNhbjk5cEl3PT0=?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f972c94f-fece-4af8-ee16-08da0baf0350 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Mar 2022 02:52:32.8539 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9eXntq5HZmJ1gwYnUAfeDFrfCrawuhm+AmbrtcIx8h3x2Js9z4xhgkoJEPQoUPSmnV8cjEqIeEee6PYK0efWEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4434 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH] libavcodec/hevc_mp4toannexb_bsf: insert extradata before non-AUD unit 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 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: On Thu, 2022-03-17 at 14:35 +0800, Xiang, Haihao wrote: > From: Haihao Xiang > > It is possible that an IRAP frame in input AVPacket contains VPS, SPS > and PPS, and these headers should take effect. However the prepended > extradata might override these headers. This patch inserts extradata > before non-AUD unit, hence VPS, SPS and PPS from the input AVPacket will > take effect if they are present. > > This should fix #7799 > > Signed-off-by: Haihao Xiang > --- > libavcodec/hevc_mp4toannexb_bsf.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/hevc_mp4toannexb_bsf.c > b/libavcodec/hevc_mp4toannexb_bsf.c > index 790dfb0394..77551ba221 100644 > --- a/libavcodec/hevc_mp4toannexb_bsf.c > +++ b/libavcodec/hevc_mp4toannexb_bsf.c > @@ -124,6 +124,7 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, > AVPacket *out) > > int got_irap = 0; > int i, ret = 0; > + int prev_nalu_is_aud = 0, extradata_offset = 0; > > ret = ff_bsf_get_packet(ctx, &in); > if (ret < 0) > @@ -169,14 +170,21 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, > AVPacket *out) > > prev_size = out->size; > > + if (prev_nalu_is_aud) > + extradata_offset = prev_size; > + > ret = av_grow_packet(out, 4 + nalu_size + extra_size); > if (ret < 0) > goto fail; > > - if (extra_size) > - memcpy(out->data + prev_size, ctx->par_out->extradata, > extra_size); > + if (extra_size) { > + memmove(out->data + extradata_offset + extra_size, out->data + > extradata_offset, prev_size - extradata_offset); > + memcpy(out->data + extradata_offset, ctx->par_out->extradata, > extra_size); > + } > + > AV_WB32(out->data + prev_size + extra_size, 1); > bytestream2_get_buffer(&gb, out->data + prev_size + 4 + extra_size, > nalu_size); > + prev_nalu_is_aud = nalu_type == HEVC_NAL_AUD; > } > > ret = av_packet_copy_props(out, in); User verified this patch works (https://trac.ffmpeg.org/ticket/7799#comment:19) and is asking to merge the patch (See https://trac.ffmpeg.org/ticket/7799#comment:21). Is there any comment ? Thanks Haihao _______________________________________________ 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".