From patchwork Sun Jan 27 21:05:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: james.hilliard1@gmail.com X-Patchwork-Id: 11882 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 54F2644C879 for ; Sun, 27 Jan 2019 23:14:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72DF168AF6C; Sun, 27 Jan 2019 23:14:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01FC968AF69 for ; Sun, 27 Jan 2019 23:14:10 +0200 (EET) Received: by mail-it1-f195.google.com with SMTP id g85so17884237ita.3 for ; Sun, 27 Jan 2019 13:14:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XUymp/jA+iTN2ZRka42yMfs8Lfni5iy0MXgYHTCw+Uw=; b=u4Lb+4+Pf5SUX5w3iIx0s5HMjbbdtu/GjSc5dZnG3IxbzzOB/qwipbDl9IHnFu99+q nZ9RKYjXtATJibBOUmxzqHnJwI6Ky1PdEcABMgJKV12QsWgkCB9XaPLYuO7VefxlTMLU kcLGcj5xqSImFGUFnhLYNZof1rUf2w76MwOTxt6rmLb5dGTS2lL+fOMhYjkSNA82szkc jcouZYDCJQzAKKFuY7UQKROUocHVdQ94f5X46rDhD6CGAgFNs6GYYiKF5Y/Wv/2KS81U TUeFQtWcIICOzhzEj/LdtrzAjRxXEh0KRU1F+lk2EsAOEc2eLGLXgjMno8o7D5yCGGpx 23Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XUymp/jA+iTN2ZRka42yMfs8Lfni5iy0MXgYHTCw+Uw=; b=eu+Bwx+4twWFx7jXMJgOpry/4S69hw2eVyZBh1gfVZWE7j/kkeNFXR+NMkV2qVk54z qxMHlGN6vpzkqiaNmwbBr3gSB/3WXrERDjBHm7TfObtQBYTPavH7/LBtXcRNP5BJN0TL IIrJm4hSF/g4aeYLhZi01gGnyiHOZPup/RtndG3ZhytKiBSpM/xqyhu7VwdbGgDToJ5q Kf4krA6JpCVr2grZZzMGlXhXCBDoem+xSJ79V5Dm+/GIGNxrrYcJjewuYR6y2WBm/eTT qv3o/qr++oA5RcI4BQzbMupHPKIfOZ/cxrLBNYLOZKTC5zJqgqH741Of660jNJcfGpmf PjfA== X-Gm-Message-State: AJcUukd2LApKz1KACvxRTtEaD41WlsYQKZP+4qv0Jw4i9aDsqRnEIuBN CuwSTlljVgmq5tWTtqJLSjskvjI2 X-Google-Smtp-Source: ALg8bN675josAv0zBE6rlzEG/VvyUx5JjLjkoIQru0dWTbr90fdky7M+hlRGSwyW9drtguEYTvcurQ== X-Received: by 2002:a24:2ed3:: with SMTP id i202mr8310313ita.89.1548623173993; Sun, 27 Jan 2019 13:06:13 -0800 (PST) Received: from dragon.Home (71-218-4-112.hlrn.qwest.net. [71.218.4.112]) by smtp.gmail.com with ESMTPSA id l3sm16097492itb.43.2019.01.27.13.06.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Jan 2019 13:06:13 -0800 (PST) From: james.hilliard1@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Jan 2019 05:05:59 +0800 Message-Id: <1548623159-15051-1-git-send-email-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v2 1/1] libavdevice/v4l2enc: support additional v4l2 output 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 Cc: Carl Eugen Hoyos , James Hilliard MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: James Hilliard The purpose of this patch is to fix a bug where ffmpeg would only output rawvideo to a v4l2loopback device even though v4l2loopback accepts other formats such as mjpeg. Signed-off-by: James Hilliard --- libavdevice/v4l2enc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavdevice/v4l2enc.c b/libavdevice/v4l2enc.c index faf6e07..f778208 100644 --- a/libavdevice/v4l2enc.c +++ b/libavdevice/v4l2enc.c @@ -47,8 +47,7 @@ static av_cold int write_header(AVFormatContext *s1) } if (s1->nb_streams != 1 || - s1->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO || - s1->streams[0]->codecpar->codec_id != AV_CODEC_ID_RAWVIDEO) { + s1->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) { av_log(s1, AV_LOG_ERROR, "V4L2 output device supports only a single raw video stream\n"); return AVERROR(EINVAL); @@ -56,7 +55,7 @@ static av_cold int write_header(AVFormatContext *s1) par = s1->streams[0]->codecpar; - v4l2_pixfmt = ff_fmt_ff2v4l(par->format, AV_CODEC_ID_RAWVIDEO); + v4l2_pixfmt = ff_fmt_ff2v4l(AV_PIX_FMT_NONE, s1->streams[0]->codecpar->codec_id); if (!v4l2_pixfmt) { // XXX: try to force them one by one? av_log(s1, AV_LOG_ERROR, "Unknown V4L2 pixel format equivalent for %s\n", av_get_pix_fmt_name(par->format));