From patchwork Fri Jul 28 09:34:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sharpbai X-Patchwork-Id: 4483 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp139834vsb; Fri, 28 Jul 2017 02:34:54 -0700 (PDT) X-Received: by 10.28.91.11 with SMTP id p11mr4846401wmb.19.1501234494558; Fri, 28 Jul 2017 02:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501234494; cv=none; d=google.com; s=arc-20160816; b=1HeEulZ8jdvs0g5GyhYmbKkpvSnSibDdgbwhmsE6inoj2stqXyBZeDQroxm4fdCw6H khipSD5EeEVuwKRn/L8MgDRC6JJAlGgxa+j0yByWeMN6CG+friveOXqNTyd8lnNWBmcw DBeaKOxmJ/qcmQurWp3wsk0nnKHYnkaxlH4gbgu5I9Igk1yGF9+Q7/OlMxerQzd3R1TN FF9nuP38Spljs2qLHhOY0o9/y51cYOQxkCx7LY4bXS0nPuE2vbsC2uMcBjAYOzazQ7i9 7xPpmPL/VRjdwoteVZAFLIni0ii1Zw8wkcQQRz4xlO5vHfmGHpHFK2wREaY65uz0R3pY 6OXA== 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=6HT0y4T0NuhMf58XLDdq8zNSMpmlxCU2figBqzXGcrY=; b=Wgp2hQqZOadl4FDk/M7RB9eGYDZxqpyOxAn8QQaSvXmAXfESoQ5VcJ/pIoP1Eb3y6n qe63e3XYtIJWG+4rpF9pyi7OUvuOMMM/hAGW93GD45qkHZkzFWankn8xoGOPs07rR0zz YqMiPZFZXh1m5Y5FQEqx2cRMb0Yxas9l8Q/9wm2/2NhYN+Ts2Xpjty36iDAp8aXc7Dlz EAJzXKjtv0qNiKuewKt87nS5G+bVA6f29kahdGemQs3prHyBihUfaf8/+VpHQvt7G0lq ZgbMh+QtTy6E84eymHFA/22MbPJGwZhd8jpOJso6DEqA2TYN66+YUYTgaUa/osNhQbKy mzRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MJrbm/vT; 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 b81si12566421wmd.50.2017.07.28.02.34.54; Fri, 28 Jul 2017 02:34:54 -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=MJrbm/vT; 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 C80666899EB; Fri, 28 Jul 2017 12:34:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA1CA680403 for ; Fri, 28 Jul 2017 12:34:43 +0300 (EEST) Received: by mail-pf0-f193.google.com with SMTP id e3so2736554pfc.5 for ; Fri, 28 Jul 2017 02:34:45 -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=41+Tlc9PjJGnYvvPLKjQ2mZUWuxzMrN+QAKWyZ9Zozw=; b=MJrbm/vTr/l+N42LVQdtrtd8KTmKC6D0e/2g9ZotY4PiEShDmhK5KFQhsZYTAuVAvd VDMgOtx16Q4qzEWu6EIqF3WVcPi2VkUUov3bcKWY1Ng7yGCZxiKaeD5riFQbSI3zbwhr xBsLVHrRldy9JhBp4exMXLQeutzpKcrUHULcz2wZy4AuwTt2D37GFckw3nKhkFQSkrMp qHVbGRjrULGtkIzpMdxOpnyk3XI3vFupr9/IVw6J2BSe4sDXA4wdZxxqGEUwMRo082mm N/r6GHgS78k9haiadIH34zaOa5twGZruGinHT1loyBiOo6fPP+sRAVbe//bVj7CRv5lN +aLw== 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=41+Tlc9PjJGnYvvPLKjQ2mZUWuxzMrN+QAKWyZ9Zozw=; b=uh9TwfhmdlDkdqRLIV8m+dx/Do7OjyIZfiiwgJJ/ca/aY0cqRbDLhUEbyAN3W8hho4 ABhy2nQdwABmROb5lm0IwwKOe2pgKJ7zIpaQ4uTZvQ7MdbRJH7OodbA1jc2KRHyMjdze 5ypfhD1i1+VVvv1y8svgXadeO2nwtPHt1JVrxaX+oS3jCu8x3qoXPBh1Xo2yuwZd2NL1 DRCVP9dtBpAEppFyg4qTlqGy8Hq6tyu+l2U+CzuV719O7TXCrIrj9NFery03yOMKoNhp /9fiihdXeSOSzrP3xbaua6cGxG/t4hc6zGue8TCUFt7jmuZeU9fnHVKCEW4o8/kUYtHh 5rgw== X-Gm-Message-State: AIVw110iFGNsETDckZkBQU2nFiiN59qfJlpUIfy1dVka8tkqbf+X5HUM YAe0Ujtc5hMQe1+jNQM= X-Received: by 10.99.157.205 with SMTP id i196mr6957706pgd.85.1501234483262; Fri, 28 Jul 2017 02:34:43 -0700 (PDT) Received: from localhost.localdomain (li377-58.members.linode.com. [106.187.34.58]) by smtp.gmail.com with ESMTPSA id i5sm50997936pgk.61.2017.07.28.02.34.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Jul 2017 02:34:42 -0700 (PDT) From: sharpbai To: ffmpeg-devel Date: Fri, 28 Jul 2017 17:34:17 +0800 Message-Id: <1501234457-29599-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 | 3 +++ libavdevice/avfoundation.m | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/doc/indevs.texi b/doc/indevs.texi index 09e3321..8873477 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -139,6 +139,9 @@ 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. Default is 1. + @end table @subsection Examples diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index e2ddf47..92e4063 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,10 @@ static int avf_read_header(AVFormatContext *s) capture_screen_input.minFrameDuration = CMTimeMake(ctx->framerate.den, ctx->framerate.num); } + if (ctx->scale_factor != 1 && ctx->scale_factor > 0) { + capture_screen_input.scaleFactor = ctx->scale_factor; + } + #if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 if (ctx->capture_cursor) { capture_screen_input.capturesCursor = YES; @@ -1025,6 +1030,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, {.i64=1}, 0, 2, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, };