使用Xcode View Hierarchy等阻碍主线程渲染的工具或代码会使Metal渲染卡顿或黑屏

.github/workflows/apple.yml

@@ -47,9 +47,9 @@ jobs:
     - run: brew install tree xcodegen
     - name: Download Pre Compiled Dependencies
       run: |
-        ./FFToolChain/main.sh install -p ios -l 'ass ffmpeg'
-        ./FFToolChain/main.sh install -p macos -l 'ass ffmpeg'
-        ./FFToolChain/main.sh install -p tvos -l 'ass ffmpeg'
+        ./FFToolChain/main.sh install -p ios -l 'ass ffmpeg8'
+        ./FFToolChain/main.sh install -p macos -l 'ass ffmpeg8'
+        ./FFToolChain/main.sh install -p tvos -l 'ass ffmpeg8'
     - name: Build iOS Framework
       run:  ./examples/ios/build-framework.sh
     - name: Build macOS Framework      

generate-proj.sh

@@ -20,4 +20,9 @@ cd "$THIS_DIR"
 set -e
 
 export MY_PROJECT_DIR="$THIS_DIR"
-xcodegen -p . -s FSPlayer.yml
+
+if [[ -n $1 ]];then
+    xcodegen -p . -s FSPlayer-$1.yml
+else
+    xcodegen -p . -s FSPlayer.yml
+fi

ijkmedia/ijkplayer/ff_ffinc.h

@@ -36,8 +36,13 @@
 #include "libavutil/version.h"
 #include "libswresample/swresample.h"
 #include "libavformat/avformat.h"
+#include "ff_version.h"
+#if IS_FFMPEG_6
 #include "libavformat/application.h"
-#include "libavcodec/avfft.h"
+#else
+#include "libavutil/application.h"
+#endif
+//#include "libavcodec/avfft.h"
 #include "libswscale/swscale.h"
 #include "ijksdl/ijksdl.h"
 

ijkmedia/ijkplayer/ff_ffplay.c

@@ -50,7 +50,7 @@
 #endif
 #include "libswscale/swscale.h"
 #include "libavutil/opt.h"
-#include "libavcodec/avfft.h"
+//#include "libavcodec/avfft.h"
 #include "libswresample/swresample.h"
 #include "ff_version.h"
 #if CONFIG_AUDIO_AVFILTER || CONFIG_VIDEO_AVFILTER
@@ -1237,7 +1237,7 @@ static int get_z_rotate_degrees(AVStream *video_st)
     if (!video_st)
         return 0;
     int32_t *displaymatrix = NULL;
-#if IS_FFMPEG_5
+#if IS_FFMPEG_6
     const AVPacketSideData *sideData = av_packet_side_data_get(video_st->codecpar->coded_side_data, video_st->codecpar->nb_coded_side_data, AV_PKT_DATA_DISPLAYMATRIX);
     if (sideData && sideData->size >= 36) {
         displaymatrix = (int32_t *)sideData->data;
@@ -1397,21 +1397,6 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
 
     vp->sar = src_frame->sample_aspect_ratio;
 
-    /* HEIC tile-grid: decode 输出是每个 tile 的独立 AVFrame，
-     * 但 overlay 应当承载整张 canvas；将 tile 的宽高改写为 canvas 宽高
-     * 以避免 alloc_picture 在 tile 切换时反复重建 overlay。
-     */
-    int tile_canvas_w_fix = 0;
-    int tile_canvas_h_fix = 0;
-    if (src_frame->opaque_ref &&
-        src_frame->opaque_ref->size >= (int)sizeof(FSTileGridMetadata)) {
-        FSTileGridMetadata *tmeta = (FSTileGridMetadata *)src_frame->opaque_ref->data;
-        if (tmeta->nb_tiles > 0 && tmeta->canvas_w > 0 && tmeta->canvas_h > 0) {
-            tile_canvas_w_fix = tmeta->canvas_w;
-            tile_canvas_h_fix = tmeta->canvas_h;
-        }
-    }
-
     //TODO: windows and android plat.
     //软解时，上层指定了明确的overlay-format时需要转格式
     if (src_frame->format != AV_PIX_FMT_VIDEOTOOLBOX) {
@@ -1539,9 +1524,30 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
         }
     }
 
