Loading media/codec2/sfplugin/CCodec.cpp +13 −10 Original line number Diff line number Diff line Loading @@ -96,11 +96,14 @@ private: public: static sp<CCodecWatchdog> getInstance() { static sp<CCodecWatchdog> instance(new CCodecWatchdog); static std::once_flag flag; // Call Init() only once. std::call_once(flag, Init, instance); static sp<CCodecWatchdog> sInstance = [] { sp<CCodecWatchdog> instance = new CCodecWatchdog; // the instance should never get destructed instance->incStrong((void *)CCodecWatchdog::getInstance); instance->init(); return instance; }(); return sInstance; } ~CCodecWatchdog() = default; Loading Loading @@ -146,11 +149,11 @@ protected: private: CCodecWatchdog() : mLooper(new ALooper) {} static void Init(const sp<CCodecWatchdog> &thiz) { ALOGV("Init"); thiz->mLooper->setName("CCodecWatchdog"); thiz->mLooper->registerHandler(thiz); thiz->mLooper->start(); void init() { ALOGV("init"); mLooper->setName("CCodecWatchdog"); mLooper->registerHandler(this); mLooper->start(); } sp<ALooper> mLooper; Loading Loading
media/codec2/sfplugin/CCodec.cpp +13 −10 Original line number Diff line number Diff line Loading @@ -96,11 +96,14 @@ private: public: static sp<CCodecWatchdog> getInstance() { static sp<CCodecWatchdog> instance(new CCodecWatchdog); static std::once_flag flag; // Call Init() only once. std::call_once(flag, Init, instance); static sp<CCodecWatchdog> sInstance = [] { sp<CCodecWatchdog> instance = new CCodecWatchdog; // the instance should never get destructed instance->incStrong((void *)CCodecWatchdog::getInstance); instance->init(); return instance; }(); return sInstance; } ~CCodecWatchdog() = default; Loading Loading @@ -146,11 +149,11 @@ protected: private: CCodecWatchdog() : mLooper(new ALooper) {} static void Init(const sp<CCodecWatchdog> &thiz) { ALOGV("Init"); thiz->mLooper->setName("CCodecWatchdog"); thiz->mLooper->registerHandler(thiz); thiz->mLooper->start(); void init() { ALOGV("init"); mLooper->setName("CCodecWatchdog"); mLooper->registerHandler(this); mLooper->start(); } sp<ALooper> mLooper; Loading