From f1059966ed01aecab6e3f25c5b9fd8abe07beb32 Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Wed, 24 May 2023 14:22:46 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HCodec=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghongran --- config.gni | 1 + services/BUILD.gn | 6 ++++++ test/BUILD.gn | 3 +++ 3 files changed, 10 insertions(+) diff --git a/config.gni b/config.gni index 70441b110..5df97c8fa 100644 --- a/config.gni +++ b/config.gni @@ -15,6 +15,7 @@ declare_args() { multimedia_av_codec_support_capi = true multimedia_av_codec_support_codec = true multimedia_av_codec_support_codeclist = true + multimedia_av_codec_support_hcodec = false multimedia_av_codec_support_demuxer = true multimedia_av_codec_support_source = true multimedia_av_codec_support_muxer = true diff --git a/services/BUILD.gn b/services/BUILD.gn index 2a6e9a619..1ba96e79f 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/multimedia/av_codec/config.gni") group("av_codec_services_package") { deps = [ @@ -19,4 +20,9 @@ group("av_codec_services_package") { "services:av_codec_service", "utils:av_codec_service_utils", ] + if (multimedia_av_codec_support_hcodec) { + deps + ["engine/codec/video/hcodec:hcodec] + } } + + diff --git a/test/BUILD.gn b/test/BUILD.gn index e21b17c52..1f4dbc764 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -39,5 +39,8 @@ group("av_codec_unit_test") { "unittest/format_test:avformat_capi_unit_test", "unittest/format_test:avformat_inner_unit_test", ] + if (multimedia_av_codec_support_hcodec) { + deps + ["unittest/hcodec_test:hcodec_unit_test] + } } } -- Gitee From 3c4c591d64d92739fc83a30032b2d4c8fc446d30 Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Wed, 24 May 2023 14:48:21 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HCodec=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghongran --- services/BUILD.gn | 2 +- test/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index 1ba96e79f..12f70b31f 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -21,7 +21,7 @@ group("av_codec_services_package") { "utils:av_codec_service_utils", ] if (multimedia_av_codec_support_hcodec) { - deps + ["engine/codec/video/hcodec:hcodec] + deps += ["engine/codec/video/hcodec:hcodec] } } diff --git a/test/BUILD.gn b/test/BUILD.gn index 1f4dbc764..05d101ff1 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -40,7 +40,7 @@ group("av_codec_unit_test") { "unittest/format_test:avformat_inner_unit_test", ] if (multimedia_av_codec_support_hcodec) { - deps + ["unittest/hcodec_test:hcodec_unit_test] + deps += ["unittest/hcodec_test:hcodec_unit_test] } } } -- Gitee From 1ae3de39964a17c9e36344559d70fd6dd07d7641 Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Wed, 24 May 2023 14:49:43 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HCodec=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghongran --- services/BUILD.gn | 2 +- test/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index 12f70b31f..c4f925b71 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -21,7 +21,7 @@ group("av_codec_services_package") { "utils:av_codec_service_utils", ] if (multimedia_av_codec_support_hcodec) { - deps += ["engine/codec/video/hcodec:hcodec] + deps += [ "engine/codec/video/hcodec:hcodec ] } } diff --git a/test/BUILD.gn b/test/BUILD.gn index 05d101ff1..53fe9455b 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -40,7 +40,7 @@ group("av_codec_unit_test") { "unittest/format_test:avformat_inner_unit_test", ] if (multimedia_av_codec_support_hcodec) { - deps += ["unittest/hcodec_test:hcodec_unit_test] + deps += [ "unittest/hcodec_test:hcodec_unit_test ] } } } -- Gitee From 02a53ea89a7dbae2b2582159fdd58b22b6cbb26e Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Wed, 24 May 2023 15:36:24 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HCodec=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghongran --- services/BUILD.gn | 2 +- test/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index c4f925b71..b453fd0da 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -21,7 +21,7 @@ group("av_codec_services_package") { "utils:av_codec_service_utils", ] if (multimedia_av_codec_support_hcodec) { - deps += [ "engine/codec/video/hcodec:hcodec ] + deps += [ "engine/codec/video/hcodec:hcodec" ] } } diff --git a/test/BUILD.gn b/test/BUILD.gn index 53fe9455b..ada177fc3 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -40,7 +40,7 @@ group("av_codec_unit_test") { "unittest/format_test:avformat_inner_unit_test", ] if (multimedia_av_codec_support_hcodec) { - deps += [ "unittest/hcodec_test:hcodec_unit_test ] + deps += [ "unittest/hcodec_test:hcodec_unit_test" ] } } } -- Gitee From 1ef69462ec73dcd81e33d39f72e8191a864a4764 Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Wed, 24 May 2023 15:58:20 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0HCodec=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghongran --- services/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index b453fd0da..756008474 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -24,5 +24,3 @@ group("av_codec_services_package") { deps += [ "engine/codec/video/hcodec:hcodec" ] } } - - -- Gitee