From patchwork Thu Feb 3 01:06:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34083 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2043402iov; Wed, 2 Feb 2022 17:07:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6J5jruVaaWlP9aIVYppUP7DrSroXWGv7hgYl8K+3p6mOcPMm4vl5CbsH9UQie+bkJ/f5R X-Received: by 2002:a17:907:7f1c:: with SMTP id qf28mr27152870ejc.94.1643850447522; Wed, 02 Feb 2022 17:07:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw1si13617955ejc.47.2022.02.02.17.07.27; Wed, 02 Feb 2022 17:07:27 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=tPshJ029; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6879F68B10F; Thu, 3 Feb 2022 03:07:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074042.outbound.protection.outlook.com [40.92.74.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C88768B09C for ; Thu, 3 Feb 2022 03:06:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PmIbcEgig0GL6IBIYCQmGpz7+jnZ3DjvVh5NMlctV82hrJSRQZ0QA6csQvH7Pj4Wsnoa0Ag9DPaK93Zfb9P2/PL+1QEItPYRYYn6cvzdfvrxKAX5aNcOrqSyJeEoG/EpSRZf+OdRJrp4P04F+jd87/Yzubm3WbHcGdNUXdf1wy8x1us7xIKY+zaQt/iFknUolGm4ThirssHIJZle4lgwzDC4pZP2GigFsyVw8Xz+ez+3neM9OwsbToP+VaMqD5FUp4TEbcT/O2mBBdMnyVm09Pui9fqjsy9wd6YN+UEz38Oz1EmraQwODHBArJX1VPfPjyvBVj8oIJXfzO9b6B01gw== 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=zb8JhCPLVtr9aEk7Tz+u7RjsCA4pSo+pBRRM77LfvfI=; b=JDHOi16znJTs6hiNWHWW9RTC2CssnaMtKk2n4A2BxNQ9TAIpehSB6ShKIo83u2Asrko151QFu7ERCLfDM9ziNTU8OUV6lPWXEAEF+zNStqxJkvvoIyy0zJ1tCjC/itOSqPq7C563Jm8ZU+9OpcFcHU/gn6V1hvDuT0AHT9QgSQwH1+Ry1xJfsMd/jJ9zpCeq/pWt7zEcQv3Uos3pHS7DUyJVtXb3++gMo4coX3nqYP1M8dCxGcuH0YX0ttMkfaLarClv5jrDRG9XK2Ll4aFgcaEhmmy3NK1SsjSEeTF/V0S3i9Ehf2V9q3/p7WdPD4wPlZjkzXNCHx232L8OasWVOg== 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=zb8JhCPLVtr9aEk7Tz+u7RjsCA4pSo+pBRRM77LfvfI=; b=tPshJ029kuQmSPMp3gQ0N+0vzYEj+o8v5y7FCKIUYWYI+66mR2+6g0Xms53Au7E/ggbER/Nf8Gbz7m7lVobERWFg27SU51Jw7Xd8xkCDHnkDZjQ2dl6hXzoBThAL/DrdlKiUpopT8PWCRh0pQF95WnTtpODaq78wp1f23UuVgVyp3+iz+ECgHKqgPln2NHPnwYlocQPnQ6szOCjzAp9UU5lamvsHJ5ODUtK1oU8P5PFvd4Js9ZHhkLevSBvJKfJwkWHKPoR+m0JgEEUkVukrVEv7zB8Cqw3mgvouLw6ev7CNhiz2aAbfxLdDDAj+WxnImbprUNksyg1lO9vFpVJJzA== 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:44 +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:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 02:06:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [znDYuJaCeLxMQJj+FteZyNGYSaAB0UCE] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e636f6d5-3a42-4130-30dc-08d9e6b171a0 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEs6bi2B2Md8122fePlSqn4ekpOhm8wG9HdVRcR/O36BB1orijMEWbsWYHZAOfVPZLPf1PV6z5zFTCcT8iXFXofi/eQLG9fsGM+gWam5FZkFIzQp/nob3iTSNADO/7rzgL357MLGH7PpbRMOMyj0swKa3CtQCJYWcI5Q3dDkdBDzbUtnh4ya44699rpi9W/VN3LzpIbMdUELK/scfRSkujY9Yq6E3xtr2enwPaCUDFnijkYwvpihcPXyaazRatwocPAaCcYyL3o5WPrQg6hQ30YGGlSBLEJYgrDnTZgXbHEo3MZtDc2w0WU3KlZKnamBQks6Wj/6UUMA4l1t1C405RBasnlTW2XFC5cChWmrxnvGF3L3BEY/hXV6t0EhVfyfbxtSOQO/pv3402POVaZ0CgArRPR71ATe2wWrLe3e5kqMFDzt4Y4U1if1GBgCH0zXw5zXbBl4MZe0nBeSWqqj1TWH1kLKYzoDV8WQEtYMPmuFuWh1vynqvT2EPF+nHmakXa1rv3wbAewN7cuMogUIlesOjGQOXamwvMTHWcZgA5jKXCEttp5wzdw945OUIRHDnuvKqVdUVoyAScLPElU4gsAXtTkSx/ObbIW924G90keaILX+4piPN2APhaW4CqcVxhNaa7xvzr/T4EqizoaZwdiBWdPBuAnzjYZ9Y555VqLOR+5eYa4DMtEL9JlS5/BY88fRg0JEGL9jGtkHv3MlYqDGnp9TORrsiM+6HM3yETKWqiyc/r2TZklBTuTTRZRbBB0xHu0IzZIjK1f8hH0PamEt X-MS-TrafficTypeDiagnostic: AM0PR0302MB3203:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HyVZFwmDE/PiD3Xtdox7yjSaplr5li0gCtcm97QtpmjM43qeZuyvtXZhnkR4WXbDJh8bbAxFQSFjR62ecVLYhmbePkNs4Dkt5ESQ8GLs0ap3VMpToS+O5ZOiEXxlrt6tLcYx9XHz6cFhp8Yvr/QJvVt5Z+NjzMnG5a+yaxqeiiqUg+99O8Tr9oEzIf3qk6MqtFdR3xAn6x+ErqHpj8S3F+nIyI3/0LZv/m9OJPITu6sSbW5my27rfTYKFxLfFXPI6C7aVgSepfnaB3Q8VP9VRgRjQXTS1B+0IW77UlO9U30Yok/d4zPRnuJDs831YESxUOsVnZQsHEIjfMQEozUzLn+fqMy4egmZ5g4Lv641HzWpr6Fh2ZnVxHhgwZoolWEStSOm7q2pxIXzlb8YDOC3ISlo+0eNk9p3DWpQ41Qt2zJqvHXx8oiIZcGHQttYwOM2hINNO1Iqk0iI7afDK/Bom+6MSNYOaZ9vSP0TC8lla54d4YoAzZAN3a0wXSn5kT4noAzPoVnrs2JVDjy3wII93WVoFwhIO0M8YRsLo83UPDaKp506MVVCoZ8FBBGMN7l3WEUZ1MJKBx+T+fvUylHOaw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rz7Q2fXKSm5yRkl4J4GWvksGiGCs03I/BGjGC7NGjk3Z3s4jKCUYsxJtLXlDFszcvgFdP4IptD7cJsJlLbe38uJBn5Iod0TC9z2gRfiHWPZps4kwyXzDDgosjIkX3YrLk6cSyAqHatRfmnqzFI6yLehlq4V5j1cjWRy7Nfg1BZt96epCzJucFh3B/3JYR9FeHKEWY2OYL8sJJVFzr8wJh9jDuuo+M/zEuFha9LFYAEKz5NmLq6xlJU9TF8BCnEh3FrtkQlyc0wyEf/zVZgbzBr7ERkT5PctM6bA6SJ8n+hR4wYAuLCy/czivJyft4KVwwmQYMfovaKl1cQvatlqNqiZbS9AJLUpGHF7m0e16ZLiioGLlNdeWppJ7j8GK9HwTslyjGRQLF1Y74rXs0FPm8bRMXQZbOQPQq7MkGAYmWU5RKdCxdN8VwpXTzXd/SRtLFRGOy6E9qEPwW9G0QD68j3e7IvGuP2/GNZiElP09xjGAv5+YCR9XvQzylu4UwYUvXYI4NGvfFjmuaP9zy64iELk9I6Hfb/Dqsf2PbGy2+QJ5hVxJd9Ja0aaYjYrfk3m+Dt1U7pDy7h5Gjpog62DjcATv2Qo0PPlyw72j2gWaCokpdPFnp6IDDADw/s3JZgXcBIe4n7Kkbu1EgSTYCwBzDPkYSNk/07GPYRs7rP+HtTaFsHc+/3N0To2AWQFL0lZsRZ7XguxEvLB1nAf3qe5T/Mq8hK4uNukIXZHKVR3spadbA3Y6fcAUSydDMmBN7o9fPP5fahtklc2OuoDUwqCRYxjw2M+8NXx1ZGobP17d9nwsgQqVwxIORh6cyyg3TTq7AD919JkwpGTyjT/I8thAXobmg81/NfCzomneUVECmvWNHyzOYuI4HzGRyjNw9GOgFSTfCwwuEfbLfvFQulfa1qJH8YDKK/1vL2hQVqlje4C9LmdKn2QQySUiVUYx//lIuPTLM88aEdvtvxUZO/CaGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e636f6d5-3a42-4130-30dc-08d9e6b171a0 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:44.1590 (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 76/80] avcodec/mpegvideo: Move ehc_mode 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DmdVEFE7Uqvn Signed-off-by: Andreas Rheinhardt --- libavcodec/flvdec.c | 2 +- libavcodec/h263dec.c | 2 +- libavcodec/h263dec.h | 1 + libavcodec/ituh263dec.c | 2 +- libavcodec/mpegvideo.h | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 8ff4c03100..d33cc11b27 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -100,7 +100,7 @@ int ff_flv_decode_picture_header(H263DecContext *h) s->f_code = 1; - if (s->ehc_mode) + if (h->ehc_mode) s->avctx->sample_aspect_ratio= (AVRational){1,2}; if (s->avctx->debug & FF_DEBUG_PICT_INFO) { diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 91e95b910e..db03e04143 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -139,7 +139,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if (avctx->codec_tag == AV_RL32("L263") || avctx->codec_tag == AV_RL32("S263")) if (avctx->extradata_size == 56 && avctx->extradata[0] == 1) - s->ehc_mode = 1; + h->ehc_mode = 1; /* for H.263, we allocate the images after having read the header */ if (avctx->codec->id != AV_CODEC_ID_H263 && diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h index 9c4c26242c..e090f4b39b 100644 --- a/libavcodec/h263dec.h +++ b/libavcodec/h263dec.h @@ -45,6 +45,7 @@ typedef struct H263DecContext { int (*decode_mb)(MPVDecContext *s, int16_t block[12][64]); // used to avoid a switch int long_vectors; ///< use horrible H.263v1 long vector mode + int ehc_mode; } H263DecContext; int ff_h263_decode_motion(MPVDecContext *s, int pred, int f_code); diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 299a668290..8467746a0e 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1258,7 +1258,7 @@ int ff_h263_decode_picture_header(H263DecContext *h) height = ff_h263_format[format][1]; s->avctx->sample_aspect_ratio= (AVRational){12,11}; } - s->avctx->sample_aspect_ratio.den <<= s->ehc_mode; + s->avctx->sample_aspect_ratio.den <<= h->ehc_mode; if ((width == 0) || (height == 0)) return -1; s->width = width; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 0e26bed7fd..7be9b889ea 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -302,7 +302,6 @@ typedef struct MPVContext { int prev_mb_info, last_mb_info; uint8_t *mb_info_ptr; int mb_info_size; - int ehc_mode; /* H.263+ specific */ int umvplus; ///< == H.263+ && unrestricted_mv