From patchwork Mon Oct 7 12:29:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52108 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp5202vqy; Mon, 7 Oct 2024 14:26:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1ZT2V6t/uLzuegfPWXQmv2naVCtBq+4EOvcEwG2W2jfcR658yDTPhx5+vvVhlZdTivh6NYDsWlNwZktlqoiF9@gmail.com X-Google-Smtp-Source: AGHT+IE5d+3NhJJEpQ5hcOoVtnDOnar9caKaoQ0mLvlnFWel8IGprHbEC3llefD8itx9KuOOzkXp X-Received: by 2002:a17:907:25c5:b0:a77:f2c5:84b3 with SMTP id a640c23a62f3a-a991bd20afamr1313080466b.22.1728336365676; Mon, 07 Oct 2024 14:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728336365; cv=none; d=google.com; s=arc-20240605; b=hZ6btgIoGkzLyh7I6RyXbn5PTuiJUVix7r94qdIGl6Hrl1Plzhs+1XCmty2/XL6p1f DVz99PeicpcrM4ypdnQ9PPxI4AU2Ojxd52TrLvdU8KikE0KYlz6TgBqckgc1zSOt5ENg i5WGoGLAQJvyt2jEGPpG7gQN1QZVRZs6bHjLYP/xg+67M1AcXoT996lsBLKZJHJBLuY8 vzrOYq6ZCpIQYqCzpS0NFuEOY4EjPILDfE5qNc9WVKKMjV4y+I7rDrjH/v5gN36Q1LiY 02x8wxjZQcy7vCJBadM8mWQPvsuzL4vTc1QQdzF0w5E18/csjz0//tux9FVgwKIggGAP z3+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=m/k2PRttyd49z7f6uDyD7BBreScYL7I+PwVLzCTl4ik=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Aoi+nID9E8gHUmidJtc2ekJKoRWJBXMb/XBYwPshfDZeHit9iZOdJSFJRrFo3vPiwQ dYJDYsNUUngH3GpoeUuNyw0x7YtsyMvO0lSt1KSzkA3xtQwzQLZ3Tpkvq5xAaBhBZ4A6 U6fr8VAlltvWGRbAA/jpWnAbSx4VQlMOtBaVSabqON+x5oiStxNB7azFJDTrKFrbFR5T z/kjKuhvqrkJQdbgdOOkt/7WgMligT945Jna2kPoB9ExvphxFUp1vHGKDO7oxXLl7SN1 FJhArzZYpp/MRvpaX655wVL5ES3WFcgLMNeAdUOn6u6c/cYtxaCA/Rq2hKgPPPQe4h2X OY9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=L04QCuNq; 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; dara=fail header.i=@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 a640c23a62f3a-a992e57da1csi517873766b.197.2024.10.07.14.26.05; Mon, 07 Oct 2024 14:26:05 -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=@gmail.com header.s=20230601 header.b=L04QCuNq; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D6DF68DCBF; Mon, 7 Oct 2024 15:30:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 258DD68DC7C for ; Mon, 7 Oct 2024 15:30:45 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7e9f355dd5dso713550a12.0 for ; Mon, 07 Oct 2024 05:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304243; x=1728909043; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EOPTIzAn6GczWREdiHG/TkZi9IywJewGE4GXULw9X6Q=; b=L04QCuNq9koKT7THs7odF0zEd+A2WSWeMR31G5kNYsQCKmk5ZCu9odGHFV2ZjuhtIv WyjwfxcK9W0OzBaFROO4BCZG4CGC+paVDoOaT2hdX0+SSKRPhqYX54FmFij+O0uFHWb+ +RkbbxqUlP44H97s546I223Ev9Zq+ZCA9wj2j9o6Y7Dy96U3MZHcBFUiL32+hZkG1MMv XM9BF9ZCbZd5y42I7vhy0o4aQdEJi4gMZxx+MCKvLa1Za7zQ1tMDunpc3NTRYETjy7Ea ZPIc86m683tqHrtu86xnupmwb8p9uGQ6FREUPvJBbHoqHyQNx5ajloSyhR8Xz/SlRb6m aP1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304243; x=1728909043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EOPTIzAn6GczWREdiHG/TkZi9IywJewGE4GXULw9X6Q=; b=JyMYgJ1muKM0syR1VnAJYSoVIgjmHKgvQGyI5qPSoaCeCCmNl8X+97izsXX9ZsMhbQ nFSCjZxU9c48YWBADGcTJaZr6dZleOzTl0yxDkGXF19Y9+2yyG+hpVuBRIA2iYTGRap0 oh0jbYgjuEUISrg6NBvYHkbAn1NTE9c3KZkju7i6gznlB7+MqUpbvwbu4IiJqaryA8rH Bpbjg2ARhp6U1GRQwlsOrl6lVeS6RaVZvDhRGzYnJbQ3zHhiT/7FzmOLx64Dc9+jGabc Ircgdz+Os2+9rN7tCKLldBLoqv1zFfs83RuQRlTrlXe61pNZ+xKc/SEcUk3Ef8A9s2I0 1R/Q== X-Gm-Message-State: AOJu0YwJ7iRQ8KxR8Ltt89bpG+niXUZVlmdITcGH/LPN7xvpkbR35JHj F4GBPyU3qRIpRCi/mY0xNOEubk0o2JtK0fC7Fc4TM/fPqsjehO4CIo9wWA== X-Received: by 2002:a05:6a21:2d84:b0:1d5:10c3:af5a with SMTP id adf61e73a8af0-1d6dfae286emr15687989637.47.1728304242856; Mon, 07 Oct 2024 05:30:42 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:55 -0300 Message-ID: <20241007122955.309-20-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/20] avcodec: deprecate v308 de/encoder 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: BykENH5Ag7ZZ The vyu444 pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer --- libavcodec/allcodecs.c | 2 +- libavcodec/codec_desc.c | 2 +- libavcodec/codec_id.h | 2 +- libavcodec/v308dec.c | 2 ++ libavcodec/v308enc.c | 2 ++ libavformat/isom_tags.c | 2 +- libavformat/movenc.c | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 356a78f6e0..19f7d63c16 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -345,9 +345,9 @@ extern const FFCodec ff_utvideo_decoder; extern const FFCodec ff_v210_encoder; extern const FFCodec ff_v210_decoder; extern const FFCodec ff_v210x_decoder; +#if FF_API_V408_CODECID extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_decoder; -#if FF_API_V408_CODECID extern const FFCodec ff_v408_encoder; extern const FFCodec ff_v408_decoder; #endif diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 6018052215..0e9cd669d2 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1477,6 +1477,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V308, .type = AVMEDIA_TYPE_VIDEO, @@ -1484,7 +1485,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, -#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V408, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 0ab0f6761f..3608c4b856 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -254,8 +254,8 @@ enum AVCodecID { AV_CODEC_ID_012V, AV_CODEC_ID_AVUI, AV_CODEC_ID_TARGA_Y216, - AV_CODEC_ID_V308, #if FF_API_V408_CODECID + AV_CODEC_ID_V308, AV_CODEC_ID_V408, #endif AV_CODEC_ID_YUV4, diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c index b591a79dd2..64876b7e5a 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -30,6 +30,8 @@ static av_cold int v308_decode_init(AVCodecContext *avctx) if (avctx->width & 1) av_log(avctx, AV_LOG_WARNING, "v308 requires width to be even.\n"); + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/v308enc.c b/libavcodec/v308enc.c index 68f9c3310b..2941ba3f03 100644 --- a/libavcodec/v308enc.c +++ b/libavcodec/v308enc.c @@ -33,6 +33,8 @@ static av_cold int v308_encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } + av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n"); + avctx->bits_per_coded_sample = 24; avctx->bit_rate = ff_guess_coded_bitrate(avctx); diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index d2f8f74e01..1e3495f0e2 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -62,8 +62,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* uncompressed 10-bit 4:2:2 */ { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10-bit 4:2:2 */ - { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ #if FF_API_V408_CODECID + { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ #endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f1312b3022..301b327bfd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2614,8 +2614,8 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_VYU444) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) - || track->par->codec_id == AV_CODEC_ID_V308 #if FF_API_V408_CODECID + || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 #endif || track->par->codec_id == AV_CODEC_ID_V410