From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A3060498F2 for ; Sat, 23 Mar 2024 12:20:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EF4368D4F8; Sat, 23 Mar 2024 14:20:23 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2063.outbound.protection.outlook.com [40.92.75.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86CC868C72F for ; Sat, 23 Mar 2024 14:20:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KD8KOBZHb0hKFRmr52/SEUOA5SsXRQC+fn+Xg4vQLCVjRu3UQZKGDn+XXQ0qIb7/Hw08ViYQiH8ojS8FhsuUT5wxNpj5R9lzCG3oeKYVerxamR7mu6yCo1DqFrLl8C8E6Yea5vDkufayxjKJNGc+C7CA6WpRKe+/GJ8YD1BG+Elro5LsjeYPkIPRfUo/dURcJ4wb40fsR2hwt7iMaS2SRFJb6dRD4wWREAzctme2iWD0jIOycxUZfXVsYNYmB1T0LwKrmaH5DHMUrM0P1psdAsIzK/t2wv6PUeIB/MAwvByv4ep8HL6Cx6dwqs8dLohN73+0zo4qCI0Wi7DgpLcP3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=El3rFcuye9hDiTg4vAithPmmVBWMWvPsuEOlZKhKQHg=; b=m3/eKl055Xu/qCSBv4b+pQh+1boFQ9ZtQ6ZZc59f46WINNTUYLwrqyP0VblSYSxmrOZBOcl+Qr0mOZLLGcrmmZGVMJCaAXQrjyx6yeS9AZa1FZwIrUwjyzgxG7y5wJHTaa3EddCbA9kneX3D83KfySjG5GP7t402OE1H8pz9X+3tGLgFgRPdD+H1BEfZHs0lMQA7pgKOhovpKG+USmpBIMGNQnxnmxcdp7htetUH3OtXUAX+Fd7GFDp5RM68LPsSsI9NCHS+SXOyDDOQKSk427uIeDtYRp3DX77Vk0i+2B+g8lQciocESqrRca1nyTRDEkymHc5exU3Z+NXjcisXYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=El3rFcuye9hDiTg4vAithPmmVBWMWvPsuEOlZKhKQHg=; b=GiFy0jfm3/CFvC6obnEmdgPkDM4qh4fQQDW42ao46dL39U3uqOJTm2rqGlrAkU7ZckHq9Sbq2Wo3eoVrE8PC0nTAIr+S61CYkf+dHUJrAna0a17z+Jp9ur0PLsArA6iFVlC9948a5Nqki2QE5402inSZW9bFrUykZAbH5Bfb/tNitRAHlM0pdCpbsz9Lpd9do5I3DKS7hSMYIQMX+ojLL17ObgGQ0oZG51NZQIUtzmRJZs9i1LMhUQ3G5rK3dT8y1JKoh3TmCnB821T309bHkWDlN+1Pj4iXAfIUIn/ftPuNk8L3+toVuuv/NkWm5IfBpNfTQGHlaMsTPmQvrviULg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0600.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:275::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.15; Sat, 23 Mar 2024 12:20:20 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 12:20:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 13:20:12 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [6RYOlvvhKiTuWhVKdOAjt+YRhJu8CsQOS6uDbPA7E+8=] X-ClientProxiedBy: ZR2P278CA0007.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323122012.1587694-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0600:EE_ X-MS-Office365-Filtering-Correlation-Id: a63e0c22-626e-41c6-d924-08dc4b339b21 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1gyFO0mbmssTqxclTMQ+CM8CrXk3NXgo5QRymiYZOOTwc7WGnDT3M/hCeBWasTxJcLWSV1dmGKOPp8M/04J6d8TdWo/yuLwMIsyN7SVQl6LKh18ZgIMIzSBJ7MUg0MtYg/4j2lIRlIFra3kOfBP83jWnP2zM2Ul46PgDGg/fm23OS6j+kAVjZ69hDE+0FsdnmYPcZUx//un87G9d+3SrfIYddOqAExN/LP9sc9ud4j0k6sUetRZmL/lsfN2gh2wNugrizKwwsxWIIjqphw2ANppsGJMGjC1xj16XX+VgshA1f7ScfqVwP+vJ1BBOID/0ac0G13Jj/OjaZ5QfJxV/cJvM1O/4jxYaQsRmaeWeR8zN/5A5M7MO1jOL4HP8LJVkreF5e8agHuCJBuQqXnwe6wVrJ6RV+BgWMSMjXBJF43CAWerLAmOu5TVagw1Gr82OgjhLGOdLF9fY7czoM9f/qqE0yN7TJHIqPbv7b7aqbWPbygOlYr998TL4I3ANoFMi0AW4zrIWlNxJKynJoCO6ldwggj1JNUkdKQ1xdEpTzzis4yb998dYVfpIiJm0C6ITOWPGaf/VIXeIL1QRN68GHq/MWu4Jb8dHp6thCEGVqT1TKmyr4dgIhge0uFLOPfl6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bg10FjHP2BMAzoihqN5Hz1YquaB1M1VR4Wrti/g+QfGEcaJLJToc0jlQ/K7E?= =?us-ascii?Q?24CfIiPoR8w6qygCMtCLcShjayuE5etB1pVdvr3fgCPaSNVJvSl0+Cjx7JN/?= =?us-ascii?Q?FtvDO48IuqlfcEiOhoS0OnzfxUHZeuEyASgABoLJN6dGTiFut/EbQ1PrNp2F?= =?us-ascii?Q?E7HnwstOEepXNTBGy1ERqi7YjiId+OTH6uQKOEYgfkDWEP1FGU/DgsCtgL8o?= =?us-ascii?Q?FcYDn4Gq76zgmvWLIAqZZxvybZnP+hUqhhZdIWSuwQZ7euLD9IYl6C2dEcXl?= =?us-ascii?Q?GfsKp5CBgfBFP05mvQP0Q5mw8Diq/OU/0s+DXFCHBQ2YrFHqkwN9Y6nIPoDy?= =?us-ascii?Q?b81iapFuKLosBLE6t5T/ZgeGWYpsnOojCp2xndYqhAJWloE0yaw/eQs4WKgz?= =?us-ascii?Q?hiE6ycXDjCg8QCjcx5/fGyFPgTd1VJ7kC3RbvFcCTO05VVsQLDno01eHtANP?= =?us-ascii?Q?I05fy1lsBSTEdsANapsUYJdVy+vnVUJnHMGsZ6uebJCHTliYC9CZD1Yhegmc?= =?us-ascii?Q?YavchQ5x/ANM9oKpBiH3kBsOjyoK6HboV0tjY3mWzunrUYh85bsctvdJApMr?= =?us-ascii?Q?rJHNBUiDb+7O09Sd2UNlay2wOlZs4jfxQ++iOqDlZg+svJ6iBwu/HkRookKk?= =?us-ascii?Q?pbyb4FIzTaDCRXW2EmqOVwvbUjx/0dlQ2B/ozIixv/d6e/4X3Oy3HAl8DzVg?= =?us-ascii?Q?tAq2ITwy0KsW0yWik9oQmAyU8skFz2qRURtGDbvs6x92HJ1eNYEJB8Rwh9Xh?= =?us-ascii?Q?CNrbkS4gdLmgwxWJkLcjpuUCr1FXyNq1CcWRruQzeS1cp45mIbTtSXgIfm09?= =?us-ascii?Q?BKuflgHi67FWO1f3DwFfC2OyeF0NsYTJSTnkRXo1rVpQNIoLt3Im4TR+3srQ?= =?us-ascii?Q?tUt/0/XemGiEuz8RG233nUquNcJSzH0n+h9fOFd6E8oQdGuKHgFiZGQyLp/m?= =?us-ascii?Q?mGwvK7cGOuHa8b2YwnIcanoD2DargIDvX6+KSS62JXUFlix/5TRUvQuGTqWi?= =?us-ascii?Q?0v80BjvKz8vaMygKGLOhckOeJfQO6PH8fiS2gRcLffn4/y0N1TS5iOxT7GZn?= =?us-ascii?Q?tjMXDhBzPwZUnohM24E4/1IfwbxNgcUimE8gTrsjT9xMaIZj4bwalzTa5bbF?= =?us-ascii?Q?6u2ZEaWHjrH+0mwkc6fHrEdvOmYIz+nT8VYae0B0rRmKmw17z08T3jZ0QDuo?= =?us-ascii?Q?aCcAJawHz0rCvXWna/rCui2e2bhT4ntz6zHdXINedAHxH2o02n8EPIQILtnN?= =?us-ascii?Q?IKqQEytszXGzZnASJN0bzTQ+AiV42swbuV8OziF9wg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a63e0c22-626e-41c6-d924-08dc4b339b21 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 12:20:20.1147 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP250MB0600 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/file: Combine all CONFIG_ANDROID_CONTENT_PROTOCOL blocks 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: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Besides improving readability this also ensures that a developer who has the android content protocol enabled and works on the other parts of the file will not forget to add necessary inclusions just because of (indirect) inclusions from the files included only when said protocol is enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/file.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 8f3b35c795..182995717a 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -40,12 +40,6 @@ #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 @@ -107,21 +101,6 @@ 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 }, @@ -547,6 +526,9 @@ const URLProtocol ff_fd_protocol = { #endif /* CONFIG_FD_PROTOCOL */ #if CONFIG_ANDROID_CONTENT_PROTOCOL +#include +#include "libavcodec/jni.h" +#include "libavcodec/ffjni.c" typedef struct JFields { jclass uri_class; @@ -670,6 +652,18 @@ done: return ret; } +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, +}; + const URLProtocol ff_android_content_protocol = { .name = "content", .url_open = android_content_open, -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".