From df18ec700dd3f9526167ced089e2d54fcf3850fc Mon Sep 17 00:00:00 2001 From: wangyi Date: Wed, 12 Mar 2025 10:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E5=90=88?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyi --- .../fuzztest/videohdrtohdr_fuzzer/video_sample.h | 16 ++++++++++------ .../videohdrvividtohdr_fuzzer/video_sample.h | 10 ++++++---- .../videohdrvividtosdr_fuzzer/video_sample.h | 16 ++++++++++------ .../videometadatagen_fuzzer/video_sample.h | 2 +- .../fuzztest/videosdrtosdr_fuzzer/video_sample.h | 5 +++-- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/test/fuzztest/videohdrtohdr_fuzzer/video_sample.h b/test/fuzztest/videohdrtohdr_fuzzer/video_sample.h index 52b3fa7..aa4eeaa 100644 --- a/test/fuzztest/videohdrtohdr_fuzzer/video_sample.h +++ b/test/fuzztest/videohdrtohdr_fuzzer/video_sample.h @@ -23,8 +23,11 @@ using namespace OHOS; using namespace std; constexpr int64_t NANOS_IN_SECOND = 1000000000L; constexpr int64_t NANOS_IN_MICRO = 1000L; +constexpr int64_t SLEEP_MICROSECONDS = 33333L; +constexpr int THREE = 3; -static int64_t GetSystemTimeUs() +namespace OHOS { +int64_t GetSystemTimeUs() { struct timespec now; (void)clock_gettime(CLOCK_BOOTTIME, &now); @@ -32,24 +35,25 @@ static int64_t GetSystemTimeUs() return nanoTime / NANOS_IN_MICRO; } -static void OnError(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) +void OnError(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) { (void)videoProcessor; (void)error; (void)userData; } -static void OnState(OH_VideoProcessing* videoProcessor, VideoProcessing_State state, void* userData) +void OnState(OH_VideoProcessing* videoProcessor, VideoProcessing_State state, void* userData) { (void)videoProcessor; (void)state; (void)userData; } -static void OnNewOutputBuffer(OH_VideoProcessing* videoProcessor, uint32_t index, void* userData) +void OnNewOutputBuffer(OH_VideoProcessing* videoProcessor, uint32_t index, void* userData) { OH_VideoProcessing_RenderOutputBuffer(videoProcessor, index); } +} class VPEConsumerListener : public IBufferConsumerListener{ public: @@ -153,13 +157,13 @@ int32_t VideoSample::InputFunc(const uint8_t *data, size_t size) err = OH_NativeBuffer_Map(nativeBuffer, &virAddr); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeBuffer_Map failed."); uint8_t *addr = reinterpret_cast(virAddr); - memcpy_s(addr, config.stride * config.height * 3, data, size); + memcpy_s(addr, config.stride * config.height * THREE, data, size); NativeWindowHandleOpt(inWindow, SET_UI_TIMESTAMP, GetSystemTimeUs()); err = OH_NativeBuffer_Unmap(nativeBuffer); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeBuffer_Unmap failed."); err = OH_NativeWindow_NativeWindowFlushBuffer(inWindow, ohNativeWindowBuffer, -1, region); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeWindow_NativeWindowFlushBuffer failed."); - usleep(33333); + usleep(SLEEP_MICROSECONDS); return err; } diff --git a/test/fuzztest/videohdrvividtohdr_fuzzer/video_sample.h b/test/fuzztest/videohdrvividtohdr_fuzzer/video_sample.h index c57764c..aa4eeaa 100644 --- a/test/fuzztest/videohdrvividtohdr_fuzzer/video_sample.h +++ b/test/fuzztest/videohdrvividtohdr_fuzzer/video_sample.h @@ -26,7 +26,8 @@ constexpr int64_t NANOS_IN_MICRO = 1000L; constexpr int64_t SLEEP_MICROSECONDS = 33333L; constexpr int THREE = 3; -static int64_t GetSystemTimeUs() +namespace OHOS { +int64_t GetSystemTimeUs() { struct timespec now; (void)clock_gettime(CLOCK_BOOTTIME, &now); @@ -34,24 +35,25 @@ static int64_t GetSystemTimeUs() return nanoTime / NANOS_IN_MICRO; } -static void OnError(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) +void OnError(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) { (void)videoProcessor; (void)error; (void)userData; } -static void OnState(OH_VideoProcessing* videoProcessor, VideoProcessing_State state, void* userData) +void OnState(OH_VideoProcessing* videoProcessor, VideoProcessing_State state, void* userData) { (void)videoProcessor; (void)state; (void)userData; } -static void OnNewOutputBuffer(OH_VideoProcessing* videoProcessor, uint32_t index, void* userData) +void OnNewOutputBuffer(OH_VideoProcessing* videoProcessor, uint32_t index, void* userData) { OH_VideoProcessing_RenderOutputBuffer(videoProcessor, index); } +} class VPEConsumerListener : public IBufferConsumerListener{ public: diff --git a/test/fuzztest/videohdrvividtosdr_fuzzer/video_sample.h b/test/fuzztest/videohdrvividtosdr_fuzzer/video_sample.h index 52b3fa7..aa4eeaa 100644 --- a/test/fuzztest/videohdrvividtosdr_fuzzer/video_sample.h +++ b/test/fuzztest/videohdrvividtosdr_fuzzer/video_sample.h @@ -23,8 +23,11 @@ using namespace OHOS; using namespace std; constexpr int64_t NANOS_IN_SECOND = 1000000000L; constexpr int64_t NANOS_IN_MICRO = 1000L; +constexpr int64_t SLEEP_MICROSECONDS = 33333L; +constexpr int THREE = 3; -static int64_t GetSystemTimeUs() +namespace OHOS { +int64_t GetSystemTimeUs() { struct timespec now; (void)clock_gettime(CLOCK_BOOTTIME, &now); @@ -32,24 +35,25 @@ static int64_t GetSystemTimeUs() return nanoTime / NANOS_IN_MICRO; } -static void OnError(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) +void OnError(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) { (void)videoProcessor; (void)error; (void)userData; } -static void OnState(OH_VideoProcessing* videoProcessor, VideoProcessing_State state, void* userData) +void OnState(OH_VideoProcessing* videoProcessor, VideoProcessing_State state, void* userData) { (void)videoProcessor; (void)state; (void)userData; } -static void OnNewOutputBuffer(OH_VideoProcessing* videoProcessor, uint32_t index, void* userData) +void OnNewOutputBuffer(OH_VideoProcessing* videoProcessor, uint32_t index, void* userData) { OH_VideoProcessing_RenderOutputBuffer(videoProcessor, index); } +} class VPEConsumerListener : public IBufferConsumerListener{ public: @@ -153,13 +157,13 @@ int32_t VideoSample::InputFunc(const uint8_t *data, size_t size) err = OH_NativeBuffer_Map(nativeBuffer, &virAddr); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeBuffer_Map failed."); uint8_t *addr = reinterpret_cast(virAddr); - memcpy_s(addr, config.stride * config.height * 3, data, size); + memcpy_s(addr, config.stride * config.height * THREE, data, size); NativeWindowHandleOpt(inWindow, SET_UI_TIMESTAMP, GetSystemTimeUs()); err = OH_NativeBuffer_Unmap(nativeBuffer); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeBuffer_Unmap failed."); err = OH_NativeWindow_NativeWindowFlushBuffer(inWindow, ohNativeWindowBuffer, -1, region); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeWindow_NativeWindowFlushBuffer failed."); - usleep(33333); + usleep(SLEEP_MICROSECONDS); return err; } diff --git a/test/fuzztest/videometadatagen_fuzzer/video_sample.h b/test/fuzztest/videometadatagen_fuzzer/video_sample.h index 78a998c..d33c390 100644 --- a/test/fuzztest/videometadatagen_fuzzer/video_sample.h +++ b/test/fuzztest/videometadatagen_fuzzer/video_sample.h @@ -26,7 +26,7 @@ constexpr int64_t NANOS_IN_MICRO = 1000L; constexpr int64_t SLEEP_MICROSECONDS = 33333L; constexpr int THREE = 3; -namespace { +namespace OHOS { int64_t GetSystemTimeUs() { struct timespec now; diff --git a/test/fuzztest/videosdrtosdr_fuzzer/video_sample.h b/test/fuzztest/videosdrtosdr_fuzzer/video_sample.h index 7ff3d0f..126698a 100644 --- a/test/fuzztest/videosdrtosdr_fuzzer/video_sample.h +++ b/test/fuzztest/videosdrtosdr_fuzzer/video_sample.h @@ -27,8 +27,9 @@ using namespace OHOS; using namespace std; constexpr int64_t NANOS_IN_SECOND = 1000000000L; constexpr int64_t NANOS_IN_MICRO = 1000L; +constexpr int THREE = 3; -namespace { +namespace OHOS { int64_t GetSystemTimeUs() { struct timespec now; @@ -159,7 +160,7 @@ int32_t VideoSample::InputFunc(const uint8_t *data, size_t size) err = OH_NativeBuffer_Map(nativeBuffer, &virAddr); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeBuffer_Map failed."); uint8_t *addr = reinterpret_cast(virAddr); - memcpy_s(addr, config.stride * config.height * 3, data, size); + memcpy_s(addr, config.stride * config.height * THREE, data, size); NativeWindowHandleOpt(inWindow, SET_UI_TIMESTAMP, GetSystemTimeUs()); err = OH_NativeBuffer_Unmap(nativeBuffer); CHECK_AND_RETURN_RET(err == 0, err, "OH_NativeBuffer_Unmap failed.");