From patchwork Wed Jan 26 21:34:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1882595iov; Wed, 26 Jan 2022 13:36:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBE0lKwK3ieGkvHZ1Kw2IsK8X08VIlfjEremfYE3CL5bovwntV7q0lJwkOcVZ/BkI1qoEZ X-Received: by 2002:a17:906:e0cb:: with SMTP id gl11mr524599ejb.135.1643232961299; Wed, 26 Jan 2022 13:36:01 -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 m25si209499ejn.613.2022.01.26.13.36.00; Wed, 26 Jan 2022 13:36:01 -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=EcV2wB1b; 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 EC1EC68B172; Wed, 26 Jan 2022 23:35:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071048.outbound.protection.outlook.com [40.92.71.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AF1768B0D3 for ; Wed, 26 Jan 2022 23:35:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZHbB5PchtHi0bxlC3F5RXAdBNgs/vgJHBT8eNGSc5ljtq7mPufQnebkmj7VljpnQibkkGheD+tzwg6DUqvPNbl6LxFq3B5ELV+fCRY9eyyK/SAi0t8kxVaEmojZMphJemINOBW5w56kqfUX86YA7HdGsfxRY1I52W0jKeABTgaFPX2DJs0ubi7D5VtohtfZlGZVghPqvGtKhd+Lgpu5u8k8Xr9jEpvcBVxu2+NnbSi3SmX00Ypfepvq8QRvHRxLuzqeca3bJTWmepuPBajL+DqD8ZdhOFM7I+GAe65+ukbqztF8Z8f2FwJfu8mywO+J2LEAgSILRio6hXbuZrOoFBA== 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=fkKkoeNxIk2DpcvkbwrtjCRVvyqK4DezK9Zlp4tT+Es=; b=H4z3LzPr2PzvnjqMEE83LTaSUdbm3WwJUEjYKCYvsnJUYsGJbkljry9RIT8EAZC84Whk3tK3FWyF5ppejVY8czdzXovxqruCm4KYJerMeqOkGu+5vQclwQJ4cQn1rh2A9OBEEsCGAlNh8y6e0jD6nmrhKUEz3RK15EjGly6jfrHkBWTrFYuw2KZKL9tK6mpfCaA93jKmIxXiL7qtJ27bP6Kz4BnMafSvAWEIJJhm/hGZ4hQkiaOSw4qgdAwe4+aI/UIR9w3Bg4JKhBSIcDh9UQm7QvK6P3MzFP8kvz6Z0fauoV8d/wQmTXgwY3fbITLecueHDXn6brPKbgjeYXnE8g== 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=fkKkoeNxIk2DpcvkbwrtjCRVvyqK4DezK9Zlp4tT+Es=; b=EcV2wB1beCRl2ElcPidVYnvayCBecGr1N9msdV+LZsgc1xyIksYFaIW/xIlRpHbN+mxsJBXyqr/iqaIJPnU0s1WG6HS+0YivRtFIhqxeMA5v2SzF9nw/erWWXPuUqaz+UVD8jnCnsqFLCORdYsOY20YPK361nWLRp3hE20v3iMqpy/YgTVQ+z8LqueiJ6ZTbnomYB1ALUXQ3qeBDHz5JI71vtt2F636X6pkEt22pCzwkdv5hagb0hZvIssF2Kd8d2CVirosrWinu+pfVOjdSObN97nTLAbzpqjp3DWEZkZ+XatWFa0Zc2t3uJoMz0V8SKJbqR0KR3Hm0n4bwHw0xkA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBAPR03MB6406.eurprd03.prod.outlook.com (2603:10a6:10:190::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Wed, 26 Jan 2022 21:35:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.017; Wed, 26 Jan 2022 21:35:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jan 2022 22:34:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TfoL19UQIF144HkL3hxX1GyIRW6mUqnv] X-ClientProxiedBy: AM3PR03CA0066.eurprd03.prod.outlook.com (2603:10a6:207:5::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220126213451.1887291-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e844122-920d-4d38-6743-08d9e113bba5 X-MS-TrafficTypeDiagnostic: DBAPR03MB6406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2LakNGhTARj9gKv2QupSoyU9aNjrxLAkJsiQZDdt/TFtlx3hgoDHSsroC9VPPI4z5/6Wf+sFDy2cF4d+UhuJ5owwEgO07ccSxiemZn6BvWP5Z+vj/1mfbLSL9HH2fhN9VuLIcZC9d6F5RjX5dXxwwPC4N5BOB82o+PrL96PSs2guVhY8EbaSidT21Qmtneu/pDAMBpAUkZIjCeBD+TmIEuqDN/99e4s4ekCkRFEyY9zCcqM/eQfsreYrdqiniFH2KwAXoiqnoI11iL4YW//oPrMv5v0ZygKfeDPj4NRK9y0Q32cKGwKkL8c78+tSGCMfdM59RgKsO2kgcankOtUcEKZGQqmoMnteMSFsVEQZpHocxjcrJByjqtmQmTgnwuxbU8xCEL1z8fWoi4bq14lwjAQPm9hUUnGnkwoA5ZmXPrpctHNo93osxW+6WB6iN9vt7PlN/cIFKqmXYWwZ9o3xPccvQC1kArSje4jWLinFAUqlyiXk2HbpUgEjx+48oEBO/0TAfhndQMygy8PD2tcVx8C0IM5V9mAyT+lIbw2oevQGToU8hWWB125lOpmo0TEu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UitEFpVAIDkgAFrQ5Ckk9uUJvk+dvXbWlG8++CfJHAzJ3VBIWQPFmVZXm2ymklk23kIcHidV9LJ2xsMgS4pY9Yn3jNjoFMI38wsfH99Lcv1cKWPmRCYAeJ/Jj1+3s9/C79K0E3cC9j2iZ5VstB1RLOAXcv3pl1w9VUIQbL1peRr9fOc9nGdJ4dXbm27IFQPp9v0AbECVIcGP+8I6gku8BGyjhrKmkSs0QS+nVwWJ38bqAtHn7+0tlaku5IzDOgGdu/zoLhawS2RHglFtctfhTNDV30b9iVifQYkyDXZ1Omx99zL0ciYXhZgMduGUDAxNhHajprFKayIfBwXhJm85PB4uOIkqN30jRslnI99GIuByfQa/dYUgA70az7rRFuWaE6q++iJkBQRLVgqj7oSl+QIM5I0qH89XYEtB1/nrSiXk/iDCkKi32QZXeQbXzXfSNl1k+UyCPEel+IfD2iieykk9oi+KHrX5fAcYbjcktoEJUXikMLiOT87ckAiFpT2C/RZ74DVrfWeb68ENPlJkLiCtCCg+UHds1qNDEc9a2FMhz0sSypTh751Vf3p/TN+7TPmnKVRBKtDWA2OuA4XWolorS+y9lrKssc814LbUk/6I1cKXZEdS7oCl5vGBjpEcCK5ghlJH3jRxK8xG6yw+ccD7kV47+6MxJrLMUEoHQ9BwNHA0czZ8k2wrZCT3Fk44ZRW3i46LEHg1HN20lhmqJAGgDQyDtktIu1YtK5IYRfnsTY2I4JHH8Z2BBKLwrNaukfyT1LjwWbSJg7vhxYCOQHYLVQVvwyhw0ZCSxgp8W4H1aAo9OUJWtUT/+D5eG2RU1K3YAeDlLne87vzlWhsD5k1jUCVCKnffuGCaCz66NORM2ZAeTba/NOX8WV7pj3mSvnhQ9B/hL4wEC5nSk1KlsmQi2cvABztlufQEidpjDW/Ras6bSyOVerH7Mk/RStELqmLV260VoVEfhqDvds8Z5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e844122-920d-4d38-6743-08d9e113bba5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 21:35:11.9224 (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: DBAPR03MB6406 Subject: [FFmpeg-devel] [PATCH 27/33] avcodec/mpegvideo: Move handling Simple Studio Profile to mpeg4videodec 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: uA9RT8WIATKL This is its only user. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4video.h | 4 +++ libavcodec/mpeg4videodec.c | 62 +++++++++++++++++++++++++++++++++++ libavcodec/mpegvideo.c | 66 +++----------------------------------- 3 files changed, 71 insertions(+), 61 deletions(-) diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index fd6b6f2863..08beb7f29f 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -119,6 +119,10 @@ typedef struct Mpeg4DecContext { int rgb; } Mpeg4DecContext; + +void ff_mpeg4_decode_studio(MpegEncContext *s, uint8_t *dest_y, uint8_t *dest_cb, + uint8_t *dest_cr, int block_size, int uvlinesize, + int dct_linesize, int dct_offset); void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x, int motion_y); diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index bdd320b1df..fb43ad2d17 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -67,6 +67,68 @@ static const int mb_type_b_map[4] = { MB_TYPE_L0 | MB_TYPE_16x16, }; +void ff_mpeg4_decode_studio(MpegEncContext *s, uint8_t *dest_y, uint8_t *dest_cb, + uint8_t *dest_cr, int block_size, int uvlinesize, + int dct_linesize, int dct_offset) +{ + const int act_block_size = block_size * 2; + + if (s->dpcm_direction == 0) { + s->idsp.idct_put(dest_y, dct_linesize, (int16_t*)(*s->block32)[0]); + s->idsp.idct_put(dest_y + act_block_size, dct_linesize, (int16_t*)(*s->block32)[1]); + s->idsp.idct_put(dest_y + dct_offset, dct_linesize, (int16_t*)(*s->block32)[2]); + s->idsp.idct_put(dest_y + dct_offset + act_block_size, dct_linesize, (int16_t*)(*s->block32)[3]); + + dct_linesize = uvlinesize << s->interlaced_dct; + dct_offset = s->interlaced_dct ? uvlinesize : uvlinesize*block_size; + + s->idsp.idct_put(dest_cb, dct_linesize, (int16_t*)(*s->block32)[4]); + s->idsp.idct_put(dest_cr, dct_linesize, (int16_t*)(*s->block32)[5]); + s->idsp.idct_put(dest_cb + dct_offset, dct_linesize, (int16_t*)(*s->block32)[6]); + s->idsp.idct_put(dest_cr + dct_offset, dct_linesize, (int16_t*)(*s->block32)[7]); + if (!s->chroma_x_shift){ //Chroma444 + s->idsp.idct_put(dest_cb + act_block_size, dct_linesize, (int16_t*)(*s->block32)[8]); + s->idsp.idct_put(dest_cr + act_block_size, dct_linesize, (int16_t*)(*s->block32)[9]); + s->idsp.idct_put(dest_cb + act_block_size + dct_offset, dct_linesize, (int16_t*)(*s->block32)[10]); + s->idsp.idct_put(dest_cr + act_block_size + dct_offset, dct_linesize, (int16_t*)(*s->block32)[11]); + } + } else if(s->dpcm_direction == 1) { + uint16_t *dest_pcm[3] = {(uint16_t*)dest_y, (uint16_t*)dest_cb, (uint16_t*)dest_cr}; + int linesize[3] = {dct_linesize, uvlinesize, uvlinesize}; + for (int i = 0; i < 3; i++) { + const uint16_t *src = (*s->dpcm_macroblock)[i]; + int vsub = i ? s->chroma_y_shift : 0; + int hsub = i ? s->chroma_x_shift : 0; + int lowres = s->avctx->lowres; + int step = 1 << lowres; + for (int h = 0; h < (16 >> (vsub + lowres)); h++){ + for (int w = 0, idx = 0; w < (16 >> (hsub + lowres)); w++, idx += step) + dest_pcm[i][w] = src[idx]; + dest_pcm[i] += linesize[i] / 2; + src += (16 >> hsub) * step; + } + } + } else { + uint16_t *dest_pcm[3] = {(uint16_t*)dest_y, (uint16_t*)dest_cb, (uint16_t*)dest_cr}; + int linesize[3] = {dct_linesize, uvlinesize, uvlinesize}; + av_assert2(s->dpcm_direction == -1); + for (int i = 0; i < 3; i++) { + const uint16_t *src = (*s->dpcm_macroblock)[i]; + int vsub = i ? s->chroma_y_shift : 0; + int hsub = i ? s->chroma_x_shift : 0; + int lowres = s->avctx->lowres; + int step = 1 << lowres; + dest_pcm[i] += (linesize[i] / 2) * ((16 >> vsub) - 1); + for (int h = (16 >> (vsub + lowres)) - 1; h >= 0; h--){ + for (int w = (16 >> (hsub + lowres)) - 1, idx = 0; w >= 0; w--, idx += step) + dest_pcm[i][w] = src[idx]; + src += step * (16 >> hsub); + dest_pcm[i] -= linesize[i] / 2; + } + } + } +} + /** * Predict the ac. * @param n block index (0-3 are luma, 4-5 are chroma) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 40494fe115..a231ee52b7 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -40,6 +40,7 @@ #include "mpeg_er.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpeg4video.h" #include "mpegvideodata.h" #include "qpeldsp.h" #include "thread.h" @@ -1602,67 +1603,10 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], } else { /* Only MPEG-4 Simple Studio Profile is supported in > 8-bit mode. TODO: Integrate 10-bit properly into mpegvideo.c so that ER works properly */ - if (!is_mpeg12 && s->avctx->bits_per_raw_sample > 8) { - const int act_block_size = block_size * 2; - - if(s->dpcm_direction == 0) { - s->idsp.idct_put(dest_y, dct_linesize, (int16_t*)(*s->block32)[0]); - s->idsp.idct_put(dest_y + act_block_size, dct_linesize, (int16_t*)(*s->block32)[1]); - s->idsp.idct_put(dest_y + dct_offset, dct_linesize, (int16_t*)(*s->block32)[2]); - s->idsp.idct_put(dest_y + dct_offset + act_block_size, dct_linesize, (int16_t*)(*s->block32)[3]); - - dct_linesize = uvlinesize << s->interlaced_dct; - dct_offset = s->interlaced_dct ? uvlinesize : uvlinesize*block_size; - - s->idsp.idct_put(dest_cb, dct_linesize, (int16_t*)(*s->block32)[4]); - s->idsp.idct_put(dest_cr, dct_linesize, (int16_t*)(*s->block32)[5]); - s->idsp.idct_put(dest_cb + dct_offset, dct_linesize, (int16_t*)(*s->block32)[6]); - s->idsp.idct_put(dest_cr + dct_offset, dct_linesize, (int16_t*)(*s->block32)[7]); - if(!s->chroma_x_shift){//Chroma444 - s->idsp.idct_put(dest_cb + act_block_size, dct_linesize, (int16_t*)(*s->block32)[8]); - s->idsp.idct_put(dest_cr + act_block_size, dct_linesize, (int16_t*)(*s->block32)[9]); - s->idsp.idct_put(dest_cb + act_block_size + dct_offset, dct_linesize, (int16_t*)(*s->block32)[10]); - s->idsp.idct_put(dest_cr + act_block_size + dct_offset, dct_linesize, (int16_t*)(*s->block32)[11]); - } - } else if(s->dpcm_direction == 1) { - int i, w, h; - uint16_t *dest_pcm[3] = {(uint16_t*)dest_y, (uint16_t*)dest_cb, (uint16_t*)dest_cr}; - int linesize[3] = {dct_linesize, uvlinesize, uvlinesize}; - for(i = 0; i < 3; i++) { - const int16_t *src = (*s->dpcm_macroblock)[i]; - int idx = 0; - int vsub = i ? s->chroma_y_shift : 0; - int hsub = i ? s->chroma_x_shift : 0; - int lowres = lowres_flag ? s->avctx->lowres : 0; - int step = 1 << lowres; - for (h = 0; h < (16 >> (vsub + lowres)); h++){ - for (w = 0, idx = 0; w < (16 >> (hsub + lowres)); w++, idx += step) - dest_pcm[i][w] = src[idx]; - dest_pcm[i] += linesize[i] / 2; - src += (16 >> hsub) * step; - } - } - } else { - int i, w, h; - uint16_t *dest_pcm[3] = {(uint16_t*)dest_y, (uint16_t*)dest_cb, (uint16_t*)dest_cr}; - int linesize[3] = {dct_linesize, uvlinesize, uvlinesize}; - av_assert2(s->dpcm_direction == -1); - for(i = 0; i < 3; i++) { - const int16_t *src = (*s->dpcm_macroblock)[i]; - int idx = 0; - int vsub = i ? s->chroma_y_shift : 0; - int hsub = i ? s->chroma_x_shift : 0; - int lowres = lowres_flag ? s->avctx->lowres : 0; - int step = 1 << lowres; - dest_pcm[i] += (linesize[i] / 2) * ((16 >> vsub) - 1); - for (h = (16 >> (vsub + lowres)) - 1; h >= 0; h--){ - for (w = (16 >> (hsub + lowres)) - 1, idx = 0; w >= 0; w--, idx += step) - dest_pcm[i][w] = src[idx]; - src += step * (16 >> hsub); - dest_pcm[i] -= linesize[i] / 2; - } - } - } + if (!is_mpeg12 && CONFIG_MPEG4_DECODER && /* s->codec_id == AV_CODEC_ID_MPEG4 && */ + s->avctx->bits_per_raw_sample > 8) { + ff_mpeg4_decode_studio(s, dest_y, dest_cb, dest_cr, block_size, + uvlinesize, dct_linesize, dct_offset); } /* dct only in intra block */ else if (IS_ENCODER(s) || !IS_MPEG12(s)) {