Fix build fail for Android due to incorrect AMediaCodec detection (#4624)

Author: trengginas

aconfigure

@@ -678,6 +678,7 @@ openssl_h_present
 ac_ssl_backend
 ac_ssl_has_aes_gcm
 ac_no_ssl
+ac_mediacodec_cflags
 ac_no_mediacodec
 ac_vpx_ldflags
 ac_vpx_cflags
@@ -9581,6 +9582,7 @@ fi
 
 
 
+
 # Check whether --enable-android-mediacodec was given.
 if test ${enable_android_mediacodec+y}
 then :
@@ -9650,11 +9652,15 @@ fi
 printf "%s\n" "Checking if Android AMediaCodec library is available... yes" >&6; }
                     printf "%s\n" "#define PJMEDIA_HAS_ANDROID_MEDIACODEC 1" >>confdefs.h
 
+                    ac_mediacodec_cflags="-DPJMEDIA_HAS_ANDROID_MEDIACODEC=1 -D__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__ -Werror=unguarded-availability"
                 else
                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... no" >&5
 printf "%s\n" "Checking if Android AMediaCodec library is available... no" >&6; }
                 fi
             ;;
+            *)
+                ac_no_mediacodec=1
+            ;;
         esac
 
  ;;

aconfigure.ac

@@ -2058,6 +2058,7 @@ fi
 
 dnl # Include Android MediaCodec
 AC_SUBST(ac_no_mediacodec)
+AC_SUBST(ac_mediacodec_cflags)
 
 AC_ARG_ENABLE(android-mediacodec,
     AS_HELP_STRING([--disable-android-mediacodec], [Exclude Android MediaCodec (default: autodetect)]),
@@ -2076,10 +2077,14 @@ AC_ARG_ENABLE(android-mediacodec,
                 if test "x$ac_pjmedia_has_amediacodec" = "x1"; then
                     AC_MSG_RESULT([Checking if Android AMediaCodec library is available... yes])
                     AC_DEFINE(PJMEDIA_HAS_ANDROID_MEDIACODEC, 1)
+                    ac_mediacodec_cflags="-DPJMEDIA_HAS_ANDROID_MEDIACODEC=1 -D__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__ -Werror=unguarded-availability"
                 else
                     AC_MSG_RESULT([Checking if Android AMediaCodec library is available... no])
                 fi
             ;;
+            *)
+                [ac_no_mediacodec=1]
+            ;;
         esac
     ]
 )

pjmedia/build/os-auto.mak.in

@@ -42,12 +42,15 @@ OPENH264_LDFLAGS = @ac_openh264_ldflags@
 VPX_CFLAGS = @ac_vpx_cflags@
 VPX_LDFLAGS = @ac_vpx_ldflags@
 
+# Android MediaCodec
+AMEDIACODEC_CFLAGS = @ac_mediacodec_cflags@
+
 
 # PJMEDIA features exclusion
 export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \
                  $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(DSHOW_CFLAGS) $(QT_CFLAGS) \
                  $(DARWIN_CFLAGS) $(ANDROID_CFLAGS) \
-                 $(OPENH264_CFLAGS) $(VPX_CFLAGS) $(OBOE_CFLAGS)
+                 $(OPENH264_CFLAGS) $(VPX_CFLAGS) $(OBOE_CFLAGS) $(AMEDIACODEC_CFLAGS)
 export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) $(DSHOW_LDFLAGS) \
                   $(OPENH264_LDFLAGS) $(VPX_LDFLAGS) $(OBOE_LDFLAGS)
 

pjmedia/src/pjmedia-codec/and_aud_mediacodec.cpp

@@ -50,7 +50,7 @@
 #define AND_MEDIA_KEY_MIME               "mime"
 
 #define BUFFER_MAX_ITEM         16
