From patchwork Sun Dec 10 13:14:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6676 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1679270jah; Sun, 10 Dec 2017 05:19:32 -0800 (PST) X-Google-Smtp-Source: AGs4zMbKrAgdlayh8P0PQN9PxoUhHNWSYMGLK+em0HoOebtNJ5J1nieP0MvavHS9ilxUCgPhvAYu X-Received: by 10.223.158.147 with SMTP id a19mr35306958wrf.179.1512911972333; Sun, 10 Dec 2017 05:19:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911972; cv=none; d=google.com; s=arc-20160816; b=suwynmh6POLaznLwUe/se8g3ZLPXrIDC/1HxUHVfPsyShSMQtljlZxrkSm+PzQ4dvp dqlqD/DoqNFwYoKwiLQwtwuKCWSBcCZSACRLMtB8PIKC1VBQoLZNo32/NQs64vPdDyLL QnpJsn1xb8D7YqldjF0flQgiO0NAHolNog0DdVI1JZvPDbIY53I5pFSddjukWkyccXBA YBsARSkwoRtq2+bjr+F5azqxUmNbzqOHFcmpuXhDdiNh2D+DB3DRdukXZTZwmOp3dvpZ XIypbH2rbTkEs2QyLw1PqYXi08eTa8qAUeVxR3wDCNKrlRgXHKNtFZnILtsZVuPhzcWF ditg== 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=x4iVwbrae4EIxTcpdlxqLFxYLgBD34PUj6oLwU+I3oQ=; b=rQQkG+qsr0DjXJmo2cwyngClFhvKRKvBYgbPF07PgTDfPnt6ZhTbSidfMTQ8s8IADw XmffbVy0zzIk2lKiH/rydcNulG5hL4Tc7PJN0NRZZ/W/kBf6ROJDm5zMhSm+eBPLql2X sKZ3dSyGp1VHhcflKbGNGSaCz0sFjlC8biJWBDv5wxt0AbdTlKpjJX+erJOhafhnTB5O 9S24E4STOzrwQW6IDTZLXlgmJAOuMJjo2sYzAnqdrbwFpPYtJdoJz+rgjIE76WskQIMt 3SKmRhbC9Yfu2iXAaqn0LStChian/FkqiAumBneEKoE1sEaxlWJgpTpggz+sqH6QSMn4 QnJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CyB6/Cvv; 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=NONE 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 u46si9322326wrb.523.2017.12.10.05.19.31; Sun, 10 Dec 2017 05:19:32 -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=20161025 header.b=CyB6/Cvv; 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=NONE 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 36BDC68A6F6; Sun, 10 Dec 2017 15:15:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D76068A6D3 for ; Sun, 10 Dec 2017 15:15:47 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id x49so14876763wrb.13 for ; Sun, 10 Dec 2017 05:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=FjQvmqjHkJt0xfl/0ymhAWPy+3gVhBEzSpzwsDt3Dqw=; b=CyB6/CvviR/rEoo/vwIGYxICj9rjzFmtqSafPeWE2HQIgM4LmVjZLT/KGEPuBBNYZI ++nGu7O/mD14WP/OwsAAi49dzVNzCeGLExd8v03UyipLmKXABdolA6qUYPeh8H9UbM+N pdFd+T7KGYdNJyX1CbYg5bS8oYZjoLRBf4D7WkBrtKgCyK5pfzdYe28Yem7E6bRMJYvU 7S0LXciA10YpYYyKk0Ggae93nMMOaTtyhuh9nFDO3oBdRrPn03mcT4pYfFlKznqIMwft 93cOp+VzQQBtg+SHSb8FbtCl6V1PJgnUSG/XoJJMPz8ou3MHwTVpAjzWXoOof5cDtvxw oXAA== 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=FjQvmqjHkJt0xfl/0ymhAWPy+3gVhBEzSpzwsDt3Dqw=; b=cq/wjd+f9rPTChyv9KPrnr9BrpzP4mfou+hHbxlX8iEV7CsbRdskeI2/qG3yd096tI cpJ0XBvpeIZD3ePffgxlTySanqrZ1LmbGbtjlVkdvcmj96fx0XbDDzy89YSVVc2hJ+lw c3mhsA8fiMAwCJhLBX06Rx8dU5lLq4OPEnGXwswBAHRTOmz6+8bcPDsocDBmet75JQfp DSN8j0iq5LB8XwLATopFcWbVWJzOf+gp9zFVWf5T1KicuDH8kuOz+v60yHYw/p3oepQQ gWb+MqiRaR78S/KrrZeWTBukhilncTWoxDAlNLyZzlsclwkcqpyxLWmV3/ujkENXwfDn nTfQ== X-Gm-Message-State: AJaThX7hRK7w1Lr9GKOHqSfbdV++KMQ5dIUDUxNsoljnbsGO0ObzSMKd ISqauyY/TKAnEvqM/HVvCBE6SQ== X-Received: by 10.223.153.247 with SMTP id y110mr30737844wrb.248.1512911753500; Sun, 10 Dec 2017 05:15:53 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:53 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:36 +0100 Message-Id: <20171210131436.15791-29-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 29/29] all: remove rest of YUVJ pixel formats usage 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" Signed-off-by: Paul B Mahol --- fftools/ffmpeg_filter.c | 4 +-- libavcodec/raw.c | 18 +++------- libavcodec/utils.c | 11 ------ libavutil/pixdesc.c | 60 -------------------------------- libavutil/pixfmt.h | 5 --- libswscale/utils.c | 20 ----------- tests/fate/vcodec.mak | 12 +++---- tests/lavf-regression.sh | 8 ++--- tests/ref/fate/filter-pixdesc-yuvj411p | 1 - tests/ref/fate/filter-pixdesc-yuvj420p | 1 - tests/ref/fate/filter-pixdesc-yuvj422p | 1 - tests/ref/fate/filter-pixdesc-yuvj440p | 1 - tests/ref/fate/filter-pixdesc-yuvj444p | 1 - tests/ref/fate/filter-pixfmts-copy | 5 --- tests/ref/fate/filter-pixfmts-crop | 5 --- tests/ref/fate/filter-pixfmts-field | 5 --- tests/ref/fate/filter-pixfmts-fieldorder | 3 -- tests/ref/fate/filter-pixfmts-hflip | 5 --- tests/ref/fate/filter-pixfmts-il | 5 --- tests/ref/fate/filter-pixfmts-null | 5 --- tests/ref/fate/filter-pixfmts-pad | 5 --- tests/ref/fate/filter-pixfmts-scale | 5 --- tests/ref/fate/filter-pixfmts-swapuv | 5 --- tests/ref/fate/filter-pixfmts-vflip | 5 --- tests/ref/fate/sws-pixdesc-query | 15 -------- tests/ref/lavf/pixfmt | 8 ----- 26 files changed, 15 insertions(+), 204 deletions(-) delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj411p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj420p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj422p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj440p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj444p diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index e69bfe295c..3aad564b81 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -42,12 +42,10 @@ static const enum AVPixelFormat *get_compliance_unofficial_pix_fmts(enum AVCodecID codec_id, const enum AVPixelFormat default_formats[]) { static const enum AVPixelFormat mjpeg_formats[] = - { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, + { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }; static const enum AVPixelFormat ljpeg_formats[] = { AV_PIX_FMT_BGR24 , AV_PIX_FMT_BGRA , AV_PIX_FMT_BGR0, - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV420P , AV_PIX_FMT_YUV444P , AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE}; diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 8da2a9735e..e19049b455 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -39,13 +39,6 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, { AV_PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') }, { AV_PIX_FMT_YUV422P, MKTAG('Y', 'V', '1', '6') }, - /* yuvjXXX formats are deprecated hacks specific to libav*, - they are identical to yuvXXX */ - { AV_PIX_FMT_YUVJ420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ - { AV_PIX_FMT_YUVJ420P, MKTAG('I', 'Y', 'U', 'V') }, - { AV_PIX_FMT_YUVJ420P, MKTAG('Y', 'V', '1', '2') }, - { AV_PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') }, - { AV_PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') }, { AV_PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, { AV_PIX_FMT_GRAY8, MKTAG('Y', '8', ' ', ' ') }, @@ -102,11 +95,8 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_BGR24, MKTAG('B', 'G', 'R', 24 ) }, { AV_PIX_FMT_YUV411P, MKTAG('4', '1', '1', 'P') }, { AV_PIX_FMT_YUV422P, MKTAG('4', '2', '2', 'P') }, - { AV_PIX_FMT_YUVJ422P, MKTAG('4', '2', '2', 'P') }, { AV_PIX_FMT_YUV440P, MKTAG('4', '4', '0', 'P') }, - { AV_PIX_FMT_YUVJ440P, MKTAG('4', '4', '0', 'P') }, { AV_PIX_FMT_YUV444P, MKTAG('4', '4', '4', 'P') }, - { AV_PIX_FMT_YUVJ444P, MKTAG('4', '4', '4', 'P') }, { AV_PIX_FMT_MONOWHITE,MKTAG('B', '1', 'W', '0') }, { AV_PIX_FMT_MONOBLACK,MKTAG('B', '0', 'W', '1') }, { AV_PIX_FMT_BGR8, MKTAG('B', 'G', 'R', 8 ) }, @@ -247,10 +237,10 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV422P, MKTAG('I', '4', '2', '2') }, { AV_PIX_FMT_YUV440P, MKTAG('I', '4', '4', '0') }, { AV_PIX_FMT_YUV444P, MKTAG('I', '4', '4', '4') }, - { AV_PIX_FMT_YUVJ420P, MKTAG('J', '4', '2', '0') }, - { AV_PIX_FMT_YUVJ422P, MKTAG('J', '4', '2', '2') }, - { AV_PIX_FMT_YUVJ440P, MKTAG('J', '4', '4', '0') }, - { AV_PIX_FMT_YUVJ444P, MKTAG('J', '4', '4', '4') }, + { AV_PIX_FMT_YUV420P, MKTAG('J', '4', '2', '0') }, + { AV_PIX_FMT_YUV422P, MKTAG('J', '4', '2', '2') }, + { AV_PIX_FMT_YUV440P, MKTAG('J', '4', '4', '0') }, + { AV_PIX_FMT_YUV444P, MKTAG('J', '4', '4', '4') }, { AV_PIX_FMT_YUVA444P, MKTAG('Y', 'U', 'V', 'A') }, { AV_PIX_FMT_YUVA420P, MKTAG('I', '4', '0', 'A') }, { AV_PIX_FMT_YUVA422P, MKTAG('I', '4', '2', 'A') }, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index aa81c21ef3..296457d3b0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -269,10 +269,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY16BE: case AV_PIX_FMT_GRAY16LE: - case AV_PIX_FMT_YUVJ420P: - case AV_PIX_FMT_YUVJ422P: - case AV_PIX_FMT_YUVJ440P: - case AV_PIX_FMT_YUVJ444P: case AV_PIX_FMT_YUVA420P: case AV_PIX_FMT_YUVA422P: case AV_PIX_FMT_YUVA444P: @@ -346,7 +342,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, h_align = 16 * 2; // interlaced needs 2 macroblocks height break; case AV_PIX_FMT_YUV411P: - case AV_PIX_FMT_YUVJ411P: case AV_PIX_FMT_UYYVYY411: w_align = 32; h_align = 16 * 2; @@ -872,12 +867,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ret = AVERROR(EINVAL); goto free_and_end; } - if (avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ420P || - avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ411P || - avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ422P || - avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ440P || - avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ444P) - avctx->color_range = AVCOL_RANGE_JPEG; } if (avctx->codec->color_range) avctx->color_range = avctx->codec->color_range; diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index e77d5f44b9..d549c49ba0 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -237,18 +237,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, - [AV_PIX_FMT_YUVJ411P] = { - .name = "yuvj411p", - .nb_components = 3, - .log2_chroma_w = 2, - .log2_chroma_h = 0, - .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - }, - .flags = AV_PIX_FMT_FLAG_PLANAR, - }, [AV_PIX_FMT_GRAY8] = { .name = "gray", .nb_components = 1, @@ -290,42 +278,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PAL, }, - [AV_PIX_FMT_YUVJ420P] = { - .name = "yuvj420p", - .nb_components = 3, - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - }, - .flags = AV_PIX_FMT_FLAG_PLANAR, - }, - [AV_PIX_FMT_YUVJ422P] = { - .name = "yuvj422p", - .nb_components = 3, - .log2_chroma_w = 1, - .log2_chroma_h = 0, - .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - }, - .flags = AV_PIX_FMT_FLAG_PLANAR, - }, - [AV_PIX_FMT_YUVJ444P] = { - .name = "yuvj444p", - .nb_components = 3, - .log2_chroma_w = 0, - .log2_chroma_h = 0, - .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - }, - .flags = AV_PIX_FMT_FLAG_PLANAR, - }, [AV_PIX_FMT_XVMC] = { .name = "xvmc", .flags = AV_PIX_FMT_FLAG_HWACCEL, @@ -644,18 +596,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, - [AV_PIX_FMT_YUVJ440P] = { - .name = "yuvj440p", - .nb_components = 3, - .log2_chroma_w = 0, - .log2_chroma_h = 1, - .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - }, - .flags = AV_PIX_FMT_FLAG_PLANAR, - }, [AV_PIX_FMT_YUV440P10LE] = { .name = "yuv440p10le", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index e184a56672..749bdcbfd2 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -71,9 +71,6 @@ enum AVPixelFormat { AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb AV_PIX_FMT_PAL8, ///< 8 bits with AV_PIX_FMT_RGB32 palette - AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range - AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range - AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) @@ -93,7 +90,6 @@ enum AVPixelFormat { AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) - AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV440P and setting color_range AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian @@ -251,7 +247,6 @@ enum AVPixelFormat { AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian - AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P and setting color_range AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */ AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */ diff --git a/libswscale/utils.c b/libswscale/utils.c index 4df09306d3..02f96338a8 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -108,10 +108,6 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_MONOWHITE] = { 1, 1 }, [AV_PIX_FMT_MONOBLACK] = { 1, 1 }, [AV_PIX_FMT_PAL8] = { 1, 0 }, - [AV_PIX_FMT_YUVJ420P] = { 1, 1 }, - [AV_PIX_FMT_YUVJ411P] = { 1, 1 }, - [AV_PIX_FMT_YUVJ422P] = { 1, 1 }, - [AV_PIX_FMT_YUVJ444P] = { 1, 1 }, [AV_PIX_FMT_YVYU422] = { 1, 1 }, [AV_PIX_FMT_UYVY422] = { 1, 1 }, [AV_PIX_FMT_UYYVYY411] = { 0, 0 }, @@ -140,7 +136,6 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GRAY16BE] = { 1, 1 }, [AV_PIX_FMT_GRAY16LE] = { 1, 1 }, [AV_PIX_FMT_YUV440P] = { 1, 1 }, - [AV_PIX_FMT_YUVJ440P] = { 1, 1 }, [AV_PIX_FMT_YUV440P10LE] = { 1, 1 }, [AV_PIX_FMT_YUV440P10BE] = { 1, 1 }, [AV_PIX_FMT_YUV440P12LE] = { 1, 1 }, @@ -1001,21 +996,6 @@ int sws_getColorspaceDetails(struct SwsContext *c, int **inv_table, static int handle_jpeg(enum AVPixelFormat *format) { switch (*format) { - case AV_PIX_FMT_YUVJ420P: - *format = AV_PIX_FMT_YUV420P; - return 1; - case AV_PIX_FMT_YUVJ411P: - *format = AV_PIX_FMT_YUV411P; - return 1; - case AV_PIX_FMT_YUVJ422P: - *format = AV_PIX_FMT_YUV422P; - return 1; - case AV_PIX_FMT_YUVJ444P: - *format = AV_PIX_FMT_YUV444P; - return 1; - case AV_PIX_FMT_YUVJ440P: - *format = AV_PIX_FMT_YUV440P; - return 1; case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YA8: case AV_PIX_FMT_GRAY9LE: diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 72fc46e83b..62afb241db 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -214,12 +214,12 @@ FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 FATE_VCODEC-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman -fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p -fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p -fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal -fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal +fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuv420p +fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuv422p +fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuv444p +fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuv420p -trellis 1 +fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuv420p -huffman optimal +fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuv420p -trellis 1 -huffman optimal FATE_VCODEC-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += mpeg1 mpeg1b fate-vsynth%-mpeg1: FMT = mpeg1video diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 45c877e4ac..35dfab24e8 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -284,7 +284,7 @@ do_image_formats sgi fi if [ -n "$do_jpg" ] ; then -do_image_formats jpg "-pix_fmt yuvj420p" +do_image_formats jpg "-pix_fmt yuv420p" fi if [ -n "$do_pam" ] ; then @@ -412,9 +412,9 @@ fi if [ -n "$do_pixfmt" ] ; then outfile="$datadir/pixfmt/" mkdir -p "$outfile" -conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \ - yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \ - monob yuv440p yuvj440p" +conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p \ + rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \ + monob yuv440p" for pix_fmt in $conversions ; do file=${outfile}${pix_fmt}.yuv run_avconv $DEC_OPTS -r 1 -f image2 -vcodec pgmyuv -i $raw_src \ diff --git a/tests/ref/fate/filter-pixdesc-yuvj411p b/tests/ref/fate/filter-pixdesc-yuvj411p deleted file mode 100644 index 5dfc0dc4cd..0000000000 --- a/tests/ref/fate/filter-pixdesc-yuvj411p +++ /dev/null @@ -1 +0,0 @@ -pixdesc-yuvj411p cac93399031ad86e8de0796b60b5bb8a diff --git a/tests/ref/fate/filter-pixdesc-yuvj420p b/tests/ref/fate/filter-pixdesc-yuvj420p deleted file mode 100644 index ad2f968a1f..0000000000 --- a/tests/ref/fate/filter-pixdesc-yuvj420p +++ /dev/null @@ -1 +0,0 @@ -pixdesc-yuvj420p 5244374882cf07c3cbcde71940caf8e5 diff --git a/tests/ref/fate/filter-pixdesc-yuvj422p b/tests/ref/fate/filter-pixdesc-yuvj422p deleted file mode 100644 index 5f80d585d6..0000000000 --- a/tests/ref/fate/filter-pixdesc-yuvj422p +++ /dev/null @@ -1 +0,0 @@ -pixdesc-yuvj422p 6c9722aa9e0c1b8f9d953efeb93dc318 diff --git a/tests/ref/fate/filter-pixdesc-yuvj440p b/tests/ref/fate/filter-pixdesc-yuvj440p deleted file mode 100644 index c98669285b..0000000000 --- a/tests/ref/fate/filter-pixdesc-yuvj440p +++ /dev/null @@ -1 +0,0 @@ -pixdesc-yuvj440p 34e6e86ca3ec4e6ef62d533aa2290e8f diff --git a/tests/ref/fate/filter-pixdesc-yuvj444p b/tests/ref/fate/filter-pixdesc-yuvj444p deleted file mode 100644 index 3e182fa6e2..0000000000 --- a/tests/ref/fate/filter-pixdesc-yuvj444p +++ /dev/null @@ -1 +0,0 @@ -pixdesc-yuvj444p f67694103bb42d74742918adf9ea31c5 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 124dddeacb..1f164e2812 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -132,10 +132,5 @@ yuva444p16be c80c1899789a6411d0025730efc8f01c yuva444p16le 2ed56ea50fafda4d226c9b133755dad8 yuva444p9be 4903fde22b15d28da90761ac1cfcb1c5 yuva444p9le 4eeb5988df0740fea720da1e31bbb829 -yuvj411p e003eefa7e2a20f20d33767775417216 -yuvj420p 8f3d8f1b4577d11082d5ab8a901e048d -yuvj422p 79d480e99e610112f266c833c6cb3d35 -yuvj440p f4b18310c7174868fc92579f87460876 -yuvj444p b161e6d5a941e2a4bb7bc56ef8af623f yuyv422 435c92283b538aa3d8fa2a020b0afd49 yvyu422 8436c2a760291cc979e0dd62ab8cede0 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index e21479ceb0..5e4df49c4c 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -129,8 +129,3 @@ yuva444p16be f817caf234aaf5848b2bc9679582ed56 yuva444p16le b32ad623fc423f897ff31c4073ea2a6f yuva444p9be 48498d994c3c9070f31773e39da306dd yuva444p9le 431b0ac211a8f81c15f38fb57a73530c -yuvj411p 241d393eeaa1517f6b4b23034222994b -yuvj420p 35583968261c636b9c57ff03fd60eb54 -yuvj422p c29a94439e96cd5dab7f65eb6dfc2f5c -yuvj440p 8899d4ce717e32937d58a76df473ba7a -yuvj444p 6c0d0ad629baaa96fe4dcb00f0f5d9de diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index ba2af6e76f..a21c194f9e 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -132,10 +132,5 @@ yuva444p16be b10fd7c1b61ac22bdb285f0d91a390f1 yuva444p16le cac82ffc36b7052747407663fc5ed510 yuva444p9be a6f66d08b3370fdd90987a6143b7b91c yuva444p9le 8d0f0b0840096127613920984078ce53 -yuvj411p 0c7caab687fbd33cba04702366b6c401 -yuvj420p c9bef7e5c1dba1024be992167806ef07 -yuvj422p ac900a0f9854dc2a0ec2e016ff5487dc -yuvj440p 6f0d66982a3b96efb341a512314317ca -yuvj444p d559f8cf2e68b0cd3abadbb2f3642dd7 yuyv422 449ca8d4b5a28ccaaa342860b24aeb3c yvyu422 6b226a0d4fce5478294d3bd4ecfb46a5 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 84a9e003c7..0247853d8d 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -101,8 +101,5 @@ yuva444p16be 2f80d411847856e1364659dee8b23485 yuva444p16le 5796be8d66371b60037fc8053c27e900 yuva444p9be a83599c0e9fca08f6b7c6e02c2413fcf yuva444p9le 390fcd8f72ee407a8c338667944e3f72 -yuvj411p 73fa99cb96d2f7171bff15bc2e43d963 -yuvj422p d5e67ce1db5347cf3416069286359f57 -yuvj444p e915da6b5aa0ee5298771ba0ca187cad yuyv422 a923c5bd4889bec92d872237f6a578ec yvyu422 d7a8697f1f5e6a2a27b0df17811b2613 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 875980d892..45f0a93e8d 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -129,8 +129,3 @@ yuva444p16be 635fb2720470e0042a7c9b70bf908a2c yuva444p16le 6d5bd13f8bb804bd1158c1af732a24e1 yuva444p9be 3d3e7491192aa4e396015bf8e3755a24 yuva444p9le 31727b34bc3d5ce726681e90557d39e4 -yuvj411p 70a0abb56a538376aff33c275584b61e -yuvj420p 83af439c504d41f986adc17059b7fda8 -yuvj422p daf02a72b26d17d1855b977aa04609fb -yuvj440p a4af7a9e3cff6cfc1c8924590ae69807 -yuvj444p f5937e0183439411673d2ebf8df62e2b diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index c6885b970e..fdec599b91 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -131,10 +131,5 @@ yuva444p16be 97f8cb6ed835c7c5cd2fb112b1e135c7 yuva444p16le 47170401a8c348d3f05f6530607d066b yuva444p9be d5c0170b41221a9607e6ae586880a383 yuva444p9le 4948983313f46180666dec85ef30130c -yuvj411p 91e137f54b2cbbb1c1423c36f031d5f2 -yuvj420p 2b6d8e3b527af5de94963d1bdefe20a9 -yuvj422p 4ce16aa04a5e785b29fd9cdf54bc9ca1 -yuvj440p 36a248ec6f1dc67555ee590651388b15 -yuvj444p 279790fe3c83b07f0a09085d36849c30 yuyv422 09af5b85deecfeaef2e00e00fbc12a49 yvyu422 62c62a80939c34fb7890c0e7791a0321 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 124dddeacb..1f164e2812 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -132,10 +132,5 @@ yuva444p16be c80c1899789a6411d0025730efc8f01c yuva444p16le 2ed56ea50fafda4d226c9b133755dad8 yuva444p9be 4903fde22b15d28da90761ac1cfcb1c5 yuva444p9le 4eeb5988df0740fea720da1e31bbb829 -yuvj411p e003eefa7e2a20f20d33767775417216 -yuvj420p 8f3d8f1b4577d11082d5ab8a901e048d -yuvj422p 79d480e99e610112f266c833c6cb3d35 -yuvj440p f4b18310c7174868fc92579f87460876 -yuvj444p b161e6d5a941e2a4bb7bc56ef8af623f yuyv422 435c92283b538aa3d8fa2a020b0afd49 yvyu422 8436c2a760291cc979e0dd62ab8cede0 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index e777211cd9..be8546811d 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -62,8 +62,3 @@ yuva444p fb60941a57596b277417a3c7c00aa194 yuva444p10le 251ea4ead8300d752eb355a08cbb0352 yuva444p16le 5b65287e1862d2d9f1ad2cfdcde94661 yuva444p9le e6946c10b94c271e7ea24b3bcff314e1 -yuvj411p ca967e68759a4956729dd366adc7e7fa -yuvj420p c00611cd5f1558047d579d8a7d30e381 -yuvj422p b3acdf07147a7598836065836ad8420b -yuvj440p 3446ba4b1d7fdf536c926cee643c2b35 -yuvj444p 3b0f1a185af048b9e0b202d003fc7e62 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index f43c519428..46164ae4ea 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -132,10 +132,5 @@ yuva444p16be 39ca2e32aa61b210b6c528855d24a16b yuva444p16le cd2e0a001d8175f2204b2eb411c6a801 yuva444p9be 58add24afbf43ff0ff7079cc1948fb56 yuva444p9le 077c8cec2c374163d7f7eae27e797bdb -yuvj411p d1076331c75ca66bf62497edbd8384f9 -yuvj420p 10390e6dda9cbb4c61fb88bcbb49fc3c -yuvj422p 996f6672566a4dcd8d272f48f058d49e -yuvj440p 3d80c9f67f8ef9b2d8a9ae2d37b464a2 -yuvj444p 9f858b9ca3fe949611147414573a904f yuyv422 1704675eff94ad0a03a9a6a3ddf5e0df yvyu422 516705a40f43d00e9c41ff47f4f7b802 diff --git a/tests/ref/fate/filter-pixfmts-swapuv b/tests/ref/fate/filter-pixfmts-swapuv index e02380988f..a2b4f5d5f6 100644 --- a/tests/ref/fate/filter-pixfmts-swapuv +++ b/tests/ref/fate/filter-pixfmts-swapuv @@ -59,8 +59,3 @@ yuva444p16be 356d72791dfd91861b21630e315d40cb yuva444p16le 176591ce074ba8befc5fb279446ca1be yuva444p9be 675f0ed3e6572b05f06d9e44611bdff5 yuva444p9le bf3ea2bf123a3a1ceedf587682b85cb9 -yuvj411p 361c32e086bd27cf3ded194dc00dc9c5 -yuvj420p 553ac1af571391271d9715e2e8a4a5cc -yuvj422p 39b613d01cacfcdd9eecf9e0d379a393 -yuvj440p afed4ad98d6accf5811d439f3a687aa1 -yuvj444p 8de64aff4b7b3895d8cedd67cc10722b diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 84b9d56858..34209b109c 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -132,10 +132,5 @@ yuva444p16be b8801dccf64b3eadc2a5b5db67ae0b0f yuva444p16le 8e72ae66754badf5d1eeb094e6bf0ddc yuva444p9be bcd845394351ca6d15e947342802957d yuva444p9le 7727a93765ed38dfd25e3d6b7a38fa63 -yuvj411p 260f51b360dc00b2222f4cb39fa05e36 -yuvj420p fab4394239b08bdb7638215a42d56eaf -yuvj422p 0309c2b34aa4d74f58048fe320a02b83 -yuvj440p f5e3a92fa46e57e2c613fc9aaad18e9d -yuvj444p ca4b3662259ba15a6297a44ef64414b7 yuyv422 8f02b2332fe9bb782f88627c99f32ee8 yvyu422 bd8cb985c2e1f9c32dc6b865bdf20637 diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index 0adfdcaf98..b18738babb 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -240,11 +240,6 @@ isYUV: yuva444p16le yuva444p9be yuva444p9le - yuvj411p - yuvj420p - yuvj422p - yuvj440p - yuvj444p yuyv422 yvyu422 @@ -319,11 +314,6 @@ isPlanarYUV: yuva444p16le yuva444p9be yuva444p9le - yuvj411p - yuvj420p - yuvj422p - yuvj440p - yuvj444p isRGB: 0bgr @@ -742,11 +732,6 @@ Planar: yuva444p16le yuva444p9be yuva444p9le - yuvj411p - yuvj420p - yuvj422p - yuvj440p - yuvj444p PackedRGB: 0bgr diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt index ec75d4ce24..4afa30ec7e 100644 --- a/tests/ref/lavf/pixfmt +++ b/tests/ref/lavf/pixfmt @@ -10,12 +10,6 @@ ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuyv422.yuv 304128 ./tests/data/pixfmt/yuv410p.yuv 8594ea0b8d7c2c964525b0801b5351de *./tests/data/pixfmt/yuv411p.yuv 304128 ./tests/data/pixfmt/yuv411p.yuv -e176bd14185788110e055f945de7f95f *./tests/data/pixfmt/yuvj420p.yuv -304128 ./tests/data/pixfmt/yuvj420p.yuv -472028e46a81c98d9b2477507def4723 *./tests/data/pixfmt/yuvj422p.yuv -304128 ./tests/data/pixfmt/yuvj422p.yuv -c10442da177c9f1d12be3c53be6fa12c *./tests/data/pixfmt/yuvj444p.yuv -304128 ./tests/data/pixfmt/yuvj444p.yuv 6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb24.yuv 304128 ./tests/data/pixfmt/rgb24.yuv 6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/bgr24.yuv @@ -34,5 +28,3 @@ d87cf0c2e7a13cc693fe6ece22461c83 *./tests/data/pixfmt/monob.yuv 304128 ./tests/data/pixfmt/monob.yuv 00b85790df5740bab95e2559d81603a7 *./tests/data/pixfmt/yuv440p.yuv 304128 ./tests/data/pixfmt/yuv440p.yuv -4d8d402c45d913038d4b725396719111 *./tests/data/pixfmt/yuvj440p.yuv -304128 ./tests/data/pixfmt/yuvj440p.yuv