From patchwork Mon Apr 17 18:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 41229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2582694pzb; Mon, 17 Apr 2023 11:46:46 -0700 (PDT) X-Google-Smtp-Source: AKy350bP3cjhIEiI7bT1Iy4JoMwzYqyslhAN+i4T3Phli/NNlwDlN2ZMckpbDCJrRk0w7M5Oa0dP X-Received: by 2002:aa7:c94c:0:b0:504:8173:ec8c with SMTP id h12-20020aa7c94c000000b005048173ec8cmr16808339edt.13.1681757206240; Mon, 17 Apr 2023 11:46:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681757206; cv=none; d=google.com; s=arc-20160816; b=05jCrUESwP/e37070OMCUfmBrH3ILREme7R0vguuAutxuxY4MnWWbur+6CpDrbGOr/ A191RljntGK88/S32ZaNzAT+fBIUNeGcpds5anKvwNYkcRIbkLw3ucvBj6FpaGdj+JKH WMgurcQpKpyNO7uJeiiXX0diljAb3XJnFZxey0Eug2oWc1RG2RIbVkm7CcWNfvt+dU+S 0f/557hwYZHFwE458G+jTCGAriowedMlJ6QVk2nAmDMOCcEXcCKIcv1rHio4daIaRyM1 2DZF9B2w2lqvgePV0hRZ8KcCwPWhrGnmcuuzkQ7fuI3iy1v7niLbEgIXitHZ5rvho0UZ hfuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=poVWNLDaVKMSQDhlYpAIDKQd3XDi8BjKMiC4/dAqTIY=; b=lKDqCXYYcO68mJACgazwXpx4o6L+QQyyopTcC3/5Faq5fhB3sRu+UbpJPnJpS9Ca4Y EWIb42txpZAU/iXUZMaq54NYRFGc5YZ54V10df+uwOApFJ0LXs7fAA0e/f1T5UzxBYD6 iqv3/k6K9UA8X+YIxP7dNTjMQUF9vekgnpY6tliNdVpFhwpTSbuLetlQ63cc1Q2kjk2N S3qRoHbQN8aPgDvi+tQi7/N8rBVMVWO1EoBMnFeliBjfKpHkH9XddkhyFLrlNA+buEGa Ed0zbeOKYMfckcumirmfsW2YVPA12sntPMpHdVJvp/LXk4hEbiZoxiJ0piOWWZcKFX5i oqgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=dCg7YBd+; 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 r18-20020aa7cfd2000000b00504923f3748si9524717edy.380.2023.04.17.11.46.45; Mon, 17 Apr 2023 11:46:46 -0700 (PDT) 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=20221208 header.b=dCg7YBd+; 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 A684C68BE4E; Mon, 17 Apr 2023 21:46:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f48.google.com (mail-ua1-f48.google.com [209.85.222.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CA7568B1C4 for ; Mon, 17 Apr 2023 21:46:35 +0300 (EEST) Received: by mail-ua1-f48.google.com with SMTP id o2so17645123uao.11 for ; Mon, 17 Apr 2023 11:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681757193; x=1684349193; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=VA9Rv5kRY3Hwc8lZxku92WZklg+rQMPp11xbzYrFDmw=; b=dCg7YBd+xjAJs4JeHOUGu53nLVCcet6BnvUHsVcyJk9nZCF+LU0eq1EKGb1Z9HHct3 ZDLxhDULB0NB+3sfQtQbnBL8yvwEai0IMZimwW62V5ineBaAM/yC7nZzSjrMXNJWqC6T sm2WK+m46heStpp4rrBLnIdPjo6rP5KiNcj3PgszUeSf6qMzVdhdLX0p3iZMGurRRcJJ zf8YsouL7soritR6cEBk6YExH8bHuGmkBY+H2v/TSpvxcJVZwVi4WIqgXRXib69U3eBL k9eyf+cN1E3ABAhZSmaieUdN6sRG7p1wRZNIRBcgwSOS3M8br+0DtyHAJM++5L6tmCNX 5YIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681757193; x=1684349193; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=VA9Rv5kRY3Hwc8lZxku92WZklg+rQMPp11xbzYrFDmw=; b=E58DAJ7uH5Y2PDNDn2VcWqej6dkm/1oqbWck5PRGPtalqgCbmdRtf4PU66pYGoSO7c rS/pAgTnIchL5iNTS36bA5R3jjXFKQUQ7ePvBW5kSf6tYwuWvVgZq1ap5VnGef8Ju2OT u33qFZFPe/GFNeGP+v00j4kZDCWJ2So6TNWwXfReF25X+qs84Q0HD1clGyBn6vCekhyI 9/rK6lNdLuuY/qVSNreGuMj+tKnRCWYNcsmosvzDAQnb+3cqnIgV49e77FwYcTHwst36 xTN6DCxE2zl5yeB426moxtT8vmbIRXu3jotnEh8g10jJpxTnFFusd+z47sjg7aAf6fVp dxdg== X-Gm-Message-State: AAQBX9eqdBhE7HAT/fuwYku99S64TOZkdLV08cSiStAFzvqnihFbI3J2 4P1tjvVwDI9OlhwstwV/gCtrvHThPCGFHUJsqHlRydQq X-Received: by 2002:ab0:4a56:0:b0:772:218a:b968 with SMTP id r22-20020ab04a56000000b00772218ab968mr8530810uae.2.1681757193499; Mon, 17 Apr 2023 11:46:33 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Mon, 17 Apr 2023 20:46:15 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] PDV format support 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kklQOX8jzn3x Patches attached. From 5a26b13f589c96075fa1dc269cc768163afe1651 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 17 Apr 2023 19:19:42 +0200 Subject: [PATCH 1/2] avcodec: add PDV decoder Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 +++ libavcodec/codec_id.h | 1 + libavcodec/pdvdec.c | 127 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 libavcodec/pdvdec.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index aa10fbfcf8..a1a8b8b88e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -583,6 +583,7 @@ OBJS-$(CONFIG_PBM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PBM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PCX_DECODER) += pcx.o OBJS-$(CONFIG_PCX_ENCODER) += pcxenc.o +OBJS-$(CONFIG_PDV_DECODER) += pdvdec.o OBJS-$(CONFIG_PFM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PFM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGM_DECODER) += pnmdec.o pnm.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 797fe39486..8eeed34e57 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -251,6 +251,7 @@ extern const FFCodec ff_pbm_encoder; extern const FFCodec ff_pbm_decoder; extern const FFCodec ff_pcx_encoder; extern const FFCodec ff_pcx_decoder; +extern const FFCodec ff_pdv_decoder; extern const FFCodec ff_pfm_encoder; extern const FFCodec ff_pfm_decoder; extern const FFCodec ff_pgm_encoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index efdcb59bc9..d40977d6b3 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1923,6 +1923,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ViewQuest VQC"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_PDV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pdv", + .long_name = NULL_IF_CONFIG_SMALL("PDV (PlayDate Video)"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 64df9699f4..70800ec20b 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -320,6 +320,7 @@ enum AVCodecID { AV_CODEC_ID_WBMP, AV_CODEC_ID_MEDIA100, AV_CODEC_ID_VQC, + AV_CODEC_ID_PDV, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/pdvdec.c b/libavcodec/pdvdec.c new file mode 100644 index 0000000000..8359feac0d --- /dev/null +++ b/libavcodec/pdvdec.c @@ -0,0 +1,127 @@ +/* + * PDV video format + * + * Copyright (c) 2023 Paul B Mahol + * + * 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 "codec_internal.h" +#include "decode.h" +#include "zlib_wrapper.h" + +#include + +typedef struct PDVContext { + AVFrame *previous_frame; + FFZStream zstream; +} PDVContext; + +static av_cold int decode_init(AVCodecContext *avctx) +{ + PDVContext *s = avctx->priv_data; + + avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; + + s->previous_frame = av_frame_alloc(); + if (!s->previous_frame) + return AVERROR(ENOMEM); + + return ff_inflate_init(&s->zstream, avctx); +} + +static av_cold int decode_end(AVCodecContext *avctx) +{ + PDVContext *s = avctx->priv_data; + + av_frame_free(&s->previous_frame); + ff_inflate_end(&s->zstream); + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, AVFrame *frame, + int *got_frame, AVPacket *avpkt) +{ + PDVContext *s = avctx->priv_data; + AVFrame *prev_frame = s->previous_frame; + z_stream *const zstream = &s->zstream.zstream; + uint8_t *dst, *prev = prev_frame->data[0]; + int ret, zret; + + zret = inflateReset(zstream); + if (zret != Z_OK) { + av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret); + return AVERROR_INVALIDDATA; + } + + if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) + return ret; + + zstream->next_in = avpkt->data; + zstream->avail_in = avpkt->size; + + dst = frame->data[0]; + for (int i = 0; i < avctx->height; i++) { + zstream->next_out = dst; + zstream->avail_out = (avctx->width + 7) >> 3; + + zret = inflate(zstream, Z_SYNC_FLUSH); + if (zret != Z_OK && zret != Z_STREAM_END) { + av_log(avctx, AV_LOG_ERROR, + "Inflate failed with return code: %d.\n", zret); + return AVERROR_INVALIDDATA; + } + + if (!(avpkt->flags & AV_PKT_FLAG_KEY)) { + for (int j = 0; j < (avctx->width + 7) >> 3; j++) + dst[j] ^= prev[j]; + prev += prev_frame->linesize[0]; + } + + dst += frame->linesize[0]; + } + + av_frame_unref(s->previous_frame); + if ((ret = av_frame_ref(s->previous_frame, frame)) < 0) + return ret; + + if (avpkt->flags & AV_PKT_FLAG_KEY) { + frame->key_frame = 1; + frame->pict_type = AV_PICTURE_TYPE_I; + } else { + frame->pict_type = AV_PICTURE_TYPE_P; + } + + *got_frame = 1; + + return avpkt->size; +} + +const FFCodec ff_pdv_decoder = { + .p.name = "pdv", + CODEC_LONG_NAME("PDV (PlayDate Video)"), + .priv_data_size = sizeof(PDVContext), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_PDV, + .p.capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .init = decode_init, + .close = decode_end, + FF_CODEC_DECODE_CB(decode_frame), +}; -- 2.39.1