diff options
author | Saurabh Shah <saurshah@codeaurora.org> | 2017-12-13 14:10:39 -0800 |
---|---|---|
committer | Saurabh Shah <saurshah@codeaurora.org> | 2018-01-04 15:31:25 -0800 |
commit | 546f77bed5ea998572e8b492d8c39c05387c7ce6 (patch) | |
tree | 20d06fe197b16a0b45c310a4984c2daf2d34ad33 /libqdutils | |
parent | ca16bf276799867fa1a0d39764a9807f797f7df1 (diff) | |
download | display-546f77bed5ea998572e8b492d8c39c05387c7ce6.tar.gz |
qdutils/hwc: Remove unused code surrounding fps calculations
Remove unused code surrounding fps calculations from qdutils and hwc
Change-Id: I1d78a26fdd582ae184fd7367cf692e472283fee1
CRs-fixed: 2157422
Diffstat (limited to 'libqdutils')
-rw-r--r-- | libqdutils/Android.mk | 3 | ||||
-rw-r--r-- | libqdutils/profiler.cpp | 197 | ||||
-rw-r--r-- | libqdutils/profiler.h | 108 |
3 files changed, 1 insertions, 307 deletions
diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index 5dac5810..820ed87c 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -13,8 +13,7 @@ LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_COPY_HEADERS_TO := $(common_header_export_path) LOCAL_COPY_HEADERS := display_config.h qd_utils.h -LOCAL_SRC_FILES := profiler.cpp \ - qd_utils.cpp \ +LOCAL_SRC_FILES := qd_utils.cpp \ display_config.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libqdutils/profiler.cpp b/libqdutils/profiler.cpp deleted file mode 100644 index 810b0198..00000000 --- a/libqdutils/profiler.cpp +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of The Linux Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#define LOG_NDDEBUG 0 -#define __STDC_FORMAT_MACROS 1 -#include <inttypes.h> - -#include "profiler.h" - -#ifdef DEBUG_CALC_FPS - - -ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::CalcFps) ; - -namespace qdutils { - -CalcFps::CalcFps() { - debug_fps_level = 0; - Init(); -} - -CalcFps::~CalcFps() { -} - -void CalcFps::Init() { - char prop[PROPERTY_VALUE_MAX]; - property_get("debug.gr.calcfps", prop, "0"); - debug_fps_level = atoi(prop); - if (debug_fps_level > MAX_DEBUG_FPS_LEVEL) { - ALOGW("out of range value for debug.gr.calcfps, using 0"); - debug_fps_level = 0; - } - - ALOGD("DEBUG_CALC_FPS: %d", debug_fps_level); - populate_debug_fps_metadata(); -} - -void CalcFps::Fps() { - if (debug_fps_level > 0) - calc_fps(ns2us(systemTime())); -} - -void CalcFps::populate_debug_fps_metadata(void) -{ - char prop[PROPERTY_VALUE_MAX]; - - /*defaults calculation of fps to based on number of frames*/ - property_get("debug.gr.calcfps.type", prop, "0"); - debug_fps_metadata.type = (debug_fps_metadata_t::DfmType) atoi(prop); - - /*defaults to 1000ms*/ - property_get("debug.gr.calcfps.timeperiod", prop, "1000"); - debug_fps_metadata.time_period = atoi(prop); - - property_get("debug.gr.calcfps.period", prop, "10"); - debug_fps_metadata.period = atoi(prop); - - if (debug_fps_metadata.period > MAX_FPS_CALC_PERIOD_IN_FRAMES) { - debug_fps_metadata.period = MAX_FPS_CALC_PERIOD_IN_FRAMES; - } - - /* default ignorethresh_us: 500 milli seconds */ - property_get("debug.gr.calcfps.ignorethresh_us", prop, "500000"); - debug_fps_metadata.ignorethresh_us = atoi(prop); - - debug_fps_metadata.framearrival_steps = - (unsigned int)(debug_fps_metadata.ignorethresh_us / 16666); - - if (debug_fps_metadata.framearrival_steps > MAX_FRAMEARRIVAL_STEPS) { - debug_fps_metadata.framearrival_steps = MAX_FRAMEARRIVAL_STEPS; - debug_fps_metadata.ignorethresh_us = - debug_fps_metadata.framearrival_steps * 16666; - } - - /* 2ms margin of error for the gettimeofday */ - debug_fps_metadata.margin_us = 2000; - - for (unsigned int i = 0; i < MAX_FRAMEARRIVAL_STEPS; i++) - debug_fps_metadata.accum_framearrivals[i] = 0; - - debug_fps_metadata.curr_frame = 0; - - ALOGD("period: %u", debug_fps_metadata.period); - ALOGD("ignorethresh_us: %" PRId64, debug_fps_metadata.ignorethresh_us); -} - -void CalcFps::print_fps(float fps) -{ - if (debug_fps_metadata_t::DFM_FRAMES == debug_fps_metadata.type) - ALOGD("FPS for last %d frames: %3.2f", debug_fps_metadata.period, fps); - else - ALOGD("FPS for last (%f ms, %d frames): %3.2f", - debug_fps_metadata.time_elapsed, - debug_fps_metadata.curr_frame, fps); - - debug_fps_metadata.curr_frame = 0; - debug_fps_metadata.time_elapsed = 0.0; - - if (debug_fps_level > 1) { - ALOGD("Frame Arrival Distribution:"); - for (unsigned int i = 0; - i < ((debug_fps_metadata.framearrival_steps / 6) + 1); - i++) { - ALOGD("%" PRId64" %" PRId64" %" PRId64" %" PRId64" %" PRId64" %" PRId64, - debug_fps_metadata.accum_framearrivals[i*6], - debug_fps_metadata.accum_framearrivals[i*6+1], - debug_fps_metadata.accum_framearrivals[i*6+2], - debug_fps_metadata.accum_framearrivals[i*6+3], - debug_fps_metadata.accum_framearrivals[i*6+4], - debug_fps_metadata.accum_framearrivals[i*6+5]); - } - - /* We are done with displaying, now clear the stats */ - for (unsigned int i = 0; - i < debug_fps_metadata.framearrival_steps; - i++) - debug_fps_metadata.accum_framearrivals[i] = 0; - } - return; -} - -void CalcFps::calc_fps(nsecs_t currtime_us) -{ - static nsecs_t oldtime_us = 0; - - nsecs_t diff = currtime_us - oldtime_us; - - oldtime_us = currtime_us; - - if (debug_fps_metadata_t::DFM_FRAMES == debug_fps_metadata.type && - diff > debug_fps_metadata.ignorethresh_us) { - return; - } - - if (debug_fps_metadata.curr_frame < MAX_FPS_CALC_PERIOD_IN_FRAMES) { - debug_fps_metadata.framearrivals[debug_fps_metadata.curr_frame] = diff; - } - - debug_fps_metadata.curr_frame++; - - if (debug_fps_level > 1) { - unsigned int currstep = - (unsigned int)(diff + debug_fps_metadata.margin_us) / 16666; - - if (currstep < debug_fps_metadata.framearrival_steps) { - debug_fps_metadata.accum_framearrivals[currstep-1]++; - } - } - - if (debug_fps_metadata_t::DFM_FRAMES == debug_fps_metadata.type) { - if (debug_fps_metadata.curr_frame == debug_fps_metadata.period) { - /* time to calculate and display FPS */ - nsecs_t sum = 0; - for (unsigned int i = 0; i < debug_fps_metadata.period; i++) - sum += debug_fps_metadata.framearrivals[i]; - print_fps(float(float(debug_fps_metadata.period * 1000000) / - (float)sum)); - } - } - else if (debug_fps_metadata_t::DFM_TIME == debug_fps_metadata.type) { - debug_fps_metadata.time_elapsed += (float)((float)diff/1000.0); - if (debug_fps_metadata.time_elapsed >= debug_fps_metadata.time_period) { - float fps = float(1000.0 * debug_fps_metadata.curr_frame/ - debug_fps_metadata.time_elapsed); - print_fps(fps); - } - } - return; -} -};//namespace qomutils -#endif diff --git a/libqdutils/profiler.h b/libqdutils/profiler.h deleted file mode 100644 index 5f270b02..00000000 --- a/libqdutils/profiler.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of The Linux Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef INCLUDE_PROFILER -#define INCLUDE_PROFILER - -#include <stdio.h> -#include <utils/Singleton.h> -#include <cutils/properties.h> -#include <cutils/log.h> - -#ifndef DEBUG_CALC_FPS -#define CALC_FPS() ((void)0) -#define CALC_INIT() ((void)0) -#else -#define CALC_FPS() qdutils::CalcFps::getInstance().Fps() -#define CALC_INIT() qdutils::CalcFps::getInstance().Init() -using namespace android; -namespace qdutils { -class CalcFps : public Singleton<CalcFps> { - public: - CalcFps(); - ~CalcFps(); - - void Init(); - void Fps(); - - private: - static const unsigned int MAX_FPS_CALC_PERIOD_IN_FRAMES = 128; - static const unsigned int MAX_FRAMEARRIVAL_STEPS = 50; - static const unsigned int MAX_DEBUG_FPS_LEVEL = 2; - - struct debug_fps_metadata_t { - /*fps calculation based on time or number of frames*/ - enum DfmType { - DFM_FRAMES = 0, - DFM_TIME = 1, - }; - - DfmType type; - - /* indicates how much time do we wait till we calculate FPS */ - unsigned long time_period; - - /*indicates how much time elapsed since we report fps*/ - float time_elapsed; - - /* indicates how many frames do we wait till we calculate FPS */ - unsigned int period; - /* current frame, will go upto period, and then reset */ - unsigned int curr_frame; - /* frame will arrive at a multiple of 16666 us at the display. - This indicates how many steps to consider for our calculations. - For example, if framearrival_steps = 10, then the frame that arrived - after 166660 us or more will be ignored. - */ - unsigned int framearrival_steps; - /* ignorethresh_us = framearrival_steps * 16666 */ - nsecs_t ignorethresh_us; - /* used to calculate the actual frame arrival step, the times might not be - accurate - */ - unsigned int margin_us; - - /* actual data storage */ - nsecs_t framearrivals[MAX_FPS_CALC_PERIOD_IN_FRAMES]; - nsecs_t accum_framearrivals[MAX_FRAMEARRIVAL_STEPS]; - }; - - private: - void populate_debug_fps_metadata(void); - void print_fps(float fps); - void calc_fps(nsecs_t currtime_us); - - private: - debug_fps_metadata_t debug_fps_metadata; - unsigned int debug_fps_level; -}; -};//namespace qdutils -#endif - -#endif // INCLUDE_PROFILER |