From patchwork Mon Feb 19 23:28:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 7667 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp2069909jai; Mon, 19 Feb 2018 15:29:05 -0800 (PST) X-Google-Smtp-Source: AH8x224de3PxogBUdSgvoSSmgwQ14f6kRL/zyMomRhRw+7kyGpeyriCdZoekbl/K+IP6Nd/5UXe7 X-Received: by 10.28.47.80 with SMTP id v77mr11977646wmv.23.1519082945208; Mon, 19 Feb 2018 15:29:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519082945; cv=none; d=google.com; s=arc-20160816; b=eUwKKl6LsjdbqLUErkMWp6x39F+FbMQA8FJLg9ypzLiGaf2gtyJioEPZITvk+0CQLp EMjkMQcwSqNq9XWbZGTfkrR3ljrkeBC5Qbm1SkJPxO+WLkxAx9FkTSEw6GOxTBAkeXNw nCOOtoibJamA0lGnO7JjfgsbEWBnGs2rFvqVcGcShK4SkUDPgAnz9BGf5bkqyUOhvCN9 hmtruEBGcnCgggH9jIvhiLreSirQRJLoNf+pZlhBQjJHxqsuzfaEmj955GMl7mYb5xVn y0Qv1Q7e1/v9/BS+kVUlCdnIVTN7NeYqaTzCRywOS4NWglcdlHIPM3n5HoFCnoGRS+F+ JowQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Li1jDGwB+e3pRLy21ZlaD3QIRinbVT3slh27gUUIiTs=; b=TQmtexexw71vXNXlklRn2drFDhT+3akuR+sJOgPYgeKBq5tneIJ68PyeSVVtyRmPJX U3x3DXX5X5gGW3x0/803QxFPga5JTV6DhHKZRqBv4X+k21TFh7L76u4lhBdKybmzu5XS jFHc0oBOB2SQC9SuBhJGgwrpByuCwcOepmkCWSL5E9Bpf8bhfg7StMiCnAAroh9vUYeK EaCZ6b65dUbzwVVXjtj6KyBTuhu7OX4cCJRxSB77R0xnNLmqg4BS72dEdqFdap5aVGtI aQ4+Szt2A7JDO9ihcosna4OsjuCPnRn3nTJpyka/01qhDZP4QCLUkjrYLOhmDTUA5KwR vo1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=Hvgvgj3X; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q6si3385024wre.427.2018.02.19.15.29.04; Mon, 19 Feb 2018 15:29: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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=Hvgvgj3X; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB7C268A060; Tue, 20 Feb 2018 01:29:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DF74689EEF for ; Tue, 20 Feb 2018 01:28:55 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id k9so11284896wre.9 for ; Mon, 19 Feb 2018 15:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=bX340tPI8RJE4g/nOfmG4IZflcc47B+l+Kl7lFn7LdY=; b=Hvgvgj3XbweYzhYmq8Lh9HpV+EhawwceFauB3/7GppvrO+D0Rfmy3W8bLbFewpP4rF syaiohjjbV6UgSAz79wBDfs/956PbsNS080+UzMyVR6bG0sSc5wbS4+SVi6uMRcjYVqO ELj6tNcgJUVhcZBL/7I3VJJblLk3Pg5B0OApMacKUXCJLoE/AOQCM81+Jm8KCy3/JrEl UvqGdVP3f8jFTT4mQRXyBkYX9GE427vMGujRFI9Zfk2YbwvU0CZWVoI+NgfrOPEAFgj3 JiGr6RJ/Tkl0PH9Ueg4WveJEtcWtbhN9nsuquvCRmDVwq2PYjRE7+pOS0CCCnm6alzQH eEAA== 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; bh=bX340tPI8RJE4g/nOfmG4IZflcc47B+l+Kl7lFn7LdY=; b=g+Uyfibb8pi8YdvHb9HGf/wTppO/SoWfy2ewlDQWUmrbuu2jaeIQXNIGBB3p1X8cdc kiVLQqkIuL9/czci9lIMplwoIRuLAdmc5Epyqj4aFMYMMhRYMsa4sCFG9Tsf56BjKSI4 58gnU17k8EPxqq92lxVA+CQf2ijyFkm2lMzjUE0e+pih7Fi6geqRVfqhXnh+U9kFXN/d fDyJxazstednLHPt6b8+BB3FDuC/OKX8uaUiqQaYdtpRRtmyiOTi8NzjGFMXLxS7xNgM V93yeSuvSmI+c7yg+U4EPxAzepn84GJNRb1vMHxYuwRwa8f2jqygkEijjd8Ow4+/2BEY kHuw== X-Gm-Message-State: APf1xPAhPprOcrIH18GAmjGwODv7VCrY1mt211bC3esI+EROSwy6ZMsp 5L19Ww/1NOoI2Szuz/A0b8Cz+DAB X-Received: by 10.223.168.46 with SMTP id l43mr15456271wrc.118.1519082935537; Mon, 19 Feb 2018 15:28:55 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 77sm31646687wmt.37.2018.02.19.15.28.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Feb 2018 15:28:54 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2018 23:28:43 +0000 Message-Id: <20180219232849.29436-1-sw@jkqxz.net> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH 1/7] lavc/mjpeg: Add profiles for MJPEG using SOF marker codes 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" This is needed by later hwaccel code to tell which encoding process was used for a particular frame, because hardware decoders may only support a subset of possible methods. --- libavcodec/avcodec.h | 6 ++++++ libavcodec/mjpegdec.c | 7 +++++++ tests/ref/fate/api-mjpeg-codec-param | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bc0eacd66b..74c7b9dadd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2918,6 +2918,12 @@ typedef struct AVCodecContext { #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define FF_PROFILE_HEVC_REXT 4 +#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT 0xc0 +#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1 +#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT 0xc2 +#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS 0xc3 +#define FF_PROFILE_MJPEG_JPEG_LS 0xf7 + /** * level * - encoding: Set by user. diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5055ee2826..29f99373cc 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2288,6 +2288,10 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, break; case SOF0: case SOF1: + if (start_code == SOF0) + s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT; + else + s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT; s->lossless = 0; s->ls = 0; s->progressive = 0; @@ -2295,6 +2299,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, goto fail; break; case SOF2: + s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT; s->lossless = 0; s->ls = 0; s->progressive = 1; @@ -2302,6 +2307,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, goto fail; break; case SOF3: + s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS; s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; s->lossless = 1; s->ls = 0; @@ -2310,6 +2316,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, goto fail; break; case SOF48: + s->avctx->profile = FF_PROFILE_MJPEG_JPEG_LS; s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; s->lossless = 1; s->ls = 1; diff --git a/tests/ref/fate/api-mjpeg-codec-param b/tests/ref/fate/api-mjpeg-codec-param index e5ad2b7656..290f941ff3 100644 --- a/tests/ref/fate/api-mjpeg-codec-param +++ b/tests/ref/fate/api-mjpeg-codec-param @@ -81,7 +81,7 @@ stream=0, decode=0 nssew=8 skip_top=0 skip_bottom=0 - profile=-99 + profile=192 level=-99 lowres=0 skip_threshold=0 @@ -221,7 +221,7 @@ stream=0, decode=1 nssew=8 skip_top=0 skip_bottom=0 - profile=-99 + profile=192 level=-99 lowres=0 skip_threshold=0