From patchwork Mon Jan 10 22:55:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3164251iog; Mon, 10 Jan 2022 14:55:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGLDGs5xMJvjzqFXk49lqMycLOk6JmbwBinm2SSHW0tW/D79kzR8ffcIAwWXS8JJlNfsrR X-Received: by 2002:a17:906:c155:: with SMTP id dp21mr1451282ejc.450.1641855357527; Mon, 10 Jan 2022 14:55:57 -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 dt17si1839719ejc.922.2022.01.10.14.55.56; Mon, 10 Jan 2022 14:55:57 -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=WpfEjDPD; 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 C967168A9AD; Tue, 11 Jan 2022 00:55:52 +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-oln040092074097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BB696803C7 for ; Tue, 11 Jan 2022 00:55:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qx8N993Ilr4TKTlsZFnsPkTe/EFWmzV41pqY5PxO6/5J01bu4rYKGCRqwuADdWbtePXZhOIEVORbh7J2NGyKIEYYzLX2U96AIALMiEPssQcKC/2/lGdoFcUfejNToNpA540UiLf0YkyJfzwCTAffgMBqVetP6d5SEZkGOk8eSDPs2cTPKVeFCYFTBbpZxMRnwIWjGhtg8/OJN2iTk+jvA+z9GlHMYFztNhvuN4ujR9iDkgKcjcZSLFtdJN5shbmCtK0L5Ij4GcPQSQQOqhqzlGdN4WGK6qF4rqapeE7cjx3D8JaNOi6MS51LVFdmMUYLCjIiavaA+ZqtPGr5AOr0lQ== 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=kOsWbXT14mXHrGGOwFFZrNFo4h3xKOSd1BsrV1+bSmg=; b=Rvz559mykrMTNjjkNoSN2DDl+xX4YwUdUa9YMYX6Cu6x1hb9VhD8UUyMxGU6NEYPx3pV5BhhR3c0PrB09nQFOQqON+mfTteedIWSRlu6qgn3HzeDYp7nuQHQWkCwXCn5D17DgQ4oII1jG96cOVnxii7wSDTMmSCbfBfnOHR8PpucCA8RsYIrzQ21iVRHyitTvnxmriFG96ad5ZmNkNKcVpuVODcSBptJ6K6HiYLbiUtLMIFKXJJOLTNVkSQn92UvRZykP4bTM4KXYVPkLXkFkl0bDIIsWjIBYQIRHScUedIg2a1I51OYM7b7jfUAPoMlYfHiJlgE9YBKkg/61BHIAQ== 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=kOsWbXT14mXHrGGOwFFZrNFo4h3xKOSd1BsrV1+bSmg=; b=WpfEjDPDGDqIF2rJ7yOuq6QkAXK9Yc4pc+9UsjfdnsLZlTdOUmDRjjzsCEAYaGj6eTbz9RuQ4usnQ+lEZ4ttQO6QzaW7UKiw8how9xI/3NmjJnIeOe0LQviP/QZeoV0RVJvJ1gBo/dKthCTXCHD0PynEukIPdeSQWRtgdg3E2CnSL3dtCqg/P1tdtkxJNNqgwY0UagYIy8RYP91HeXYECn30Nqxae3BpGVOTyhY3TByxHDesDNuqDMnHcgFCwKIBbY//ipsme52noSIWqpDpPNLvc3y/ZoxIs6qTFMhNV0FJagB7QnuMh91ciPftspcBCu+fUOIWE/puzP8Cb/QxDQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6181.eurprd03.prod.outlook.com (2603:10a6:20b:142::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 22:55:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 22:55:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 23:55:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3tKAX5BIHGc1kVRS5agByH9bN4DEM3DW] X-ClientProxiedBy: AM0PR02CA0021.eurprd02.prod.outlook.com (2603:10a6:208:3e::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110225536.887209-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5140c05d-3b08-4b21-9310-08d9d48c55a1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JzDao3i/3GTvoif372ewHF4/atRAL6XSP9tEpiyj7h3kQ5BwGLv2ljo4X2O+5MyLUlRHrtCbYbwNlT6mgSfRBxsyWnmjAgpoA0uJqEOpAaShGaPpYGw3lhmCerl4KR7/PwpgrNl0+7Q+UAr4+apssxWTSuFd0t1yHhoRBTsP13SIDJT1N6HH1n7eDbQwaDqZFATnJckaiLMh6xZoPRQeew6Y3zPb1VBXJfAgWj9gXwW3w8hDW2E36q+DsPsUOe4ezvj0wx65QkTqSa+eiVnwhDLX5OMxb2Ary42RkVs2jXaGg7gVp016faIrHpyo8Czo0dJ1nAwcLIwpFQyB0NF6GZZFn1NvrSL9b9AF+N4oOfbTkvP/BaxU5eKjaW+Qo17Z4lZrL0Mzp+uG1qKc9RrBStLmx4D5WbsRU7EDgW4hnixAaf2zm78ucaLNBpnmi9dArTx/PHgIhis9eGDLiukPfi0r2lKeGsxoeu/5ZhMdmFyHAjgIv28m8jIqyGQmbho8eGE5zkNZn+HKhm96jXxdbi2jiQA3BXdeBiMVDGjlnvEQFKDf+bnzsmCNz/BqfiGJNAM9+WtkqdOkh462t9ywNA1KOGoscm6S6zBs74XrfcQ+fyEJ4LWeaySJprhzlj9m3vPh2+y/lqWOxE+xfereKSi0MogRTdKn3qB+4jYxC7I+545aJ2eAvcmWPy/LM10z8EZhzkzOK9lqEvtb49r95ZOl4/fxR36Cg59Q4GbDGm1w= X-MS-TrafficTypeDiagnostic: AM7PR03MB6181:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9A9sIHPtBgVlESFAPfT+LjTXp3NxQ1y7d0RBKyjH3XbGffx5aCSk/D+LycCRccLpZM+QsEfa6NUzkPT905qaNNEnic90cQDaFHUfHRKZeNKTe5QXADH8r19Qp18ddL+bJRzaLkF9dOKLp/BQjmiSQ6/d4Jrhhm8c1hyTjB3mjYH8lYxCTwo5mKzkAvN8ZLcK7vDGKSsBPXDGnvBbGacudWXBGi2dn6zy3Sl1GpsH6dMHg8Y56qBBw5Vprb+Q4lnY0eKcAGXOqPdV6S2YXGsOTe379nu2VXevo9z1dbehy9+9p3zSxfjfpIVRL72zNaEdOiKRlEmo/IFfnzR4052DHlMm3rLd+WApSMKshrATHvo79ZvCPpjgew7NjhUOEFggG9yqD2TnRprhPSbQraFS4HioCNrf4EiYb3UyzcLBiIHd36a1/PflII+HB/j4t5pJbZdkjrahkJIFqNNXrsubLlMEdXyZ2PIMCC59xciQv0FSeR3veQJwMte2W4hBdtsGKpL/BnHSgiE9DVvWyy6YtuphchvZOsWrT+hDtjurEvVjxGY5owvyM5nYreoZ/whDKxKDTN9PBS8ezlKZGnyTWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AyvkEqBUHq04bSGXBuwyEEBlvfPqRCfPuXLpEWfl2AC7fostfJMdNX3y8kZYzd7vdPizXmKpy7azoATZW/vY35RthoVIV1X5gAKCkt1J3LbOQTJg1U2WQiOPsNRFYBVma1JWfGd6M660vqouX0aaJ+uBNUpDYFKPK2Vb6Nk71HL7SHyQTD2EVxkJMA38cmR+tzXWtdxXlmGgBO9EEWAUWu8ImVwsbSWpSvlMM5NNfzzMNjFgtwW/Q9wUUgvqQaqP4t+jVQdfDMoYvYhBv+7UobQRvlulXg9zDoi2f7/MWO63gLcDaSpc070MhmcKIugOcNNe52AS/PXoPmOrqGEyh7qRQu8reYHdb3DPOI1b38lnN6puFbp67R/N9jV5df5cxhg4+07yIPNVfm5d3EuvB66m1fiv/pKNhAeFzwpaKbFiB6N+syWGtbTYUHZS+PQbvHDDWJFIQOgZ7zjxS/YLwO6cbilaXc3wrEqdbtp2M8edqq0Q2bDkU0EYlk74hK/nDBWm+X3wl3Tg0vQn65tRFM0G9CCCpZdzq1ynKivPTIOilZaAJsFdgJGmB9OrO6N3ASUdns3pyVDtW4FWW2o4wr0YxdI/YaY8R1H5OVxaSqF0p4EoNM0zJVrv2X0hQVbeuMpZB4Jk64Mf8z6ECG3cbh8kB4d8Re3BCUMsgQv8jOcjfchN5e16Fr75yg6UKKSghPQEgwp5EbOYJIb6VsHGK9zEux8RzFudWf2JCDtpKnAE6kKQhMVC68G7xGAv/N33GtAQ42cdATU5eH6U7Su3MBs2qGceUf7lpzaBRf5DwN/7gFzkT9Au5puShxqMf9bljhcC5G8lh4iEq1KvCuhbTHMDy8YEvoMoXc1OlkehTLRFnoo3VwpZyY+YRebsvLFCFlfGSG1a03bCWWcoXZtW6cgaBWt4aEhA8YNT2kw49RkxOBknHA7G5W5zoNL1M1j6KZUjWENpXlApH6ZBSQMXMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5140c05d-3b08-4b21-9310-08d9d48c55a1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 22:55:45.0390 (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: AM7PR03MB6181 Subject: [FFmpeg-devel] [PATCH 7/9] avcodec/mpegvideo: Don't set unrestricted_mv for decoders 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: DJiet6n41Y7a It is write-only for them. Signed-off-by: Andreas Rheinhardt --- libavcodec/flvdec.c | 1 - libavcodec/h263dec.c | 2 -- libavcodec/intelh263dec.c | 1 - libavcodec/ituh263dec.c | 2 -- libavcodec/rv10.c | 2 -- 5 files changed, 8 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 6258c1c0a7..2ddcf021fd 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -90,7 +90,6 @@ int ff_flv_decode_picture_header(MpegEncContext *s) s->h263_plus = 0; - s->unrestricted_mv = 1; s->h263_long_vectors = 0; /* PEI */ diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 9cc2665cac..ac48acf47a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -83,13 +83,11 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) s->quant_precision = 5; s->decode_mb = ff_h263_decode_mb; s->low_delay = 1; - s->unrestricted_mv = 1; /* select sub codec */ switch (avctx->codec->id) { case AV_CODEC_ID_H263: case AV_CODEC_ID_H263P: - s->unrestricted_mv = 0; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; break; case AV_CODEC_ID_MPEG4: diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 7c794dc5e3..58c1b63c0a 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -66,7 +66,6 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) return -1; /* SAC: off */ } s->obmc= get_bits1(&s->gb); - s->unrestricted_mv = s->obmc || s->h263_long_vectors; s->pb_frame = get_bits1(&s->gb); if (format < 6) { diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 17af5d7f89..5329e62a5e 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1150,7 +1150,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) return -1; /* SAC: off */ } s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ - s->unrestricted_mv = s->h263_long_vectors || s->obmc; s->pb_frame = get_bits1(&s->gb); s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); @@ -1180,7 +1179,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */ s->loop_filter= get_bits1(&s->gb); - s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter; if(s->avctx->lowres) s->loop_filter = 0; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d8261c34c7..0dc2c87335 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -149,7 +149,6 @@ static int rv10_decode_picture_header(MpegEncContext *s) } skip_bits(&s->gb, 3); /* ignored */ s->f_code = 1; - s->unrestricted_mv = 1; return mb_count; } @@ -298,7 +297,6 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size) skip_bits(&s->gb, 5); s->f_code = 1; - s->unrestricted_mv = 1; s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I; s->modified_quant = 1; if (!s->avctx->lowres)