StVideoQueue - try opening vp9/hevc MediaCodec hardware decoders

gkv311 · Aug 2, 2020 · c49a72a · c49a72a
1 parent 3b943e7
commit c49a72a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/StMoviePlayer/StMoviePlayer.cpp b/StMoviePlayer/StMoviePlayer.cpp
@@ -184,7 +184,7 @@ void StMoviePlayer::updateStrings() {
 #if defined(_WIN32)
     const StCString aGpuAcc = stCString(" (DXVA2)");
 #elif defined(__APPLE__)
-    const StCString aGpuAcc = stCString(" (VDA)");
+    const StCString aGpuAcc = stCString(" (VideoToolbox)");
 #elif defined(__ANDROID__)
     const StCString aGpuAcc = stCString(""); //stCString(" (Android Media Codec)");
 #else

diff --git a/StMoviePlayer/StVideo/StVideoQueue.cpp b/StMoviePlayer/StVideo/StVideoQueue.cpp
@@ -170,6 +170,8 @@ StVideoQueue::StVideoQueue(const StHandle<StGLTextureQueue>& theTextureQueue,
   myMaster(theMaster),
 #if defined(__ANDROID__)
   myCodecH264HW(avcodec_find_decoder_by_name("h264_mediacodec")),
+  myCodecHevcHW(avcodec_find_decoder_by_name("hevc_mediacodec")),
+  myCodecVp9HW (avcodec_find_decoder_by_name("vp9_mediacodec")),
 #endif
   myCodecOpenJpeg(avcodec_find_decoder_by_name("libopenjpeg")),
   myUseGpu(false),
@@ -358,9 +360,15 @@ bool StVideoQueue::init(AVFormatContext*   theFormatCtx,
 #if defined(__ANDROID__)
     AVCodec* aCodecGpu = NULL;
     if(myUseGpu
-    && StString(myCodecAuto->name).isEquals(stCString("h264"))
     && myCodecCtx->pix_fmt == stAV::PIX_FMT::YUV420P) {
-        aCodecGpu = myCodecH264HW;
+        const StString anAutoCodecName(myCodecAuto->name);
+        if(anAutoCodecName.isEquals(stCString("h264"))) {
+            aCodecGpu = myCodecH264HW;
+        } else if(anAutoCodecName.isEquals(stCString("hevc"))) {
+            aCodecGpu = myCodecHevcHW;
+        } else if(anAutoCodecName.isEquals(stCString("vp9"))) {
+            aCodecGpu = myCodecVp9HW;
+        }
     }
 
     if(aCodecGpu != NULL) {

diff --git a/StMoviePlayer/StVideo/StVideoQueue.h b/StMoviePlayer/StVideo/StVideoQueue.h
@@ -398,7 +398,9 @@ class StVideoQueue : public StAVPacketQueue {
 
     StHandle<StHWAccelContext> myHWAccelCtx;
 #if defined(__ANDROID__)
-    AVCodec*                   myCodecH264HW;     //!< h264 decoder using dedicated hardware (VDA codec on OS X; Android Media Codec)
+    AVCodec*                   myCodecH264HW;     //!< h264 decoder using dedicated hardware (Android Media Codec)
+    AVCodec*                   myCodecHevcHW;     //!< hevc decoder using dedicated hardware
+    AVCodec*                   myCodecVp9HW;      //!< vp9  decoder using dedicated hardware
 #endif
     AVCodec*                   myCodecOpenJpeg;   //!< libopenjpeg decoder
     bool                       myUseGpu;          //!< activate decoding on GPU when possible