From patchwork Wed Dec 13 10:59:39 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: 6755 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5267711jah; Wed, 13 Dec 2017 03:04:05 -0800 (PST) X-Google-Smtp-Source: ACJfBosc6xVmjoUftQZl6F5iotZGeK2q+YkBTGW7RkYK8YCBByT71ArBqVf+mxRardSs5HskaFPo X-Received: by 10.28.110.24 with SMTP id j24mr1539216wmc.100.1513163045205; Wed, 13 Dec 2017 03:04:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513163045; cv=none; d=google.com; s=arc-20160816; b=OV86d5or4xaWkBUpISNgZ6adOngA2wMuv1L1YYLH0XgJD6sPqw6L8lgvDjQvoEsM6V O5exm7iIwVHUT110sJcJQbB4tshEEIzQtzQHyIwAhaw1izoFfNoWKmRSGGQw50mP5g/L iZUAcRq5MMz9SA4WWVNdBWhPTI6n9DdHpDWaxHqz/0KCtEnUdieB5pPNgwwHPt3NbOjH tENQWoS0avkc0QUGiN472QSeP7fWMDv9GJx4UcpX/jQqVTW0cc2+ykNC4/KJd6TTPQTz pNiDrRsOTA5g/PhgLkEgDkfth0WUuuG5mIlteGrs38Xp195bak8RgoleRlE8W4lR3xYe 2QOA== 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=jMpkHxnfDgFpAfkP9dDdN071kVetgJHYy2suv62EYj3nnp03qy5QjbMDAvKWfvVkQC onJXQMD5JyVQfpweLUv9a6Q1votsoBb/05OwFDtDf19UdKiiUcIlVfR/A5QWhMAfdqgH lwTjohD6KPszTiJgC9QHazuEwJK3SoYfJFrt9OuqUr2i04eVQE9GfKyL6gSQ5F8s5djS DR+eJPLybFPnxepVpG2kXdsqYBBnlgwzJW4V+gLTJ9IFzIgIr6GtODFFj4IyPZLVYQQL w/t8lrijvvVz7+OJwvWBP5dCtH45TsBZQfkJj9ona2l0ORg8OVJ2Y/Jh3ukRzhmF4UYU zflw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=huAQw97W; 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 h8si1100997wrh.277.2017.12.13.03.04.04; Wed, 13 Dec 2017 03:04:05 -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=huAQw97W; 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 4EF3768A613; Wed, 13 Dec 2017 13:00:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C30DD68A5C2 for ; Wed, 13 Dec 2017 13:00:44 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id g53so1723987wra.2 for ; Wed, 13 Dec 2017 03:00:53 -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=huAQw97WXnlpL7b6DDjrtCPI1fu6fVCID7TnTlFEcY/FRgL4uftk3sFtcAHh99imW1 Hymntx8xaErRNZH9kMDglr6U1S3x4cTwENvPHgKUepM97h0cw5WRF+esgyg7FDXY3H2T cqYjWa/wqoKE322zfEyDTh/BsAowLOmfEvAsh1jn/PkWCMyeTR7WOCvaXNPxTdEMLHCz bqfLUWlmARiGrYNv0R9/rANaSQ6uZeWZlrvqJ4lIsUlpUApDm3IJd2KTFmT5Q62cu1Ui I3pynPK42k88vWdS7NbBECdYBMPNEePXqfhlK3P+FLay2+IlIKzXuiuJvlJrg0I32qh6 Ee3A== 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=nKL6p9BV3lw4ijyZjv1C3TvRdRWJZIXc9nwZVLOVylLHEvKUC7U4B2eKv7atMuFbHm qGcGfFQvxW4l/RIAIQnkjAVVTs2IPEsJT/bxc/Dh/1qIJ9wyEnRysx0TyU3eX2O/d/II WwHoM6IOKxrP5H4zzh7GSdvP0zQ2MKjNMyHLnMl7+r89BtKalpxMWBs/FI/VjrW02K53 X2IfTPD3jQa1WPNJ0xhGgMMv9+w27LZEg0caGs7gqBuPqbo3/GO0Zbk0CV2G5Uu6UbrV F8mGSjt3PXBw1mFAJvrDvtheiXdMP6tmOjY92axtDq7hRi2JFFuljvW8s+e3BzmZl80W T+Pw== X-Gm-Message-State: AKGB3mJ9sZgJbvkyp5Cx0la/OjfDV1eT0uhpblU1cFUnfhSyiKnB7VD8 oqqTwmIvflkS4ZCzy1C1G1meZA== X-Received: by 10.223.190.2 with SMTP id n2mr1787675wrh.44.1513162852501; Wed, 13 Dec 2017 03:00:52 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:51 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:39 +0100 Message-Id: <20171213105940.32103-23-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171213105940.32103-1-onemda@gmail.com> References: <20171213105940.32103-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 23/24] 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");