fix possible h265 npe

pedroSG94 · Nov 26, 2024 · e7d23da · e7d23da
1 parent 63ea93d
commit e7d23da
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
@@ -311,7 +311,7 @@ public void setForceFps(int fps) {
   }
 
   @Override
-  public void inputYUVData(Frame frame) {
+  public void inputYUVData(@NonNull Frame frame) {
     if (running && !queue.offer(frame)) {
       Log.i(TAG, "frame discarded");
     }
@@ -326,15 +326,17 @@ private boolean sendSPSandPPS(MediaFormat mediaFormat) {
         getVideoData.onVideoInfo(bufferInfo, null, null);
         return true;
       }
-      return false;
       //H265
     } else if (type.equals(CodecUtil.H265_MIME)) {
-      List<ByteBuffer> byteBufferList = extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0"));
-      oldSps = byteBufferList.get(1);
-      oldPps = byteBufferList.get(2);
-      oldVps = byteBufferList.get(0);
-      getVideoData.onVideoInfo(oldSps, oldPps, oldVps);
-      return true;
+      ByteBuffer bufferInfo = mediaFormat.getByteBuffer("csd-0");
+      if (bufferInfo != null) {
+        List<ByteBuffer> byteBufferList = extractVpsSpsPpsFromH265(bufferInfo);
+        oldSps = byteBufferList.get(1);
+        oldPps = byteBufferList.get(2);
+        oldVps = byteBufferList.get(0);
+        getVideoData.onVideoInfo(oldSps, oldPps, oldVps);
+        return true;
+      }
       //H264
     } else {
       oldSps = mediaFormat.getByteBuffer("csd-0");
@@ -343,6 +345,7 @@ private boolean sendSPSandPPS(MediaFormat mediaFormat) {
       getVideoData.onVideoInfo(oldSps, oldPps, oldVps);
       return true;
     }
+    return false;
   }
 
   /**