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 9B5D645144 for ; Tue, 10 Jan 2023 03:36:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C03B068BC28; Tue, 10 Jan 2023 05:36:02 +0200 (EET) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5073F68B590 for ; Tue, 10 Jan 2023 05:35:54 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1673321746; bh=dh/CDszGA1BwHc3wMk1XGQGk0SVbVKKKpWsOltVdU1w=; h=From:To:Cc:Subject:Date; b=vkfZsKqU1G+sk5fjFiIxq++XPcizHd2apBSorzIeW0AXJHOdgYDjqkD2RA6NBVJPx GUhBfjgHbCTr7rBE5yaW+8kxUcubamhYiuFk2SiDQytLOutimw+2Ovv6EIGqDTD3J7 IDwKb/1bnfhHWSyUY/W+gATUneu/Z0b14W88JHI4= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 8ED1DAE8; Tue, 10 Jan 2023 11:35:45 +0800 X-QQ-mid: xmsmtpt1673321745ts65f2cas Message-ID: X-QQ-XMAILINFO: NFVZPzP5KASdvZJa9Xl5Hggc1StuCCHpYA5ho9H3c8k0gCr+2aSwyj0+ngx0Xl DFAv5X+TJgEYNX+JIxG1C+11Wo6nyqZq4cP63qv8VvDk5ryE6hsGrEUQ6Dai1nz45+MwN8YVh5e9 tOCRo94PCgGi3rMoQUbKzokGQdBrRqAm8S0F8u5pX3zk6U0hsKnBQ3FeI6uNbQc1xu/mRoxXhdTR kKaokcd8EQdp4uBGNnYw+qdEC+15gqRtnZH8Q/EixLYAIwVN5ldww9lVaM0M5OGkO0mhG3vX8Zx+ A7L3pR21xlzS9/wXf8JC0qonNxCJiHE0a8yoHzTq8butYXf/Jezf3rbbqQ93ssuow6Xx5lIyJMeO Cv1KH9bzWzLDTMTNoLyMqH450Srz+wjxAmWiC8Hcfa5hesSmGdruIjlVJ6my5Ihrbr8WrbbWacbR EZc+st0ZI2Hg/6xlqAUjZkevJ72YcmdVzJYWhADZ9BBccIINnTU68O7XIUbJIqJ6maaaLWshlkTG I3ydtF67vu4pYyCB9uWVtSp2Eb+xRznKWhvrWeBy+IUNFvmE0Fy0HEk/PiddSwClYvRUMCu5rDtZ tnq0K6DpFTYXTWKAbO0xfBduhxOCN4ir5MUYJ77U0ZfcLJP8Mqjy8OC+rOikSdj/BxgO3bCyemmh +c4KSPJTov5wSVM2xUBR6VtoWwk4kVJJSeXSybieW7Xeynm+5g61RNk0r4B3GKM5hW+5kpQ5o7pz YDQYfMcOfVkf9C0o890RSkV/5BblHhUA/X7D6tBkh9cUxngav+5Om2TQkiazuMzauMB1BD2i+B0C KgLAJ+XxQLxZjB0Jd1qiuvc7UFVBpSCWM5b1xCC/Fd23HoXRyIN511stR0ZwsZ5gBP56QMKuwm52 8CU4TkNW8aaBUIqaib5ehxEDJeaPRThTIbAS0xII5PUvwpfZfrWUpRqUfYcIWVh/qJVqJy6PGLvv TsnzfiRB9P39caFtFrJoh3ubFgdsXInR11lPPsLOa5yTG4YS5laDMZXjtN0tJL From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2023 19:35:46 +0800 X-OQ-MSGID: <20230110113546.373057-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] avcodec/mediacodecdec: check ff_Build_SDK_INT return value 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: Zhao Zhili 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: From: Zhao Zhili --- v3: when target API <= 24 ==> when target API < 24 v2: add comments libavcodec/mediacodecdec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 11f655a9aa..21464900d1 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -415,7 +415,13 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) s->ctx->codec_name, ret); sdk_int = ff_Build_SDK_INT(avctx); - if (sdk_int <= 23 && + /* ff_Build_SDK_INT can fail when target API < 24 and JVM isn't available. + * If we don't check sdk_int > 0, the workaround might be enabled by + * mistake. + * JVM is required to make the workaround works reliably. On the other hand, + * missing a workaround should not be a serious issue, we do as best we can. + */ + if (sdk_int > 0 && sdk_int <= 23 && strcmp(s->ctx->codec_name, "OMX.amlogic.mpeg2.decoder.awesome") == 0) { av_log(avctx, AV_LOG_INFO, "Enabling workaround for %s on API=%d\n", s->ctx->codec_name, sdk_int); -- 2.25.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".