跳过反复初始化代码

langhuihui · Jun 5, 2022 · 30e7bec · 30e7bec · vercel · Jun 5, 2022
1 parent 8235f46
commit 30e7bec
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ node_modules
 demo/.vitepress/dist
 yarn.lock
 package-lock.json
-
+.DS_Store
diff --git a/demo/public/decoder.wasm b/demo/public/decoder.wasm
diff --git a/demo/public/jessibuca.js b/demo/public/jessibuca.js
diff --git a/demo/public/jessibuca.js.map b/demo/public/jessibuca.js.map
diff --git a/dist/decoder.wasm b/dist/decoder.wasm
diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/decoder/decoder.wasm b/src/decoder/decoder.wasm
diff --git a/wasm/decoder.cpp b/wasm/decoder.cpp
@@ -41,18 +41,18 @@ class FFmpeg
     bool initialized = false;
     FFmpeg(val &&v) : jsObject(forward<val>(v))
     {
+        pkt = av_packet_alloc();
+        frame = av_frame_alloc();
     }
     void initCodec(enum AVCodecID id)
     {
         if (dec_ctx != nullptr)
         {
             clear();
         }
-        pkt = av_packet_alloc();
         codec = avcodec_find_decoder(id);
         parser = av_parser_init(codec->id);
         dec_ctx = avcodec_alloc_context3(codec);
-        frame = av_frame_alloc();
     }
     void initCodec(enum AVCodecID id, string input)
     {
@@ -67,6 +67,8 @@ class FFmpeg
     virtual ~FFmpeg()
     {
         clear();
+        av_frame_free(&frame);
+        av_packet_free(&pkt);
     }
     virtual int decode(string input, u32 timestamp)
     {
@@ -84,25 +86,12 @@ class FFmpeg
         return 0;
     }
     virtual void _decode(u32 timestamp){};
-    virtual void clear()
+    void clear()
     {
-        if (parser)
-        {
-            av_parser_close(parser);
-            parser = nullptr;
-        }
-        if (dec_ctx)
-        {
-            avcodec_free_context(&dec_ctx);
-        }
-        if (frame)
-        {
-            av_frame_free(&frame);
-        }
-        if (pkt)
-        {
-            av_packet_free(&pkt);
-        }
+        av_parser_close(parser);
+        parser = nullptr;
+        avcodec_free_context(&dec_ctx);
+
         codec = nullptr;
         initialized = false;
     }
@@ -236,19 +225,20 @@ class FFmpegVideoDecoder : public FFmpeg
         if (((int)(data[0]) >> 4) == 1 && data[1] == 0)
         {
             //                emscripten_log(0, "codec = %d", codec_id);
-            if (!initialized)
-                jsObject.call<void>("setVideoCodec", codec_id);
-            switch (codec_id)
-            {
-            case 7:
-                initCodec(AV_CODEC_ID_H264, data.substr(5));
-                break;
-            case 12:
-                initCodec(AV_CODEC_ID_H265, data.substr(5));
-                break;
-            default:
-                emscripten_log(0, "codec not support: %d", codec_id);
-                return -1;
+            if (!initialized){
+              jsObject.call<void>("setVideoCodec", codec_id);
+              switch (codec_id)
+              {
+              case 7:
+                  initCodec(AV_CODEC_ID_H264, data.substr(5));
+                  break;
+              case 12:
+                  initCodec(AV_CODEC_ID_H265, data.substr(5));
+                  break;
+              default:
+                  emscripten_log(0, "codec not support: %d", codec_id);
+                  return -1;
+              }
             }
         }
         else