From patchwork Tue May 1 19:40:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8721 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4904583jad; Tue, 1 May 2018 12:42:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZod7/rhSC7CzbB1nQcKuaVLXILSISi5tebXqYn6LhYdD8N2FaKev+MpdMuW0uMUM9ke0hoZ X-Received: by 10.28.69.132 with SMTP id l4mr10323494wmi.142.1525203763989; Tue, 01 May 2018 12:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203763; cv=none; d=google.com; s=arc-20160816; b=WaUS1PzQ3BjBuSpKg9vQ7pVBqtw2gXrt1ojdu7CS1ZlfX4Pb/DATC4Q+9QdDaw5x2p XUWdLs7qRKpS/OgtxgSS0LIRA9G85GEp6zhXtfOP2cG7unplVxhFQxJEQbmrW7O5BXRl 7j8Foqxc1ihiFeDP9T8qqyjhz0hHiLY4GJJyHgp1sTrI/OEH7+tVlpJaGFJZsOkR10g1 3er+64c8SBXczEISGg2eJSnDQ2RDJgJmVK8md2fH/5ZU83pAtPQUjplpuPLJlhSvaCE6 ZfaQJ4togArCQGREPbE/cPclFbPPE7xL0lmEXNH6TWplzBnvjQ73+pXueaexS2eAFr9S qZKA== 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=Qn/dnSw7sodsx2uJnA18LtkcpZuNcu7UHj1AutbUOq4=; b=anCS/2SvRQXWtL8iEF1V234b0e1WgHzrmz1fYWj3jc6xga+izORYIvDvh/FxVN7vUs UaijDCpaPD5EGoCYV+XUfouy0Db69YtLjLq29S5vEYGwidMRPV54JAitpQWjHZ7cN/fC ND1HjyMDaeiIBWJVIi/GnmhFcg+FfwH+1EfkluOTL1NsCgQr538ny2X0N4V4xE+K4Fc7 DtyMYUgxqoXazExLZ6Xj5Z+DtwnDHRABIQ6F95UzSoRelprIMosv1ENijMjDkkMROx56 JMKzy/eYrt9BLBK2GuuyKztNA3N3ClP2wuxj0yEMLGrCYX45EMRhSIFm8PEb+oqfst/l hQVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=A3UOn3Fd; 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 r136si228048wmf.13.2018.05.01.12.42.43; Tue, 01 May 2018 12:42:43 -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=20161025 header.b=A3UOn3Fd; 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 3AC7168A427; Tue, 1 May 2018 22:40:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B812F68A400 for ; Tue, 1 May 2018 22:40:36 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id t11so19232692wmt.0 for ; Tue, 01 May 2018 12:41:09 -0700 (PDT) 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=nTSs9zSNQiDRfpWR7wxLpPzWV25S0ah2FNCzbDzqVjw=; b=A3UOn3FdNERtkLQD63D+31dQx3DOXGf2Qgwv3kQ6B2HbyZoPvfCA1fSu1Plg335S6r LhblMe4O0R5wUt/vPvK7M4fTPebSPI//y4rYGsrihC5E/L5mtnZup52GwPZxcbVhxwTR 3PNujpPBajMRp4/CfYFL8nGbY5zXxDPr5yCZlXOYjzRXJXwxAEz7Mu/wki92AOeiDSE7 gQtv5GSC+vHvWl6wnMFMjZ0Pgxo/GNsGl1QO5sw6Mz7gMUSlXXRTHdJuyDMO7EM9/+du RT+la2n7E43ze0IF8ATBdQFZ1twq8sv1yOiT51DMxgW8iIbs7HHliwkOltUKn2xile23 z61w== 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=nTSs9zSNQiDRfpWR7wxLpPzWV25S0ah2FNCzbDzqVjw=; b=O805hiKSOS9hBsGRvu/aP2fqoAG/SxYLQcROygTppxtR1vv+dsZUzrevQMtAuTYvuE XtME1mkXeqhEgZbspYWfFiNjqrJVdP0xHWU6xQZKEUGJtdlP3E+10ACUuFr1C7Ve7ZJo ecSSY1j9rWQ4IgkoDf8RQduDEtQjY2+RM2zvR7wMVUj+mT/9A3t5+o/aG8NVVCu1rism caUovcEcLu02adYvY/K6zFINOWW4uhFcrUpCtKWiuLw43K7KqRpV+iU7zu6DJuEuWaoC V4tqH9PqIh6sffxPPkAUDnvjm4oRKMgM7mQ5a93MDz9NehInMV743EDsz0Jnvg0bvMQS O7tw== X-Gm-Message-State: ALQs6tAiblKUPmkrpTBSApbQn/96YK6lgYh/65dZGtID4sgOPC9Ps741 gKDHIlh/jwgBrx003X1VZQE3pA== X-Received: by 10.28.211.1 with SMTP id k1mr2239537wmg.43.1525203668688; Tue, 01 May 2018 12:41:08 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:08 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:40:01 +0200 Message-Id: <20180501194013.9552-12-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180501194013.9552-1-onemda@gmail.com> References: <20180501194013.9552-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 12/24] avcodec/mjpegenc: add support for non-YUVJ formats 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 --- libavcodec/mjpegenc.c | 5 ++++- libavcodec/mpegvideo_enc.c | 3 +-- tests/lavf-regression.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d2fcb8e191..c31985efd3 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -415,8 +415,10 @@ AVCodec ff_mjpeg_encoder = { .close = ff_mpv_encode_end, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]){AVCOL_RANGE_JPEG, AVCOL_RANGE_MPEG, AVCOL_RANGE_UNSPECIFIED}, .priv_class = &mjpeg_class, }; #endif @@ -439,8 +441,9 @@ AVCodec ff_amv_encoder = { .encode2 = amv_encode_picture, .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]){AVCOL_RANGE_JPEG, AVCOL_RANGE_UNSPECIFIED}, .priv_class = &amv_class, }; #endif diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2e7950c64d..76aa675685 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -315,8 +315,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) avctx->pix_fmt == AV_PIX_FMT_YUV444P))) format_supported = 1; /* MPEG color space */ - else if (avctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL && - (avctx->pix_fmt == AV_PIX_FMT_YUV420P || + else if ((avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV444P)) format_supported = 1; diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 45c877e4ac..b03d5ac2e7 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -376,7 +376,7 @@ do_audio_only rso fi if [ -n "$do_smjpeg" ] ; then -do_lavf smjpeg "" "-f smjpeg" +do_lavf smjpeg "" "-vf format=yuv420p:pc -f smjpeg" fi if [ -n "$do_sox" ] ; then