From patchwork Wed Feb 2 06:01:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1266572iov; Tue, 1 Feb 2022 22:02:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxrEFEESdFi7pDu9CmREYSTmeGNkntLviyRDHEpOKOFl35bFGZT+xfsZcXsN8FXYRQbR9hA X-Received: by 2002:a05:6402:1543:: with SMTP id p3mr28698543edx.273.1643781760136; Tue, 01 Feb 2022 22:02:40 -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 se21si8543188ejb.330.2022.02.01.22.02.39; Tue, 01 Feb 2022 22:02:40 -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=PpUpuZAF; 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 24A6C68B384; Wed, 2 Feb 2022 08:02:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067012.outbound.protection.outlook.com [40.92.67.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D1A168AE25 for ; Wed, 2 Feb 2022 08:02:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G31yy+5LjvUhhAS9OsLmhW0mcEBQjTzLpUWadGJGEAlKRtwg6UAEDhqgr1vUADLynw/XbIyNPODy9NCQ7iSwpaXQqKXcAO6LoDHNzktv+ZO9aJqIvFM8p8U+X5Du0L3OJPmDmdhNm7iOjIZjqIwMhb91v1YzG4AVoXAhZcjnbpaRtc5enXvy59VaKeR9hFzwlIRvBjfR6YSxk6TtutxPtS5jqDwxcWznhKorHE6/OZdeke7U3WXwOM0+OmdrDkKfeza2lETP1ACC7Wt5OVVbOSW93absSRF3fQlS3nU1qEM4oeGsinn3PuRDwZ/bQHOiQ45RmLa9gGi43fuqle9bzQ== 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=Iyg/CvDu2oTARWDO1Tn1/v+ZjffmJRbqfWlUbW5Qa+s=; b=Mph3CTglpcJJVbJ3k2RRvwDCEDm26THdoEYfzhum3hbbRPZAev7l9egqivAwDJXlAzt54Zl7qATHjkkCxedXHC+uF38PI2DkXcVTStgNeCVAbbHd0oWZ13gkHqV98CuI1bD9BCWZnHyUxynhyPW7a22mtHh8DDzUkGtGudDa+wNYrcuQFs4jBhrz+vwdP2zDfFqZM17H1npwb+hG4w+AmNhpI7MIbidwR1a10BRAkqLZMHEZmIP8v66bAglVSiRYZuhYhGPVhlGTAywn27c5BalpE6W0EPB9q+57fRdQNkj1+0rVk7pRN2zcDsUa+Sih4WgSjP7GNQfEqTu82OTg4A== 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=Iyg/CvDu2oTARWDO1Tn1/v+ZjffmJRbqfWlUbW5Qa+s=; b=PpUpuZAFEfiGCrO2cAULvDAbuVNGhVqdZj64LtbR7i29voxe1Kr1rXlkFKSKiPEtBhfvDMX7SaUAufDHlyvMjLLOOf1LRFwIo/prlvJIF8UgEt/MZC1H4JAtpVcr2PWQCe/REbOsfSjoOwZT71lqe6EW/FUnQbzSCLhApSHdEl+u3lShPY85/Va4tgBx5LZ+RfUTpNIo9qoI363o4AQ3f36O2H8pB4lnpckF54MpVrlpumod0KmLoalzyTNL92rg1OFBSIpOv/F5Bg1cGtfjgxYdPZ6KM43XIMUyTpuNGT7YlH7RXfw9n7nawOookivzEsXZL/81fx7APX2KdyRYfw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0302MB2813.eurprd03.prod.outlook.com (2603:10a6:800:e2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Wed, 2 Feb 2022 06:02:09 +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; Wed, 2 Feb 2022 06:02:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Feb 2022 07:01:58 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [HE2c1zKnBn9uzfEYphR9yv50xC68DyMz] X-ClientProxiedBy: AS9PR06CA0280.eurprd06.prod.outlook.com (2603:10a6:20b:45a::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220202060158.1636121-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b83f424-e477-4442-5741-08d9e6118c91 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2813:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JCPu7PyE0Q7bPi2/cC84dCdkNiMIjpDQdqCSrM7i4HEZvF4FdxHY3F4Ynh+bTHAJG5g24CFM9PK81A5l0dmQ93y36OmKOU3PXSao3Zlzn507pnZe9cRw/i2zIK0lpi2pRt0I0xLduwzfVIqgL3NwsKiXhproNWAMFj84JV0rrstDg7voMhziEip73dWkWcYlY7Ls5R2KCzcRDKqI6pSM+9gI1e6DPNa8ovKE76ZU3Mvgs5RkuUwLxKnHbZjVjskImW+Hx5KsIj4pryubdcS5dnd9p/JIW8yeSg3q+LUwtRFbzZuCg0TAj8zX30mJHlYb87oGT596omEJu9utwAIGSzHxpxe6CkNpOJZlC/xuXcLQYNxrydkozgldIMT0zoP73GJg/93M+KuTnxcwVJPJzIlzaUlhK/0LOaETybzeZPIo5T6eHwuORJTk3yLDlK6kVwDyqrUuwOZpRcoIt+XTD93ADav8QIAk62MKYlMKZLo85Mh9TYnd1m3mOqty6hb9V/WvBQGL9tLUThBNEiN2ztzZYG/VG1cs6YMXbJ/NqChZ564m9dg7/4BiCI/mNV+H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fJFchEIVXh6/dsdOE/CZl5FXCHbTeDWr1QezZ+FISvu1CDP+w9nl/gt+bx29ccMGD26MfL8/I4znB6nEAQuARkiWt6ogcChHKTSCqghQCFyjEjX4fZ5+kkI5eu99fL685CATQqTsDpLxVTjxYnZvYDYUKAarwY4V7LIcBhOJa5KpTFno+Vy6l2mBr+lYUbasallxS0G01e3q3tC2xg1RG9dbrrWgzNRyaeVRRRRrfrlYeiUZxFWrBjuNijdO1x5Yc7+pbauGaEfKAINiDZem+Ik/LL8lXUeEAAAC7+UmmEV4hyT7oMxh34LFzZfpdfXZpsa3jIzRcd1np7ZWDpGw7M1+6vDGhc08OUdgE77mtpJK8D/P9WwwrgD9Ai8M02QORz5mdf38/RLgStUVNy1xlScIpsjlwXUG086wUblQxzAJ/6jZaR+9/WsH/IEXqSrMUkQ1r5FedFFq/yTfvkkOGXKMrA22FoI3pn4HXvnXcKjY/tjLrx0wPFlwlBF2q0BA4hfMB4llfcJ40+wCQdnn4XXDNisaHOCy4PGa5Fgrv9WtHlJ0KI+eyjH3Rw2NSDxYKAq/8Agzm8mt4ykRmlawMYzjdLjdXBzUBWU1LS6Lp/vldGWVASUDoff2a5Xr2cI1yC1ezfEn0tdtTHqSBl4f+D1/e7/mIkUyMuAIxISyEltIUXZQ9Czwp3R6kbLAAf6EHyhnIqDyTuyQ77Z13II9uuwYPIw66j2GAyV7pvvZmY9qU9XVJjWD0iZqLsNaafYuRkhvd4VC/fB1l+QqVUZ1U9D/NWXf2B11TLRIFjc25gYm15ZxFNKjrSAHEmT2yc62CGPE8G3xj2XcIgmTPX2Xodl356NPBUeUpo3+XZZa1bJsFqtm9PeWvBu2sB9ZspP+ntXA1c8iYr52RVsNxhnPLuh5Jn5Y91PFOe81yNZ0UK/BPIl6OT+LOeRgIQvGbYwolZO5+CZftfoJy937K7FnNw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b83f424-e477-4442-5741-08d9e6118c91 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 06:02:09.8053 (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: VI1PR0302MB2813 Subject: [FFmpeg-devel] [PATCH 72/72] avcodec/mpegvideo: Make new_picture an ordinary AVFrame 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: abcA3BerDTHF It is currently a "Picture", an mpegvideo-specific type that has a lot of baggage, all of which is unnecessary for new_picture, because only its embedded AVFrame is ever used. So just use an ordinary AVFrame. Signed-off-by: Andreas Rheinhardt --- libavcodec/motion_est.c | 12 ++++----- libavcodec/mpeg4videoenc.c | 2 +- libavcodec/mpegvideo.c | 4 +-- libavcodec/mpegvideo.h | 4 +-- libavcodec/mpegvideo_enc.c | 50 +++++++++++++++++++------------------- libavcodec/snowenc.c | 2 +- libavcodec/svq1enc.c | 4 +-- 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 3df1e4f40a..69e1455c3e 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -681,7 +681,7 @@ static inline int h263_mv4_search(MPVEncContext *s, int mx, int my, int shift) if (s->mecc.me_sub_cmp[0] != s->mecc.mb_cmp[0]) { dmin_sum += s->mecc.mb_cmp[0](s, - s->new_picture.f->data[0] + + s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * 16 * stride, c->scratchpad, stride, 16); } @@ -705,8 +705,8 @@ static inline int h263_mv4_search(MPVEncContext *s, int mx, int my, int shift) s->hdsp.put_pixels_tab [1][dxy](c->scratchpad + 8, s->last_picture.f->data[2] + offset, s->uvlinesize, 8); } - dmin_sum += s->mecc.mb_cmp[1](s, s->new_picture.f->data[1] + s->mb_x * 8 + s->mb_y * 8 * s->uvlinesize, c->scratchpad, s->uvlinesize, 8); - dmin_sum += s->mecc.mb_cmp[1](s, s->new_picture.f->data[2] + s->mb_x * 8 + s->mb_y * 8 * s->uvlinesize, c->scratchpad + 8, s->uvlinesize, 8); + dmin_sum += s->mecc.mb_cmp[1](s, s->new_picture->data[1] + s->mb_x * 8 + s->mb_y * 8 * s->uvlinesize, c->scratchpad, s->uvlinesize, 8); + dmin_sum += s->mecc.mb_cmp[1](s, s->new_picture->data[2] + s->mb_x * 8 + s->mb_y * 8 * s->uvlinesize, c->scratchpad + 8, s->uvlinesize, 8); } c->pred_x= mx; @@ -895,7 +895,7 @@ void ff_estimate_p_frame_motion(MPVEncContext *s, int mb_type=0; Picture * const pic= &s->current_picture; - init_ref(c, s->new_picture.f->data, s->last_picture.f->data, NULL, 16*mb_x, 16*mb_y, 0); + init_ref(c, s->new_picture->data, s->last_picture.f->data, NULL, 16*mb_x, 16*mb_y, 0); av_assert0(s->quarter_sample==0 || s->quarter_sample==1); av_assert0(s->linesize == c->stride); @@ -1066,7 +1066,7 @@ int ff_pre_estimate_p_frame_motion(MPVEncContext *s, int P[10][2]; const int shift= 1+s->quarter_sample; const int xy= mb_x + mb_y*s->mb_stride; - init_ref(c, s->new_picture.f->data, s->last_picture.f->data, NULL, 16*mb_x, 16*mb_y, 0); + init_ref(c, s->new_picture->data, s->last_picture.f->data, NULL, 16*mb_x, 16*mb_y, 0); av_assert0(s->quarter_sample==0 || s->quarter_sample==1); @@ -1495,7 +1495,7 @@ void ff_estimate_b_frame_motion(MPVEncContext *s, int fmin, bmin, dmin, fbmin, bimin, fimin; int type=0; const int xy = mb_y*s->mb_stride + mb_x; - init_ref(c, s->new_picture.f->data, s->last_picture.f->data, + init_ref(c, s->new_picture->data, s->last_picture.f->data, s->next_picture.f->data, 16 * mb_x, 16 * mb_y, 2); get_limits(s, 16*mb_x, 16*mb_y); diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 2f78763344..81fbd918ca 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -646,7 +646,7 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], y = s->mb_y * 16; offset = x + y * s->linesize; - p_pic = s->new_picture.f->data[0] + offset; + p_pic = s->new_picture->data[0] + offset; s->mb_skipped = 1; for (i = 0; i < m->max_b_frames; i++) { diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7314f1b39e..d0fbdaf1b4 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -721,7 +721,7 @@ av_cold int ff_mpv_common_init(MPVMainContext *m) if (!(s->next_picture.f = av_frame_alloc()) || !(s->last_picture.f = av_frame_alloc()) || !(s->current_picture.f = av_frame_alloc()) || - !(s->new_picture.f = av_frame_alloc())) + !(s->new_picture = av_frame_alloc())) goto fail_nomem; if ((ret = ff_mpv_init_context_frame(m))) @@ -803,7 +803,7 @@ void ff_mpv_common_end(MPVMainContext *m) ff_mpv_picture_free(s->avctx, &s->last_picture); ff_mpv_picture_free(s->avctx, &s->current_picture); ff_mpv_picture_free(s->avctx, &s->next_picture); - ff_mpv_picture_free(s->avctx, &s->new_picture); + av_frame_free(&s->new_picture); m->context_initialized = 0; m->context_reinit = 0; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index ba081a9087..2d5ee61a27 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -130,10 +130,10 @@ typedef struct MPVContext { Picture next_picture; /** - * copy of the source picture structure for encoding. + * Reference to the source picture for encoding. * note, linesize & data, might not match the source picture (for field pictures) */ - Picture new_picture; + AVFrame *new_picture; /** * copy of the current picture structure. diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1d1cd6e3d3..ddfd123c46 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -995,7 +995,7 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) for (int i = 0; i < FF_ARRAY_ELEMS(m->tmp_frames); i++) av_frame_free(&m->tmp_frames[i]); - ff_mpv_picture_free(avctx, &s->new_picture); + av_frame_free(&s->new_picture); av_freep(&avctx->stats_out); @@ -1555,15 +1555,15 @@ static int select_input_picture(MPVMainEncContext *m) } } no_output_pic: - ff_mpeg_unref_picture(s->avctx, &s->new_picture); + av_frame_unref(s->new_picture); if (m->reordered_input_picture[0]) { m->reordered_input_picture[0]->reference = m->reordered_input_picture[0]->f->pict_type != AV_PICTURE_TYPE_B ? 3 : 0; - if ((ret = ff_mpeg_ref_picture(s->avctx, &s->new_picture, - m->reordered_input_picture[0]))) + if ((ret = av_frame_ref(s->new_picture, + m->reordered_input_picture[0]->f))) return ret; if (m->reordered_input_picture[0]->shared || s->avctx->rc_buffer_size) { @@ -1594,8 +1594,8 @@ no_output_pic: // input is not a shared pix -> reuse buffer for current_pix s->current_picture_ptr = m->reordered_input_picture[0]; for (i = 0; i < 4; i++) { - if (s->new_picture.f->data[i]) - s->new_picture.f->data[i] += INPLACE_OFFSET; + if (s->new_picture->data[i]) + s->new_picture->data[i] += INPLACE_OFFSET; } } ff_mpeg_unref_picture(s->avctx, &s->current_picture); @@ -1603,7 +1603,7 @@ no_output_pic: s->current_picture_ptr)) < 0) return ret; - s->picture_number = s->new_picture.f->display_picture_number; + s->picture_number = s->new_picture->display_picture_number; } return 0; } @@ -1761,7 +1761,7 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, } /* output? */ - if (s->new_picture.f->data[0]) { + if (s->new_picture->data[0]) { int growing_buffer = context_count == 1 && !pkt->data && !s->data_partitioning; int pkt_size = growing_buffer ? FFMAX(s->mb_width*s->mb_height*64+10000, avctx->internal->byte_buffer_size) - AV_INPUT_BUFFER_PADDING_SIZE : @@ -1785,7 +1785,7 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, init_put_bits(&m2->thread_context[i]->pb, start, end - start); } - s->pict_type = s->new_picture.f->pict_type; + s->pict_type = s->new_picture->pict_type; //emms_c(); ret = frame_start(m); if (ret < 0) @@ -2151,11 +2151,11 @@ static av_always_inline void encode_mb_internal(MPVEncContext *s, wrap_y = s->linesize; wrap_c = s->uvlinesize; - ptr_y = s->new_picture.f->data[0] + + ptr_y = s->new_picture->data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; - ptr_cb = s->new_picture.f->data[1] + + ptr_cb = s->new_picture->data[1] + (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width; - ptr_cr = s->new_picture.f->data[2] + + ptr_cr = s->new_picture->data[2] + (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width; if((mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){ @@ -2645,18 +2645,18 @@ static int sse_mb(MPVEncContext *s) if(w==16 && h==16) if(s->avctx->mb_cmp == FF_CMP_NSSE){ - return s->mecc.nsse[0](s, s->new_picture.f->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, s->dest[0], s->linesize, 16) + - s->mecc.nsse[1](s, s->new_picture.f->data[1] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[1], s->uvlinesize, 8) + - s->mecc.nsse[1](s, s->new_picture.f->data[2] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[2], s->uvlinesize, 8); + return s->mecc.nsse[0](s, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, s->dest[0], s->linesize, 16) + + s->mecc.nsse[1](s, s->new_picture->data[1] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[1], s->uvlinesize, 8) + + s->mecc.nsse[1](s, s->new_picture->data[2] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[2], s->uvlinesize, 8); }else{ - return s->mecc.sse[0](NULL, s->new_picture.f->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, s->dest[0], s->linesize, 16) + - s->mecc.sse[1](NULL, s->new_picture.f->data[1] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[1], s->uvlinesize, 8) + - s->mecc.sse[1](NULL, s->new_picture.f->data[2] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[2], s->uvlinesize, 8); + return s->mecc.sse[0](NULL, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, s->dest[0], s->linesize, 16) + + s->mecc.sse[1](NULL, s->new_picture->data[1] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[1], s->uvlinesize, 8) + + s->mecc.sse[1](NULL, s->new_picture->data[2] + s->mb_x * 8 + s->mb_y * s->uvlinesize * 8, s->dest[2], s->uvlinesize, 8); } else - return sse(s, s->new_picture.f->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize) - +sse(s, s->new_picture.f->data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], w>>1, h>>1, s->uvlinesize) - +sse(s, s->new_picture.f->data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize); + return sse(s, s->new_picture->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize) + +sse(s, s->new_picture->data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], w>>1, h>>1, s->uvlinesize) + +sse(s, s->new_picture->data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize); } static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ @@ -2711,7 +2711,7 @@ static int mb_var_thread(AVCodecContext *c, void *arg){ for(mb_x=0; mb_x < s->mb_width; mb_x++) { int xx = mb_x * 16; int yy = mb_y * 16; - uint8_t *pix = s->new_picture.f->data[0] + (yy * s->linesize) + xx; + uint8_t *pix = s->new_picture->data[0] + (yy * s->linesize) + xx; int varc; int sum = s->mpvencdsp.pix_sum(pix, s->linesize); @@ -3433,13 +3433,13 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; s->current_picture.encoding_error[0] += sse( - s, s->new_picture.f->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, + s, s->new_picture->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize); s->current_picture.encoding_error[1] += sse( - s, s->new_picture.f->data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, + s, s->new_picture->data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, s->dest[1], w>>1, h>>s->chroma_y_shift, s->uvlinesize); s->current_picture.encoding_error[2] += sse( - s, s->new_picture.f->data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, + s, s->new_picture->data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, s->dest[2], w>>1, h>>s->chroma_y_shift, s->uvlinesize); } if(s->loop_filter){ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 7200d94f65..fa0bb77994 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1653,7 +1653,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, mpv->avctx= s->avctx; mpv-> last_picture.f = s->last_picture[0]; - mpv-> new_picture.f = s->input_picture; + mpv-> new_picture = s->input_picture; mpv-> last_picture_ptr= &mpv-> last_picture; mpv->linesize = stride; mpv->uvlinesize= s->current_picture->linesize[1]; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 3a84bb6a07..64c856ddb5 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -278,7 +278,7 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, mpv->last_picture.f->data[0] = ref_plane; mpv->linesize = mpv->last_picture.f->linesize[0] = - mpv->new_picture.f->linesize[0] = + mpv->new_picture->linesize[0] = mpv->current_picture.f->linesize[0] = stride; mpv->width = width; mpv->height = height; @@ -328,7 +328,7 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, mpv->me.dia_size = s->avctx->dia_size; mpv->first_slice_line = 1; for (y = 0; y < block_height; y++) { - mpv->new_picture.f->data[0] = src - y * 16 * stride; // ugly + mpv->new_picture->data[0] = src - y * 16 * stride; // ugly mpv->mb_y = y; for (i = 0; i < 16 && i + 16 * y < height; i++) {