From patchwork Wed Jan 5 21:56:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1111548iog; Wed, 5 Jan 2022 13:56:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxw2eZyU2fLkjP6yS70Y7GIv0XP2oByYQmgwY2HMaIO/LjbaNf8rHVQVpwx34J/aZbOc8yq X-Received: by 2002:a17:907:7602:: with SMTP id jx2mr1201113ejc.92.1641419807629; Wed, 05 Jan 2022 13:56:47 -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 gw26si38669ejb.533.2022.01.05.13.56.45; Wed, 05 Jan 2022 13:56:47 -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=onyeZlp1; 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 AA7A568AE47; Wed, 5 Jan 2022 23:56:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACBB168ADF2 for ; Wed, 5 Jan 2022 23:56:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nUpoS59S6Hs3yQ4Uff+v1QZuYAeXz6W0u3eFGYDgVciYqQbJSVGwV3n8L9rHUbfBQ/E19DY8X1N6PEa87pQ98kcRBIgaACP3xRq+NNfcM890o1FWYdsIhrozeVXpVnWOyNu5d9XOWAnqW22Os9ccwkED3X56n8zshLmzxMQz9MkdJSOfXAPmRnrpwbPrpRVwJ39bTYFkM9FwGjpbhuIoe1193RYfTWL0XYgekhYIr0otmlqMgMCbexysTUgJZvgy6t9Kc2j+75s4hun9+uJMcoKrl/p1mgfTTfnDEY6rU9tajGqCJ1FSVYCeREfE12WQzKXJMpLDbgZK2OgJ9qgUnQ== 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=ZLUlr46pwrHd3LJlQhstcVQCIuJBQzHElHF/qFl7TPA=; b=LiTp7nxJ/LFgJsbkJQTWwUwIdZUP05V2+eZSqO+mac9VWXjwTVuwUFZ+i9M384NwhM+c8wV81TSjo8kYKq6jr5XVozvpELyEwKAXSckO3BTcnPcMnBQWnPEXvQRYVVj9BDn8BTNeI+RQJPlr2EHPdl9xiht0p1mOCPTav/pI5RP9jPtem58ZDEc0Ov7qtrORFhThrZMkzjYF6Gn0t62Zl8Mvwxq1Ou2TeoHSIZwAmELvKqBVdL+jv2uB9SKH1pTGQq29vboW7KP9qXGMph00b16qAMJKfjiPjYVpjkN+Mx/JK03MUob6E5d9aHkA61lGJrvmY4i7vb8iBq6VBdPcUw== 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=ZLUlr46pwrHd3LJlQhstcVQCIuJBQzHElHF/qFl7TPA=; b=onyeZlp1QsEE8VvYZ4ITrB9fnvF2i5qCvFXXXBARmYf9ElTpCnwVsMdsfamAR1zsAjA6HvvDu4nFQD55MwtK5eiaEf0nsAQSCYTABDiY8ouFKrQywfzjHiyZIAaVsotMgTAbw2NOXKvxsw6PlAoRp29iU9NvG8dw562fhv7YRiCjYZZcaAVA2oiASa6zSyaSigaM7TLAuB6cXMSYmldCaumayBP7vtZsqPMBJ7fv/BY3zldUixnoNDIrTMjNh7vNJSIHr1at3nblXAO5zUmI0j0S/bE/mz1bQ3ADRo/GphOIyRd4lS4w16sj4zZUook6Js095TwlrpaCrZpscuf1xw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 21:56:24 +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.009; Wed, 5 Jan 2022 21:56:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:56:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [tGKcMFtRBdYxd+hQu/D8fsBDSPnq5UlM] X-ClientProxiedBy: AM0PR02CA0183.eurprd02.prod.outlook.com (2603:10a6:20b:28e::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105215610.813119-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee190680-0ca6-4888-5af2-08d9d096371e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JSQdmdgchly91t8zvYniWOPLIOdUCOtw1iOsHjC6iPo+GMJc2Z9NVbEBcLxkPVSM6seR/D65WIPE3ZXNo7m3/Ama1EnffkLLieAEHEt5oTUVBJiV2iF+ybSYKYjD8mTXDX2oMg4fAQfo/UCceqxfMUV/TTJW0J6RV7+pTctG6K8ZhB2srJ2v8xi6JlQ2c66T3bOk/QprVSrvRg6iBM6YMjCZW7322nT30Mq0QuAfyVtP0axrB9LPwkkC5HrRvm3gBD0e8AVZJaAC35NpwhIWf2q5bEheLrl0znkCMY7ZueOSEO7dww0QeqQaMKzl8bTQ8vTGdhzGs2elKN2dPUsxGKb1QJ9ycNhMRdCO78RLuZLP2fbTa8i+X6A4lmOawkJbF3MC2lajEeCIDOu8/zDS/CzuGM9I81inGkHKnWdNaK6MIf5VIctxozEATbWoPTSuflih6OeS5uN+8eK0InoovvK0UKhX1kXJnMT5nldeNRNRlplFoJwehjkpZDHkdyCrdUA7+kH8rqLUTFmxpxbfhvrP/LmZnUNHZa6tsQqxOA4c16Kk96eaf9QFXVFzk1oiBWzEUIeuT3FlFohIe5vftrrxEi6HlUPTOO56lU+BfnSh9Y9X5CeveVdetnuwZ/ft7Qk5/WTrMJTRWq0CBUnDOk/CxmoLMVj5EB/9w9lbRdeTdOsIrdIzvU/ru4VBhitGHd802PIRO1r6rf3o8a66wSJYiUSoYloL0AKUbHWpUoiY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ez8SYf7aHxj7/89k4CwjtQncCjMU0jpnmGfygBS59nOvI8mZydnDS6vzWt7Z0eITDUM7nxNbD4nxOJ7HzfGmCz/4FLrZEccfQeqIS7yhEWr/z060xZgWMZa+xJzNqoW149M8v57KPwrwKPttl8aXrQUAOrUjuLOVSVV+e7tS3WkwJL5caDKsXRJviQuxUhuMN55WZpY/+HZcMeG5rD7RKRbLX1MValttQnF7g9izOn6pEXGhQdZU8304VMd23dwUHjIPMTumFUyDvyybUOx0/ASqyQxYkZ8RU2+YxgbPMMBJZMdqXWJi8Iqqi+NP9USNr9wpOAStcM9UbAwMvqe4H2+20hfwdy38EVAXvdcu58JpWZVX8vv0BF2o8EYduD4N3QLIvyrG5QmnuNhUCLkbIhm6mRuSVD4c3p8YFLUrdnu4T8Yr/LbUjllY3VObhlnTQrGAc8yFgDlrpTomiTJPr2tv7xahQoxfjrKRftgjnD1Sj+Q/bYSPebI5BqsQ5A2rmRTv8hEmqk2d5tHtUACObODy6LZBVqnevfJSuoeUOPfBxZWnnG2/T3l3glegJFfHPmj4WJpM5nxxzZWmj5t/Yw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: blNyTZ0j/YdPz8Yx7G5onrgCvmN14PXWOCrYkh2aOHCBCwtmlH/t5Yeg/i9Sy1eD19qWPANwxnCNilZDHbxw0AKHxmo+IImkFfSHUk2bcPV9o9c0g5BDin7TzDs1t9kOEiTff/Hn9vm1+eu1HLfw/YtQ30Qdg2ETqrYUfLmWL0Jy2pAWdxMYhrvwJ5qJ8u/WDFq3EUQCtXFj/huTHX+AtKAmo7z5kOeq6LXBv94viAlZCfjb7H+Wv/SGvx/N/RwJP3k1Wb3kO0nSnhGoHsWHymPU5eKbOIZDn5F2hPPHK1idDsUy1NcTIVwbj49L35DOGDxanzUH925pzxQydt4nXhzTsoqBY4qdDzgAbXGtL0EeCKSq/6JTSONwd5lM9+kZxSGhnV/noG1yRnFwVOETeP/G0vGKJGPj5qTBywEkNILoF83V695Ip+mAP8Njw0JC88j1C7XOK7BND7ngZbYrXSxKMQyw1PEaoAjYqsLFwHoyPuHWiC1xEi2aTHBjln+gu/JSH5Qwue0FOu21t5mUH9YVZKgRGRj3C9iJcS0RhiF5RAhXzyS/89SRlQ7xSfJnjiSi+4lfpPFjU6QmAnr2YkidSD2tbdy35QB9986X0lZRIktTWI/yMuJ0eMS+M2tJ/UTejkirXvIm8bhWoZ3Y3ik1e7dxMTGlx6Pi8HcsFK5rQ7My7LL0N1ceJwSWn6R4g3Sr/VfSA3E8VEYPsgAwk/EuNl3UZRqX0OWjLpoDOoDJKry9RLA1jg9cC39lp05aILVYge9ngddMgUjRDeWO5Jvu6l0awdAogXZnoJAfssacjEOW10ZCP6MIT1KStW6zZNUxdueVDfxwkEES7Gbkmh0JD/9mWEHcNstRtOhPOn0j3WSGxgeZ6ouCFRp/TauKYAC0kQw7CWTWEvhSEAsUF6NySIn1UFZcyRU3otNQWXHSeO22Aboxrso83VNIGXh81/L3q+hjGxGnaSU2ibSU1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee190680-0ca6-4888-5af2-08d9d096371e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:56:24.1012 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 04/10] avcodec/h263: Move functions only used once to their caller 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: /lTyupokqbfc In this case it means moving ff_h263_pred_dc() resp. ff_h263_pred_acdc() to ituh263enc.c resp. ituh263dec.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263.c | 128 ---------------------------------------- libavcodec/h263.h | 2 - libavcodec/ituh263dec.c | 89 +++++++++++++++++++++++++++- libavcodec/ituh263enc.c | 43 +++++++++++++- 4 files changed, 130 insertions(+), 132 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index f8fba3c9f4..b30ffaf878 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -102,47 +102,6 @@ void ff_h263_update_motion_val(MpegEncContext * s){ } } -int ff_h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) -{ - int x, y, wrap, a, c, pred_dc; - int16_t *dc_val; - - /* find prediction */ - if (n < 4) { - x = 2 * s->mb_x + (n & 1); - y = 2 * s->mb_y + ((n & 2) >> 1); - wrap = s->b8_stride; - dc_val = s->dc_val[0]; - } else { - x = s->mb_x; - y = s->mb_y; - wrap = s->mb_stride; - dc_val = s->dc_val[n - 4 + 1]; - } - /* B C - * A X - */ - a = dc_val[(x - 1) + (y) * wrap]; - c = dc_val[(x) + (y - 1) * wrap]; - - /* No prediction outside GOB boundary */ - if(s->first_slice_line && n!=3){ - if(n!=2) c= 1024; - if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024; - } - /* just DC prediction */ - if (a != 1024 && c != 1024) - pred_dc = (a + c) >> 1; - else if (a != 1024) - pred_dc = a; - else - pred_dc = c; - - /* we assume pred is positive */ - *dc_val_ptr = &dc_val[x + y * wrap]; - return pred_dc; -} - void ff_h263_loop_filter(MpegEncContext * s){ int qp_c; const int linesize = s->linesize; @@ -228,93 +187,6 @@ void ff_h263_loop_filter(MpegEncContext * s){ } } -void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) -{ - int x, y, wrap, a, c, pred_dc, scale, i; - int16_t *dc_val, *ac_val, *ac_val1; - - /* find prediction */ - if (n < 4) { - x = 2 * s->mb_x + (n & 1); - y = 2 * s->mb_y + (n>> 1); - wrap = s->b8_stride; - dc_val = s->dc_val[0]; - ac_val = s->ac_val[0][0]; - scale = s->y_dc_scale; - } else { - x = s->mb_x; - y = s->mb_y; - wrap = s->mb_stride; - dc_val = s->dc_val[n - 4 + 1]; - ac_val = s->ac_val[n - 4 + 1][0]; - scale = s->c_dc_scale; - } - - ac_val += ((y) * wrap + (x)) * 16; - ac_val1 = ac_val; - - /* B C - * A X - */ - a = dc_val[(x - 1) + (y) * wrap]; - c = dc_val[(x) + (y - 1) * wrap]; - - /* No prediction outside GOB boundary */ - if(s->first_slice_line && n!=3){ - if(n!=2) c= 1024; - if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024; - } - - if (s->ac_pred) { - pred_dc = 1024; - if (s->h263_aic_dir) { - /* left prediction */ - if (a != 1024) { - ac_val -= 16; - for(i=1;i<8;i++) { - block[s->idsp.idct_permutation[i << 3]] += ac_val[i]; - } - pred_dc = a; - } - } else { - /* top prediction */ - if (c != 1024) { - ac_val -= 16 * wrap; - for(i=1;i<8;i++) { - block[s->idsp.idct_permutation[i]] += ac_val[i + 8]; - } - pred_dc = c; - } - } - } else { - /* just DC prediction */ - if (a != 1024 && c != 1024) - pred_dc = (a + c) >> 1; - else if (a != 1024) - pred_dc = a; - else - pred_dc = c; - } - - /* we assume pred is positive */ - block[0]=block[0]*scale + pred_dc; - - if (block[0] < 0) - block[0] = 0; - else - block[0] |= 1; - - /* Update AC/DC tables */ - dc_val[(x) + (y) * wrap] = block[0]; - - /* left copy */ - for(i=1;i<8;i++) - ac_val1[i] = block[s->idsp.idct_permutation[i << 3]]; - /* top copy */ - for(i=1;i<8;i++) - ac_val1[8 + i] = block[s->idsp.idct_permutation[i]]; -} - int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, int *px, int *py) { diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 84a3a19517..982e545491 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -74,8 +74,6 @@ void ff_h263_loop_filter(MpegEncContext * s); int ff_h263_decode_mba(MpegEncContext *s); void ff_h263_encode_mba(MpegEncContext *s); void ff_init_qscale_tab(MpegEncContext *s); -int ff_h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr); -void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n); /** diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 3f982f414f..17af5d7f89 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -439,6 +439,93 @@ static void h263_decode_dquant(MpegEncContext *s){ ff_set_qscale(s, s->qscale); } +static void h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) +{ + int x, y, wrap, a, c, pred_dc, scale; + int16_t *dc_val, *ac_val, *ac_val1; + + /* find prediction */ + if (n < 4) { + x = 2 * s->mb_x + (n & 1); + y = 2 * s->mb_y + (n>> 1); + wrap = s->b8_stride; + dc_val = s->dc_val[0]; + ac_val = s->ac_val[0][0]; + scale = s->y_dc_scale; + } else { + x = s->mb_x; + y = s->mb_y; + wrap = s->mb_stride; + dc_val = s->dc_val[n - 4 + 1]; + ac_val = s->ac_val[n - 4 + 1][0]; + scale = s->c_dc_scale; + } + + ac_val += ((y) * wrap + (x)) * 16; + ac_val1 = ac_val; + + /* B C + * A X + */ + a = dc_val[(x - 1) + (y) * wrap]; + c = dc_val[(x) + (y - 1) * wrap]; + + /* No prediction outside GOB boundary */ + if (s->first_slice_line && n != 3) { + if (n != 2) c= 1024; + if (n != 1 && s->mb_x == s->resync_mb_x) a= 1024; + } + + if (s->ac_pred) { + pred_dc = 1024; + if (s->h263_aic_dir) { + /* left prediction */ + if (a != 1024) { + ac_val -= 16; + for (int i = 1; i < 8; i++) { + block[s->idsp.idct_permutation[i << 3]] += ac_val[i]; + } + pred_dc = a; + } + } else { + /* top prediction */ + if (c != 1024) { + ac_val -= 16 * wrap; + for (int i = 1; i < 8; i++) { + block[s->idsp.idct_permutation[i]] += ac_val[i + 8]; + } + pred_dc = c; + } + } + } else { + /* just DC prediction */ + if (a != 1024 && c != 1024) + pred_dc = (a + c) >> 1; + else if (a != 1024) + pred_dc = a; + else + pred_dc = c; + } + + /* we assume pred is positive */ + block[0] = block[0] * scale + pred_dc; + + if (block[0] < 0) + block[0] = 0; + else + block[0] |= 1; + + /* Update AC/DC tables */ + dc_val[(x) + (y) * wrap] = block[0]; + + /* left copy */ + for (int i = 1; i < 8; i++) + ac_val1[i] = block[s->idsp.idct_permutation[i << 3]]; + /* top copy */ + for (int i = 1; i < 8; i++) + ac_val1[8 + i] = block[s->idsp.idct_permutation[i]]; +} + static int h263_decode_block(MpegEncContext * s, int16_t * block, int n, int coded) { @@ -579,7 +666,7 @@ retry: } not_coded: if (s->mb_intra && s->h263_aic) { - ff_h263_pred_acdc(s, block, n); + h263_pred_acdc(s, block, n); i = 63; } s->block_last_index[n] = i; diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 79c8c9999e..d944c4879f 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -445,6 +445,47 @@ static void h263p_encode_umotion(PutBitContext *pb, int val) } } +static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) +{ + int x, y, wrap, a, c, pred_dc; + int16_t *dc_val; + + /* find prediction */ + if (n < 4) { + x = 2 * s->mb_x + (n & 1); + y = 2 * s->mb_y + ((n & 2) >> 1); + wrap = s->b8_stride; + dc_val = s->dc_val[0]; + } else { + x = s->mb_x; + y = s->mb_y; + wrap = s->mb_stride; + dc_val = s->dc_val[n - 4 + 1]; + } + /* B C + * A X + */ + a = dc_val[(x - 1) + (y) * wrap]; + c = dc_val[(x) + (y - 1) * wrap]; + + /* No prediction outside GOB boundary */ + if (s->first_slice_line && n != 3) { + if (n != 2) c = 1024; + if (n != 1 && s->mb_x == s->resync_mb_x) a = 1024; + } + /* just DC prediction */ + if (a != 1024 && c != 1024) + pred_dc = (a + c) >> 1; + else if (a != 1024) + pred_dc = a; + else + pred_dc = c; + + /* we assume pred is positive */ + *dc_val_ptr = &dc_val[x + y * wrap]; + return pred_dc; +} + void ff_h263_encode_mb(MpegEncContext * s, int16_t block[6][64], int motion_x, int motion_y) @@ -552,7 +593,7 @@ void ff_h263_encode_mb(MpegEncContext * s, if(i<4) scale= s->y_dc_scale; else scale= s->c_dc_scale; - pred_dc = ff_h263_pred_dc(s, i, &dc_ptr[i]); + pred_dc = h263_pred_dc(s, i, &dc_ptr[i]); level -= pred_dc; /* Quant */ if (level >= 0)