From patchwork Tue Feb 27 14:50:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 46572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp2043725pzb; Tue, 27 Feb 2024 06:56:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU2BKnwxj74DnVjP9W5ePPBy0W8/tppCpLCd3x/+i5bmaS1L8i0vYhepOhgqqFSrEbSOIMzc7ggKAcUEAEB7pBNpzBV6N6mDwseDQ== X-Google-Smtp-Source: AGHT+IF4skb3BHofKaDnvZMM+hqCD7NwImkwTaPumvETfHWna0QtL0FfUr6olsJGQ8sW6x8mC45Q X-Received: by 2002:a05:6512:a91:b0:512:ed78:a840 with SMTP id m17-20020a0565120a9100b00512ed78a840mr8231894lfu.61.1709045784090; Tue, 27 Feb 2024 06:56:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709045784; cv=none; d=google.com; s=arc-20160816; b=rqPTGfbR1C5DSxb+wZstBD7UdbvfgWeKd+ScsrwQpuzFzcv/sYvuhzR/f94h8z2R2r HCS2nmP44ygGGZVrPRG6GKF6YNQ3NQ9xNxUZG3L3Nlt4/49jUvhdoPyF7xaVf7Fq/zUA Ybj5ZVOO/TWj8PeKYvCzAjNerBWqKb5EZGKfZuyjQ1a4L9VHn338ESyvENPwxZYSy67m W7EQz8pjVmtmW7KsZjn9V7GyNQGXUMQpwZ/CE1F6GG2jZNr3fUA90pWDEHvGL/tBqufY 4PL5aSd5Xp/xV5RvQeFXe2xfrhmfdFXSID4cOMdUHG25hZOsDhcpTw0oNj8fh6Kn6uu6 hOTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=82tnwUxoFdtxr8NQU9bkwGaGc0XTehjr3uTieiu9YLU=; fh=bsOL+ub9JEnfNazRgCdgjxJAChubFVskZxBzYcxeDLU=; b=U0UZOYEtmNtMDqP5FzWn0PHwrakTtNsBP/IIWsC6a1HCTiAyiu03HWDPrBp2STkH6H 2m99byU80mWS9it+FUqB2tn4UO3uyGNkKkq4tvhHPyddNG3VIY7lYYaVTJBGHrc7wNmh Q1E9E6dYdnXOm2ccUV8BS4GC6tqVH61FMInkhp58pXBrBdH0Jk3t31MOn0Fe28uSDyMb zemy8kR66HxJg7sYOpr6TyBAQBKe/JA92Q8BZXmaFvolfiDw2VFR0Oa/NEer+FRp7qvh Uc9DZPtLWZ2ddi1PweHnh6Q0sGvv/1m7lDf8j1oyW/CJ1p/goD0PsdZ7ICUjJqxrdjN4 XbTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="jNv/Uosh"; 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=QUARANTINE 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 e20-20020aa7d7d4000000b0056484c0505asi760913eds.201.2024.02.27.06.56.23; Tue, 27 Feb 2024 06:56:24 -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=@gmail.com header.s=20230601 header.b="jNv/Uosh"; 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=QUARANTINE 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 526F768CC49; Tue, 27 Feb 2024 16:56:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C97968CBDB for ; Tue, 27 Feb 2024 16:55:59 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4129e8bc6c8so24708315e9.2 for ; Tue, 27 Feb 2024 06:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709045758; x=1709650558; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a0bDzAb3nSRlCdgcE+1SAVS6H5SSolRMeK6W0cxSe1A=; b=jNv/UoshCQ7gqYAbqluRFaPJjcdN/DaFKsbYy/xLISlc3gXuCI9YmJK/IHdt2td4/2 rpDiF5Pjp5nTZXsDOXl8t+O/mxSzY4TZKB3SNu9yVctaAtbrlepgZIyzzXzRzJuHFpx9 OyXyygexJyp7iC8p+KnPbVJ8lbATcofCgVjHUdl+fN5rsXdrWrbnzkkvV87VWtMcfYqW jf4TlXzRf/6b+xjYEC7/MhM8s5r81i+LO8JQx3b6m2IlShAbLJS2lfZIAT7FTF5mEnu9 7U63BEV9jn6UKzVsQn5WIIjKCZyiradeS+AJUWFj3Nt2I7C5SDULmJhNQkAzSeFSzxx5 w2+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709045758; x=1709650558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a0bDzAb3nSRlCdgcE+1SAVS6H5SSolRMeK6W0cxSe1A=; b=sxzpk+JuOOmQ9Jmrl0nJjeZnHAiajT6vvUhy2GjIXZzl5271oi2zEDWlodJkT9LQB8 /dGAKX/7E5R03Cy4/N90JDq+K94GfvPP9EjcJuBLXf1oXAHlLtKNwjq1w31s1It2aac7 mHWi2NZFPX9abyj5Kh9gtFsqNkmkIpwzH74ElFsVrc11oQM7HYjFMcLjICMZmKJcVgVL L8utZmLxwwEMELML0ofA2J8H0G68YmmB+W4TNJUYIl9oNh6+pwtW8VfrjTxQIdF4U7R5 iDOVa+/wt2OFKNDyQexo250EKRRavBWFeYN8FHfqRfMBWl0Djaviz+Z7akIBt/jFsTup ZInA== X-Gm-Message-State: AOJu0YwkxdOwAbFX/1GjqkEmRFK6Khlngsku4U9zVBQqHXneV11r5Nso AowKoY7gETJPoK33h2qR5VMePhucMtMpqrFbbBF9l//UMpz2jFsi/+Isi7tU X-Received: by 2002:a05:600c:524f:b0:412:9eff:4a9a with SMTP id fc15-20020a05600c524f00b004129eff4a9amr6620123wmb.9.1709045758316; Tue, 27 Feb 2024 06:55:58 -0800 (PST) Received: from localhost.localdomain (2a01cb040b6872000000000000000afa.ipv6.abo.wanadoo.fr. [2a01:cb04:b68:7200::afa]) by smtp.gmail.com with ESMTPSA id o9-20020a5d4a89000000b0033df1dc39f0sm1859627wrq.4.2024.02.27.06.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 06:55:57 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 15:50:38 +0100 Message-ID: <20240227145536.281991-3-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227145536.281991-1-matthieu.bouron@gmail.com> References: <20240213230418.457056-1-matthieu.bouron@gmail.com> <20240227145536.281991-1-matthieu.bouron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/6] avformat: add Android content resolver protocol support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SFwAXi3nysnP Handles Android content-uri starting with content://. --- configure | 2 + doc/APIchanges | 3 + libavcodec/jni.c | 3 +- libavformat/Makefile | 1 + libavformat/file.c | 157 ++++++++++++++++++++++++++++++++++++++++ libavformat/protocols.c | 1 + 6 files changed, 166 insertions(+), 1 deletion(-) diff --git a/configure b/configure index bb5e630bad..790a1df7c8 100755 --- a/configure +++ b/configure @@ -3655,6 +3655,8 @@ xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes" xv_outdev_deps="xlib_xv xlib_x11 xlib_xext" # protocols +android_content_protocol_deps="jni" +android_content_protocol_select="file_protocol" async_protocol_deps="threads" bluray_protocol_deps="libbluray" ffrtmpcrypt_protocol_conflict="librtmp_protocol" diff --git a/doc/APIchanges b/doc/APIchanges index 10f6667e9e..258e953ca6 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2024-02-xx - xxxxxxxxxx - lavc 60.41.100 - jni.h + Add av_jni_set_android_app_ctx() and av_jni_get_android_app_ctx(). + 2024-02-26 - xxxxxxxxxx - lavf 60.22.101 - avformat.h AV_DISPOSITION_DEPENDENT may now also be used for video streams intended to be merged with other video streams for presentation. diff --git a/libavcodec/jni.c b/libavcodec/jni.c index 7d04d0a268..5a75d97f19 100644 --- a/libavcodec/jni.c +++ b/libavcodec/jni.c @@ -35,6 +35,7 @@ #include "ffjni.h" static void *java_vm; +static void *android_app_ctx; static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; int av_jni_set_java_vm(void *vm, void *log_ctx) @@ -66,7 +67,7 @@ void *av_jni_get_java_vm(void *log_ctx) int av_jni_set_android_app_ctx(void *app_ctx, void *log_ctx) { - JNIEnv *env = avpriv_jni_get_env(c); + JNIEnv *env = ff_jni_get_env(log_ctx); if (!env) return AVERROR(EINVAL); diff --git a/libavformat/Makefile b/libavformat/Makefile index 4a380668bd..08fe98a535 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -657,6 +657,7 @@ OBJS-$(CONFIG_LIBOPENMPT_DEMUXER) += libopenmpt.o OBJS-$(CONFIG_VAPOURSYNTH_DEMUXER) += vapoursynth.o # protocols I/O +OBJS-$(CONFIG_ANDROID_CONTENT_PROTOCOL) += file.o OBJS-$(CONFIG_ASYNC_PROTOCOL) += async.o OBJS-$(CONFIG_APPLEHTTP_PROTOCOL) += hlsproto.o OBJS-$(CONFIG_BLURAY_PROTOCOL) += bluray.o diff --git a/libavformat/file.c b/libavformat/file.c index 64df7ff6fb..1b2b69f090 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -40,6 +40,12 @@ #include #include "os_support.h" #include "url.h" +#if CONFIG_ANDROID_CONTENT_PROTOCOL +#include +#include "libavcodec/jni.h" +#include "libavcodec/ffjni.c" +#endif + /* Some systems may not have S_ISFIFO */ #ifndef S_ISFIFO @@ -101,6 +107,21 @@ typedef struct FileContext { int64_t initial_pos; } FileContext; + +#if CONFIG_ANDROID_CONTENT_PROTOCOL +static const AVOption android_content_options[] = { + { "blocksize", "set I/O operation maximum block size", offsetof(FileContext, blocksize), AV_OPT_TYPE_INT, { .i64 = INT_MAX }, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, + { NULL } +}; + +static const AVClass android_content_class = { + .class_name = "android_content", + .item_name = av_default_item_name, + .option = android_content_options, + .version = LIBAVUTIL_VERSION_INT, +}; +#endif + static const AVOption file_options[] = { { "truncate", "truncate existing files on write", offsetof(FileContext, trunc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM }, { "blocksize", "set I/O operation maximum block size", offsetof(FileContext, blocksize), AV_OPT_TYPE_INT, { .i64 = INT_MAX }, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, @@ -524,3 +545,139 @@ const URLProtocol ff_fd_protocol = { }; #endif /* CONFIG_FD_PROTOCOL */ + +#if CONFIG_ANDROID_CONTENT_PROTOCOL + +struct JFields { + jclass uri_class; + jmethodID parse_id; + + jclass context_class; + jmethodID get_content_resolver_id; + + jclass content_resolver_class; + jmethodID open_file_descriptor_id; + + jclass parcel_file_descriptor_class; + jmethodID detach_fd_id; +}; + +#define OFFSET(x) offsetof(struct JFields, x) +static const struct FFJniField jfields_mapping[] = { + { "android/net/Uri", NULL, NULL, FF_JNI_CLASS, OFFSET(uri_class), 1 }, + { "android/net/Uri", "parse", "(Ljava/lang/String;)Landroid/net/Uri;", FF_JNI_STATIC_METHOD, OFFSET(parse_id), 1 }, + + { "android/content/Context", NULL, NULL, FF_JNI_CLASS, OFFSET(context_class), 1 }, + { "android/content/Context", "getContentResolver", "()Landroid/content/ContentResolver;", FF_JNI_METHOD, OFFSET(get_content_resolver_id), 1 }, + + { "android/content/ContentResolver", NULL, NULL, FF_JNI_CLASS, OFFSET(content_resolver_class), 1 }, + { "android/content/ContentResolver", "openFileDescriptor", "(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;", FF_JNI_METHOD, OFFSET(open_file_descriptor_id), 1 }, + + { "android/os/ParcelFileDescriptor", NULL, NULL, FF_JNI_CLASS, OFFSET(parcel_file_descriptor_class), 1 }, + { "android/os/ParcelFileDescriptor", "detachFd", "()I", FF_JNI_METHOD, OFFSET(detach_fd_id), 1 }, + + { NULL } +}; +#undef OFFSET + +static int android_content_open(URLContext *h, const char *filename, int flags) +{ + FileContext *c = h->priv_data; + int fd, ret; + const char *mode_str = "r"; + + JNIEnv *env; + struct JFields jfields = { 0 }; + jobject application_context = NULL; + jobject url = NULL; + jobject mode = NULL; + jobject uri = NULL; + jobject content_resolver = NULL; + jobject parcel_file_descriptor = NULL; + + env = ff_jni_get_env(c); + if (!env) { + return AVERROR(EINVAL); + } + + ret = ff_jni_init_jfields(env, &jfields, jfields_mapping, 0, c); + if (ret < 0) { + av_log(c, AV_LOG_ERROR, "failed to initialize jni fields\n"); + return ret; + } + + application_context = av_jni_get_android_app_ctx(); + if (!application_context) { + av_log(c, AV_LOG_ERROR, "application context is not set\n"); + ret = AVERROR_EXTERNAL; + goto done; + } + + url = ff_jni_utf_chars_to_jstring(env, filename, c); + if (!url) { + ret = AVERROR_EXTERNAL; + goto done; + } + + if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) + mode_str = "rw"; + else if (flags & AVIO_FLAG_WRITE) + mode_str = "w"; + + mode = ff_jni_utf_chars_to_jstring(env, mode_str, c); + if (!mode) { + ret = AVERROR_EXTERNAL; + goto done; + } + + uri = (*env)->CallStaticObjectMethod(env, jfields.uri_class, jfields.parse_id, url); + ret = ff_jni_exception_check(env, 1, c); + if (ret < 0) + goto done; + + content_resolver = (*env)->CallObjectMethod(env, application_context, jfields.get_content_resolver_id); + ret = ff_jni_exception_check(env, 1, c); + if (ret < 0) + goto done; + + parcel_file_descriptor = (*env)->CallObjectMethod(env, content_resolver, jfields.open_file_descriptor_id, uri, mode); + ret = ff_jni_exception_check(env, 1, c); + if (ret < 0) + goto done; + + fd = (*env)->CallIntMethod(env, parcel_file_descriptor, jfields.detach_fd_id); + ret = ff_jni_exception_check(env, 1, c); + if (ret < 0) + goto done; + +#if HAVE_SETMODE + setmode(fd, O_BINARY); +#endif + c->fd = fd; + h->is_streamed = 0; + +done: + (*env)->DeleteLocalRef(env, url); + (*env)->DeleteLocalRef(env, mode); + (*env)->DeleteLocalRef(env, uri); + (*env)->DeleteLocalRef(env, content_resolver); + (*env)->DeleteLocalRef(env, parcel_file_descriptor); + ff_jni_reset_jfields(env, &jfields, jfields_mapping, 0, c); + + return ret; +} + +URLProtocol ff_android_content_protocol = { + .name = "content", + .url_open = android_content_open, + .url_read = file_read, + .url_write = file_write, + .url_seek = file_seek, + .url_close = file_close, + .url_get_file_handle = file_get_handle, + .url_check = NULL, + .priv_data_size = sizeof(FileContext), + .priv_data_class = &android_content_class, +}; + +#endif /* CONFIG_ANDROID_CONTENT_PROTOCOL */ diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 360018b17c..93a6d67261 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -24,6 +24,7 @@ #include "url.h" +extern const URLProtocol ff_android_content_protocol; extern const URLProtocol ff_async_protocol; extern const URLProtocol ff_bluray_protocol; extern const URLProtocol ff_cache_protocol;