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 6FEE64B73F for ; Wed, 12 Jun 2024 13:57:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF1CF68DAA8; Wed, 12 Jun 2024 16:56:29 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2070.outbound.protection.outlook.com [40.92.75.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9620468DA8D for ; Wed, 12 Jun 2024 16:56:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HSSea5AYZ/crlkCFxOQhld2E0tcqdUhiMVOQ/OWsMJVp4C2vNkDhLsYfRdClB2przHj29BykIvLEFfoLZPF28OSCY0Mt1UrBeide7rpWD3ROOyLjUhDDiDxciV0PIiLjmrO0nYjaIzGBwPkn1qRpEmnDFJNYCvLapueFityzgzTBFNrAfwlcKIWfU+WZSv83zoeXch4uewGQcZxK5/oxDpilMwonUOo6Dohm36icReJ84HzrO0RpJofHtU9vc2tWjtRt4SIk3kMLZKd+JF+xKFGSXwiQqe7vN17IjGrXkvBVqHNyWEeLsSRnzayN6o6E5ZfhamKY2wtrnE61HuA7cw== 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=IjguJD6hFbjNJv1yaZxIYytMy1BZgCZ8Qhg6SQZEfeE=; b=Y53TRM0igtyQs3LAX1FdVBLntwO7jaeHcscxQHy1C7yhYkEEt05LThzNhiqRbWNficXZw3yo98vnLeTV78FmrkssPa3JlQF+ExntEzAFqoHLJVV7TfF0xnOB8JtE4Aj1VIM51aeQStCb7Y6XGiKyld5OWf+MjEuwx1P2uG5mPgTzR/iueBpwANHgp7POJVas0/1Bh3++cKbSV7D+O4r3ZAuEzFo+GAXC3NpBsIEP797R6f3U9mqo3JshsBq3PNYZby/kt+bar1xeH/kAiIxsxFTFzEs2zzjZdPfjVllrYxY/AX037FPJIh6xvFBsDlrrzsHIS/bG3NoORHLPD/xmWw== 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=IjguJD6hFbjNJv1yaZxIYytMy1BZgCZ8Qhg6SQZEfeE=; b=JPqmq0vXRrt4DHvz15ZMSQO6eu6YTR4I6FULUKo50qs/AqEibcMiGWOEJivh0XEGHDJATGbjULBWQyU1DX2Djy1rmDL4sg2KgJPXq9322bOCrT1M74ysQ3FnGx6d+dt64tYT6dnx3Pok9OfGFwZzEIMHdK3xoLTtWSOey/h+660sJWZbx6pWhkqNVlGf6Ya9HMAcdsOrtDdfqsnnKFv5/JUk5mqwX1qQjTdDCDhuhbIS0trfLn8kn3GaZs2xdAiE0JILktxNmnMpZZmj+0wvgKG5b2rO71D81oq635dEFNd/SN0SbLvD3BIv9IEOxfmoE+lvMMnPBZFN/3BGask6OA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0232.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:56:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:56:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:47 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [w5Xp4+5TLBy2/A4frnxze0cn9O+ESd52qgY8sBwtpIw=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-50-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0232:EE_ X-MS-Office365-Filtering-Correlation-Id: 28cefc09-15ca-46cb-c3b4-08dc8ae77388 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: vb5t6DWAOVyEuAYgte1w19w0CGIccXp5XUQOEFO8lD/yH1+YcEnsQPwEemn+SXa/t8o8LuVdaF7avtgrLB3VfyccUd8moov+SF8sZD3yZh28lQqW764xiSUtttOj+PgAlxzMDM112vrJWuxjXbCppvFP4so5x6aj+FIjLr6b8FIhHgCe8ynXwor6CeGrcqGm8eYeX58fBpV8jl6nbidYumRPGuunlLBOcOZY+qUdMh2sLFpvFBQhWTTAeLy+PXevM4end48nlf5coGl01IcXGP8h63LheiG6/8oTBid2eWH/XHwgoTRE57Se1qBPKLeUgK0KEpYB4bVu6rq2xX4k2kkU709jXOlxYHfWgcsGXkzaWgAGKNfxgjT7XPtDdn5ffT68PBlOWAAmWT6jBGBmSt2hcXZiH7V0B1j+XUV35SHFNBQ7SC3dcajRZPGZWIaznSzWagSWMXWVWHn9b+G2tu/YGKgsfPnpTrWfE5Oy6lS3c9MRebbRGq5TUiEaMnMREkt2oSo69UqdqUF+Om7jQasHBi4MjqTyqt/OXbowrztj9V1LdpuW5mI+ZPN9tW2or0vB9S4Qe4FhLwN4C4zzga62ZJG9AUvxRg86iC5c6nxp4C4RUNS7g4uZdGSGpb3Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K3W0TMcraewa8HtczPx/wPDHhWVkUN2XvSWxN4tu9GhCYcH/FNcTUyxKMQgs?= =?us-ascii?Q?6pVPxeL+KSS8c3e0Kf0f1kDKA5flBDAa2wT3tQXeGOhXfC1wK76HOI10zgM7?= =?us-ascii?Q?D0NmxhM9baw5SeQryhVrx7HKDEA+HStKyIKD3hqtSwca0Yml4zj5eUlhc4Bw?= =?us-ascii?Q?3FO4Eeq5VhV4a0/YeWCSQr1r8bhoSZik8JpwHUFS8Oz6b39kSxEXQiil3y9b?= =?us-ascii?Q?0YUb8Qus+rYuJKa+5RyqSuC6XAAw1ZXNNZkPtkQmNLnvv7xr01jKKE5UKtbk?= =?us-ascii?Q?SRZQoaZn3ssVaYvFNVOHNMj1Ow3sqkpJNazZ1Dw6uwocT4vJk7lfZ8Zy24ip?= =?us-ascii?Q?cMuxMzwu76s7f9Daoxj9wN2+wPudf28UwbVFteDDptVYviDeRSlM7VpQGZ65?= =?us-ascii?Q?nreyPwLPlurtnOe9/iQzmMA+TjkNW5LynJ5a5GOvBcAwyLM96vfvwl32Lxjq?= =?us-ascii?Q?aqHrl2CpxiAIgOSdIiQcekaTA8uxsrQhAVSYpDAvrSBgBJLeYzbwQTK82deN?= =?us-ascii?Q?P7sAdwi0DUySQTt5xz1KlBGDbZM9+gjr8JCdNviIS2GWVi54QtJXselbW9SM?= =?us-ascii?Q?vYCmkUuoolVpv78c9t/Dkd/4pG1A2pRADAe36ivPP1OnynrJ+jSdcSW9rW78?= =?us-ascii?Q?g+A0mE7nW1EfBpQnKkMtQV5TlFJ6VFkmT3T0LT8yM5KeSpzVE7bhRjiqK87M?= =?us-ascii?Q?4yk5DqOEWK0WBHEyR2LLm0w0J7ayuNVlxSYd+mtlK7Df838obamK6tzMLqpb?= =?us-ascii?Q?sFE3JJcc2dIJuhlFRNO9khYRH5l9p/CiD0m0NXtoFRgWdB0UDhSkj2DRN32Q?= =?us-ascii?Q?E3ELWkAuwxReT36l5qSP5F2MsgnCKwH2CFpL/cOZl2cXbDB2NG0DEB4A2jkg?= =?us-ascii?Q?OnTLuq1Fl3BzxqJeTSg8WGo9awFklJT4Zs7b+ktXC65qT4/lGBbd4N+dkXGb?= =?us-ascii?Q?oWNxZO7R6vfX18GkZIBuNB+fgtxAuMQz0eqLBn7ZrG+m1C7Sun/2JMpZWloi?= =?us-ascii?Q?RfwbYloaMDb6m1FWAKvbigUR23KTBlL8coLn33LSljIlXtAhKyNUT8pwKfyL?= =?us-ascii?Q?VG47xGSvZwq8RsDmWWDljc4Ag3IE8ONdjKEDudsS/p5zQuS9wONpP/2+m2GM?= =?us-ascii?Q?Vcpux+oo/eMiwHzx1ykJvxAWn5jVT/y1Ddq4u+DLgoNcnuVOH1I46oP8zeRN?= =?us-ascii?Q?Y0CiKwaFTyzMceyt5T06tH7CB503iuBOFbN1w7rUlLG5/Vo284JmKs8B4fC3?= =?us-ascii?Q?6iW8etB9450XD1y6fdYORPK7Ax8GMwmZzIv4OjixyA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28cefc09-15ca-46cb-c3b4-08dc8ae77388 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:56:26.2194 (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: AM8P250MB0232 Subject: [FFmpeg-devel] [PATCH 51/57] avcodec/h261dec: Simplify decoding GOB header 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: Andreas Rheinhardt 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: h261_resync() can be completely removed, because h261_decode_gob_header() checks for a GOB header itself if gob_start_code_skipped is zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 2038afc591..f1c1e1a48a 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -165,31 +165,6 @@ static int h261_decode_gob_header(H261DecContext *h) return 0; } -/** - * Decode the group of blocks / video packet header. - * @return <0 if no resync found - */ -static int h261_resync(H261DecContext *h) -{ - MpegEncContext *const s = &h->s; - int ret; - - if (h->gob_start_code_skipped) { - ret = h261_decode_gob_header(h); - if (ret >= 0) - return 0; - } else { - if (show_bits(&s->gb, 15) == 0) { - ret = h261_decode_gob_header(h); - if (ret >= 0) - return 0; - } - // OK, it is not where it is supposed to be ... - } - - return -1; -} - /** * Decode skipped macroblocks. * @return 0 @@ -626,7 +601,7 @@ static int h261_decode_frame(AVCodecContext *avctx, AVFrame *pict, s->mb_y = 0; while (h->gob_number < (s->mb_height == 18 ? 12 : 5)) { - if (h261_resync(h) < 0) + if (h261_decode_gob_header(h) < 0) break; h261_decode_gob(h); } -- 2.40.1 _______________________________________________ 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".