From 1df3859c984f21578a4234b70e7af510ead2781d Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Tue, 9 Jul 2019 14:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E6=AD=A5addDelegate?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=B8=A2=E5=B8=A7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/ZLToolKit     |  2 +-
 tests/test_player.cpp | 38 ++++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index ec50224e..03d0953f 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit ec50224e4094b91be10a40ba221793706676b2b9
+Subproject commit 03d0953f91e0a75fa8e95fce032ff9d3bef04789
diff --git a/tests/test_player.cpp b/tests/test_player.cpp
index aeecf75d..62852565 100644
--- a/tests/test_player.cpp
+++ b/tests/test_player.cpp
@@ -25,6 +25,7 @@
  */
 #include <signal.h>
 #include <unistd.h>
+#include "Util/util.h"
 #include "Util/logger.h"
 #include <iostream>
 #include "Poller/EventPoller.h"
@@ -68,22 +69,27 @@ int main(int argc, char *argv[]) {
             WarnL << "没有视频或者视频不是264编码!";
             return;
         }
-        SDLDisplayerHelper::Instance().doTask([viedoTrack]() {
-            std::shared_ptr<H264Decoder> decoder(new H264Decoder);
-            std::shared_ptr<YuvDisplayer> displayer(new YuvDisplayer);
-            viedoTrack->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([decoder, displayer](const Frame::Ptr &frame) {
-                SDLDisplayerHelper::Instance().doTask([decoder, displayer, frame]() {
-                    AVFrame *pFrame = nullptr;
-                    bool flag = decoder->inputVideo((unsigned char *) frame->data(), frame->size(),
-                                                    frame->stamp(), &pFrame);
-                    if (flag) {
-                        displayer->displayYUV(pFrame);
-                    }
-                    return true;
-                });
-            }));
-            return true;
-        });
+
+        AnyStorage::Ptr storage(new AnyStorage);
+        viedoTrack->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([storage](const Frame::Ptr &frame) {
+            SDLDisplayerHelper::Instance().doTask([frame,storage]() {
+                auto &decoder = (*storage)["decoder"];
+                auto &displayer = (*storage)["displayer"];
+                if(!decoder){
+                    decoder.set<H264Decoder>();
+                }
+                if(!displayer){
+                    displayer.set<YuvDisplayer>();
+                }
+
+                AVFrame *pFrame = nullptr;
+                bool flag = decoder.get<H264Decoder>().inputVideo((unsigned char *) frame->data(), frame->size(), frame->stamp(), &pFrame);
+                if (flag) {
+                    displayer.get<YuvDisplayer>().displayYUV(pFrame);
+                }
+                return true;
+            });
+        }));
     });