From patchwork Thu Feb 11 21:48:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Batlle_i_Rossell?= X-Patchwork-Id: 25585 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 7490644ADEB for ; Thu, 11 Feb 2021 23:49:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E0ED68AB81; Thu, 11 Feb 2021 23:49:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from o139.p8.mailjet.com (o139.p8.mailjet.com [87.253.233.139]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AD9B68AB37 for ; Thu, 11 Feb 2021 23:49:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; q=dns/txt; d=viric.name; i=viric@viric.name; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe-post:list-unsubscribe: cc:feedback-id:in-reply-to:references:x-csa-complaints:x-mj-mid:x-mj-smtpguid: x-report-abuse-to:content-type:content-transfer-encoding; bh=3GBGBks6LT5cJQRdnekqo+No2BfcUMIOUwBG2t8jzdw=; b=BBU6S0R1o/Cr2vTShbPp451JbpmkI/8CStTmIFmD78wqjGLtMxVtYtjgd DUefnJZZkn5F85+TGQD4g4+Ijww+MTTHmpXKsdUH42wnmd9qi4p4K1QBcV0C A3rIHgoGs+lxOrUTpdkFHqxJcL0eXxDjTECAq5x26uAqccsEW/wtUw= Message-Id: MIME-Version: 1.0 From: =?utf-8?q?Llu=C3=ADs_Batlle_i_Rossel?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Feb 2021 22:48:19 +0100 List-Unsubscribe-Post: List-Unsubscribe=One-Click Feedback-Id: 42.495910.472369:MJ In-Reply-To: <20210211214819.18855-1-viric@viric.name> References: <20210211214819.18855-1-viric@viric.name> X-CSA-Complaints: csa-complaints@eco.de X-MJ-Mid: AUoAACIcJusAAAAAAAAAALF60VUAARpcY_sAAAAAAAeRJgBgJaZeJAvApEzTT4e2qFCel_VVrQAHNTE X-MJ-SMTPGUID: 240bc0a4-4cd3-4f87-b6a8-509e97f555ad X-REPORT-ABUSE-TO: Message sent by Mailjet please report to abuse@mailjet.com with a copy of the message Subject: [FFmpeg-devel] [PATCH 1/3] libavcodec/mmaldec: enable MJPEG decoding 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: =?utf-8?q?Llu=C3=ADs_Batlle_i_Rossell?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Lluís Batlle i Rossell From: Cosmin Gorgovan --- configure | 1 + libavcodec/allcodecs.c | 1 + libavcodec/mmaldec.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/configure b/configure index a76c2ec4ae..048bedb589 100755 --- a/configure +++ b/configure @@ -3105,6 +3105,7 @@ hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m" hevc_v4l2m2m_decoder_select="hevc_mp4toannexb_bsf" hevc_v4l2m2m_encoder_deps="v4l2_m2m hevc_v4l2_m2m" mjpeg_cuvid_decoder_deps="cuvid" +mjpeg_mmal_decoder_deps="mmal" mjpeg_qsv_decoder_select="qsvdec" mjpeg_qsv_encoder_deps="libmfx" mjpeg_qsv_encoder_select="qsvenc" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 16ec182a52..8d1908c6d5 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -187,6 +187,7 @@ extern AVCodec ff_mdec_decoder; extern AVCodec ff_mimic_decoder; extern AVCodec ff_mjpeg_encoder; extern AVCodec ff_mjpeg_decoder; +extern AVCodec ff_mjpeg_mmal_decoder; extern AVCodec ff_mjpegb_decoder; extern AVCodec ff_mmvideo_decoder; extern AVCodec ff_mobiclip_decoder; diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index cb15ac072a..df14b9fc95 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -375,6 +375,9 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) format_in = decoder->input[0]->format; format_in->type = MMAL_ES_TYPE_VIDEO; switch (avctx->codec_id) { + case AV_CODEC_ID_MJPEG: + format_in->encoding = MMAL_ENCODING_MJPEG; + break; case AV_CODEC_ID_MPEG2VIDEO: format_in->encoding = MMAL_ENCODING_MP2V; break; @@ -851,6 +854,7 @@ static const AVOption options[]={ }; FFMMAL_DEC(h264, AV_CODEC_ID_H264) +FFMMAL_DEC(mjpeg, AV_CODEC_ID_MJPEG) FFMMAL_DEC(mpeg2, AV_CODEC_ID_MPEG2VIDEO) FFMMAL_DEC(mpeg4, AV_CODEC_ID_MPEG4) FFMMAL_DEC(vc1, AV_CODEC_ID_VC1)