From patchwork Sat Apr 18 14:25:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 19053 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 04C6C44A224 for ; Sat, 18 Apr 2020 17:26:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEBC968B1AA; Sat, 18 Apr 2020 17:26:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C78A68BC38 for ; Sat, 18 Apr 2020 17:26:13 +0300 (EEST) Received: from creator.alpe-d-promontory.fun (192.168.13.165) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Sat, 18 Apr 2020 07:26:11 -0700 From: John Stebbins To: Date: Sat, 18 Apr 2020 08:25:43 -0600 Message-ID: <20200418142547.21299-2-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200418142547.21299-1-jstebbins@jetheaddev.com> References: <20200418142547.21299-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [192.168.13.165] Subject: [FFmpeg-devel] [PATCH 1/4] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Required to remux m2ts to mkv --- Changelog | 1 + doc/bitstream_filters.texi | 8 ++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/pgs_frame_merge_bsf.c | 168 +++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+) create mode 100644 libavcodec/pgs_frame_merge_bsf.c diff --git a/Changelog b/Changelog index d9fcd8bb0a..fec4867488 100644 --- a/Changelog +++ b/Changelog @@ -59,6 +59,7 @@ version : - mv30 decoder - Expanded styling support for 3GPP Timed Text Subtitles (movtext) - WebP parser +- PGS subtitle frame merge bitstream filter version 4.2: diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8fe5b3ad75..21ed09986c 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -548,6 +548,14 @@ ffmpeg -i INPUT -c copy -bsf noise[=1] output.mkv @section null This bitstream filter passes the packets through unchanged. +@section pgs_frame_merge + +Merge a sequence of PGS Subtitle segments ending with an "end of display set" +segment into a single packet. + +This is required by some containers that support PGS subtitles +(muxer @code{matroska}). + @section prores_metadata Modify color property metadata embedded in prores stream. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 88944d9a3a..b630de21bc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1115,6 +1115,7 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o \ OBJS-$(CONFIG_MPEG2_METADATA_BSF) += mpeg2_metadata_bsf.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_NULL_BSF) += null_bsf.o +OBJS-$(CONFIG_PGS_FRAME_MERGE_BSF) += pgs_frame_merge_bsf.o OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 6b5ffe4d70..92619225f0 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -49,6 +49,7 @@ extern const AVBitStreamFilter ff_mpeg4_unpack_bframes_bsf; extern const AVBitStreamFilter ff_mov2textsub_bsf; extern const AVBitStreamFilter ff_noise_bsf; extern const AVBitStreamFilter ff_null_bsf; +extern const AVBitStreamFilter ff_pgs_frame_merge_bsf; extern const AVBitStreamFilter ff_prores_metadata_bsf; extern const AVBitStreamFilter ff_remove_extradata_bsf; extern const AVBitStreamFilter ff_text2movsub_bsf; diff --git a/libavcodec/pgs_frame_merge_bsf.c b/libavcodec/pgs_frame_merge_bsf.c new file mode 100644 index 0000000000..cae5c75655 --- /dev/null +++ b/libavcodec/pgs_frame_merge_bsf.c @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2020 John Stebbins + * + * 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 + */ + +/** + * @file + * This bitstream filter merges PGS subtitle packets containing incomplete + * set of segments into a single packet + * + * Packets already containing a complete set of segments will be passed through + * unchanged. + */ + +#include "avcodec.h" +#include "bsf.h" +#include "libavutil/intreadwrite.h" + +enum PGSSegmentType { + PALETTE_SEGMENT = 0x14, + OBJECT_SEGMENT = 0x15, + PRESENTATION_SEGMENT = 0x16, + WINDOW_SEGMENT = 0x17, + DISPLAY_SEGMENT = 0x80, +}; + +typedef struct PGSMergeContext { + AVPacket *buffer_pkt, *in; + int presentation_found; +} PGSMergeContext; + +static void frame_merge_flush(AVBSFContext *bsf) +{ + PGSMergeContext *ctx = bsf->priv_data; + + av_packet_unref(ctx->in); + av_packet_unref(ctx->buffer_pkt); +} + +static int frame_merge_filter(AVBSFContext *bsf, AVPacket *out) +{ + PGSMergeContext *ctx = bsf->priv_data; + AVPacket *in = ctx->in, *pkt = ctx->buffer_pkt; + int ret, i, size, pos, display = 0; + + if (!in->data) { + ret = ff_bsf_get_packet_ref(bsf, in); + if (ret < 0) + return ret; + } + if (!in->size) { + av_packet_unref(in); + return AVERROR(EAGAIN); + } + + // Validate packet data and find display_end segment + size = in->size; + i = 0; + while (i + 3 <= in->size) { + uint8_t segment_type; + int segment_len; + + segment_type = in->data[i]; + segment_len = AV_RB16(in->data + i + 1) + 3; + if (i + segment_len > in->size) // Invalid data + break; + if (segment_type == PRESENTATION_SEGMENT && i + 10 < in->size && + !ctx->presentation_found) { + uint8_t state; + ctx->presentation_found = 1; + ret = av_packet_copy_props(pkt, in); + if (ret < 0) + goto fail; + state = in->data[i + 10] & 0xc0; + if (state) + pkt->flags |= AV_PKT_FLAG_KEY; + } + i += segment_len; + if (segment_type == DISPLAY_SEGMENT) { + size = display = i; + break; + } + } + if (display && pkt->size == 0 && size == in->size) { // passthrough + ctx->presentation_found = 0; + av_packet_move_ref(out, in); + return 0; + } + if ((!display && i != in->size) || size > in->size) { + av_log(bsf, AV_LOG_WARNING, "Failed to parse PGS segments.\n"); + // force output what we have + display = size = in->size; + } + + pos = pkt->size; + ret = av_grow_packet(pkt, size); + if (ret < 0) + goto fail; + memcpy(pkt->data + pos, in->data, size); + + if (size == in->size) + av_packet_unref(in); + else { + in->data += size; + in->size -= size; + } + + if (display) { + ctx->presentation_found = 0; + av_packet_move_ref(out, pkt); + return 0; + } + return AVERROR(EAGAIN); + +fail: + ctx->presentation_found = 0; + frame_merge_flush(bsf); + return ret; +} + +static int frame_merge_init(AVBSFContext *bsf) +{ + PGSMergeContext *ctx = bsf->priv_data; + + ctx->in = av_packet_alloc(); + ctx->buffer_pkt = av_packet_alloc(); + if (!ctx->in || !ctx->buffer_pkt) + return AVERROR(ENOMEM); + + return 0; +} + +static void frame_merge_close(AVBSFContext *bsf) +{ + PGSMergeContext *ctx = bsf->priv_data; + + av_packet_free(&ctx->in); + av_packet_free(&ctx->buffer_pkt); +} + +static const enum AVCodecID frame_merge_codec_ids[] = { + AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_pgs_frame_merge_bsf = { + .name = "pgs_frame_merge", + .priv_data_size = sizeof(PGSMergeContext), + .init = frame_merge_init, + .flush = frame_merge_flush, + .close = frame_merge_close, + .filter = frame_merge_filter, + .codec_ids = frame_merge_codec_ids, +}; From patchwork Sat Apr 18 14:25:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 19054 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 1272744A224 for ; Sat, 18 Apr 2020 17:26:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC08B68BC5D; Sat, 18 Apr 2020 17:26:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5DB968B9D5 for ; Sat, 18 Apr 2020 17:26:51 +0300 (EEST) Received: from creator.alpe-d-promontory.fun (192.168.13.165) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Sat, 18 Apr 2020 07:26:50 -0700 From: John Stebbins To: Date: Sat, 18 Apr 2020 08:25:44 -0600 Message-ID: <20200418142547.21299-3-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200418142547.21299-1-jstebbins@jetheaddev.com> References: <20200418142547.21299-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [192.168.13.165] Subject: [FFmpeg-devel] [PATCH 2/4] lavf/matroskaenc: add PGS merge to auto bsf list 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" PGS segments must be merged to one packet for muxing to mkv --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d3256d8f5d..bccf8b11d2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2655,6 +2655,8 @@ static int mkv_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); } else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) { ret = ff_stream_add_bitstream_filter(st, "vp9_superframe", NULL); + } else if (st->codecpar->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) { + ret = ff_stream_add_bitstream_filter(st, "pgs_frame_merge", NULL); } return ret; From patchwork Sat Apr 18 14:25:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 19058 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:db88:0:0:0:0:0 with SMTP id m8csp934700qvk; Sat, 18 Apr 2020 07:27:08 -0700 (PDT) X-Google-Smtp-Source: APiQypKyxE/qUbYX29wefFF0wxD2Fq2MiRg62FfEv39yDP70+ImziaL/GCUT9XbRak7kMos3n5Iw X-Received: by 2002:a5d:6847:: with SMTP id o7mr9290183wrw.83.1587220028301; Sat, 18 Apr 2020 07:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587220028; cv=none; d=google.com; s=arc-20160816; b=Ke8JkKhCaB54nblLyiIUgHlRXmqpPrLCotPwl8DZdjq4a7gIJvnNMklb0X8QNKxRkH H2C8B1NAn7Wm6Vzh1mbrJgaZW7qKYk2K5mD3ubBjjIcjr3XUbdGC3mz6Lkg0fQX8NsRz mpNSVqhUYgZUqKMARTjgkJn804XCMolmTvfHhGCgu8iqy+YgIG93pTZ30vMF75qnuK4V QTBmCcn6GNNQgNI8UukCr69e5dE0/5Pl0PqroaGqIrdMTJHMC+0O/8EY8+Kvj3VG7dBW smisv6k6zff4msU5iCbUqtDYgxwGgANWBC0OUyyeHhOXTFFpmlhdUPutVVwYs2O26J37 lCQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=0SE+zO+PRZHNdIMf+nJnFBV8uZoW//QNasO9qx9N2JE=; b=pBPMDK2PCCxtTlNxcSgN9Vt136wDmNbpJMUvpaY7XAoemWoQ4Wa2/EpcnYSM9bxLxJ cPiOHWfW7/T2FFdA8VKXmjylHYm1c9LIQv6YP1wHzHQpxhEFYx3IWXhREjvHRdLaXbbr /hEyJ/99AsNecfyc7duLvzeEXKGpZzoyKNhoUT3dY476scoZBK1LcI3bcVwgxs2Nhxk8 JFIuz573txw8J4TRx1zksmW6FjHe9yZVKX4hgdju5aEbVuJ/Z4fbRLsAaSnmKCskZIWW W65Xj/YdAgBQQMx0w5z5Rxdj86iDtmXX3KHgwIqgcsk2A7Ib9sp/UgBWMZYoxZwAsJkM b4iw== 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 b3si8291284wro.428.2020.04.18.07.27.07; Sat, 18 Apr 2020 07:27:08 -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; 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 26EA168BC99; Sat, 18 Apr 2020 17:27:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D97B68BCA3 for ; Sat, 18 Apr 2020 17:26:59 +0300 (EEST) Received: from creator.alpe-d-promontory.fun (192.168.13.165) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Sat, 18 Apr 2020 07:26:57 -0700 From: John Stebbins To: Date: Sat, 18 Apr 2020 08:25:45 -0600 Message-ID: <20200418142547.21299-4-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200418142547.21299-1-jstebbins@jetheaddev.com> References: <20200418142547.21299-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [192.168.13.165] Subject: [FFmpeg-devel] [PATCH 3/4] lavc/pgs_frame_split_bsf: add bsf to split PGS segments 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kgv0op8kmIS3 Content-Length: 11206 Requried to remux mkv to m2ts --- Changelog | 1 + doc/bitstream_filters.texi | 8 ++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/pgs_frame_split_bsf.c | 176 +++++++++++++++++++++++++++++++ 5 files changed, 187 insertions(+) create mode 100644 libavcodec/pgs_frame_split_bsf.c diff --git a/Changelog b/Changelog index fec4867488..372bb4694c 100644 --- a/Changelog +++ b/Changelog @@ -60,6 +60,7 @@ version : - Expanded styling support for 3GPP Timed Text Subtitles (movtext) - WebP parser - PGS subtitle frame merge bitstream filter +- PGS subtitle frame split bitstream filter version 4.2: diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 21ed09986c..643c419076 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -556,6 +556,14 @@ segment into a single packet. This is required by some containers that support PGS subtitles (muxer @code{matroska}). +@section pgs_frame_split + +Split a packet containing a sequence of PGS Subtitle segments into separate +packets each containing a single segment. + +This is required by some streaming formats, typically the MPEG-2 +transport stream format (muxer @code{mpegts}). + @section prores_metadata Modify color property metadata embedded in prores stream. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b630de21bc..0e5f2db192 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1116,6 +1116,7 @@ OBJS-$(CONFIG_MPEG2_METADATA_BSF) += mpeg2_metadata_bsf.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_NULL_BSF) += null_bsf.o OBJS-$(CONFIG_PGS_FRAME_MERGE_BSF) += pgs_frame_merge_bsf.o +OBJS-$(CONFIG_PGS_FRAME_SPLIT_BSF) += pgs_frame_split_bsf.o OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 92619225f0..02e72c9ca5 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -50,6 +50,7 @@ extern const AVBitStreamFilter ff_mov2textsub_bsf; extern const AVBitStreamFilter ff_noise_bsf; extern const AVBitStreamFilter ff_null_bsf; extern const AVBitStreamFilter ff_pgs_frame_merge_bsf; +extern const AVBitStreamFilter ff_pgs_frame_split_bsf; extern const AVBitStreamFilter ff_prores_metadata_bsf; extern const AVBitStreamFilter ff_remove_extradata_bsf; extern const AVBitStreamFilter ff_text2movsub_bsf; diff --git a/libavcodec/pgs_frame_split_bsf.c b/libavcodec/pgs_frame_split_bsf.c new file mode 100644 index 0000000000..c983f6acf5 --- /dev/null +++ b/libavcodec/pgs_frame_split_bsf.c @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2020 John Stebbins + * + * 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 + */ + +/** + * @file + * This bitstream filter splits PGS subtitle packets into packets containing + * just one segment. + * + * Packets already containing only one segment will be passed through + * unchanged. + */ + +#include "avcodec.h" +#include "bsf.h" +#include "libavutil/intreadwrite.h" + +enum PGSSegmentType { + PALETTE_SEGMENT = 0x14, + OBJECT_SEGMENT = 0x15, + PRESENTATION_SEGMENT = 0x16, + WINDOW_SEGMENT = 0x17, + DISPLAY_SEGMENT = 0x80, +}; + +typedef struct PGSSplitContext { + AVPacket *in; +} PGSSplitContext; + +static int frame_split_filter(AVBSFContext *bsf, AVPacket *out) +{ + PGSSplitContext *ctx = bsf->priv_data; + AVPacket *in = ctx->in; + int i, ret; + uint8_t segment_type; + uint16_t segment_len; + int split = !!in->data; + + if (!in->data) { + ret = ff_bsf_get_packet_ref(bsf, in); + if (ret < 0) + return ret; + } + if (!in->size) { + av_packet_unref(in); + return AVERROR(EAGAIN); + } + + // Validate packet data + i = 0; + while (i < in->size) { + segment_type = in->data[i]; + segment_len = AV_RB16(in->data + i + 1) + 3; + i += segment_len; + } + if (i != in->size) { + av_log(bsf, AV_LOG_WARNING, "Failed to parse PGS segments.\n"); + av_packet_move_ref(out, in); + return 0; + } + + segment_type = in->data[0]; + segment_len = AV_RB16(in->data + 1) + 3; + if (split || segment_len < in->size) { // Split + int64_t ts_delta, dts; + + ret = av_packet_ref(out, in); + if (ret < 0) + goto fail; + out->size = segment_len; + in->data += segment_len; + in->size -= segment_len; + + // Update PTS/DTS, Stagger timestamps by 3ms + ts_delta = 270; // Assume 90khz tick if no time_base_in + if (bsf->time_base_in.num && bsf->time_base_in.den) + ts_delta = bsf->time_base_in.den / bsf->time_base_in.num / 333; + if (ts_delta == 0) + ts_delta = 1; + + // Compute DTS, it's the same for all packets that carry it + // Assuming input PTS/DTS come from original presentation_segment + if (in->dts <= in->pts - 2 * ts_delta && + in->dts != AV_NOPTS_VALUE) + dts = in->dts; + else if (in->pts != AV_NOPTS_VALUE) + dts = in->pts - 2 * ts_delta; + + switch (segment_type) { + case DISPLAY_SEGMENT: + if (in->pts != AV_NOPTS_VALUE) + out->pts = in->pts - ts_delta; + out->dts = AV_NOPTS_VALUE; + break; + case PALETTE_SEGMENT: + if (in->pts != AV_NOPTS_VALUE) + out->pts = in->pts - 2 * ts_delta; + out->dts = AV_NOPTS_VALUE; + break; + case PRESENTATION_SEGMENT: + out->pts = in->pts; + out->dts = dts; + break; + case WINDOW_SEGMENT: + case OBJECT_SEGMENT: + default: + if (in->pts != AV_NOPTS_VALUE) + out->pts = in->pts - ts_delta; + out->dts = dts; + break; + } + } else + av_packet_move_ref(out, in); + + return 0; + +fail: + av_packet_unref(in); + + return ret; +} + +static int frame_split_init(AVBSFContext *bsf) +{ + PGSSplitContext *ctx = bsf->priv_data; + + ctx->in = av_packet_alloc(); + if (!ctx->in) + return AVERROR(ENOMEM); + + return 0; +} + +static void frame_split_flush(AVBSFContext *bsf) +{ + PGSSplitContext *ctx = bsf->priv_data; + + av_packet_unref(ctx->in); +} + +static void frame_split_close(AVBSFContext *bsf) +{ + PGSSplitContext *ctx = bsf->priv_data; + + av_packet_free(&ctx->in); +} + +static const enum AVCodecID frame_split_codec_ids[] = { + AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_pgs_frame_split_bsf = { + .name = "pgs_frame_split", + .priv_data_size = sizeof(PGSSplitContext), + .init = frame_split_init, + .flush = frame_split_flush, + .close = frame_split_close, + .filter = frame_split_filter, + .codec_ids = frame_split_codec_ids, +}; From patchwork Sat Apr 18 14:25:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 19055 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 3CFBF44A929 for ; Sat, 18 Apr 2020 17:27:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22B1068BCA6; Sat, 18 Apr 2020 17:27:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D748068BC5D for ; Sat, 18 Apr 2020 17:27:37 +0300 (EEST) Received: from creator.alpe-d-promontory.fun (192.168.13.165) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Sat, 18 Apr 2020 07:27:36 -0700 From: John Stebbins To: Date: Sat, 18 Apr 2020 08:25:46 -0600 Message-ID: <20200418142547.21299-5-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200418142547.21299-1-jstebbins@jetheaddev.com> References: <20200418142547.21299-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [192.168.13.165] Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/version: Bump minor-version for new PGS bsfs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 8cff2e855b..ad85fb15e5 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 80 +#define LIBAVCODEC_VERSION_MINOR 81 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \