From patchwork Wed Aug 28 15:45:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14759 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0B5A0448BE0 for ; Wed, 28 Aug 2019 18:53:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D62F268AAF2; Wed, 28 Aug 2019 18:53:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBEA868AAEF for ; Wed, 28 Aug 2019 18:53:27 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id f19so177347plr.3 for ; Wed, 28 Aug 2019 08:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2IGrquMOwAGT4tkst/3iTpU6Gmce2umx5wmhLeWcB9Q=; b=Cm2Spu+K7a08iX2vXH4rRVTiU200u3MErAeVEJp+CbVW+logP6iRgrD+G+BBh2zALU NFrhbR1G/jMP4MqGcXfCuK4rXFUrfgFS3v3NlcvsPRuFuSTk3iDG9dWuD+yqE6q2NnVF Eg63Ed8HndaXjcqczCgo6PkJWNbfSm9YpBG3DPt/FQfgzF7+wCNu1YEEf5OlIzkEGmP5 w6EEwHVBfZzyGgd7NPIvOGK7S+M5YgPdEfNL1JT++td/so73kUlsmd82vFCR2qdqf0f/ hjGVpkXcCRjj2qa0RJqIcb6pBHXf/J91klnyFRSz5/CB59ufVLVLifBtzS5521zaX557 CKsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2IGrquMOwAGT4tkst/3iTpU6Gmce2umx5wmhLeWcB9Q=; b=W3EolnOn4/WHV5XyAK/zZH7lYcCnxMvZBRHKHz8ritr01IEdxWsv3dI3Ffmr+1R8eh GkFF18pLEartWO/SecaQBvYw3oASj2bUVBCg2m5CIru67sZdPBLQBrue7IaELN+QfAoi twgBs8zS837OmVtlMEZCiJlzOC2e/Bphw0EDJqTt3oMZa4xXnsPFZg1G6ugvdOYNv4BN MmZJGntnrdlioVYuNyIgizBf/K54EMkb9NkHM3rA4l89lEwwh65kFwgDc8yWjArt5Irf RqnP7cU9mF2GRwbfJTBXkEq6h/gkdNPhkVuwuHV+bWwZYysugNKczpauKO/nJnUFiFoa XkXw== X-Gm-Message-State: APjAAAVIWxWdj60u9FKeaErdN/Oz32Au+0T8OVQRWGT0tmX/PcaiUPg2 bgw9ewA9/YYc+Kk5tkTl28VWjfnq X-Google-Smtp-Source: APXvYqzTpkuipcDuDOqTD4+oraE/47ela0Ur60EyFG9vzFt/cmEY+ZfoSLBkoKoDc/WIHUczCBJtXw== X-Received: by 2002:a17:902:1ab:: with SMTP id b40mr4996549plb.136.1567007158867; Wed, 28 Aug 2019 08:45:58 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e3sm2489502pjr.9.2019.08.28.08.45.57 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 28 Aug 2019 08:45:58 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Aug 2019 23:45:16 +0800 Message-Id: <1567007116-9088-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1567007116-9088-1-git-send-email-lance.lmwang@gmail.com> References: <1567007116-9088-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 5/5] avcodec/v210enc: define DEFINE_V210_ENCODE_FUNC to remove duplicate code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/v210enc.c | 171 +++++++++++++++++++++------------------------------ 1 file changed, 69 insertions(+), 102 deletions(-) diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 2400538..b40c7ae 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -89,15 +89,77 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } +#define DEFINE_V210_ENCODE_FUNC(nbits, depth) \ +static void v210_enc_##depth(AVCodecContext *avctx, \ + uint8_t *dst, const AVFrame *pic) \ +{ \ + V210EncContext *s = avctx->priv_data; \ + int aligned_width = ((avctx->width + 47) / 48) * 48; \ + int stride = aligned_width * 8 / 3; \ + int line_padding = stride - ((avctx->width * 8 + 11) / 12) * 4; \ + int h, w; \ + int bytes = nbits / 8; \ + const uint##nbits##_t *y = (const uint##nbits##_t *)pic->data[0]; \ + const uint##nbits##_t *u = (const uint##nbits##_t *)pic->data[1]; \ + const uint##nbits##_t *v = (const uint##nbits##_t *)pic->data[2]; \ + const int sample_size = 6 * s->sample_factor_##depth; \ + const int sample_w = avctx->width / sample_size; \ + \ + for (h = 0; h < avctx->height; h++) { \ + uint32_t val; \ + w = sample_w * sample_size; \ + s->pack_line_##depth (y, u, v, dst, w); \ + \ + y += w; \ + u += w >> 1; \ + v += w >> 1; \ + dst += sample_w * 16 * s->sample_factor_##depth; \ + \ + for (; w < avctx->width - 5; w += 6) { \ + WRITE_PIXELS(u, y, v, depth); \ + WRITE_PIXELS(y, u, y, depth); \ + WRITE_PIXELS(v, y, u, depth); \ + WRITE_PIXELS(y, v, y, depth); \ + } \ + if (w < avctx->width - 1) { \ + WRITE_PIXELS(u, y, v, depth); \ + \ + val = CLIP(*y++, depth); \ + if (w == avctx->width - 2) { \ + AV_WL32(dst, val); \ + dst += 4; \ + } \ + } \ + if (w < avctx->width - 3) { \ + val |= (CLIP(*u++, depth) << (20-depth)) | \ + (CLIP(*y++, depth) << (30-depth)); \ + AV_WL32(dst, val); \ + dst += 4; \ + \ + val = CLIP(*v++, depth) << (10-depth) | \ + (CLIP(*y++, depth) << (20-depth)); \ + AV_WL32(dst, val); \ + dst += 4; \ + } \ + \ + memset(dst, 0, line_padding); \ + dst += line_padding; \ + y += pic->linesize[0] / bytes - avctx->width; \ + u += pic->linesize[1] / bytes - avctx->width / 2; \ + v += pic->linesize[2] / bytes - avctx->width / 2; \ + } \ +} + +DEFINE_V210_ENCODE_FUNC(8, 8) +DEFINE_V210_ENCODE_FUNC(16, 10); + static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pic, int *got_packet) { - V210EncContext *s = avctx->priv_data; int aligned_width = ((avctx->width + 47) / 48) * 48; int stride = aligned_width * 8 / 3; - int line_padding = stride - ((avctx->width * 8 + 11) / 12) * 4; AVFrameSideData *side_data; - int h, w, ret; + int ret; uint8_t *dst; ret = ff_alloc_packet2(avctx, pkt, avctx->height * stride, avctx->height * stride); @@ -107,105 +169,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } dst = pkt->data; - if (pic->format == AV_PIX_FMT_YUV422P10) { - const uint16_t *y = (const uint16_t *)pic->data[0]; - const uint16_t *u = (const uint16_t *)pic->data[1]; - const uint16_t *v = (const uint16_t *)pic->data[2]; - - const int sample_size = 6 * s->sample_factor_10; - const int sample_w = avctx->width / sample_size; - - for (h = 0; h < avctx->height; h++) { - uint32_t val; - w = sample_w * sample_size; - s->pack_line_10(y, u, v, dst, w); - - y += w; - u += w >> 1; - v += w >> 1; - dst += sample_w * 16 * s->sample_factor_10; - - for (; w < avctx->width - 5; w += 6) { - WRITE_PIXELS(u, y, v, 10); - WRITE_PIXELS(y, u, y, 10); - WRITE_PIXELS(v, y, u, 10); - WRITE_PIXELS(y, v, y, 10); - } - if (w < avctx->width - 1) { - WRITE_PIXELS(u, y, v, 10); - - val = CLIP(*y++, 10); - if (w == avctx->width - 2) { - AV_WL32(dst, val); - dst += 4; - } - } - if (w < avctx->width - 3) { - val |= (CLIP(*u++, 10) << (20-10)) | (CLIP(*y++, 10) << (30-10)); - AV_WL32(dst, val); - dst += 4; - - val = CLIP(*v++, 10) << (10-10) | (CLIP(*y++, 10) << (20-10)); - AV_WL32(dst, val); - dst += 4; - } - - memset(dst, 0, line_padding); - dst += line_padding; - y += pic->linesize[0] / 2 - avctx->width; - u += pic->linesize[1] / 2 - avctx->width / 2; - v += pic->linesize[2] / 2 - avctx->width / 2; - } - } else if(pic->format == AV_PIX_FMT_YUV422P) { - const uint8_t *y = pic->data[0]; - const uint8_t *u = pic->data[1]; - const uint8_t *v = pic->data[2]; - - const int sample_size = 6 * s->sample_factor_8; - const int sample_w = avctx->width / sample_size; - - for (h = 0; h < avctx->height; h++) { - uint32_t val; - w = sample_w * sample_size; - s->pack_line_8(y, u, v, dst, w); - - y += w; - u += w >> 1; - v += w >> 1; - dst += sample_w * 16 * s->sample_factor_8; - - for (; w < avctx->width - 5; w += 6) { - WRITE_PIXELS(u, y, v, 8); - WRITE_PIXELS(y, u, y, 8); - WRITE_PIXELS(v, y, u, 8); - WRITE_PIXELS(y, v, y, 8); - } - if (w < avctx->width - 1) { - WRITE_PIXELS(u, y, v, 8); - - val = CLIP(*y++, 8) << (10-8); - if (w == avctx->width - 2) { - AV_WL32(dst, val); - dst += 4; - } - } - if (w < avctx->width - 3) { - val |= (CLIP(*u++, 8) << (20-8)) | (CLIP(*y++, 8) << (30-8)); - AV_WL32(dst, val); - dst += 4; - - val = (CLIP(*v++, 8) << (10-8)) | (CLIP(*y++, 8) << (20-8)); - AV_WL32(dst, val); - dst += 4; - } - memset(dst, 0, line_padding); - dst += line_padding; - - y += pic->linesize[0] - avctx->width; - u += pic->linesize[1] - avctx->width / 2; - v += pic->linesize[2] - avctx->width / 2; - } - } + if (pic->format == AV_PIX_FMT_YUV422P10) + v210_enc_10(avctx, dst, pic); + else if(pic->format == AV_PIX_FMT_YUV422P) + v210_enc_8(avctx, dst, pic); side_data = av_frame_get_side_data(pic, AV_FRAME_DATA_A53_CC); if (side_data && side_data->size) {