From 2cdb8ba97ac16765937da3a0a1ac71b9c09c8275 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Mon, 5 Jun 2017 15:32:01 -0400
Subject: [PATCH] video: wrap accelerated MediaCodec decoders in RING_ACCEL
MediaCodec is Android's hardware acceleration API, and using it
should therefore depend on RING_ACCEL
Change-Id: Ia8f4332aa108fce455796b8352ca11b99e3ba0ef
---
src/media/video/decoder_finder.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/media/video/decoder_finder.h b/src/media/video/decoder_finder.h
index e2378ef154..7897a55042 100644
--- a/src/media/video/decoder_finder.h
+++ b/src/media/video/decoder_finder.h
@@ -26,7 +26,7 @@ extern "C" {
namespace ring { namespace video {
/**
- * Attempt to find standalone accelerated AVCodec decoder using AVCodecID,
+ * Attempt to find standalone AVCodec decoder using AVCodecID,
* or fallback to the default decoder.
*/
AVCodec*
@@ -34,7 +34,7 @@ findDecoder(const enum AVCodecID codec_id)
{
const char* codec_name;
switch (codec_id) {
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && defined(RING_ACCEL)
case AV_CODEC_ID_MPEG4:
codec_name = "mpeg4_mediacodec"; break;
case AV_CODEC_ID_H264:
--
GitLab