From patchwork Sun Dec 10 13:14:34 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: 6678 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1679059jah; Sun, 10 Dec 2017 05:19:13 -0800 (PST) X-Google-Smtp-Source: AGs4zMY8r7eJ1MCwHWxZEoiP8xtfMnsqw6PMLUqAK/Hup+FMWJXZuMgb/MQICCHwxN6gglJClnEY X-Received: by 10.223.166.235 with SMTP id t98mr34564222wrc.251.1512911953473; Sun, 10 Dec 2017 05:19:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911953; cv=none; d=google.com; s=arc-20160816; b=MUM13d2RdQARX51iy+cVPj6D2KeOVQMtg3h9mZSaAWQQhKL8MrbzE/0/qK0ufeyYpm BF70Fd0DmDQBygbDRA4YZuahkm5fBcYTXVbismOZTUyffpvu+0Hq9ilVvRwXl+5QymRC Twc/rOtT+tmqufzeL9XQbAZ6MCcPdkF5Nnr6H0I5adPz85Tqo5mtOAcumNmhTv1ALDSK KH0VlroSmhdC2Ziwyfffz8xsxUAIEklUvnBOGCNmAPbIg8gvOPFf5W1gpEiyY7JCyY3z /wXeuCU/sqOPntQmuzgGjCPYU8vRCjudsGyzOuf7Zm6XJqL3Fq8QwWuiN4b68lYpRNU1 SxEQ== 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=h3YaTY/4Tnw7QLIhYeMeJgKMm950337olWCW5dYlYScu2tTYl6UV4QF6fonRZ7qLWv KG75bmDuceXT7hOg2d2QA8leH0ABWVELoPHKUN5mMwtyj8Ssvd8TgQmv8LHZgKLKeGqO 9CTvxIDfM7FNcMdMit4k3+uBtTH6xLP7Z3Dwp7i6nkMfFOR92XkFobBw4FpVY8egTcKT zReegJgHYPhuJtaNtf1tPDcrd4s4SwphXqtw2wh+Z94+fFYEK8/+D7Kl6vxe7SD3gRzP 226FIsM7twGzAW84f6XuG7eiQbOjuNPIrlw8bCViNCLPtcYvPbVKKSEomBxYGtDNaFYN rcnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eNOFuRgd; 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 o82si3822758wmo.230.2017.12.10.05.19.13; Sun, 10 Dec 2017 05:19:13 -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=eNOFuRgd; 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 6F4EA68A6EC; Sun, 10 Dec 2017 15:15:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D58468A693 for ; Sun, 10 Dec 2017 15:15:42 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id f9so9800272wmh.0 for ; Sun, 10 Dec 2017 05:15:49 -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=eNOFuRgdUx6fpjAcopgkT4ZSpL2GPRgY2KcQJWR5ZM6fKBHqt4js3raUDxTZ0xMPwb jq8UwgD7T+OxJY3FHUl9GQlnk3CbYYmzc7XLqyISO1qlBPc9ETmVbk4q0KVwPdv1QK2l Q/rFouVH94pu+bg3O7gP4rxjWGr2Ry8vcczjUsIRN//OXRNLtL3jjN6m88pk1tP7DPLa 6pi2LRIlSqw7BxUQvyREHTnCk23ckfT2D8a93eXrQMn0xef8lo571zwQpWaXUbSVeIgG kk73KfJzHihsxgJqtSFYKjTeO9w1lqiLLmNN5tKfkW2ZkVqJwdGIp59yozpx989Z6a5u cFjA== 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=WjGNPO5X9SwQ1CPZjDHAFY49hzAY0C7km6XcyT+mgfG3KMV9o3JTRyXWteM9hbNFQP nZtCvgEakmHaECR3VnUiZpbcnHq4IqYW7sDtL77ggtf4LcQbnPrZVAlAXzHiMFanF1Vl 7PvpHJJynm7sf3gIcewNZ/ZiyHagFhqhSlV32/n3GlBRe+O5xc6Bt3qhl3QLICJOfm7y bkcxgoNvuZ0/7UluQCDFZlzkgMXcPh17p1w55+EhURoJdkWVolPp2kYKJrFLXWwbE2gM 6CmahV+/eUIvWM2QPZ0KXrtdr+VYRcZKrapSJL0uoVIHztSflNDkY1HAV3mkKOvmdh9q hdIw== X-Gm-Message-State: AKGB3mKe3i4etbrZdKFxUEHG31WQZzVFacPhCde5xaYkrfcwtiFWN7GI 5rhIGafjFc6SveLcBK70yKdO+w== X-Received: by 10.28.120.19 with SMTP id t19mr9006908wmc.64.1512911749103; Sun, 10 Dec 2017 05:15:49 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:48 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:34 +0100 Message-Id: <20171210131436.15791-27-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 27/29] 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");