-    /* alloc or resize hardware picture buffer */
+#if IS_TILEGRID_HEIC_ENABLED
+    /* HEIC tile-grid: decode 输出是每个 tile 的独立 AVFrame，
+     * 但 overlay 应当承载整张 canvas；将 tile 的宽高改写为 canvas 宽高
+     * 以避免 alloc_picture 在 tile 切换时反复重建 overlay。
+     */
+    int tile_canvas_w_fix = 0;
+    int tile_canvas_h_fix = 0;
+    if (src_frame->opaque_ref &&
+        src_frame->opaque_ref->size >= (int)sizeof(FSTileGridMetadata)) {
+        FSTileGridMetadata *tmeta = (FSTileGridMetadata *)src_frame->opaque_ref->data;
+        if (tmeta->nb_tiles > 0 && tmeta->canvas_w > 0 && tmeta->canvas_h > 0) {
+            tile_canvas_w_fix = tmeta->canvas_w;
+            tile_canvas_h_fix = tmeta->canvas_h;
+        }
+    }
     int cmp_w = tile_canvas_w_fix > 0 ? tile_canvas_w_fix : src_frame->width;
     int cmp_h = tile_canvas_h_fix > 0 ? tile_canvas_h_fix : src_frame->height;
+#else
+    int cmp_w = src_frame->width;
+    int cmp_h = src_frame->height;
+#endif
+
+    /* alloc or resize hardware picture buffer */
+
     if (!vp->bmp || !vp->allocated ||
         vp->width  != cmp_w ||
         vp->height != cmp_h ||
@@ -1577,7 +1583,7 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
             av_log(NULL, AV_LOG_FATAL, "Cannot initialize the conversion context\n");
             return -3;
         }
-        
+#if IS_TILEGRID_HEIC_ENABLED
         /* HEIC tile-grid: 如果 overlay 还在累积 tile，不要 push 到渲染队列，
          * 保留 writable 槽位给下一个 tile 继续写入。
          */
@@ -1589,7 +1595,10 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
         if (isPending) {
             return 0;
         }
-
+#else
+        /* update the bitmap content */
+        SDL_VoutUnlockYUVOverlay(vp->bmp);
+#endif
         vp->pts = pts;
         vp->duration = duration;
         vp->pos = pos;
