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 D396C40A4C for ; Thu, 3 Feb 2022 01:07:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C87068B172; Thu, 3 Feb 2022 03:07:06 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074078.outbound.protection.outlook.com [40.92.74.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15E9468B09C for ; Thu, 3 Feb 2022 03:07:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OKqp7gNKsA2o//uVr5uBnh1GLwveqyIJtBusxP94wxLdDrcK39Rx/tdu10P7iw7VttfOkAcke2pZARz8qKmH7tprSqMrDOqhjBfehnscS6JhQYKUvwrIoLr00abWwhvpAfEVAHuwWdxEEUBbHwJ/YMTJkkzxq+3ojzXr7rmFHCFx2btHwIxQD+3UewfTf5rAXyXIlvGpT5K6sGFZhqgxIIyAbre6UCC4glrDGMyZmNmhlXAWuAVDarCf5E86v88kMUsBhFXR3yLisgnZeus/40icWPhJ3EQvhHwOOc21MtAAXvdWuAIp4WH+NDrpRg+TdFMdWLuvKgjnbb21O1cZiw== 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=KPVvmZCStk7KTmHBFBmZMBTf4bjzie+uKrEYRF2R55Y=; b=fK23zbW5DjUo0H9ZaNtt3j0HySZAeZBpYMwAkyHrOYUlatPo2v2Kk3UIbTZIk6LW/T/f1Nt1uQpi0s7AMWlS88aQP1oCY1X1scBp9MfZ2/HXoHnje92qZ25vOge3lOgGNPVuYoywfZ+zNWmrb9enpIFU2W4qudctyiI7xCCg6Lf8U4FmjM82KWVouY3TtDzksJb/sMsRKXTCjGs6MN6/ncWDOl3VGjqNRzTyLwQ3s4cUE3pdsbUpERPZI1S9ZWbnMqA+xZbge1vDRgOP/8SSgXEEMp3unRQqyF/Do8n9sWp6j/r/zns3dpxeQmKY+LT1B4IJ0M38WnBHiX/8O6O2wA== 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=KPVvmZCStk7KTmHBFBmZMBTf4bjzie+uKrEYRF2R55Y=; b=hDU5K5eOZGQeny3pb8BxG+O+9BgmCe3OFWeWyE1GGGgDggk3Clynule7dqaoXrAOWAKUYIIVX144wD31Hg3C5hKRk6TeJxw0m2MX7hVgEs0oloAnR1xocwdUEy+e29/u4ovTrjOfFwbo5PFKC1pvXDKRE8CrP6FBp5UQy8PdaHZgPQf9dRNluir2nEC7lTiTtovIm5bz3MU0y4sT6O63Fi98+A8NsNtt+g+0sTkfovpN8Xz+Or2KNNE/RWqjL5b/uPsFIqtv/5PbEgBaFogeMhBA4DpBu4YF8njafzeUgInfEedSvlV3CXDgMKzcSPVmHFVzHMyL7IygGIA9s1qcAA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR0302MB3203.eurprd03.prod.outlook.com (2603:10a6:208:11::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Thu, 3 Feb 2022 01:06:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Thu, 3 Feb 2022 01:06:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 02:06:30 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [RCjwjR8KyUUxj2Mg++Mia0YYUluYvMPU] X-ClientProxiedBy: AS8PR04CA0125.eurprd04.prod.outlook.com (2603:10a6:20b:127::10) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220203010631.1929837-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e2753ca-c596-4179-6429-08d9e6b17389 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEs6bi2B2Md8122fePlSqn4ekpOhm8wG9HdVRcR/O36BBy+6lZRurYZrHu5s1uyNXR2d+AsVsH/Zq2rW4jn3IGv6U+ew6Lwkdbvhyp1QHJz8JyLr54q7AMJABkZan2WbgXKuec34b3Fd6YKJwEveTA7FMyJTyZCcuRoB3rjxPN7JIHZIuHhpm/ErkIQVIOl+nIDQElZ4EeMF8vQUg+Y24UJJzfKhK9E39KM7Cf2cMsAWz/W96mauppWYSW7x3dLASvcM4JZPu55b3i8UhZtm+LTU5Mq/JmO6wQCzgOG+e5YlrfMPKaark9v2/6/L5C0odVpxXMO8PMTH+4L1XixC1K76j8QnSGP9Mf/VIdQgCHSperr4PqFJh7GKczLhujJJ6g6KMsbwt78r5odLh7p6JS+RM5qKNMECv0wFtUXRKJloyXVWHpeDow2x5zW1HiJqTKhOFL1kv1a67MsoWXpxuzJVo7/z7KVCwoQw412qNfbfspE/FpDK77MX5lGcteHd0Wbzcoq1y5nsFdsMmelRc01/QibmfRQdLIFNFNXz2jsH5dk2MmL4QVtXKlNFZkS1KrbfneylOWU/UtCtfcf9mL5nJbfQcqA+YNrVCk6lH7QyWJtujrBk5KTU2lvOFmo74Er+EtOpNj8xdGzd49PUdd7e8oEQnffi00tuZ6mq3dc3J6pumQ+qc3xyuTCmGm26AOntfm0+5NjrukGK0xZIsq4PUwQ2tpTtH9821Y+tKYdwHxBIct19zRJVPpJMBNj2M9JiWhs+BOXSXZT5GfcFZpnF X-MS-TrafficTypeDiagnostic: AM0PR0302MB3203:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YxL8utlo94faqQSI59OpegHjrKuvxWoI7owJSjEDQZFMnHJjEQmExw4CjZlNdGufrc0GxzJjYVE4Xa+z6eePBxHQlpio2I8wbPFNiRo8HYKHjMBi/GN8oKNfhVYNkaSQ/8c7kGRI9W/BVDnET9yYL6IJafvGn5LptbKi4MVbbN3IzRlKMKuLQ2pR8goFiNiTcsQbVHnE86AqwHbvv/SboT/M4FFEfnNlnixMcCXjK4GYtq8am7Wl9NElNgFhORSuAAnn0VQLjiIkQjDREFWZWDErMIr19LEida1Nh/43V8LYWbASk64NT6ut4PcX7kcVESqItbPc6npJasez6/+vvXXqR47dzwF0JZtbR75XQnpMDHiokuyhnN1id592R4tOs+CVfocmEZQAS8qwN4jwinq5qYllLZQXhJpt6aU8evmjd+QNBq1T+PeKSbjZEb1f6H5ovpQjDP3rfSctwq3QVJYuSuYzvG0K8pRC3GOwC4wbSWPwThm7Nc1uWxL/m+XqJCIgJoUxsIFuQmmKq/a3XeBQQzyhTfrX8zdxQEy1FSK4oNft4gS5SRSDrxeFvxICTeNDx+oaKmunIC2Do+CJzw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XGBc5s2x01szd8gcve1vV9tBUNkLXKmqwtRm0Rzz0Q6Gr0aeVC7oEVxasaYI?= =?us-ascii?Q?EcgWvTWH3F+U0Y0d6Or7pPnvxQcXisPX1DgXRYtKjuR/4EF6OnfBshBJXccn?= =?us-ascii?Q?AKoAiPk3jgUbKh3K18xXxo/NRqn9gUEFWn8/ezwnK4mozJAbQMfBayY83Hyu?= =?us-ascii?Q?lPQMBPHdWwu9p66+VqBfYsBsyU8q0d+sf/1/ILDBRTZ9xvOM7CpkWrZt1S6S?= =?us-ascii?Q?cV1KpDt3eRd9S5lB+0u4pj37ZFLS+4yF+YaZBXWvrPEywBXb7/l2hp0LFG9C?= =?us-ascii?Q?1GL2N+FnHO10Kua5LfQN6hoIPL/aRDfHPhUvT1nVGD/Ir4WFvkzsJQ7Ow1Ib?= =?us-ascii?Q?5tL9o/IZAXYjI+SjYmkd6Er0FvQ7V5PmDBQznKJcnRMRaxR0bA1yKB//9qBf?= =?us-ascii?Q?/6WxPTbKgGt2PTlDAYnkhI+af8XH2uOIdx/uptJvsygqM/BhbZucBLP18nBT?= =?us-ascii?Q?MfQAEKD745/Dz46f8wQOv/6Z81PEdEGUjHdlvUY+pwchDNQGke+fPK/LTNYP?= =?us-ascii?Q?wMvOmRDlb/u47MRk2+9Z/RHJ3KIAahSJ58dnEvHGPG+FNsG5KwkdqIWePnlE?= =?us-ascii?Q?DATRNqihPxRLzBh7GBdeMaV00yZi4MNOyfyk6b8lz5lbUJhPYNEf/qztf5rg?= =?us-ascii?Q?bPTxR3npjqT1X9YaKiVOz179/3aykS/Y2Od82tF6Ii21m674nGzR3WdLdwrJ?= =?us-ascii?Q?TkO4fhn5zF8uDmMaLQirTdn7ubThTENeLGE2C66ILKZ5a6vbwNmEzIcZJmfZ?= =?us-ascii?Q?JKEJH48Fydi/HYGzOiyCOZoGNuKzfF89VilD3RVMGM4JjG4SAsMcMWkAYVVb?= =?us-ascii?Q?QgRzZwLssKkbIdgQ1IQFNqer+lIuNvDA3AGXO0vR6M/9Uhc6mKyzudFr5rzD?= =?us-ascii?Q?ddgBfP30SL5vC+sb9dBt6UmiqKOs2uz+QdNEj3+l0M2uoF8ohCnVgsOn8x2U?= =?us-ascii?Q?I+kciDC1bJ2YijPH0+Hh5g=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e2753ca-c596-4179-6429-08d9e6b17389 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2022 01:06:47.3650 (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: AM0PR0302MB3203 Subject: [FFmpeg-devel] [PATCH 79/80] avcodec/mpegvideo: Move custom_pcf to H263DecContext 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.h | 1 + libavcodec/ituh263dec.c | 9 ++++----- libavcodec/mpegvideo.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h index 04c238d90a..539f2df01a 100644 --- a/libavcodec/h263dec.h +++ b/libavcodec/h263dec.h @@ -47,6 +47,7 @@ typedef struct H263DecContext { int pb_frame; ///< PB-frame mode (0 = none, 1 = base, 2 = improved) int long_vectors; ///< use horrible H.263v1 long vector mode int ehc_mode; + int custom_pcf; /* divx specific, used to workaround (many) bugs in divx5 */ int divx_packed; diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 15365afebc..0ce0b1c795 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1184,7 +1184,7 @@ int ff_h263_decode_picture_header(H263DecContext *h) /* OPPTYPE */ format = get_bits(&s->gb, 3); ff_dlog(s->avctx, "ufep=1, format: %d\n", format); - s->custom_pcf= get_bits1(&s->gb); + h->custom_pcf = get_bits1(&s->gb); s->umvplus = get_bits1(&s->gb); /* Unrestricted Motion Vector */ if (get_bits1(&s->gb) != 0) { av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n"); @@ -1267,7 +1267,7 @@ int ff_h263_decode_picture_header(H263DecContext *h) s->width = width; s->height = height; - if(s->custom_pcf){ + if (h->custom_pcf) { int gcd; s->avctx->framerate.num = 1800000; s->avctx->framerate.den = 1000 + get_bits1(&s->gb); @@ -1284,9 +1284,8 @@ int ff_h263_decode_picture_header(H263DecContext *h) } } - if(s->custom_pcf){ + if (h->custom_pcf) skip_bits(&s->gb, 2); //extended Temporal reference - } if (ufep) { if (s->umvplus) { @@ -1326,7 +1325,7 @@ int ff_h263_decode_picture_header(H263DecContext *h) if (h->pb_frame) { skip_bits(&s->gb, 3); /* Temporal reference for B-pictures */ - if (s->custom_pcf) + if (h->custom_pcf) skip_bits(&s->gb, 2); //extended Temporal reference skip_bits(&s->gb, 2); /* Quantization information for B-pictures */ } diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 2b5267f1c3..1be77bc83b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -309,7 +309,6 @@ typedef struct MPVContext { int alt_inter_vlc; ///< alternative inter vlc int modified_quant; int loop_filter; - int custom_pcf; /* MPEG-4 specific */ int studio_profile; -- 2.32.0 _______________________________________________ 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".