From patchwork Mon Mar 7 23:17:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:4285:0:0:0:0 with SMTP id wq5csp5472nkb; Mon, 7 Mar 2022 15:18:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7Cs6N85N0HGIvX5xvhjPSx+ms9LbBxot72J2+3mgOlE+xaakSM2iR9HBKOmZ/rI4EeQY2 X-Received: by 2002:a17:906:30d1:b0:6cf:d160:d8e4 with SMTP id b17-20020a17090630d100b006cfd160d8e4mr11000907ejb.265.1646695092562; Mon, 07 Mar 2022 15:18:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646695092; cv=none; d=google.com; s=arc-20160816; b=PleTX+gWoYAohAuQdJtyAV9cEcNYCQp8K5G7urRzINJdFKRGVwVdyIPE8DqFdLTFGa c++LwqTbesLbi5sETHKdXjkFNc5hNHd02cdmU+Zq3yTkYHPQq0kAru+b4IHnxKu6WFWM meUedZSTZyY4zqebgq+A8B/FM0G+x5eravgiQUlhhKBRK2zUIfQy6I6JkiCajiUchZD/ f2QwbDozClsubqNp82eAJmwOCkmvhiXyE+IHzcAKwE89/e5U+0LYQ/GfSXwNnTOYnIvk wsamWsvpb53+uBCXTRvjfisobxpkwOgFRP8ItcwXfrFiYje0Walz1O2oUbEoR18Q6r73 Uyzg== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=Eeur213i6k7PFGCHsBM7KiCnZ/tUwzyQnYB1mKwjKWM=; b=CTIrh+DVA0Z/cHRdEl1Z81djeWnXT6V6sX3AI+mCpMoTSVKlmMAYNC5c5RzCpDEmBY kLbv7qAB0wcL630BEkezrTCbk+mBLgyoZHTFWtHSTdbWQgHq83gtoPfMvC8pOmUa55XZ 3CiDW8csA5mJ2oE/Kk8QUi2CE2bEmAoFpMo/F66CYTg4DU/qlIVrBKOQcegzooP8uoGs HvXBgEAC1Q9o+TdmoU5AB97WfMGA3QLrRDUAAFRDK+kwq9lYKBKc89Lf6xt4Sk4/dtde sL7RXczEFavpFhaqvtOMXBLeFfRgV4xpWdiqQdtYDOfmFk3T8ojNS5xkrpQ7SR8SIOCg ti+Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l7-20020a056402254700b00412d085989bsi13462354edb.211.2022.03.07.15.18.11; Mon, 07 Mar 2022 15:18:12 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F33F168A6E0; Tue, 8 Mar 2022 01:18:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 862A968A6E0 for ; Tue, 8 Mar 2022 01:18:00 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nRMc3-0009IL-AG for ffmpeg-devel@ffmpeg.org; Tue, 08 Mar 2022 00:17:59 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id RMbunmeamSgGFRMc3nsuFb; Tue, 08 Mar 2022 00:17:59 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id RMbnnCsdLOPqFRMbnn78Br; Tue, 08 Mar 2022 00:17:44 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=622692a6 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=a4NEJbfMAAAA:8 a=oFE9F1wdAAAA:8 a=-xQvAoWo-MkjwnOOxY4A:9 a=ixBQwLOsxXTRgPO0apzN:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 8 Mar 2022 00:17:43 +0100 Message-Id: <20220307231743.28998-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJwUUT7Jte+tg/o+4aui2rRKDhg5d+TkeKqxuTD8/vUagLwSfWWJHNeEVr+zmbt48LqrChqQpDChS300cCcbtbK3wORm+pg+rgVTCqC4tm2Fj3Malpqd URLnOMZ892OuTMsmSVoOPCZWLNaGsz/xi311xmmJXwZWDwKuTkDkGlLpSbmMFQYIgVJe1nJ5LswaVw== Subject: [FFmpeg-devel] [PATCH] avcodec: Add dv marker bsf 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Hv5wNGAXmWqJ Signed-off-by: Michael Niedermayer --- doc/bitstream_filters.texi | 15 ++++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/dv_error_marker_bsf.c | 117 +++++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 libavcodec/dv_error_marker_bsf.c diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index a0092878c8..6a882ade97 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -132,6 +132,21 @@ the header stored in extradata to the key packets: ffmpeg -i INPUT -map 0 -flags:v +global_header -c:v libx264 -bsf:v dump_extra out.ts @end example +@section dv_error_marker + +Blocks in DV which are marked as damaged are replaced by blocks of the specified color. + +@table @option +@item color +The color to replace damaged blocks by +@item sta +The error status to replace. If -1 then the stamask is used. -1 is the default. +@item stamask +A 16 bit mask which specifies which of the 16 possible error status values are +to be replaced by colored blocks. 0xFFFE is the default which replaces all non 0 +error status values. +@end table + @section eac3_core Extract the core from a E-AC-3 stream, dropping extra channels. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bfc31bacd4..c5ed46f121 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1161,6 +1161,7 @@ OBJS-$(CONFIG_AV1_FRAME_SPLIT_BSF) += av1_frame_split_bsf.o OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_DCA_CORE_BSF) += dca_core_bsf.o +OBJS-$(CONFIG_DV_ERROR_MARKER_BSF) += dv_error_marker_bsf.o OBJS-$(CONFIG_EAC3_CORE_BSF) += eac3_core_bsf.o OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += extract_extradata_bsf.o \ av1_parse.o h2645_parse.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index d565286397..ab27972a88 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -31,6 +31,7 @@ extern const AVBitStreamFilter ff_av1_metadata_bsf; extern const AVBitStreamFilter ff_chomp_bsf; extern const AVBitStreamFilter ff_dump_extradata_bsf; extern const AVBitStreamFilter ff_dca_core_bsf; +extern const AVBitStreamFilter ff_dv_error_marker_bsf; extern const AVBitStreamFilter ff_eac3_core_bsf; extern const AVBitStreamFilter ff_extract_extradata_bsf; extern const AVBitStreamFilter ff_filter_units_bsf; diff --git a/libavcodec/dv_error_marker_bsf.c b/libavcodec/dv_error_marker_bsf.c new file mode 100644 index 0000000000..31c0fb8da6 --- /dev/null +++ b/libavcodec/dv_error_marker_bsf.c @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2022 Michael Niedermayer + * + * 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 "bsf.h" +#include "bsf_internal.h" +#include "libavutil/colorspace.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" + +typedef struct DVErrorMarkerContext { + const AVClass *class; + uint8_t color_rgba[4]; + int sta; + int stamask; + uint8_t marked_block[76]; +} DVErrorMarkerContext; + +static int dv_error_marker_init(AVBSFContext *ctx) +{ + DVErrorMarkerContext *s = ctx->priv_data; + int i; + + memset(s->marked_block, -1, 76); + for (i=0; i<4; i++) { + s->marked_block[14*i ] = RGB_TO_Y_JPEG(s->color_rgba[0], s->color_rgba[1],s->color_rgba[2]) + 128; + s->marked_block[14*i+1] = 0x06; + } + s->marked_block[4*14 + 10*0 ] = RGB_TO_V_JPEG(s->color_rgba[0], s->color_rgba[1],s->color_rgba[2]) - 128; + s->marked_block[4*14 + 10*0+1] = 0x16; + s->marked_block[4*14 + 10*1 ] = RGB_TO_U_JPEG(s->color_rgba[0], s->color_rgba[1],s->color_rgba[2]) - 128; + s->marked_block[4*14 + 10*1+1] = 0x16; + + return 0; +} + +static int dv_error_marker_filter(AVBSFContext *ctx, AVPacket *pkt) +{ + DVErrorMarkerContext *s = ctx->priv_data; + int ret = ff_bsf_get_packet_ref(ctx, pkt); + uint8_t *p; + int writable = 0; + int stamask; + int match_count = 0; + + if (ret < 0) + return ret; + + if (s->sta >= 0) { + stamask = 1 << s->sta; + } else + stamask = s->stamask; + + p = pkt->data; + for(int i = 0; i < pkt->size - 79; i+=80) { + // see page 44-46 or section 5.5 of http://web.archive.org/web/20060927044735/http://www.smpte.org/smpte_store/standards/pdf/s314m.pdf. + if ((p[i] >> 4) == 9 && ((stamask >> (p[i+3] >> 4))&1)) { + if (!writable) { + ret = av_packet_make_writable(pkt); + if (ret < 0) { + av_packet_unref(pkt); + return ret; + } + writable = 1; + p = pkt->data; + } + memcpy(p+i+4, s->marked_block, 76); + match_count ++; + } + } + av_log(ctx, AV_LOG_DEBUG, "%8"PRId64": Replaced %5d blocks by color %X\n", pkt->pts, match_count, AV_RB32(s->color_rgba)); + + return 0; +} + +#define OFFSET(x) offsetof(DVErrorMarkerContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) +static const AVOption options[] = { + { "color" , "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "yellow"}, 0, 0, FLAGS }, + { "stamask", "bitmask to specify which error status values to match" + , OFFSET(stamask ), AV_OPT_TYPE_INT , {.i64 = 0xFFFE}, 0, 0xFFFF, FLAGS }, + { "sta" , "specify which error status value to match" + , OFFSET(sta ), AV_OPT_TYPE_INT , {.i64 = -1},-1, 15, FLAGS }, + { NULL }, +}; + +static const AVClass dv_error_marker_class = { + .class_name = "dv_error_marker", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVBitStreamFilter ff_dv_error_marker_bsf = { + .name = "dv_error_marker", + .priv_data_size = sizeof(DVErrorMarkerContext), + .priv_class = &dv_error_marker_class, + .init = dv_error_marker_init, + .filter = dv_error_marker_filter, + .codec_ids = (const enum AVCodecID []){ AV_CODEC_ID_DVVIDEO, AV_CODEC_ID_NONE }, +};