@@ -3654,7 +3663,7 @@ static int read_thread(void *arg)
         do {
             if (av_stristart(is->filename, "data:", NULL) && orig_nb_streams > 0) {
                 for (i = 0; i < orig_nb_streams; i++) {
-                    if (!ic->streams[i] || !ic->streams[i]->codecpar || ic->streams[i]->codecpar->profile == FF_PROFILE_UNKNOWN) {
+                    if (!ic->streams[i] || !ic->streams[i]->codecpar || ic->streams[i]->codecpar->profile == AV_PROFILE_UNKNOWN) {
                         break;
                     }
                 }
@@ -4166,7 +4175,7 @@ static int read_thread(void *arg)
             }
 
             do {
-                
+#if IS_TILEGRID_HEIC_ENABLED
                 if (ic->nb_stream_groups > 0) {
                     for (unsigned int i = 0; i < ic->nb_stream_groups; i++) {
                         AVStreamGroup *group = ic->stream_groups[i];
@@ -4247,7 +4256,7 @@ static int read_thread(void *arg)
                     }
                     break;
                 }
-                
+#endif
                 AVStream *st = ic->streams[pkt->stream_index];
                 /* check if packet is in play range specified by user, then queue, otherwise discard */
                 stream_start_time = st->start_time;

ijkmedia/ijkplayer/ff_ffplay_def.h

@@ -49,7 +49,7 @@
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 #include "libavutil/opt.h"
-#include "libavcodec/avfft.h"
+//#include "libavcodec/avfft.h"
 #include "libswresample/swresample.h"
 
 #if CONFIG_AUDIO_AVFILTER || CONFIG_VIDEO_AVFILTER

ijkmedia/ijkplayer/ff_version.h

@@ -26,9 +26,15 @@
 #include "libavformat/version_major.h"
 
 #define IS_FFMPEG_7             (LIBAVFORMAT_VERSION_MAJOR >= 61)
-#define IS_LESS_THAN_FFMPEG_7   (LIBAVFORMAT_VERSION_MAJOR < 61)
+#define IS_LESS_THAN_FFMPEG_7   (LIBAVFORMAT_VERSION_MAJOR <  61)
 #define IS_FFMPEG_6             (LIBAVFORMAT_VERSION_MAJOR >= 60)
+#define IS_LESS_THAN_FFMPEG_6   (LIBAVFORMAT_VERSION_MAJOR <  60)
 #define IS_FFMPEG_5             (LIBAVFORMAT_VERSION_MAJOR >= 59)
 #define IS_FFMPEG_4             (LIBAVFORMAT_VERSION_MAJOR >= 58)
+#define IS_TILEGRID_HEIC_ENABLED IS_FFMPEG_7
+
+#if IS_LESS_THAN_FFMPEG_6
+#define AV_PROFILE_UNKNOWN FF_PROFILE_UNKNOWN
+#endif
 
 #endif /* ff_version_h */

ijkmedia/ijkplayer/ijkavformat/allformats.c

@@ -211,14 +211,18 @@ void ijkav_register_all(void)
 #ifdef __ANDROID__
     FS_REGISTER_PROTOCOL(ijkmediadatasource);
 #endif
+#if IS_FFMPEG_6
     FS_REGISTER_PROTOCOL(ijkhttp2);
+#endif
     FS_REGISTER_PROTOCOL(ijkio);
     FS_REGISTER_PROTOCOL(ijktcphook);
     FS_REGISTER_PROTOCOL(ijkhttphook);
     FS_REGISTER_PROTOCOL(ijksegment);
     /* demuxers */
     FS_REGISTER_DEMUXER(ijklivehook);
+#if IS_FFMPEG_6
     //private hls demuxer
     FS_REGISTER_DEMUXER(ijkplaceholder1);
+#endif
     av_log(NULL, AV_LOG_INFO, "===== custom modules end =====\n");
 }

ijkmedia/ijkplayer/ijkavformat/ijkhls.c

@@ -27,6 +27,9 @@
  * https://www.rfc-editor.org/rfc/rfc8216.txt
  */
 
+#include "../ff_version.h"
+#include "libavformat/avformat.h"
+#if IS_FFMPEG_6
 #include "libffmpeg/config_components.h"
 
 #include "libavformat/http.h"
@@ -39,7 +42,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
 #include "libavutil/time.h"
-#include "libavformat/avformat.h"
+
 #include "libavformat/demux.h"
 #include "libavutil/internal.h"
 #include "libavformat/avio_internal.h"
@@ -48,7 +51,6 @@
 
 #include "libavformat/hls_sample_encryption.h"
 #include "libavformat/internal.h"
-#include "../ff_version.h"
 
 #define INITIAL_BUFFER_SIZE 32768
 
@@ -2761,6 +2763,8 @@ static const AVClass fs_hls_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
+#endif
+
 #if IS_FFMPEG_7
 const FFInputFormat ijkff_ijkplaceholder1_demuxer = {
     .p.name         = "debug_hls",
@@ -2776,7 +2780,7 @@ const FFInputFormat ijkff_ijkplaceholder1_demuxer = {
     .read_seek      = hls_read_seek,
 };
 
-#else
+#elif IS_FFMPEG_6
 
 const AVInputFormat ijkff_ijkplaceholder1_demuxer = {
     .name           = "fs_hls",
@@ -2791,4 +2795,21 @@ const AVInputFormat ijkff_ijkplaceholder1_demuxer = {
     .read_close     = hls_close,
     .read_seek      = hls_read_seek,
 };
+
+#else
+
+#define IJK_DUMMY_DEMUXER(x)                                        \
+static const AVClass ijk_##x##_demuxer_class = {                    \
+    .class_name = #x,                                               \
+    .item_name  = av_default_item_name,                             \
+    .version    = LIBAVUTIL_VERSION_INT,                            \
+    };                                                              \
+                                                                    \
+AVInputFormat ff_##x##_demuxer = {                                  \
+    .name                = #x,                                      \
+    .priv_data_size      = 1,                                       \
+    .priv_class          = &ijk_##x##_demuxer_class,                \
+};
+
+IJK_DUMMY_DEMUXER(ijkplaceholder1);
 #endif

ijkmedia/ijkplayer/ijkavformat/ijkiourlhook.c

@@ -26,7 +26,12 @@
 #include <stdlib.h>
 #include "ijkiourl.h"
 #include "ijkioprotocol.h"
+#include "../ff_version.h"
+#if IS_FFMPEG_6
 #include "libavformat/application.h"
+#else
+#include "libavutil/application.h"
+#endif
 #include "libavformat/avio.h"
 #include "libavutil/error.h"
 #include "libavutil/avstring.h"

ijkmedia/ijkplayer/ijkavformat/ijklivehook.c

@@ -30,8 +30,13 @@
 #include "ijkplayer/ijkavutil/opt.h"
 
 #include "ijkavformat.h"
-#include "libavformat/application.h"
 #include "../ff_version.h"
+#if IS_FFMPEG_6
+#include "libavformat/application.h"
+#else
+#include "libavutil/application.h"
+#endif
+
 
 typedef struct {
     AVClass         *class;

ijkmedia/ijkplayer/ijkavformat/ijksegment.c

@@ -26,8 +26,12 @@
 #include "libavutil/avstring.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
-
+#include "../ff_version.h"
+#if IS_FFMPEG_6
 #include "libavformat/application.h"
+#else
+#include "libavutil/application.h"
+#endif
 
 typedef struct Context {
     AVClass        *class;

ijkmedia/ijkplayer/ijkavformat/ijkurlhook.c

@@ -26,8 +26,12 @@
 #include "libavutil/avstring.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
-
+#include "../ff_version.h"
+#if IS_FFMPEG_6
 #include "libavformat/application.h"
+#else
+#include "libavutil/application.h"
+#endif
 
 typedef struct Context {
     AVClass        *class;

ijkmedia/ijkplayer/ijkmeta.c

@@ -26,6 +26,7 @@
 #include "ff_ffinc.h"
 #include "ijksdl/ijksdl_misc.h"
 #include "ff_ffplay.h"
+#include "ff_version.h"
 
 #define FS_META_INIT_CAPACITY 13
 
@@ -302,7 +303,7 @@ void ijkmeta_set_avformat_context_l(IjkMediaMeta *meta, AVFormatContext *ic)
         const char *codec_name = avcodec_get_name(codecpar->codec_id);
         if (codec_name)
             ijkmeta_set_string_l(stream_meta, FSM_KEY_CODEC_NAME, codec_name);
-        if (codecpar->profile != FF_PROFILE_UNKNOWN) {
+        if (codecpar->profile != AV_PROFILE_UNKNOWN) {
             const AVCodec *codec = avcodec_find_decoder(codecpar->codec_id);
             if (codec) {
                 ijkmeta_set_int64_l(stream_meta, FSM_KEY_CODEC_PROFILE_ID, codecpar->profile);

ijkmedia/ijksdl/apple/ijksdl_vout_ios_gles2.m

@@ -149,7 +149,7 @@ static int vout_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay, SDL_
         ALOGE("vout_display_overlay_l: invalid format:%d\n",overlay->format);
         return -4;
     }
-
+#if IS_TILEGRID_HEIC_ENABLED
     /* HEIC tile grid 路径：把所有 tile 打包到 FSOverlayAttach.tilePieces */
     if (overlay->is_tile_grid) {
         int count = SDL_VoutOverlay_GetTileCount(overlay);
@@ -191,7 +191,8 @@ static int vout_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay, SDL_
         free(bufs); free(xs); free(ys); free(ws); free(hs);
         return [gl_view displayAttach:attach];
     }
-
+#endif
+
     CVPixelBufferRef videoPic = SDL_Overlay_getCVPixelBufferRef(overlay);
     if (videoPic) {
         FSOverlayAttach *attach = [[FSOverlayAttach alloc] init];