From patchwork Thu Jan 13 01:49:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33295 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp12811iog; Wed, 12 Jan 2022 17:53:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxOB/U012ShLHFqspKdwFRMo4yeU+0zBHlznvBlW//usE4bCBEs+aWenYqcz/PTimVhmszQ X-Received: by 2002:a17:906:abca:: with SMTP id kq10mr1127881ejb.563.1642038793515; Wed, 12 Jan 2022 17:53:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038793; cv=none; d=google.com; s=arc-20160816; b=z7hlqaRy6PCcnMXjUhIuFIk9wyiWny50+zAQYgMK67ij1411Imk5yIQnyFBSi9pStj jx5fCXU2ME0p9S/QbEIRCs7B1JK4HftlsKqIUsLAmOS7oVLY6qLXBFDq2G9Cg9mfP0GP gIwA9MSMZHGnXsMEwT7tmwL01+GgXItmjkHr2Njd9AzEGG0E7kekMJQJvVH7LrmRPtW2 TaB94q9x0Jzes9YzIYCy342VefC9Skx7tUma6ZQonCgpPNTCnG7FbtrCu41e8MEh9Fv+ SH5N2JpH3TesWKph3WakUNIxfIo/GUipIxiQYzhfN22wJdXlnUlnT9T5m6ZDk3JC/uXl RPww== 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:dkim-signature:delivered-to; bh=fmaSjuOtESwhio7kVShkhLdVYOLHLuigkqQ3hz36Buc=; b=w3F+mA//vNsgne2oJ89SLqueOuA3MsoakI578fcGm6wbB/ulkM+YHicDgCW18IWTPb NrNzqhjrrKHnoqCx3n150vGSvY2eFwKRQHdecC8Kdpr/Zey6b1sJVJGW3qG4q684GJxr OzViOIJQdNL3qZqdEV+W+VJ3LPtsG8xR/pV5p4DFLdLN/h2L2Wk1Jnty3Nty/39YGLVt Y47e0f3Og4xFNVljUQ/rRYRhAhK+OwJZdLplgMJq5reT4Ios42md4e8ox21+gQ9jWMQX nLY8/q1hNUKHS588ZBJNw1FrMwKuaDSbCu9ACujuobPkqtaytZMMd25cp+7hM4+NSv1r SNVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pXvOtVnv; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sc11si837039ejc.65.2022.01.12.17.53.13; Wed, 12 Jan 2022 17:53:13 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pXvOtVnv; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47B8368AF37; Thu, 13 Jan 2022 03:52:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B84C68AEE7 for ; Thu, 13 Jan 2022 03:52:04 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id b127so5624075qkd.0 for ; Wed, 12 Jan 2022 17:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kr5PHjtrcLHXcSwj5WIaSL0lmUp4JjkzaAMBSBeoTXY=; b=pXvOtVnvEhQdwb+CZGH2paYN2SSwjVz5KE7dt+kCXjEpKZ0vJW4JQzSfNa+LRiDyM0 Lep4erqh4IQehONj0IeyBzC1uekmoth/ZhoxMzFm5ZV+HA328V6ZII8aFjLRlwF+Wuc4 vMNDFLaHNqQAbx2Y9qPh9q+ere45c7kaIoCbl7YQBjrSc2b0WaX5Y68NlIh2lYD8WEdo uGHkrbw3QMsUIz0Fwl6wUKzttgbhmaX4Wg15Pel7kwtWugCoYAmWwebkwMWkAKZSOPvJ tsQ/NuXYxeKQkSPAyMxM4zzujT9FCknIJ2iqTA7p1KiZwgq6Xtoj4uAaj9ruDMj1nHF2 r/YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kr5PHjtrcLHXcSwj5WIaSL0lmUp4JjkzaAMBSBeoTXY=; b=1CZzlPFgCOblEYpOYIg6Bvs8/tkiH2eN/aICXYgOS391hLFVeYR+voHf0RNBI3XU96 n4g7q513aWIm47wWy2XlNgtkAqqmK/wG0zXmtQyAE3ibxn1Q8iiYsS+Pcv6/2tmMD8M9 lG/YCIIteP1t9RghougrCI86x4lppFAbOj7TsZezT71Ettk0HDVAefzIC+/lj8ZLl6IZ D4L+CHZAA2zAPejHE4IEO8uzBX+htGGs8sJDfuTMsqbIRA9FpWHK/Ff/zmC0Sl59OLGd gkrlxPIGbyZW98+TJPMjb0+/lPo3QNNKV1V0u8CdBUFlJqJXMcn9hDltbGekLg3N6B1B PINg== X-Gm-Message-State: AOAM532qru4LMm40MVg5NSz8aUaG2znUngCt0iW3JC4LXF4ROgZOSp8A NK7coOb3qMNoWNhcH/Q7IclfaQiFyAk= X-Received: by 2002:a05:620a:2589:: with SMTP id x9mr1768746qko.325.1642038722751; Wed, 12 Jan 2022 17:52:02 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:02 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:26 -0300 Message-Id: <20220113015101.4-5-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 004/281] lavc: deprecate channel count/layout changing side data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bNcM4eL3x8+E From: Anton Khirnov They are incompatible with the new channel layout scheme and no decoder uses them. Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/decode.c | 4 ++++ libavcodec/packet.h | 5 +++++ libavformat/dump.c | 9 ++++++++- libavformat/nutenc.c | 2 ++ libavformat/utils.c | 9 +++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 0912f86a14..60127e95fc 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -91,6 +91,8 @@ static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt) flags = bytestream_get_le32(&data); size -= 4; +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { if (size < 4) goto fail; @@ -109,6 +111,8 @@ static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt) avctx->channel_layout = bytestream_get_le64(&data); size -= 8; } +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { if (size < 4) goto fail; diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 4a349fe051..0c3729f32c 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -447,8 +447,13 @@ typedef struct AVPacketList { #define AV_PKT_FLAG_DISPOSABLE 0x0010 enum AVSideDataParamChangeFlags { +#if FF_API_OLD_CHANNEL_LAYOUT + /** + * @deprecated those are not used by any decoder + */ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002, +#endif AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004, AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008, }; diff --git a/libavformat/dump.c b/libavformat/dump.c index 4824965ee9..69b838fbc7 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -164,8 +164,11 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd) { int size = sd->size; const uint8_t *data = sd->data; - uint32_t flags, channels, sample_rate, width, height; + uint32_t flags, sample_rate, width, height; +#if FF_API_OLD_CHANNEL_LAYOUT + uint32_t channels; uint64_t layout; +#endif if (!data || sd->size < 4) goto fail; @@ -174,6 +177,8 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd) data += 4; size -= 4; +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { if (size < 4) goto fail; @@ -191,6 +196,8 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd) av_log(ctx, AV_LOG_INFO, "channel layout: %s, ", av_get_channel_name(layout)); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif /* FF_API_OLD_CHANNEL_LAYOUT */ if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { if (size < 4) goto fail; diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 585ce953ca..9d5eb4ed99 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -894,6 +894,7 @@ static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int break; case AV_PKT_DATA_PARAM_CHANGE: flags = bytestream_get_le32(&data); +#if FF_API_OLD_CHANNEL_LAYOUT if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { put_str(dyn_bc, "Channels"); put_s(dyn_bc, bytestream_get_le32(&data)); @@ -907,6 +908,7 @@ static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int avio_write(dyn_bc, data, 8); data+=8; sm_data_count++; } +#endif if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { put_str(dyn_bc, "SampleRate"); put_s(dyn_bc, bytestream_get_le32(&data)); diff --git a/libavformat/utils.c b/libavformat/utils.c index e643821fc9..7468ec301d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1328,6 +1328,9 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels, uint8_t *data; if (!pkt) return AVERROR(EINVAL); + +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS if (channels) { size += 4; flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT; @@ -1336,6 +1339,8 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels, size += 8; flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT; } +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (sample_rate) { size += 4; flags |= AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE; @@ -1348,10 +1353,14 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels, if (!data) return AVERROR(ENOMEM); bytestream_put_le32(&data, flags); +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS if (channels) bytestream_put_le32(&data, channels); if (channel_layout) bytestream_put_le64(&data, channel_layout); +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (sample_rate) bytestream_put_le32(&data, sample_rate); if (width || height) {