From patchwork Sun Aug 20 22:41:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 4773 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.37.132 with SMTP id g126csp2343608jag; Sun, 20 Aug 2017 15:43:28 -0700 (PDT) X-Received: by 10.28.17.10 with SMTP id 10mr6238387wmr.84.1503269008268; Sun, 20 Aug 2017 15:43:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503269008; cv=none; d=google.com; s=arc-20160816; b=pJX2vCr5TCHYKsWajv0ntePoQnsUBUdxSmhaZHxMB1OmqGyiQ0PNIs9rq2wW1pKqeX HZWsDQInEfq9SfP2AXcgjMqEGZwzOepz7zSFycGPz0CRJWtKq+jQJ2Qk9/V7FlHCf/gi eqt4rN0uciDvgokY8ak3BZdJstzIJfLBrIbVDumW+h0AE7OfQowBX59yqLYLmG3fggtR N2goaGXnuAbotb5GFh89VsxH4ThmGLSveAh0dFTuoOXtVuTnYWW8D+vYKXiHJ16QluSi ddoUXU73xwtm1wvHNpL1ahwkYbQiKBXkDDrJfnpxNQqlmTjDslqB/qxf0ZaTDBzJo38Q kAhQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=DvjiBL/gbLnKoLKX0OfATlji6KazaAHR/QKDzoAZx3w=; b=gMJyUy2oSVSHzgg4WhmHpOwmACoW249aElVhHAiL+sxTx64YzpPTx4kI/2GqmUSV6K CdY3vYjhJ3Kedpe9l4h0pd5iBUX5RhkgmOx0Qfi/zH9zkbZc9I8EE5t41lz+d5pafUBS 6m/rb8JmXo1alBIuky9kZxOep/sAZacY28wOjM5iWXu4+Xx/h6Ewm/TH7PakxIIf2z82 RSsvzWzkq9hJx8Zu7vCR606ZXj0/834cpRFVDkdxHG29UprtzuWioenJ10CnUvyJ+69R +kRiEhq8yQsjXNNPGE4VmoUZZ3p6NvOTJIA4EtsSp+gBAO3hkJqiSzfHfYNKPVB8y+d1 C23A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=fUzvdl8j; 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 n126si4807229wma.257.2017.08.20.15.43.27; Sun, 20 Aug 2017 15:43:28 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=fUzvdl8j; 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 1BF99689A3D; Mon, 21 Aug 2017 01:42:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E73D6891EE for ; Mon, 21 Aug 2017 01:42:04 +0300 (EEST) Received: by mail-wr0-f178.google.com with SMTP id f8so48167379wrf.3 for ; Sun, 20 Aug 2017 15:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=xiPPyuVRGWPzhNy+x48ZLcSDRaaNNGQizlH/L9aWdmM=; b=fUzvdl8jfyQbzJqMsFtBWeboT6CVbVYoxi2URQUhERsC3jP1iO1WpZ1X7EKP6ZUfwd EbkDyiWZ+fuZK2Cp1v00U46eoEUkfHTCnB3DNwamGVvXaxj66YvzZjVz2d4LUQjFMzcX pUqTFhZQRFduzQAfetJCrRyAYZbH0MrozerKgAXVoTheM2BCgQtVP2lXUqQMlktIcku6 dtOuJw1DzrxEKkwprYTH1IbJz/kDkSMhiLMaRoB78Ox7ITP1MCmCR81c7i3YKoTfcTRg 1FjIAtuTRbVDesEhb1LpruVwFfKss3GvVimdo9O84BebJEocdAp7GW0Q8r5IrsnLUd96 NPig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xiPPyuVRGWPzhNy+x48ZLcSDRaaNNGQizlH/L9aWdmM=; b=rYUAVYMZpWo87FpT8Ax2tJvBkbo6gK8kOR74kh4/7f1sMG3h9SZGfItAdyV2RuNJKJ styu9rxstqVSJr03AGGPKaM+EyeCwk3oPuSaJkJmX6jt/FBFu4JlR5hvub4KhFG4jVbb IwN5B92hw50VzT2JoYPcXDywGxUUJBq3WTEZzSH821tfqiVlzjPm7EwcdD3xlkbkCOMK C2YlxN91w+90Cb5SRb5lZZsu1QbL1XXKimqzwP0PQdRLIALUdqAAV7Am+U9wE7VM33ao Ip112hf2jpNVPLUq0CiIAGLs190bEH2Zy/+k5XSoTXR4lJi374YBVdLEBnsbb4bwTy84 rakA== X-Gm-Message-State: AHYfb5hqfxACX9WgvXC+qcm/ZSP6U0/HqZw12HAXKPEvBxlKwwhjfeon E6yHAyum5joxhVYvuF8= X-Received: by 10.223.166.79 with SMTP id k73mr10673841wrc.287.1503268930516; Sun, 20 Aug 2017 15:42:10 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id f9sm5391116wmf.18.2017.08.20.15.42.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Aug 2017 15:42:09 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Aug 2017 23:41:39 +0100 Message-Id: <20170820224146.21289-12-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170820224146.21289-1-sw@jkqxz.net> References: <20170820224146.21289-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 11/18] lavc: Add h264_redundant_pps bitstream filter 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This applies a specific fixup to some Bluray streams which contain redundant PPSs modifying irrelevant parameters of the stream which confuse other transformations which require correct extradata. A new single global PPS is created, and all of the redundant PPSs within the stream are removed. (cherry picked from commit e6874bc3af2f09af39b5d91b9c5f9ded67459696) --- configure | 1 + doc/bitstream_filters.texi | 9 ++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/h264_redundant_pps_bsf.c | 178 ++++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+) create mode 100644 libavcodec/h264_redundant_pps_bsf.c diff --git a/configure b/configure index 7028bc753b..fe523feb1e 100755 --- a/configure +++ b/configure @@ -2833,6 +2833,7 @@ vc1_parser_select="vc1dsp" # bitstream_filters h264_metadata_bsf_select="cbs_h264" +h264_redundant_pps_bsf_select="cbs_h264" mjpeg2jpeg_bsf_select="jpegtables" trace_headers_bsf_select="cbs_h264 cbs_h265 cbs_mpeg2" diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index f7dfa1f753..f9d17dc1b1 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -174,6 +174,15 @@ ffmpeg -i INPUT.mp4 -codec copy -bsf:v h264_mp4toannexb OUTPUT.ts Please note that this filter is auto-inserted for MPEG-TS (muxer @code{mpegts}) and raw H.264 (muxer @code{h264}) output formats. +@section h264_redundant_pps + +This applies a specific fixup to some Bluray streams which contain +redundant PPSs modifying irrelevant parameters of the stream which +confuse other transformations which require correct extradata. + +A new single global PPS is created, and all of the redundant PPSs +within the stream are removed. + @section hevc_mp4toannexb Convert an HEVC/H.265 bitstream from length prefixed mode to start code diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9680c4f27a..492f58b656 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -992,6 +992,7 @@ OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += extract_extradata_bsf.o \ h2645_parse.o OBJS-$(CONFIG_H264_METADATA_BSF) += h264_metadata_bsf.o OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o +OBJS-$(CONFIG_H264_REDUNDANT_PPS_BSF) += h264_redundant_pps_bsf.o OBJS-$(CONFIG_HEVC_MP4TOANNEXB_BSF) += hevc_mp4toannexb_bsf.o OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 0e133b9036..5ab4f14642 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -31,6 +31,7 @@ extern const AVBitStreamFilter ff_dca_core_bsf; extern const AVBitStreamFilter ff_extract_extradata_bsf; extern const AVBitStreamFilter ff_h264_metadata_bsf; extern const AVBitStreamFilter ff_h264_mp4toannexb_bsf; +extern const AVBitStreamFilter ff_h264_redundant_pps_bsf; extern const AVBitStreamFilter ff_hevc_mp4toannexb_bsf; extern const AVBitStreamFilter ff_imx_dump_header_bsf; extern const AVBitStreamFilter ff_mjpeg2jpeg_bsf; diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c new file mode 100644 index 0000000000..805659f5fb --- /dev/null +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -0,0 +1,178 @@ +/* + * 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 + +#include "libavutil/common.h" +#include "libavutil/mem.h" + +#include "bsf.h" +#include "cbs.h" +#include "cbs_h264.h" +#include "h264.h" + + +typedef struct H264RedundantPPSContext { + CodedBitstreamContext input; + CodedBitstreamContext output; + + CodedBitstreamFragment access_unit; + + int global_pic_init_qp; + int current_pic_init_qp; +} H264RedundantPPSContext; + + +static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx, + H264RawPPS *pps) +{ + // Record the current value of pic_init_qp in order to fix up + // following slices, then overwrite with the global value. + ctx->current_pic_init_qp = pps->pic_init_qp_minus26 + 26; + pps->pic_init_qp_minus26 = ctx->global_pic_init_qp - 26; + + // Some PPSs have this set, so it must be set in all of them. + // (Slices which do not use such a PPS on input will still have + // *_weight_l*flag as zero and therefore write equivalently.) + pps->weighted_pred_flag = 1; + + return 0; +} + +static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx, + H264RawSliceHeader *slice) +{ + int qp; + + qp = ctx->current_pic_init_qp + slice->slice_qp_delta; + slice->slice_qp_delta = qp - ctx->global_pic_init_qp; + + return 0; +} + +static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out) +{ + H264RedundantPPSContext *ctx = bsf->priv_data; + AVPacket *in; + CodedBitstreamFragment *au = &ctx->access_unit; + int au_has_sps; + int err, i; + + err = ff_bsf_get_packet(bsf, &in); + if (err < 0) + return err; + + err = ff_cbs_read_packet(&ctx->input, au, in); + if (err < 0) + return err; + + au_has_sps = 0; + for (i = 0; i < au->nb_units; i++) { + CodedBitstreamUnit *nal = &au->units[i]; + + if (nal->type == H264_NAL_SPS) + au_has_sps = 1; + if (nal->type == H264_NAL_PPS) { + h264_redundant_pps_fixup_pps(ctx, nal->content); + if (!au_has_sps) { + av_log(ctx, AV_LOG_VERBOSE, "Deleting redundant PPS " + "at %"PRId64".\n", in->pts); + ff_cbs_delete_unit(&ctx->input, au, i); + } + } + if (nal->type == H264_NAL_SLICE || + nal->type == H264_NAL_IDR_SLICE) { + H264RawSlice *slice = nal->content; + h264_redundant_pps_fixup_slice(ctx, &slice->header); + } + } + + err = ff_cbs_write_packet(&ctx->output, out, au); + if (err < 0) + return err; + + ff_cbs_fragment_uninit(&ctx->output, au); + + err = av_packet_copy_props(out, in); + if (err < 0) + return err; + + av_packet_free(&in); + + return 0; +} + +static int h264_redundant_pps_init(AVBSFContext *bsf) +{ + H264RedundantPPSContext *ctx = bsf->priv_data; + CodedBitstreamFragment *au = &ctx->access_unit; + int err, i; + + err = ff_cbs_init(&ctx->input, AV_CODEC_ID_H264, bsf); + if (err < 0) + return err; + + err = ff_cbs_init(&ctx->output, AV_CODEC_ID_H264, bsf); + if (err < 0) + return err; + + ctx->global_pic_init_qp = 26; + + if (bsf->par_in->extradata) { + err = ff_cbs_read_extradata(&ctx->input, au, bsf->par_in); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n"); + return err; + } + + for (i = 0; i < au->nb_units; i++) { + if (au->units[i].type == H264_NAL_PPS) + h264_redundant_pps_fixup_pps(ctx, au->units[i].content); + } + + err = ff_cbs_write_extradata(&ctx->output, bsf->par_out, au); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to write extradata.\n"); + return err; + } + + ff_cbs_fragment_uninit(&ctx->output, au); + } + + return 0; +} + +static void h264_redundant_pps_close(AVBSFContext *bsf) +{ + H264RedundantPPSContext *ctx = bsf->priv_data; + ff_cbs_close(&ctx->input); + ff_cbs_close(&ctx->output); +} + +static const enum AVCodecID h264_redundant_pps_codec_ids[] = { + AV_CODEC_ID_H264, AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_h264_redundant_pps_bsf = { + .name = "h264_redundant_pps", + .priv_data_size = sizeof(H264RedundantPPSContext), + .init = &h264_redundant_pps_init, + .close = &h264_redundant_pps_close, + .filter = &h264_redundant_pps_filter, + .codec_ids = h264_redundant_pps_codec_ids, +};