From patchwork Tue Jul 9 01:10:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13863 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 413E744758E for ; Tue, 9 Jul 2019 04:11:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DE8068AF37; Tue, 9 Jul 2019 04:11:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FCCD68AF28 for ; Tue, 9 Jul 2019 04:11:40 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id n9so9940538wrr.4 for ; Mon, 08 Jul 2019 18:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b2DvG4ahHCCV7ArkDkpBvxcZq4fp5jlE/d9Zy7iJilM=; b=DYih1WnTUWCjPkBh9luMabzF+7n0iwgXVye7GNBk7b56Jp6VLURLK0O0/YsmLJZ2oM 1D3WGiYcQMixFtf2VfRIMykKGdw1WkDEg8fZOeINIwLGDuJkDIdpFzmQcWprTaidcr5f S8TEa8EwrhE0OUremqbtjr7i2vWuA61ZFkN43c5IwQWKckjo+ev8H5tRubcYLFkhTAkp RxJBqDT5EwkQhlzwoVO1e9Gru+bUen+WBbEaaETRdvaZdy0UPHMpotfDG+R4bIXDMEvG s+zPDgkgfyZn5iSsNB++tSg88n1ae7e1f4rOaIGJcLkjVUkd5TUzMLpo3yF5CZvA4HnN hLzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b2DvG4ahHCCV7ArkDkpBvxcZq4fp5jlE/d9Zy7iJilM=; b=co8M0sZmo8RxFdcIDbHmxJq/k0oHUs+181mVbw+DDO4cxrO+EvyJc+De0TcP8BOFw2 fJsXJHgZdGQrdpDd+wNKxNzHjodOFZ0MJdVuIWToTm/yPFySmxuJqqCd4DTMiATJqN3f Yw7Z2f5mT/MH2ilJ8uKjfYZDQig5iGA/mdAA/Nf0rbWPNmb9BSTMztwioDM2tGU2b1Hy V0IbNOYSSy9t124iOIUvHO1OrxgCEWP54cutDvy+vOChSl2ybU3EGWAEf9u5iCpFl+xm xeKbrf0JLP5CQAPNHLg6ChI9SdLWR4vYPo+cdSWvqxYeQGfsSxIbqeewmBCjLZp+8/3m iiYw== X-Gm-Message-State: APjAAAUiQWuYF5MWB2ZXEuI7UP8Npf3dCY1IpYHj0ITTVu2QQvILeURu VWuwMDwwAsklrwVl3jnQsqymvP3I X-Google-Smtp-Source: APXvYqyVyvq4nYT6g21sq9tg/lNONgrNhoC8YrifCbTi9yWlbDtpOOzeXs3rrzjr2L+RKe1CdGQbSA== X-Received: by 2002:adf:df90:: with SMTP id z16mr762082wrl.331.1562634699435; Mon, 08 Jul 2019 18:11:39 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b8f.dynamic.kabel-deutschland.de. [188.192.139.143]) by smtp.gmail.com with ESMTPSA id a84sm1140319wmf.29.2019.07.08.18.11.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 18:11:39 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jul 2019 03:10:44 +0200 Message-Id: <20190709011048.29601-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190709011048.29601-1-andreas.rheinhardt@gmail.com> References: <7166cd5e-8604-3842-3191-e0d47d7ac934@gmail.com> <20190709011048.29601-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/31] mpeg2_metadata: Update AVCodecParameters during init 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Otherwise the muxer could add header data that is based on the old AVCodecParameters that contradicts and potentially nullifies the modifications made to the bitstream. This brings mpeg2_metadata in line with what is expected of a bitstream filter. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg2_metadata_bsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 3f371a028d..458a1f2e61 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -249,6 +249,11 @@ static int mpeg2_metadata_init(AVBSFContext *bsf) } } + ff_cbs_update_video_parameters(ctx->cbc, bsf->par_out, -1, -1, -1, + -1, -1, -1, ctx->colour_primaries, + ctx->transfer_characteristics, + ctx->matrix_coefficients, -1, -1); + err = 0; fail: ff_cbs_fragment_reset(ctx->cbc, frag);