From patchwork Tue Aug 2 22:28:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Gu X-Patchwork-Id: 73 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp425054vsd; Tue, 2 Aug 2016 15:28:31 -0700 (PDT) X-Received: by 10.194.39.35 with SMTP id m3mr57020921wjk.51.1470176910940; Tue, 02 Aug 2016 15:28:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s7si5294538wme.118.2016.08.02.15.28.30; Tue, 02 Aug 2016 15:28:30 -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; 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 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 1D1CE68A03C; Wed, 3 Aug 2016 01:28:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com [209.85.220.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77FFE689FF1 for ; Wed, 3 Aug 2016 01:28:11 +0300 (EEST) Received: by mail-pa0-f65.google.com with SMTP id hh10so12779336pac.1 for ; Tue, 02 Aug 2016 15:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p6Dt9R/+NNMgAp85F6bKckrhdkHniBZZRtFFSpe0faY=; b=ve/d/v7VOiOoMGSJPyLhMqgeHlNVNs6UNa60hLD2aYMJ56OeIyavHySTm3B5NIBfMu rUb5vvPHTPtz3Aovo38pl8tgTj4g9+SxMmyjdlgED0JJGuc4Cchyu/h/SF2OsshToga9 PjUilHTT232sZNEQ0DNXcjVdGPLcbBBm1mZir76Pi2NJcwtnOgZRHetn7dXSldk5p0CW S6lrsKEqi/paM3gm8Anww+hDYwzdM3v577xeLAY4Uyxk0A1xyZqbgg2wYZ5wpCQadh90 y4+4cFQL3rrPBGdZ7kwtEvD1qggyq3O2R3Dr6i/PvD1UKtG8lMXFpCfIFaSW/lSrP+GD Wn4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=p6Dt9R/+NNMgAp85F6bKckrhdkHniBZZRtFFSpe0faY=; b=NIuc80y4Fo2L2t2XvJL4MCJJFlnIS86KrhcwPqXf5XfYwqXqaQRWeJFJzE662db4Hh qasSL3UKeTV35Vq6c//X0nA2v6hjqgCsZ9wIo8OnSd0pSt2oRFHifYkqA8W9SfdqhOjA A65/m9HFy8A2NReUqqpTQXFxcgvkYxI0sYN7ADLPakE4MsR35v8tR5TXynesbzDzihLp ot4gGiLS4eWmShUYg0Cnrg/NOjqx3CAPaPGHJ4IUFr8iaAPffRcYN40/ehmI73d0LoxT Wy8UFXJKvNGxviGyrirruRcPdUtHNzDbtiN4KNhnw2fPNevUOyomFCv8LqguY3V/Un74 S9cA== X-Gm-Message-State: AEkoouvQ80fO1QeXlVg2kHWyMNwzz8oPqocOH5aLYazPPHXEyaQ9GZoDvm0IlBCnxR55nA== X-Received: by 10.66.160.41 with SMTP id xh9mr111408639pab.85.1470176896114; Tue, 02 Aug 2016 15:28:16 -0700 (PDT) Received: from biggie.timothygu.me (ip68-5-186-115.oc.oc.cox.net. [68.5.186.115]) by smtp.gmail.com with ESMTPSA id h1sm7157105pay.48.2016.08.02.15.28.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Aug 2016 15:28:15 -0700 (PDT) From: Timothy Gu To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Aug 2016 15:28:10 -0700 Message-Id: <1470176890-11990-1-git-send-email-timothygu99@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1470170320-29796-1-git-send-email-timothygu99@gmail.com> References: <1470170320-29796-1-git-send-email-timothygu99@gmail.com> Subject: [FFmpeg-devel] [PATCH] jni, mediacodec: Return ENOSYS on unsupported platforms 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: Timothy Gu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/jni.c | 9 ++++----- libavcodec/mediacodec.c | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/jni.c b/libavcodec/jni.c index 32456f5..85dcf2a 100644 --- a/libavcodec/jni.c +++ b/libavcodec/jni.c @@ -20,19 +20,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include -#include "config.h" +#include "libavutil/error.h" #include "jni.h" #if CONFIG_JNI - -#include #include #include #include "libavutil/log.h" -#include "libavutil/error.h" #include "ffjni.h" void *java_vm; @@ -69,7 +68,7 @@ void *av_jni_get_java_vm(void *log_ctx) int av_jni_set_java_vm(void *vm, void *log_ctx) { - return 0; + return AVERROR(ENOSYS); } void *av_jni_get_java_vm(void *log_ctx) diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c index cd8766f..a658f0e 100644 --- a/libavcodec/mediacodec.c +++ b/libavcodec/mediacodec.c @@ -22,6 +22,8 @@ #include "config.h" +#include "libavutil/error.h" + #if CONFIG_H264_MEDIACODEC_HWACCEL #include @@ -108,7 +110,7 @@ AVMediaCodecContext *av_mediacodec_alloc_context(void) int av_mediacodec_default_init(AVCodecContext *avctx, AVMediaCodecContext *ctx, void *surface) { - return 0; + return AVERROR(ENOSYS); } void av_mediacodec_default_free(AVCodecContext *avctx) @@ -117,7 +119,7 @@ void av_mediacodec_default_free(AVCodecContext *avctx) int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render) { - return 0; + return AVERROR(ENOSYS); } #endif