From patchwork Tue May 1 19:40:12 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: 8736 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4905615jad; Tue, 1 May 2018 12:44:12 -0700 (PDT) X-Google-Smtp-Source: AB8JxZodgKPd/qnBwGRoxNsFHgjROo9irdp35hN7C+Ovsvi0qF4LrSRdCacYv/tuHQgAWWADcALx X-Received: by 10.28.66.205 with SMTP id k74mr10175343wmi.81.1525203852560; Tue, 01 May 2018 12:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203852; cv=none; d=google.com; s=arc-20160816; b=jDtLtYjyIn4Ea31H4X4jcFbGAiPADOq9hT9mEuNcX7cvrv/4WNPWHFksiEaFrjTu/O xAqgH1XzWEBozLuMGCJf516f1kSws8OnMIWmcPGsdyM+NVFbKjA96aRJ4mrj2DdqIgyH TRea8aTZupcTDtcOeU2C4uFtiEzVmPrgTvdFETawAUXN8MbZDHKg3wfmAysx9BumOB03 /fNirYmdBWW6XPYGNMIGWFn72h0IxuepLe0aDCCH197qNGglt/2eBp9QySRI+PI+peGd fCMQjTtpxbfrM9Lpck5COLXY5eV72LQz2nlrzcGWAmOs8CKSIdXHaZ1YQu2jmnhk9jhw LwuQ== 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=UJN6WahK7hbh5bzl7IHDpVnUMGhgvkySz+eYRG/r9XXLA4f608FLUMcJkfIOA6xUDQ CSz930kFhTux5fbGLCTgDiBfjQHr6QfQddiCB/XuKLC8tbvd7I+nkU/UQZoZFcx2bCVn gpdq9gvu5MXOrvxt65PWPW5afFobHK4y8qUGPG5cK7283q7kgkz9IV8b9wk0PH4E6/9S Jz0j1bXK4fgJoh9JzAW+PacPTA60BW9LI4ZlHEPTRMNNqoWv1DL6uLFhLztKiKCBu/P0 z28+DvWDLvlJeb9i97P214wB05JmhQ+oZhSxv+MTd+fl8MdO+CYobdhDNo7MTcIT+uXv UPMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MiikihyS; 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 b191si7644308wmf.137.2018.05.01.12.44.12; Tue, 01 May 2018 12:44:12 -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=MiikihyS; 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 86E2068A4A4; Tue, 1 May 2018 22:40:51 +0300 (EEST) 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 C9B9C68A48D for ; Tue, 1 May 2018 22:40:49 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id f8so10029496wmc.4 for ; Tue, 01 May 2018 12:41:22 -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=a2BlwexY15HZwu51sGWW3FRXEfFgixdeEsUnmPIna0w=; b=MiikihyS3czdrQVX3QCoqBgVCYXsbO05CRk/mbKrlzz5vg8pnl1J10vyLNafk2HVaE qNhnm4cvIrMcxBP6/np/yQwHgx2uhFbV5S+nDYEtsahEuXuwurr2r0IHhjDwSq3SuYyk 8IrFAD0JeX/6DEoSuaT9cCcpf+CLoPFiRHvLcGpnrqajQPafcKcDckAaGZOL2Wx9263h mHSS2OEB4+9QRf90IkdQfDaesFW7GEajrZaMiPb5aUQjuv6DAmsxsn/IxtPwfXw4xlyH Li+o86779r4UQ7aIhTmwXqe7DIRe4yoMeTq7o59nPKbpSjWIji9WuJIYz/I8tEe1YKR0 EhGg== 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=r3VzuCBNwmQSrGrQ5D6TP/HUpqrMofS5l/5o8Zx3Vugxx0Fta/B09dQAKu7ON0fv04 ahFA2IvfqibNqTgpxuPx1OBPd1w1rItJjaGvPBtW/N9KmUxDAQUiAs7FVckyCq8c4qrP H+AkJbVJlysnjYvlG80fZqMQVbj8T4Gps6AHGD/3SmtkLl8CFQ/0cZqU0KfQTLrCLrZk IMhNH3PAl2xb29Odjcbf+ciF1uJKtYsNU3merNowW61InZc24rnUnmiZJce1LvCvdh28 dvV7RrgdPmB+WfW7AcyIlw+nxeMEHmvWurO9mg8HxlStl+D0l08ILvALvYC+OfPHyp/g 57ag== X-Gm-Message-State: ALQs6tCwM/+P1RUgzFVvcGjcAv6JZ+OogD5r1fjEJ3clNwyb11YHdydp Ftb1ed8cxlrlPshqUUbCX/xqAg== X-Received: by 10.28.178.69 with SMTP id b66mr9980106wmf.31.1525203681811; Tue, 01 May 2018 12:41:21 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:21 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:40:12 +0200 Message-Id: <20180501194013.9552-23-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 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");