From b72ab343e97e0d4ddf77e38fcfa1bf174ab08279 Mon Sep 17 00:00:00 2001 From: sxzheng96 Date: Tue, 15 Mar 2022 16:37:21 +0800 Subject: [PATCH 1/2] fix distributed screen ut bug Signed-off-by: sxzheng96 --- .../common/screen_channel/include/iscreen_channel_listener.h | 2 +- services/screenclient/test/unittest/BUILD.gn | 2 +- .../screensinkprocessor/decoder/src/image_sink_decoder.cpp | 2 +- .../screensinkprocessor/src/image_sink_processor.cpp | 2 +- .../screensourceprocessor/encoder/src/image_source_encoder.cpp | 2 +- .../screensinkprocessor/src/image_sink_processor_test.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/common/screen_channel/include/iscreen_channel_listener.h b/services/common/screen_channel/include/iscreen_channel_listener.h index 1fb3b18f..f562bb6b 100644 --- a/services/common/screen_channel/include/iscreen_channel_listener.h +++ b/services/common/screen_channel/include/iscreen_channel_listener.h @@ -16,8 +16,8 @@ #ifndef OHOS_ISCREEN_CHANNEL_LISTENER_H #define OHOS_ISCREEN_CHANNEL_LISTENER_H -#include "data_buffer.h" #include +#include "data_buffer.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index d00cb089..4cdcf6b1 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/services/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp b/services/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp index ea167bf7..93a52ab5 100644 --- a/services/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp +++ b/services/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp @@ -114,7 +114,7 @@ int32_t ImageSinkDecoder::InitVideoDecoder(const VideoParam &configParam) DHLOGI("%s: InitVideoDecoder.", LOG_TAG); switch (configParam.GetCodecType()) { case VIDEO_CODEC_TYPE_VIDEO_H264: - videoDecoder_ = Media::VideoDecoderFactory::CreateByName("OMX_hisi_video_decoder_avc"); + videoDecoder_ = Media::VideoDecoderFactory::CreateByMime("video/avc"); break; case VIDEO_CODEC_TYPE_VIDEO_H265: videoDecoder_ = Media::VideoDecoderFactory::CreateByMime("video/hevc"); diff --git a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp index 6572255e..8f9af8fd 100644 --- a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp +++ b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp @@ -54,7 +54,7 @@ int32_t ImageSinkProcessor::ReleaseImageProcessor() int32_t ret = imageDecoder_->ReleaseDecoder(); if (ret != DH_SUCCESS) { DHLOGE("%s: ReleaseDecoder failed.", LOG_TAG); - return ERR_DH_SCREEN_TRANS_ERROR; + return ret; } return DH_SUCCESS; diff --git a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp index bfd1c630..229344ff 100644 --- a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp +++ b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp @@ -117,7 +117,7 @@ int32_t ImageSourceEncoder::InitVideoEncoder(const VideoParam &configParam) DHLOGI("%s: InitVideoEncoder.", LOG_TAG); switch (configParam.GetCodecType()) { case VIDEO_CODEC_TYPE_VIDEO_H264: - videoEncoder_ = Media::VideoEncoderFactory::CreateByName("OMX_hisi_video_encoder_avc"); + videoEncoder_ = Media::VideoEncoderFactory::CreateByMime("video/avc"); break; case VIDEO_CODEC_TYPE_VIDEO_H265: videoEncoder_ = Media::VideoEncoderFactory::CreateByMime("video/hevc"); diff --git a/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp b/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp index b8a246ea..1f61e554 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp +++ b/services/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp @@ -42,7 +42,7 @@ void ImageSinkProcessorTest::SetUp(void) processor_ = std::make_shared(); imageListener_ = std::make_shared(); processor_->imageDecoder_ = std::make_shared(imageListener_); - processor_->imageDecoder_->videoDecoder_ = Media::VideoDecoderFactory::CreateByName("OMX_hisi_video_decoder_avc"); + processor_->imageDecoder_->videoDecoder_ = Media::VideoDecoderFactory::CreateByMime("video/avc"); } void ImageSinkProcessorTest::TearDown(void) {} -- Gitee From 0c859d06d7d1e9b522be5cb9d35f7705e0535df2 Mon Sep 17 00:00:00 2001 From: sxzheng96 Date: Tue, 15 Mar 2022 17:20:56 +0800 Subject: [PATCH 2/2] fix gn format Signed-off-by: sxzheng96 --- services/screenclient/test/unittest/BUILD.gn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 4cdcf6b1..db6632d2 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/screen_client_test" @@ -47,16 +48,16 @@ ohos_unittest("ScreenClientTest") { configs = [ ":module_private_config" ] deps = [ - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}/frameworks/surface:surface", "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", "${windowmanager_path}/wm:libwm", "//foundation/distributedhardware/distributedscreen/services/screenclient:distributed_screen_client", + "//third_party/googletest:gmock", + "//third_party/googletest:gtest_main", ] - external_deps = [ + external_deps = [ "hiviewdfx_hilog_native:libhilog", "multimodalinput_base:libmmi-client", ] @@ -66,4 +67,3 @@ group("screen_client_test") { testonly = true deps = [ ":ScreenClientTest" ] } - -- Gitee