From patchwork Sat Dec 9 15:38:17 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: 6642 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp810724jah; Sat, 9 Dec 2017 07:42:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMYunkUO2V6VOmW9XL3F+EowYq407mhsk3qpLaClYDZge34vBLaXFAQnVVcUafhlkviwi0wa X-Received: by 10.28.231.19 with SMTP id e19mr6379283wmh.1.1512834140133; Sat, 09 Dec 2017 07:42:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834140; cv=none; d=google.com; s=arc-20160816; b=goMYpeMjZditPOxF/Z+5sm93NCl/Y7R1hx1LKNbwsJ3qRdzWdEfeXIVI4mOWEpCrZT i4CX6tDcdvWFLrXRcIK9RYYul+fjHjV0iXYfC/V2MV7wT8p0/MUWiN3O7E9QybWBvLh5 6tyNBVc1sKYLI3Y8EWr6dUjrkoRl7mJkOD77g1t6ZEkEEMlaFCTjJsV881XTKiVTbeuT AkSAF3djbtB2TbsmHZmk3qkfT1NvSprVb2iLKXae7Vbl0Q+PPNcsb9qK0T4QaNXvToBG S4hPmcLXBQ4b0ltwH2eX4x8U8oWLSEaOhPu29vs8Q280UJdfKa1c67E9E/eHzruLwKqg LLxg== 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=B9KRI+ADmu9gQzwFztxEuV/XLJTg35jX93qgtVIVXSQ=; b=SnMcQGuHYb+uT8u8vZ/pWxIaGQdhA4HxSaj9DIIlz9NFLsQBR7Sqi+AnmljWwM5Glj MUYJmmXhnAyllK8+rvdbt5xgEbUoXHZtQlKnzq7sF/KqB8k2kUGhxk8FB1fPMIy+rMoH OXdvNrZCbcH8+RwlQxfdC0IJ/E+ldNM51+gyDNFCSs1EPM5Hd+VK07NNZSZLWaA96/5o IQy6LekwgKmCgGYZxiBc9Xq1qIObkPGMisdyUzvwn4yMqQWH0FudlfEIFVHH1M8m8ZFj qJPTM7ugTi92oQ0vYYem8I9Ur9x7fpD44IAtUrYrWJ2ZIXw7udBh6CIDHwALWHgF3hL6 crYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lY7cXjJy; 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 f10si6799615wre.14.2017.12.09.07.42.19; Sat, 09 Dec 2017 07:42:20 -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=lY7cXjJy; 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 5F45C68A549; Sat, 9 Dec 2017 17:39:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53D2368A516 for ; Sat, 9 Dec 2017 17:39:18 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id o2so13426251wro.5 for ; Sat, 09 Dec 2017 07:39:25 -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=a2BlwexY15HZwu51sGWW3FRXEfFgixdeEsUnmPIna0w=; b=lY7cXjJyPa3yZtlnoNzwUrFijO4qFT+SwCojV/9hq1SdN9Q+pB9t+tdWf9904QppRI Px38qj/5EbsymhG/N9/AxmDBnGIhkJJuSP//5ibRZd/yVdxULX/JBKwteAqQ6ZQ9wbrV mPkW+J2GDoffSgmjrHIwaFCbacIQSP88XEyjc11qovd40yxsnves+JYJT6pZRf1S04NC CV4yI/OriyfuX40mOnWxseTXwC0FMFqtrIoVnxvXMORpp4MpZB5w+YPtVCYSEkyWDGBp 8U8zqwr5ZLxWcrgdei6mg2ekxBuqh+5NbRKLe7hBkwU3jqGhRuPEe+iKAMtiYEpWfdUf ndNg== 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=a2BlwexY15HZwu51sGWW3FRXEfFgixdeEsUnmPIna0w=; b=TcHZULSDOlteoswoQLFx2nC+Y3Qc6UDg4Rg7u8g+46LJtQlbxF6spS0xYqPBvJCv4L Ka/wdQSqHRT7UqjGFE+CIsJhrkaINLZZLf+HzCLK5CThboOjjlw6xOtkv7diyXYfizpX grqDih3nMZAbHpQa89pV80AR8b/Jrqb1tDgd+Ar70rNx9K80rk4amViGDLfDODGMPXmt 4YQMiN7hy64UFjapKIbmFo1C7uoT8owfchN8mXwiAXDrI47VVONFC7vnvK9TdNKAUGtA yYanRjArBFKjXLIK2Q0xOTyySr44NM8uw9pfaj+EgEefispOFMe7BSjwos4BzrHyudSc Veow== X-Gm-Message-State: AJaThX7LfCJMwlQzS/npeSRPr63FTc4QCS/VmfS82OspTpyn1TB2tpPr 1rWf1EGhzaeCz+oX5yRccn6ftQ== X-Received: by 10.223.184.245 with SMTP id c50mr29154526wrg.268.1512833964536; Sat, 09 Dec 2017 07:39:24 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:24 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:17 +0100 Message-Id: <20171209153819.19007-25-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 25/27] avformat/rtpenc_jpeg: remove usage of 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 --- libavformat/rtpenc_jpeg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 38eb2e68eb..e0e7afebfc 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -46,13 +46,11 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) h = AV_CEIL_RSHIFT(s1->streams[0]->codecpar->height, 3); /* get the pixel format type or fail */ - if (s1->streams[0]->codecpar->format == AV_PIX_FMT_YUVJ422P || - (s1->streams[0]->codecpar->color_range == AVCOL_RANGE_JPEG && - s1->streams[0]->codecpar->format == AV_PIX_FMT_YUV422P)) { + if (s1->streams[0]->codecpar->color_range == AVCOL_RANGE_JPEG && + s1->streams[0]->codecpar->format == AV_PIX_FMT_YUV422P) { type = 0; - } else if (s1->streams[0]->codecpar->format == AV_PIX_FMT_YUVJ420P || - (s1->streams[0]->codecpar->color_range == AVCOL_RANGE_JPEG && - s1->streams[0]->codecpar->format == AV_PIX_FMT_YUV420P)) { + } else if (s1->streams[0]->codecpar->color_range == AVCOL_RANGE_JPEG && + s1->streams[0]->codecpar->format == AV_PIX_FMT_YUV420P) { type = 1; } else { av_log(s1, AV_LOG_ERROR, "Unsupported pixel format\n");