-
+#define API_AT_LEAST(x) __builtin_available(android x, *)
 typedef struct and_med_buf_info {
     pj_int32_t index;
     pj_int32_t size;
@@ -493,6 +493,15 @@ PJ_DEF(pj_status_t) pjmedia_codec_and_media_aud_init( pjmedia_endpt *endpt )
     pjmedia_codec_mgr *codec_mgr;
     pj_str_t codec_name;
     pj_status_t status;
+    int api_level = android_get_device_api_level();
+
+    if (api_level < 28) {
+        PJ_LOG(4,(THIS_FILE, "Minimum API level 28,"
+                  "Android MediaCodec cannot work with API level %d",
+                  api_level));
+
+        return PJ_SUCCESS;
+    }
 
     if (and_media_factory.pool != NULL) {
         /* Already initialized. */
@@ -987,10 +996,6 @@ static pj_status_t and_media_codec_open(pjmedia_codec *codec,
     codec_data->vad_enabled = (attr->setting.vad != 0);
     codec_data->plc_enabled = (attr->setting.plc != 0);
     and_media_data->clock_rate = attr->info.clock_rate;
-    AMediaCodecOnAsyncNotifyCallback async_cb = {&and_med_on_input_avail,
-                                                 &and_med_on_output_avail,
-                                                 &and_med_on_format_changed,
-                                                 &and_med_on_error};
 
 #if PJMEDIA_HAS_AND_MEDIA_AMRNB
     if (and_media_data->codec_id == AND_AUD_CODEC_AMRNB ||
@@ -1093,8 +1098,18 @@ static pj_status_t and_media_codec_open(pjmedia_codec *codec,
                    s->dec_setting.octet_aligned, s->dec_setting.reorder));
     }
 #endif
-    AMediaCodec_setAsyncNotifyCallback(codec_data->enc, async_cb, codec_data);
-    AMediaCodec_setAsyncNotifyCallback(codec_data->dec, async_cb, codec_data);
+
+    if (API_AT_LEAST(28)) {
+        AMediaCodecOnAsyncNotifyCallback async_cb = {&and_med_on_input_avail,
+                                                     &and_med_on_output_avail,
+                                                     &and_med_on_format_changed,
+                                                     &and_med_on_error};
+
+        AMediaCodec_setAsyncNotifyCallback(codec_data->enc, async_cb,
+                                           codec_data);
+        AMediaCodec_setAsyncNotifyCallback(codec_data->dec, async_cb,
+                                           codec_data);
+    }
 
     status = configure_codec(codec_data, PJ_TRUE);
     if (status != PJ_SUCCESS) {

pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp

@@ -77,6 +77,7 @@
 #define AND_MED_VP9_PT          PJMEDIA_RTP_PT_VP9_RSV1
 
 #define BUFFER_MAX_ITEM         16
+#define API_AT_LEAST(x) __builtin_available(android x, *)
 
 typedef struct and_med_buf_info {
     pj_int32_t index;
@@ -566,6 +567,15 @@ PJ_DEF(pj_status_t) pjmedia_codec_and_media_vid_init(
 {
     const pj_str_t h264_name = { (char*)"H264", 4};
     pj_status_t status;
+    int api_level = android_get_device_api_level();
+
+    if (api_level < 28) {
+        PJ_LOG(4,(THIS_FILE, "Minimum API level 28,"
+                  "Android MediaCodec cannot work with API level %d",
+                  api_level));
+
+        return PJ_SUCCESS;
+    }
 
     if (and_media_factory.pool != NULL) {
         /* Already initialized. */
@@ -1048,10 +1058,6 @@ static pj_status_t and_media_codec_open(pjmedia_vid_codec *codec,
     pjmedia_vid_codec_param *param;
     pj_status_t status = PJ_SUCCESS;
 
-    AMediaCodecOnAsyncNotifyCallback async_cb = {&and_med_on_input_avail,
-                                                 &and_med_on_output_avail,
-                                                 &and_med_on_format_changed,
-                                                 &and_med_on_error};
     and_media_data = (and_media_codec_data*) codec->codec_data;
     and_media_data->prm = pjmedia_vid_codec_param_clone( and_media_data->pool,
                                                      codec_param);
@@ -1062,11 +1068,18 @@ static pj_status_t and_media_codec_open(pjmedia_vid_codec *codec,
         if (status != PJ_SUCCESS)
             return status;
     }
-    AMediaCodec_setAsyncNotifyCallback(and_media_data->enc, async_cb,
-                                       and_media_data);
-    AMediaCodec_setAsyncNotifyCallback(and_media_data->dec, async_cb,
-                                       and_media_data);
 
+    if (API_AT_LEAST(28)) {
+        AMediaCodecOnAsyncNotifyCallback async_cb = {&and_med_on_input_avail,
+                                                     &and_med_on_output_avail,
+                                                     &and_med_on_format_changed,
+                                                     &and_med_on_error};
+
+        AMediaCodec_setAsyncNotifyCallback(and_media_data->enc, async_cb,
+                                           and_media_data);
+        AMediaCodec_setAsyncNotifyCallback(and_media_data->dec, async_cb,
+                                           and_media_data);
+    }
     and_media_data->whole = (param->packing == PJMEDIA_VID_PACKING_WHOLE);
     status = configure_encoder(and_media_data);
     if (status != PJ_SUCCESS) {