From patchwork Wed Nov 24 15:27:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31630 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp10608696iob; Wed, 24 Nov 2021 07:29:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwetZdPd21YSILZSXKggiWE+dF+bQ+Y2EhtQFecutDR+3j7hCpomAtdv9Ype9Ibm9Sq98qq X-Received: by 2002:a17:906:7ccf:: with SMTP id h15mr21009127ejp.386.1637767791758; Wed, 24 Nov 2021 07:29:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637767791; cv=none; d=google.com; s=arc-20160816; b=tw+Qyj9D2V1F0NakRvo1VnGfuV7tkuaLkl9Rtyps8tvZTjoNVuMaQBwPF/blHt4w+0 mpMwxfqkLgdLvokFwPb4UFl2f5ZZ5y/qZE6CYgFtKSqkmcadaC5/aPBmgw3YbzeoL/i6 Bb8VQrHV60npd14t+XJytYWo+sdnnpy6/3OIeM0r/C7fY3XkL1eD4FLHkfn4kbAr5krF bLAELI45ygAbnPb+Xba2/W+CDf5+xqSIs5Y5Nmgol6xUKwYTxWxo8sSWMPiFQjmffGWi eVHelLE6kAA90sQgqC0XdXNJvnx7R9H9xfwBaiWfsN4S7TQ1tIKFPqmkLXD7He/Gz4VT eboQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=gnezIR5kzcahpslym0xLfP3yLfoecj7IuZ2tRc2OHHE=; b=RIym82bGhlHDBkhMWITlNlj5jBQhat3v7c4uOn0hYD9ybH9QK1tAiHx/XAOu0WwU27 SG+aZNNlvAQ6QZCK75M8QJ6fGsXhzYlyNvgio1GdzmT7GmYzlapv6taMkcoE7qeILCdk zWDdDSYQ+6YAEnTu5rvpp6hSNYdDQtjvGA9Yp/Yy6nFCbS4+n1n9MCDdGD98/LLHmbc/ 8lzmXvTVpLAMTWy3JWwapP5bTrTamk6lpRC5eGaacOVTZS2XlcqDjQLgaHux8q0aHb48 j4bNPQ8s++g6UCS3rWkG2TtADSkms58yeRLVWrTWQp3V6+yrcwuJRXA/uo+c2kpyHpnk 1ehg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=V1muKAvE; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i1si233270ejw.736.2021.11.24.07.29.50; Wed, 24 Nov 2021 07:29:51 -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=@gmail.com header.s=20210112 header.b=V1muKAvE; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3876568ACFD; Wed, 24 Nov 2021 17:29:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3521C68A7B8 for ; Wed, 24 Nov 2021 17:28:56 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id w33-20020a17090a6ba400b001a722a06212so4487808pjj.0 for ; Wed, 24 Nov 2021 07:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oiDzAM7eA2b6mzv3/WcFgO87uoWC88FD7SP1YEO8ECk=; b=V1muKAvEHKMBsENTJV4eDcN4WvzGgB4QXbIoU14g6Ax8PGdt366A4aM+4hYBZkaola v/e/im+rtWKglwcWZ5mrTbTUtjQdxWy6zL7hFK3iCpGAiFU6x/fz2397djfRefGBsQZZ ipzvNR03pVI3tfeL82f+JIUGdMB0v1U0O8uhbg3OORyb01utIi1OJTU7C9Y5t7zmLFfF Kf5vc+hE9phn61qTyJrS33T6xlsufcdwuRmX96AkEL+FIxmynknnFGwsga4/JyiLNiXq Dpf58XCQ0t+1qtN7Vuaw7sBToDYtnffz1vJMs6PBF22F+Iq9ILmqrZmZODFUM1YSG/QK IvkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oiDzAM7eA2b6mzv3/WcFgO87uoWC88FD7SP1YEO8ECk=; b=osSYLFqAPi+Dt2uTu4kUwjQXBrsnIQOoIH7lXtVXGYILTCc68GdSL3E56QlH0Kfm8O Pnne3M/9HBX8wAbMVn7zCBDN46G05bCGy5OQR8c7FZf1GBYhDn1/dl5gZTlL06eG5jf9 HmKETB79jyXmOs+8FXjlYiY44U9gDKpddvnmh7B3KzUIharTfRmR4SfT49xDEw8hIA/T jObHdryVoGW75bx6Adwzw2/F2DAdG5k8X6PZxpIAS8tG17nzwxItYGfDpn0JtmH9iOTD YxgS4KdXvs0X9Ddhyo5wglNf+7yVoDRVjEv2RuFEcDUJdpnYbA6mJDhyILbnTt8NOBgQ VHcg== X-Gm-Message-State: AOAM531AVGI41zUi/B2uRXiQpHy9QE9OwE9byYIZf/P7syDlCO4vrC00 1pzhAXYF7kMZap80arYlmFcv2T6i3x4= X-Received: by 2002:a17:903:245:b0:143:c5ba:8bd8 with SMTP id j5-20020a170903024500b00143c5ba8bd8mr19989144plh.64.1637767734388; Wed, 24 Nov 2021 07:28:54 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b6sm83842pfm.170.2021.11.24.07.28.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Nov 2021 07:28:54 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Nov 2021 23:27:43 +0800 Message-Id: <1637767665-6777-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1637767665-6777-1-git-send-email-lance.lmwang@gmail.com> References: <1636712536-13114-1-git-send-email-lance.lmwang@gmail.com> <1637767665-6777-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 5/7] avcodec: suppport for bitpacked encode 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Vi92IIOebU5c From: Limin Wang Signed-off-by: Limin Wang --- Changelog | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/bitpacked_enc.c | 121 +++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 5 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 libavcodec/bitpacked_enc.c diff --git a/Changelog b/Changelog index 2035c27..a66231b4 100644 --- a/Changelog +++ b/Changelog @@ -32,6 +32,7 @@ version : - huesaturation video filter - colorspectrum source video filter - RTP packetizer for uncompressed video (RFC 4175) +- bitpacked encoder version 4.4: diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fbb2b79..6be90cd 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -244,6 +244,7 @@ OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER) += binkaudio.o OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER) += binkaudio.o OBJS-$(CONFIG_BINTEXT_DECODER) += bintext.o cga_data.o OBJS-$(CONFIG_BITPACKED_DECODER) += bitpacked_dec.o +OBJS-$(CONFIG_BITPACKED_ENCODER) += bitpacked_enc.o OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmvaudio.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 9ede09b..89d6526 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -65,6 +65,7 @@ extern const AVCodec ff_bethsoftvid_decoder; extern const AVCodec ff_bfi_decoder; extern const AVCodec ff_bink_decoder; extern const AVCodec ff_bitpacked_decoder; +extern const AVCodec ff_bitpacked_encoder; extern const AVCodec ff_bmp_encoder; extern const AVCodec ff_bmp_decoder; extern const AVCodec ff_bmv_video_decoder; diff --git a/libavcodec/bitpacked_enc.c b/libavcodec/bitpacked_enc.c new file mode 100644 index 0000000..a8cad64 --- /dev/null +++ b/libavcodec/bitpacked_enc.c @@ -0,0 +1,121 @@ +/* + * bitpacked encoder + * + * Copyright (c) 2021 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "encode.h" +#include "internal.h" +#include "put_bits.h" +#include "libavutil/pixdesc.h" + +struct BitpackedContext { + int (*encode)(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame); +}; + +static int encode_yuv422p10(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame) +{ + const int buf_size = avctx->height * avctx->width * avctx->bits_per_coded_sample / 8; + int ret; + uint8_t *dst; + const uint16_t *y; + const uint16_t *u; + const uint16_t *v; + PutBitContext pb; + const int depth = avctx->bits_per_raw_sample; + + ret = ff_get_encode_buffer(avctx, pkt, buf_size, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; + } + dst = pkt->data; + + init_put_bits(&pb, dst, buf_size); + + for (int i = 0; i < avctx->height; i++) { + y = (uint16_t*)(frame->data[0] + i * frame->linesize[0]); + u = (uint16_t*)(frame->data[1] + i * frame->linesize[1]); + v = (uint16_t*)(frame->data[2] + i * frame->linesize[2]); + + for (int j = 0; j < avctx->width; j += 2) { + /* u, y0, v, y1 */ + put_bits(&pb, depth, av_clip_uintp2(*u++, depth)); + put_bits(&pb, depth, av_clip_uintp2(*y++, depth)); + put_bits(&pb, depth, av_clip_uintp2(*v++, depth)); + put_bits(&pb, depth, av_clip_uintp2(*y++, depth)); + } + } + flush_put_bits(&pb); + + return 0; +} + + +static av_cold int encode_init(AVCodecContext *avctx) +{ + struct BitpackedContext *s = avctx->priv_data; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); + const int depth = desc->comp[0].depth; + + if (avctx->width & 1) { + av_log(avctx, AV_LOG_ERROR, "bitpacked needs even width\n"); + return AVERROR(EINVAL); + } + + avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc); + avctx->bits_per_raw_sample = depth; + avctx->bit_rate = ff_guess_coded_bitrate(avctx); + + if (avctx->pix_fmt == AV_PIX_FMT_YUV422P10) + s->encode = encode_yuv422p10; + else + return AVERROR(EINVAL); + + return 0; +} + +static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *frame, int *got_packet) +{ + struct BitpackedContext *s = avctx->priv_data; + int ret; + + ret = s->encode(avctx, pkt, frame); + if (ret) + return ret; + + *got_packet = 1; + return 0; +} + +const AVCodec ff_bitpacked_encoder = { + .name = "bitpacked", + .long_name = NULL_IF_CONFIG_SMALL("Bitpacked"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_BITPACKED, + .priv_data_size = sizeof(struct BitpackedContext), + .capabilities = AV_CODEC_CAP_DR1, + .init = encode_init, + .encode2 = encode_frame, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 4d30003..58e3322 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 13 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \