From patchwork Mon Jul 31 15:34:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sharpbai X-Patchwork-Id: 4549 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp2537143vsb; Mon, 31 Jul 2017 08:35:22 -0700 (PDT) X-Received: by 10.28.163.198 with SMTP id m189mr11639687wme.154.1501515322501; Mon, 31 Jul 2017 08:35:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501515322; cv=none; d=google.com; s=arc-20160816; b=MbxqPWY5ZOYp3d0Pj0nz608+j++4E8nNHmMh9KeWWCg7ouE5P02qf+GyfMDRMbmowz DgUh91Zs4d9yEJe0sbaEO/Ty4ka5eJMorRojIHFlOHVRwNZj7Gqw+hQ0mw50MRXKjdG8 duwZanTnBav80RaWVMReBCg2+IHbE/dzf40Fqm0+LEXWbYaUnm8Uzb9Ht2bBvNFiynGW GnGY1VE8BInvRUkmQcBA3ZDi9xkhSWzFGbYNAIh/7ku5sPgTUSCZoMLUpQfrN45gvUQu Mrdp8ryGS83D5Y7poCen2Nmdf2gNMy+IEM1VnzQBnJbNIaNKQ636Ew1JXX81i1HtEFh1 QEQg== 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:cc: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=xCLpdeoiWd4QFMQLxhKEdddreK8vxrBkCXHzz3yvN1M=; b=L5PSLjHQtHiX7fsmIYTXeBKriFRFxn9qiG1Py0VCq9fbsCfBlO/TzGDvsQHizib3F4 T3WxWJm+4Cjnk7VDT1Qfeoos4aBLbZG2NVPozpo5EmgbniVWpnQqxcFpDjoVMdNY4Zug W+hKt9IUDgzVn1HpWmjvPab2rtmDcMmajRRsev7ZHwwghM4CaE2Gn1AR1FRUQYOaW/DO QYXhWvcYhHkXVp79bza93WLOXvjdGsS4FpZ0r6ZEHUVWI3NeHf2k4YjtUv7YFxA7nU2C RsfcwTDjjNg/EMa7fLcjex31inf8LnaHoxwnHB7dEo+PsqhbCURPRyENiG9WC0NwIeAI NWxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=XM/VBJ6o; 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 b17si25703164wrc.358.2017.07.31.08.35.21; Mon, 31 Jul 2017 08:35:22 -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.b=XM/VBJ6o; 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 943EF68A1D6; Mon, 31 Jul 2017 18:35:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4629689B54 for ; Mon, 31 Jul 2017 18:35:09 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id u185so8957691pgb.0 for ; Mon, 31 Jul 2017 08:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qv6Gi4bOQ7lX+6k8KUEe5RROv5P1gvy9pwEOhQKuU8M=; b=XM/VBJ6opRwQ/+ccTWU1bG5f05ay7dRtUJVINNq2LzXOsHqzCoRQQaUo0nSoN1aL++ /nReCHHuCWxo/p180GY51z6VqF+6CQ92CBXN988M62nUqdWhtxchT9vI5bQkTIq6X4rS xbAsDrSO6DAu6GfHS5XQ23kxbwFTkk4tjG9nl+hQBeKOBfhoyzn/zIwGLkx/AqXQmfMA gWOtua4ZuLKQ88Y7GFqWF5mck1sJ60FYLnJZQ8UuuCw31FeMPvrZZoza21a6vbIB5Sgx 8pa5j/2d20fcBfEDNWuDiJ4aUibO4IscD/fHLEu6myt8nsIoKJLmgCAOao4RcM8v8CdN krjg== 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=qv6Gi4bOQ7lX+6k8KUEe5RROv5P1gvy9pwEOhQKuU8M=; b=qA+Gz/pbX3d6o+kJuD1DJ1aGM6BhHjO7w2p4AjtE8i4dOczfcqauCKNWjgK7ntRW4y NuGATHH9h59U535p7w01yLLPxoUV4M+1Bd3rjVsdqSbKiceZ2OQPoUJY2ON0AqrZ32Gx a5JIy+3F/tkdtEUeB1jo/8Tl1G1u2LeKku4oPbnQ07Q2Pl7hg2BYjCqqvgNNXW4Rif4Y EjK5WCHquscrKFetbBXAk39L/fm3/KAgd7aeJX9+Mh5zGvmRmnYzWwVROhzhSrf8oa0s oEl7XP6DoEgD2EqoD0taPduMpwIXcURF5buFO5OCiA0bTAtKU30vrGhJy7qwKk1qLUd4 9ymA== X-Gm-Message-State: AIVw113TT/7ydtC82FqS4c7FRmctblHEtaQGkP+EydBYmbob6mHDlIsQ yHLn/sgKPf0tL9OVhys= X-Received: by 10.84.132.42 with SMTP id 39mr15888208ple.448.1501515310005; Mon, 31 Jul 2017 08:35:10 -0700 (PDT) Received: from localhost.localdomain (li377-58.members.linode.com. [106.187.34.58]) by smtp.gmail.com with ESMTPSA id o4sm48051036pga.47.2017.07.31.08.35.07 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 31 Jul 2017 08:35:09 -0700 (PDT) From: sharpbai To: ffmpeg-devel Date: Mon, 31 Jul 2017 23:34:51 +0800 Message-Id: <1501515291-95794-1-git-send-email-sharpbai@gmail.com> X-Mailer: git-send-email 2.2.1 Subject: [FFmpeg-devel] [PATCH] avdevice/avfoundation: add scaleFactor attribute for avfoundation 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: baitian , wangsiyuan , liyiren MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: sharpbai feature: add scaleFactor attribute for avfoundation added by: siyuan.wang@duobei.com added by: yiren.li@duobei.com --- doc/indevs.texi | 6 ++++++ libavdevice/avfoundation.m | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/doc/indevs.texi b/doc/indevs.texi index 09e3321..3d25930 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -139,6 +139,12 @@ Capture the mouse pointer. Default is 0. @item -capture_mouse_clicks Capture the screen mouse clicks. Default is 0. +@item -scale_factor +Scale factor for capture the screen. Set this property to scale the buffers +by a given factor. For example a 320x240 capture area with a scale_factor of 2.0 +produces video buffers at 640x480. Another example a 320x240 capture area with +a scale_factor of 0.5 produces video buffers at 160x120. Default is 1.0 (no scaling). + @end table @subsection Examples diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index e2ddf47..3764de8 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -96,6 +96,7 @@ typedef struct int capture_cursor; int capture_mouse_clicks; + float scale_factor; int list_devices; int video_device_index; @@ -735,6 +736,12 @@ static int avf_read_header(AVFormatContext *s) capture_screen_input.minFrameDuration = CMTimeMake(ctx->framerate.den, ctx->framerate.num); } + if (ctx->scale_factor <= 2.0 && ctx->scale_factor > 0.0) { + capture_screen_input.scaleFactor = ctx->scale_factor; + } else { + av_log(ctx, AV_LOG_ERROR, "The value of scale_factor must be more than 0.0 and less than or equal to 2.0"); + } + #if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 if (ctx->capture_cursor) { capture_screen_input.capturesCursor = YES; @@ -1025,6 +1032,7 @@ static const AVOption options[] = { { "video_size", "set video size", offsetof(AVFContext, width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, { "capture_cursor", "capture the screen cursor", offsetof(AVFContext, capture_cursor), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { "capture_mouse_clicks", "capture the screen mouse clicks", offsetof(AVFContext, capture_mouse_clicks), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { "scale_factor", "scale screen factor range", offsetof(AVFContext, scale_factor), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 2.0, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, };