From patchwork Sat Mar 12 18:11:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp823031nkb; Sat, 12 Mar 2022 10:12:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeIEEVlesTT3Y51l5Q3Rg7uOd67nB2Y544MKueRX/ld8RaMLuWpyzqfe1L68h+B9LGMi99 X-Received: by 2002:a17:907:1c91:b0:6d7:b83:cddb with SMTP id nb17-20020a1709071c9100b006d70b83cddbmr12599960ejc.739.1647108744881; Sat, 12 Mar 2022 10:12:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647108744; cv=none; d=google.com; s=arc-20160816; b=lt01gzzt4xY8v9PkIDGIP34IP2lsf97Uk7iRLVPBBdSi/CDtb3YgbVU0AZG99ensxt 3b2hbNvm6qavt1PlcfsvIUreHbY7ARQUCt0Dxb6qhQtIuQUpfHH5g8AU4jxB75s474o1 nWYBlcbNvGO4+v29M15SfnPQcd4Cf0PM6h/t4X7eulEJ2QlyiuXJzcadTd9nO3nZVd8r FcAgjYCWf7axga6J2peJoeP9bQSpzwdE/Pr7XSUw+VQigfSUG/5qQQKLkp1x5CUgdCew aV/HHig+PxYRGOKEeetYdfozeuWHi26Ax7ftrZ5mF978emjS+eqV+D4hxvPun54PVfH1 7ozg== 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=yMJoJedxnNTYqcAoU8uO25zjyuUNQSO760BnQlGLGj8=; b=O/VSjAOuhYZw5O8sp+s/8KDMYemNbvOEwrwKBNqJdBA28R0OSxkHjnbz1XJG9Pv5rI z2jDL57k3ivFOo+/csQA4Jumx362iAZEAWacsy6Z77w8Q3fBRKTxdPmDqVPag44ZU7fr DJuuXYWa1Af/dVGvmVMR+495Tmyx64lB4LODLdwAGEn5mSoamg8L4deGtQMfzl+4VO4G 08pvEpu9c9YsmWMLOXpLQHep3RBihMN8w6EceXn6K5byTq6UGjq+H5U+ixfDPObI1lj7 Kax358AA080myEbYK6VU8nyGLOkbsWvJgdMXiqZD6bl68+OklJWBk50flcWYcDTsC/hs SYoA== 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 kw3-20020a170907770300b006d1ad1eea4csi6334766ejc.402.2022.03.12.10.12.24; Sat, 12 Mar 2022 10:12:24 -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 A943C68AAA0; Sat, 12 Mar 2022 20:12:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-1.mx.upcmail.net (vie01a-dmta-at02-1.mx.upcmail.net [62.179.121.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EC3B68AAA0 for ; Sat, 12 Mar 2022 20:12:15 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nT6Du-0003lQ-9V for ffmpeg-devel@ffmpeg.org; Sat, 12 Mar 2022 19:12:14 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id T6BfnDsxMSgGFT6Dun2dsg; Sat, 12 Mar 2022 19:12:14 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id T6DfnrubkOPqFT6DfnBiIz; Sat, 12 Mar 2022 19:11:59 +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=622ce27d 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=djXbFVEq1orTyDWKpCwA:9 a=ixBQwLOsxXTRgPO0apzN:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 12 Mar 2022 19:11:58 +0100 Message-Id: <20220312181158.5863-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfOEjTvxFYTyjM90R+zvDtNTq2JbYdUjQnjg8vrM2iBX7vpOYm7/apqhhyepVrl9gJjEm0qI/O2nuYWGaSabrxWMAJSwkCKFQ8F2mPkAzX3+kWUj98DOX m1T0a0ezEH9prJ0HOqL6mGzmMjYPM/4NUodoBcxWKe2ShBG7VxiIWTN0PyPrApm8RGFy9Z2b7dQUog== 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: i6EuSQjvDppY Signed-off-by: Michael Niedermayer --- doc/bitstream_filters.texi | 30 +++++++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/dv_error_marker_bsf.c | 139 +++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 libavcodec/dv_error_marker_bsf.c diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index a0092878c8..8c5d84dceb 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -132,6 +132,36 @@ 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 +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. +@table @samp +@item ok +No error, no concealment +@item err +Error, No concealment +@item res +Reserved +@item notok +Error or concealment +@item notres +Not reserved +@item Aa, Ba, Ca, Ab, Bb, Cb, A, B, C, a, b, erri, erru +The specific error status code +@end table +see page 44-46 or section 5.5 of +@url{http://web.archive.org/web/20060927044735/http://www.smpte.org/smpte_store/standards/pdf/s314m.pdf} + +@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 cd929da8e6..f36b2e992d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1163,6 +1163,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..ef83e914da --- /dev/null +++ b/libavcodec/dv_error_marker_bsf.c @@ -0,0 +1,139 @@ +/* + * 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; + uint8_t marked_block[76]; +} DVErrorMarkerContext; + +static void setdc(uint8_t *b, const uint8_t color_rgba[4], int cblocks, int y_step, int v_step, int u_step) { + for (int i=0; i<4; i++) { + b[0] = RGB_TO_Y_JPEG(color_rgba[0], color_rgba[1],color_rgba[2]) + 128; + b[1] = 0x06; + b += y_step; + } + for (int i=0; ipriv_data; + int i; + + memset(s->marked_block, -1, 76); + setdc(s->marked_block, s->color_rgba, 1, 14, 10, 10); + setdc(s->marked_block, s->color_rgba, 2, 10, 10, 8); + + 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 = s->sta; + int match_count = 0; + + if (ret < 0) + return ret; + + 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 }, + { "sta" , "specify which error status value to match" + , OFFSET(sta ), AV_OPT_TYPE_FLAGS, {.i64 = 0xFFFE}, 0, 0xFFFF, FLAGS, "sta" }, + { "ok" , "No error, no concealment", 0, AV_OPT_TYPE_CONST, {.i64 = 0x0001}, 0, 0xFFFF, FLAGS, "sta"}, + { "Aa" , "No error, concealment from previous frame type a",0, AV_OPT_TYPE_CONST, {.i64 = 0x0004}, 0, 0xFFFF, FLAGS, "sta"}, + { "Ba" , "No error, concealment from next frame type a", 0, AV_OPT_TYPE_CONST, {.i64 = 0x0010}, 0, 0xFFFF, FLAGS, "sta"}, + { "Ca" , "No error, unspecified concealment type a", 0, AV_OPT_TYPE_CONST, {.i64 = 0x0040}, 0, 0xFFFF, FLAGS, "sta"}, + { "erri" , "Error with inserted code, No concealment", 0, AV_OPT_TYPE_CONST, {.i64 = 0x0080}, 0, 0xFFFF, FLAGS, "sta"}, + { "erru" , "Error with unidentified pos, No concealment", 0, AV_OPT_TYPE_CONST, {.i64 = 0x8000}, 0, 0xFFFF, FLAGS, "sta"}, + { "err" , "Error, No concealment", 0, AV_OPT_TYPE_CONST, {.i64 = 0x8080}, 0, 0xFFFF, FLAGS, "sta"}, + { "Ab" , "No error, concealment from previous frame type b",0, AV_OPT_TYPE_CONST, {.i64 = 0x0400}, 0, 0xFFFF, FLAGS, "sta"}, + { "Bb" , "No error, concealment from next frame type b", 0, AV_OPT_TYPE_CONST, {.i64 = 0x1000}, 0, 0xFFFF, FLAGS, "sta"}, + { "Cb" , "No error, unspecified concealment type b", 0, AV_OPT_TYPE_CONST, {.i64 = 0x4000}, 0, 0xFFFF, FLAGS, "sta"}, + { "A" , "No error, concealment from previous frame", 0, AV_OPT_TYPE_CONST, {.i64 = 0x0404}, 0, 0xFFFF, FLAGS, "sta"}, + { "B" , "No error, concealment from next frame", 0, AV_OPT_TYPE_CONST, {.i64 = 0x1010}, 0, 0xFFFF, FLAGS, "sta"}, + { "C" , "No error, unspecified concealment", 0, AV_OPT_TYPE_CONST, {.i64 = 0x4040}, 0, 0xFFFF, FLAGS, "sta"}, + { "a" , "No error, concealment type a", 0, AV_OPT_TYPE_CONST, {.i64 = 0x0054}, 0, 0xFFFF, FLAGS, "sta"}, + { "b" , "No error, concealment type b", 0, AV_OPT_TYPE_CONST, {.i64 = 0x5400}, 0, 0xFFFF, FLAGS, "sta"}, + { "res" , "Reserved", 0, AV_OPT_TYPE_CONST, {.i64 = 0x2B2A}, 0, 0xFFFF, FLAGS, "sta"}, + { "notok" , "Error or concealment", 0, AV_OPT_TYPE_CONST, {.i64 = 0xD4D4}, 0, 0xFFFF, FLAGS, "sta"}, + { "notres" , "Not reserved", 0, AV_OPT_TYPE_CONST, {.i64 = 0xD4D5}, 0, 0xFFFF, FLAGS, "sta"}, + { 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 }, +};