From 1c42867cf5caec68c70e058540001bc2f5ae2d6f Mon Sep 17 00:00:00 2001 From: sxzheng96 Date: Tue, 15 Mar 2022 15:30:46 +0800 Subject: [PATCH 1/2] fix distributed ,.... Signed-off-by: sxzheng96 --- bundle.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index c89001c4..39c456bf 100644 --- a/bundle.json +++ b/bundle.json @@ -1,3 +1,4 @@ +aaa { "name":"@ohos/distributed_screen", "description":"distributed hardware screen", @@ -84,4 +85,4 @@ ] } } -} \ No newline at end of file +} -- Gitee From bb907f1d859eb8f447ddcc2d3845846b37f7d36d Mon Sep 17 00:00:00 2001 From: sxzheng96 Date: Tue, 15 Mar 2022 16:18:04 +0800 Subject: [PATCH 2/2] fix distributed screen encoder&decoder problem Signed-off-by: sxzheng96 --- bundle.json | 1 - 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, 5 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index 39c456bf..0b60524f 100644 --- a/bundle.json +++ b/bundle.json @@ -1,4 +1,3 @@ -aaa { "name":"@ohos/distributed_screen", "description":"distributed hardware screen", 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..fa8200b8 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::VideoEncoderFactory::CreateByMime("video/avc"); } void ImageSinkProcessorTest::TearDown(void) {} -- Gitee