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 228EF40C80 for ; Tue, 10 May 2022 04:26:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7541668B3BB; Tue, 10 May 2022 07:26:42 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074014.outbound.protection.outlook.com [40.92.74.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3EA8680374 for ; Tue, 10 May 2022 07:26:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EIqKu2D3vR3QEDA/3bwioe/q080eQs/aLrkSo6X4j0L0JfeCGHsVdv7enkh1whw4UGK8MROiP42VpP3ln7/WZGMuidSgsijVYoYkCVz2gH3+HoNnuhDIRaOMTVpjg/fPjXZeopGmkRhy0g7dkA7NuwHfoG7rOMnSXXbl2PbXeijXlE9shgdBSSQQGrY4rKYyJ2TFs3jHrtPw1ZQTouwYPc4vwX82AO9j/NLAM3pf+r2P8d76yxW8xHmxfuC7iyvL0DKcf+m8MnTPxCLpljnj+//ojqsSfb98mZqbWfieYJlWrVKwZ1s87tNIdUv/XyhTyNx9+kBq1mCO/yrMieT+Ew== 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=0mqXIPqSmM+gbqdrC7p4+rGh6/Nu47gl/qiaFAzgWG8=; b=jbwbRO2e36tsXlTLutYUzZ1S29PAfcB8bYSWBXwlFmv6PU4VkdW3V19QutFwWkMZ3sj0pBvQ/pXhf1Q2bEp4g8+T2MGbbMQoSl8htTkPWm5Y0nqZTbvbPXpuflk9piXpD6gGmD5ODEdqg5km93BGl1DktpNoTWBFCjY4O7lTeFSf/9ewb5b0gCqdXeXyky7k+JW0ZqcLsStOVwZrkC4FsUv7M/621xxxVpFectyGredIUOSiO1ncizi7V7ioxL/fvGWmyJhmuS9WrWgVZGpECS3iGSLKy0Ct9xcHXvBDMB7eGmX8ZXPFeiRf+V7K+Gus576gqwqJjDpnJcvXK+wb3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0mqXIPqSmM+gbqdrC7p4+rGh6/Nu47gl/qiaFAzgWG8=; b=i1SS/zrk9YuYz/zi60nFc8c2EU23cQ4GUNzQSjjrlAJ2In6/rBVUmWelCDbEEobmnYcwHiAdwuhX4hRhsDbBJNlkZyaRO2O6r1eEKF1HQWI2MCL2gBVvIuaKUaaphDfTVsK1QGelIhZvx5SbQbjauUHEaV94Zs2EKFswPV+EU1IBf6bOgH3Wl0NBvPAgx9BFvpVFAHT9U+MjUT+CbOKooAHvLUQjxU4asH1jmD18OoNtG8COpsxFZWL6D6i41mvQFhbQgFipagHodrM4XQTvgsaECEepE8BzSF6aZXMDtzBlboxDW2v1YigRYd1dVWzs8V+ZaTAHbL7epCd3vk7g5A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB4676.eurprd01.prod.exchangelabs.com (2603:10a6:208:eb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Tue, 10 May 2022 04:26:33 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.023; Tue, 10 May 2022 04:26:33 +0000 Message-ID: Date: Tue, 10 May 2022 06:26:30 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [S3SbTraByADb4gGj3H8eYzy+sVJftRG5] X-ClientProxiedBy: ZR0P278CA0060.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::11) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2658ab9-5aa9-41b5-a2f0-08da323d4306 X-MS-TrafficTypeDiagnostic: AM0PR01MB4676:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VYHVw6lPTeh9nQBempNe61ywrqqwlxAl2QD08rDtxmJjKN0FDQ42ym7WQRbR3A7xCA1SIbLssiSgk7WNlyCiDkLvcHQAmWYgEuJrP510zOtsrK0AFd85lEq+7ykvmFp0B470yY0Lmx2hPw7X/+wZ9nFZDUrfheKsBHWIWpoF197FWqB3Wqp9kQtwWN4PeEy/THqiBaQvgkKuTkiKV5SId35tlgMZNn8I9V78uN4gLrg79CIkMAIBYSj/BiSQf4UEdcnnq9t/LQtjUQeUddCZ8fklYYsMKevWxCDBfT+0Y/J/lmXskzrBNfHuB+Vm+DCdLtnYcRWUaIUXP/mbakaDe9qZHct4vw1jnuAlKSwZDeyTryvU4wnv0yjhjBx7oXGQPoiYdOjoiilCgRRB1WyvgaHcf3yW+iFlUOeah3HTt7fHxK0x0Bmb3myE0DcVyfX3QXc9nuz5bA/vUBzQ/kp4B+JgtITlDKmiD0/zWoEokFyjc8PBRHoxI69XcbCXnj0u9CKUkQgmNi2Kq6Fb+LjDP6Gn5lQJX7Iijl9eGNvvKqcJp3s94ncPbLED8jvAxGO3p66dilO6jvtuqnDe709QGmryD+NHqd0wI9rw8aLtxOi4RuinHJnBEk6x49j75J2gJJ2CbMPQru7D9zbCBEXEtg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V2NpOURVTFJOMTJqdWdSWFY2UW9xcHNJUmNncEM0S2ZpeGpGYW44S2t1MjBR?= =?utf-8?B?WHVLeXpJd094blBOeHgrb3U1aFBKWkJVOE5VWVk4YVBZYndTZEg2Ym5MWmpM?= =?utf-8?B?YkpFUjM1K01wanhOY2JpOGd4QTNKWTVmVjZqdG9tZHIyemFGSWg2ODBoRERI?= =?utf-8?B?Q1IySjNUcEtMNyt4eFl2Smg0ak9RQjlGdUIwaXBPSmxCUktNQ2FqR01KV05v?= =?utf-8?B?N3JGdm80UTc5c0R0U0JMMGNEemNnL0lIZU11aWZiakIyaWF0bkpBbk1IYnRv?= =?utf-8?B?OXJKRVZNeGhUK0hObnRXS1o0b2pXOCs0Z0JYU084SkVIUjBBS1hWRnY4YnhP?= =?utf-8?B?b1YrOTZGRFFZRkFvNkdpc0FlVEY4T2Yzc3RoRVorcEVPSXplK2RCVU9ZTTRI?= =?utf-8?B?TTVVOFhkRmNBUUwva2FXWnFlWVFXNURYa1o0aDNqcFd2VmY3RTJlNkpCdTNU?= =?utf-8?B?dG8wZWQvSTR4WXNFUlhqajdXVmdZL2hUU1dSa0hVL2xUR0pVNDVJTjZvbnJk?= =?utf-8?B?TnN2eVhsbkFRZERwNzRyL1lZZ2YwckRSaGJCaHFTNklNMDA0b0xjcCtXQVJn?= =?utf-8?B?TVJLMDE4cC93Rmh0S1NxU2VxdTc4aFpGbDFnVnIwTk9LNkJUU2lnTGY0NnFi?= =?utf-8?B?R1FhM2pzWHVJUHVpeXFKYTU3cm5JWldUaXdUWWZiOXFnekJIY1NmWGpSRUwr?= =?utf-8?B?V2RrZGRtUm4yQ0d6dkJVQUZuODVQWWJId2dubzhTU2dYVnhnTTN5Qis5QjE1?= =?utf-8?B?cW9maU1RT0FRVmlBSG1hQUR1TFRTbDZsWjJUdkRCMG9JRElzYUREY3JEK3NB?= =?utf-8?B?SkFVTzFVOEo5TlhTK2Zmb0UxQXZRbXltZEFrcDh1SjUvK3k0bGVzV2VPWUZT?= =?utf-8?B?T3Y3RWN4ME0zeFR4MnFFUkNZSUFrb1o5S1F2MjBhbHoySjVucDEyYlI1ZUts?= =?utf-8?B?UDlVQVFuYjk2NzBZZEpVU1ovK3J6VlNMS1N1TkFmKzZ3ZGR4bjE4Z2dDQzcv?= =?utf-8?B?MVovQW5DMENFY1NNbldPWU1WalV4dTc1NVJTbXRjT0ErcXIyN2FZMUZGY0Yx?= =?utf-8?B?Qk1lWm1MdzYyMVkvbEx1bm5uQ3AvZFB2eXUxdk4zUmNiakxoT041ODZKRTJ5?= =?utf-8?B?NUE0OERWTkZSZkF6WmxuTzJUQWE3ajlQME1nTXFpOCsxYVg4SE5ob1BtWTZz?= =?utf-8?B?SzdkZEwxM3lBaUdTa3BsOE5BaW56OW5WVURlWU5RemNpTHdvSmNnS3BoWUFE?= =?utf-8?B?Zm4xamhPdDM0WmNQT2tRT1NlR3hndTlzTVNEWjV1Y3ZhK09xbDNGU2FvbVRa?= =?utf-8?B?VmVoMnd3WC9yaXp5WU5QdXNCaW9Ib0lXNTJSYnBIR1lRc21TVStzU2p4czIy?= =?utf-8?B?Ni9HU1U3KzUwZmVXbzcvSkg4OUhTZ2lzdm81bjB4T1pSVWttQUpQRHhyNjY3?= =?utf-8?B?ak1KRzhoZFRJNU0xeTRQMlNLZ2NLRUROWDErYTlEbmVyWGRXWUh6OHFTUzRw?= =?utf-8?B?U1NlbEdZam95UTZXRHF6MjlTc05DY2xjLzEwN0kyRjY5c3MzWkZ6WUZENW1l?= =?utf-8?B?MkxtL0kyQXRHWUZZL2lCNXdCQkJFVmpkY25TVitEOVBOeDhnaEh0NWl6Tk9x?= =?utf-8?B?OXhZVUNRcTJzaGc3WUhmcDlmR2hhbGNNOW4xcHBxcmR4NmpXWmk2dFhpdjAy?= =?utf-8?B?cUpOVkNvSEJXbzFaM0JtNFdEZXlmSzlxSEorVXBzTzhIdmI0TkJZQ3lySnoz?= =?utf-8?B?dWR6Q01pajkxaUwzM0lMWTdXS2xOVjNtTTEyV2FTSDJrTjVnSG1HWVhVOVJa?= =?utf-8?B?azZON2RONVp4M21pNzBjdmlFMVZCSkU0TUM2YzNUQTVIK2JNK2FWNTh5N3Zl?= =?utf-8?B?a2l6V2IvOE9sQWhJQ2d0QkdORFBDcmxBN1pZeStmUnAzeWNtMktwTXNkTkVm?= =?utf-8?B?VXZRZ2NRQnBrT0k1ZnYwU3Rjd0hCSXAyV0dHN2NDaml6b2pOVXBxTHNqa09r?= =?utf-8?B?aGxXbUpxdmd3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2658ab9-5aa9-41b5-a2f0-08da323d4306 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 04:26:33.3060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR01MB4676 Subject: Re: [FFmpeg-devel] [PATCH 6/6] lavc/h264_ps: always include the stop bit in [s|p]ps->data 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: rcombs: > From: rcombs > > The VideoToolbox hwaccel needs the entire NAL (including the stop bit), > but ff_h2645_packet_split may remove it. Detect this case by looking for > bit counts divisible by 8 and insert a stop-bit-only 0x80 byte. > > Signed-off-by: rcombs > --- > libavcodec/h264_ps.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c > index 051f06692c..e16da68dec 100644 > --- a/libavcodec/h264_ps.c > +++ b/libavcodec/h264_ps.c > @@ -351,6 +351,10 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, > } > memcpy(sps->data, gb->buffer, sps->data_size); > > + // Re-add the removed stop bit (may be used by hwaccels). > + if (!(gb->size_in_bits & 7) && sps->data_size < sizeof(sps->data)) > + sps->data[sps->data_size++] = 0x80; > + > profile_idc = get_bits(gb, 8); > constraint_set_flags |= get_bits1(gb) << 0; // constraint_set0_flag > constraint_set_flags |= get_bits1(gb) << 1; // constraint_set1_flag > @@ -775,6 +779,10 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct > } > memcpy(pps->data, gb->buffer, pps->data_size); > > + // Re-add the removed stop bit (may be used by hwaccels). > + if (!(bit_length & 7) && pps->data_size < sizeof(pps->data)) > + pps->data[pps->data_size++] = 0x80; > + > pps->sps_id = get_ue_golomb_31(gb); > if ((unsigned)pps->sps_id >= MAX_SPS_COUNT || > !ps->sps_list[pps->sps_id]) { Modifying these functions affects more than just VideoToolbox. Are you sure that the other users of this file are ok with this change? - Andreas _______________________________________________ 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".