From patchwork Wed Dec 8 01:06:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32118 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7043650iog; Tue, 7 Dec 2021 17:08:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkZ/wOypqeMMXJDiDu+POCwBs2i68GcayOby/s0Hv0E6RxrJ95zh+D9orzc7zNbpoOWhyC X-Received: by 2002:aa7:c2c6:: with SMTP id m6mr14439825edp.42.1638925708386; Tue, 07 Dec 2021 17:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925708; cv=none; d=google.com; s=arc-20160816; b=B7Mfj4g4P2hTI8VKQUmOsJkOUQ2VaXDirvv7289LdCrRT1msfatqfnO8Apl3uMv+gA ATvVzHHt6bPRs9eLdrWNa+gM5l1Bceq+QBpHp9zSJyn01ktEKm+1RVPZIA7yIjYy5/1I TE9W7qHG+bEz7fYIJRcH/sbtIIio+0BempHI6NpHWbQjhesmMelxRhF8oXBBXTbtx792 ZxIpFEDmB6epbI1PJ7G6cW5la3n2BrQkbgRT28/5nZY5CjcG3M0tq0zqaUAzpcRppyaz +GhQNzdPhnmesSqb/1jEejhz1M2Q8+wLn9MwZg5MzfMNvLIRsi8YXvjDwBWiskE8LftV vqqw== 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=l5BGStm78ylwQfNB+6ptqEZdQrcMWMNwieFJMOHPUY4=; b=JJpP4hMycT4QIn4OlZ5seMFZKasJHEihAW+diJ7RFWlC6TJn1lriBauK8wPPNvtbGd zPsjv0I8Q7jNuI5f+6WxMKW7GnxtJWUo2tVgQjDB8Kc0fJ439nBtHH9odP3omSdrmD8N 0z/hzDtRE37dD6V79biYvkP8SP3f02wBuXy2lHaxXeRsnAbDgrDkmLS8kviB1y7EGnlJ +R23PRNYdF9iGzwzCQX8BuYrTQZO+4C/aMEIgFEm/UQ5Y/sQXiIWmCR/MdDwimNq/K72 5bK3HFvDt5dJc04GTAFyqDev2ATnC11T/V+Y+6hRv8Ei9Lpg0Z/qemwm7lplvGQXQNdN IeSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aABLKD6A; 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 ds1si2685668edb.99.2021.12.07.17.08.28; Tue, 07 Dec 2021 17:08:28 -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=aABLKD6A; 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 F0BEC68ADCC; Wed, 8 Dec 2021 03:07:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f51.google.com (mail-ua1-f51.google.com [209.85.222.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 851E868AC75 for ; Wed, 8 Dec 2021 03:07:28 +0200 (EET) Received: by mail-ua1-f51.google.com with SMTP id a14so2030716uak.0 for ; Tue, 07 Dec 2021 17:07:28 -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=oy2C4j9eYp6F5lHMTp0YL5wYJ5tXEdrCdTtwukM6OmE=; b=aABLKD6AgbF8PVaUjBEg90Ciu+Ybjy7KycVn7VQb2wKfbQMVZhM6SaLlklBdY3w2dH FPLU7Y8kVLzg7D2PBZJ4aYwj8fU9ZfMNbQUDRRk/BT9TXLTi6DpEnTo90i+rquOhcdVg ZEvRMQi5Y30HoGog6dhS7lQbPfEdOisT9DWd0wAMNi3C7BkIXSSpS0moJ1G8F4Fk30sQ heC6rEK2mo12Z3rQQZy4YUFClzjFXYb3JdoPCXFJZbzeU5d+3csWNcl1vuCfS0pkiJV1 V3w6nMSKsamZHenxlli0o2SQqStaSUeQ8hRqo8JahSl0RJaZsRB2L6OU3jWs59XU/1Go Hmhg== 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=oy2C4j9eYp6F5lHMTp0YL5wYJ5tXEdrCdTtwukM6OmE=; b=pTTrsz4mZ2WuIq2VviZHUQP3qpVJYRZLmclH1LmhBjV33bl/epwsBPr3YFthouZkda LLR6TNMfcj6AXHKsmDEe9p8GZlHjk8YtOuggDPgW+BW83VPaEgeYdBgU571EuG2luvNs llQGI9Z2PCJbp4yuaki9vcJpXoGLwoX9V9WEollLiE//yNJ+Q/AAVI4xlbD9OQbK59eG 9Sed5KwRH7dUMjX5cu9BNmrkMRec/ebkqeoBYsaPufSlGum+eJtYlJbEusSsenmAmDaI U4nc2KThFJB96X7RDpU53hQC80lJHNBe45GO91iBqxse136ogWKvHPMP85KXUGZATDFo 5VaQ== X-Gm-Message-State: AOAM530t5Hh28TRxJVpWgUQ+9GBajkeo7cZx5xJkr0LppfFFU4DE/XFR 49gBvPWEPyRzc2nHTHIocDfcm9bE8OGgVAGz X-Received: by 2002:a67:f8c2:: with SMTP id c2mr45412013vsp.62.1638925646949; Tue, 07 Dec 2021 17:07:26 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:20 -0300 Message-Id: <20211208010649.381-5-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 004/279] 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: jBx6gaJxpu7c 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 52bf5dcd33..01fea93c04 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 7977980935..2479a3e9dd 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 7840e8717c..7643e5ca10 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1319,6 +1319,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; @@ -1327,6 +1330,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; @@ -1339,10 +1344,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) {