From patchwork Sat Dec 16 10:12:33 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: 6813 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp470818jah; Sat, 16 Dec 2017 02:18:53 -0800 (PST) X-Google-Smtp-Source: ACJfBovPm6VMLvbOiFfWLV+Tm8ga9yHgrf02sl+6BGus+d/cmlJwv51b1JXX6eTz5pgpK0Hnh1iI X-Received: by 10.223.135.121 with SMTP id 54mr12543114wrz.160.1513419533706; Sat, 16 Dec 2017 02:18:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513419533; cv=none; d=google.com; s=arc-20160816; b=twhcKzBif+25CQPkisinNkihX0kpSITD/C/R3kL7NxyO9r2rIOuY6ucpDtNgUUEI56 8LiDz2FL+VYi6UNGOa/3T1U3cZQGrO/+Hw1dSf04OkVDwmB2g9ESZbxKjRjkPVld7qoe lFcj5zcZnibARD44qjKBY0o6KbMEL16XTjouSXahM1XGbAzsHwNitEss8gA22bUwjpMv DsCHoyodzR/1E8JEe/mUxRuklsqGEaY+oBrFfiE/cJRHEOn6K2Esfgw669RpglNkuu4X RQcC7TXvre6nZ3cSDKglVuHasb/u/EumI3pOgLePsK5au4EIq+TJ3LgG8G5QdCrR7oxs cdZg== 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=NQcx4v2M4j55RbFLdv8/qIguA5c0zUXlfLcVYSOuVYQ=; b=EuwvaupSUa7mmAsHqwhCrUYSaFXkkJn8NDMpUdH5L369YkGZeOgjBpvskPEIXhOuYS oH9JTZuQ/aGLnhZjty3GUqEH5Xv9v3z/txKy8ScMR87ENCLTRFc4qBn3HSJ1tBDWx66v DuPWHLu3aL/sH6DddT8dUMKefp4exFLg0RV4/Va6+zFUCYfR6dr459gSryDdyBFhR/02 i+w4BtdGP4zrjrP0MSPYucidjiNTqhyS2Z7FXy1poldwtvlZDIZAxidLdip39L8/3VoT tNP0B4URQzWx6/GPUdW8TqdS9/FYI64JhP9VtlAie3v0vsYFKcW8lcL6aVEB4crIDoLa A4cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VW6TpGru; 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 n21si5753672wmc.81.2017.12.16.02.18.53; Sat, 16 Dec 2017 02:18:53 -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=VW6TpGru; 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 D1E91689A9E; Sat, 16 Dec 2017 12:18:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F5BD6899E9 for ; Sat, 16 Dec 2017 12:18:36 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id g130so1165117wme.0 for ; Sat, 16 Dec 2017 02:18:45 -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=wpU7h3R/Xh9RXUF5JCPEd9ThDQTI7ZZr9ZwOYIs2LMI=; b=VW6TpGruBpMU4vzAk8eU9jy3XxRLqtWyTs6zwYZuEFw6umxz0wxegND/hqbNh8ZTWE QT/g1xoXqQNYmtHnLEEKumTg7yIjq8E4CwZYWSfmehVqWEViUFEdheKECV3YHFSqZI+l Sv4vhM0oaLEsziOBKohn9JXcNtLKCD2RBijhZW8AKUGGV92iCX+N/8u91cm6Kksi8f+B DwCPnnATF5Vc8cYFxaaUNbcJB0nZcGICItsOyUXfX4A/R+XaPTTP2c7uEmQumvXnsQCJ r1c+z0veC92Ur7HoF7J4Ar4rH9Bi28H5k74uyhNnHIXoxeJGlYyaDK2zQzCPkwT3qmwb 0hAA== 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=wpU7h3R/Xh9RXUF5JCPEd9ThDQTI7ZZr9ZwOYIs2LMI=; b=G7Bo61eP+pF4Q+uX0y02pSj0p8xbobpzggOW4uQPPHYKVg7NFy+f4z0uOnhJpl3lzn sLzi3Zr01Q+nBSbIHWBMMwQZbUgsbXX22heiR1BmuL9YBxpiCQ0XCNbAE9LhOJ9g4Ojw FDT6gsYuOnKZco5YnbcWw0PeZ9D4kpAYZ2PJxxrLWukXs0PoxJFNmycc9LNHkPyeq/In 3fAdNoF+XytTSSwHuaqSLbLnuXuWHIzY2gFQb3wxm1b7n1NKLYybfGL5Td1zm8YQBiqa 1XtknHPmmVjkbqTOFxPQFsHAE4T3CdyE6gPa4D5eranY944lE2Qmtr0uIPuzeMJ092JV s8zA== X-Gm-Message-State: AKGB3mLNiCliw1PBoS0XHzxz5BFQ1Zs61L1dESIXp1h2ImIsAyQDdVC4 p2O8AuYkf2vh1wjhbWY6pAa6gQ== X-Received: by 10.80.230.143 with SMTP id z15mr21780914edm.106.1513419224100; Sat, 16 Dec 2017 02:13:44 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i6sm7100034eda.6.2017.12.16.02.13.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 02:13:43 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2017 11:12:33 +0100 Message-Id: <20171216101245.26977-13-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216101245.26977-1-onemda@gmail.com> References: <20171216101245.26977-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 13/25] 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 ++++- tests/lavf-regression.sh | 2 +- 2 files changed, 5 insertions(+), 2 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/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