【修改说明】gn规范修改

1、av_codec_root_dir全部换成小写的;
2、av_codec_root_dir全局变量移动到了config.gni;
3、删除没有头文件的include_dirs路径

Signed-off-by: linziming <linziming2@huawei.com>
This commit is contained in:
linziming 2023-04-26 18:28:21 +08:00
parent b863df0b3e
commit 00d649dc89
10 changed files with 255 additions and 338 deletions

View File

@ -21,6 +21,7 @@ declare_args() {
multimedia_av_codec_support_test = true
}
av_codec_root_dir = "//foundation/multimedia/av_codec"
av_codec_defines = []
if (multimedia_av_codec_support_capi) {

View File

@ -14,114 +14,89 @@
import("//build/ohos.gni")
import("//foundation/multimedia/av_codec/config.gni")
AV_CODEC_ROOT_DIR = "//foundation/multimedia/av_codec"
config("av_codec_packege_include") {
include_dirs = [
"//foundation/multimedia/av_codec/",
"//foundation/multimedia/av_codec/frameworks/",
"//foundation/multimedia/av_codec/frameworks/native/",
"//foundation/multimedia/av_codec/frameworks/native/avcodec/",
"//foundation/multimedia/av_codec/frameworks/native/avcodeclist/",
"//foundation/multimedia/av_codec/frameworks/native/avdemuxer/",
"//foundation/multimedia/av_codec/frameworks/native/avmuxer/",
"//foundation/multimedia/av_codec/frameworks/native/avsource/",
"//foundation/multimedia/av_codec/frameworks/native/capi/",
"//foundation/multimedia/av_codec/frameworks/native/capi/avcodec",
"//foundation/multimedia/av_codec/frameworks/native/capi/avdemuxer",
"//foundation/multimedia/av_codec/frameworks/native/capi/avmuxer",
"//foundation/multimedia/av_codec/frameworks/native/capi/common",
"//foundation/multimedia/av_codec/frameworks/native/common",
"//foundation/multimedia/av_codec/interfaces/",
"//foundation/multimedia/av_codec/interfaces/inner_api/",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/interfaces/kits/",
"//foundation/multimedia/av_codec/interfaces/kits/c/",
"//foundation/multimedia/av_codec/interfaces/kits/c/avmuxer/",
"//foundation/multimedia/av_codec/services/",
"//foundation/multimedia/av_codec/services/dfx/",
"//foundation/multimedia/av_codec/services/dfx/include/",
"//foundation/multimedia/av_codec/services/engine/",
"//foundation/multimedia/av_codec/services/engine/avcodeclist",
"//foundation/multimedia/av_codec/services/engine/plugin/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/demuxer/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/demuxer/ffmpeg_demuxer/",
"//foundation/multimedia/av_codec/services/include/",
"//foundation/multimedia/av_codec/services/services/",
"//foundation/multimedia/av_codec/services/services/avcodeclist/",
"//foundation/multimedia/av_codec/services/services/avcodeclist/client",
"//foundation/multimedia/av_codec/services/services/avcodeclist/ipc",
"//foundation/multimedia/av_codec/services/services/avcodeclist/server",
"//foundation/multimedia/av_codec/services/services/codec/",
"//foundation/multimedia/av_codec/services/services/codec/client",
"//foundation/multimedia/av_codec/services/services/codec/ipc",
"//foundation/multimedia/av_codec/services/services/codec/server",
"$av_codec_root_dir/frameworks/native/avcodec/",
"$av_codec_root_dir/frameworks/native/avcodeclist/",
"$av_codec_root_dir/frameworks/native/avdemuxer/",
"$av_codec_root_dir/frameworks/native/avmuxer/",
"$av_codec_root_dir/frameworks/native/avsource/",
"$av_codec_root_dir/frameworks/native/capi/common/",
"$av_codec_root_dir/interfaces/inner_api/native/",
"$av_codec_root_dir/interfaces/kits/c/",
"$av_codec_root_dir/services/dfx/include/",
"$av_codec_root_dir/services/engine/avcodeclist/",
"$av_codec_root_dir/services/engine/base/include/",
"$av_codec_root_dir/services/engine/muxer/",
"$av_codec_root_dir/services/engine/plugin/core/",
"$av_codec_root_dir/services/engine/plugin/interface/",
"$av_codec_root_dir/services/engine/plugin/plugins/demuxer/ffmpeg_demuxer/",
"$av_codec_root_dir/services/engine/plugin/plugins/muxer/ffmpeg_muxer/",
"$av_codec_root_dir/services/include/",
"$av_codec_root_dir/services/services/avcodeclist/client/",
"$av_codec_root_dir/services/services/avcodeclist/ipc/",
"$av_codec_root_dir/services/services/avcodeclist/server/",
"$av_codec_root_dir/services/services/codec/client/",
"$av_codec_root_dir/services/services/codec/ipc/",
"$av_codec_root_dir/services/services/codec/server/",
"$av_codec_root_dir/services/services/common/",
"$av_codec_root_dir/services/services/demuxer/client/include/",
"$av_codec_root_dir/services/services/demuxer/ipc/include/",
"$av_codec_root_dir/services/services/demuxer/server/include/",
"$av_codec_root_dir/services/services/factory/",
"$av_codec_root_dir/services/services/muxer/client/",
"$av_codec_root_dir/services/services/muxer/ipc/",
"$av_codec_root_dir/services/services/muxer/server/",
"$av_codec_root_dir/services/services/sa_avcodec/client/",
"$av_codec_root_dir/services/services/sa_avcodec/ipc/",
"$av_codec_root_dir/services/services/sa_avcodec/server/include/",
"$av_codec_root_dir/services/services/source/client/",
"$av_codec_root_dir/services/services/source/ipc/",
"$av_codec_root_dir/services/services/source/server/",
"$av_codec_root_dir/services/utils/include/",
# "//foundation/multimedia/av_codec/services/services/codecbase/",
# "//foundation/multimedia/av_codec/services/services/codecbase/server/",
# "//foundation/multimedia/av_codec/services/services/codecbase/server/include/",
"//foundation/multimedia/av_codec/services/engine/base/",
"//foundation/multimedia/av_codec/services/engine/base/include/",
"//foundation/multimedia/av_codec/services/services/common/",
"//foundation/multimedia/av_codec/services/services/demuxer/",
"//foundation/multimedia/av_codec/services/services/demuxer/client/",
"//foundation/multimedia/av_codec/services/services/demuxer/ipc/",
"//foundation/multimedia/av_codec/services/services/demuxer/server/",
"//foundation/multimedia/av_codec/services/services/muxer/",
"//foundation/multimedia/av_codec/services/services/muxer/client/include",
"//foundation/multimedia/av_codec/services/services/muxer/ipc/include",
"//foundation/multimedia/av_codec/services/services/muxer/server/include",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/client/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/ipc/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/server/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/server/include/",
"//foundation/multimedia/av_codec/services/services/source/",
"//foundation/multimedia/av_codec/services/services/source/client/",
"//foundation/multimedia/av_codec/services/services/source/ipc/",
"//foundation/multimedia/av_codec/services/services/source/server/",
# "//foundation/multimedia/av_codec/services/services/sourcebase/",
# "//foundation/multimedia/av_codec/services/services/sourcebase/server/",
# "//foundation/multimedia/av_codec/services/services/sourcebase/server/include/",
"//foundation/multimedia/av_codec/services/utils/",
"//foundation/multimedia/av_codec/services/utils/include/",
]
}
config("av_codec_client_local_config") {
include_dirs = [
"$AV_CODEC_ROOT_DIR/services/services/factory",
"$AV_CODEC_ROOT_DIR/services/engine/muxer",
"$AV_CODEC_ROOT_DIR/services/engine/factory",
"$AV_CODEC_ROOT_DIR/services/engine/muxer",
"$AV_CODEC_ROOT_DIR/services/engine/plugin/common",
"$AV_CODEC_ROOT_DIR/services/engine/plugin/core",
"$AV_CODEC_ROOT_DIR/services/engine/plugin/interface",
"$av_codec_root_dir/services/services/factory",
"$av_codec_root_dir/services/engine/muxer",
"$av_codec_root_dir/services/engine/factory",
"$av_codec_root_dir/services/engine/muxer",
"$av_codec_root_dir/services/engine/plugin/common",
"$av_codec_root_dir/services/engine/plugin/core",
"$av_codec_root_dir/services/engine/plugin/interface",
]
}
config("av_codec_client_ipc_config") {
include_dirs = [
"$AV_CODEC_ROOT_DIR/services/services/sa_avcodec/client",
"$AV_CODEC_ROOT_DIR/services/services/sa_avcodec/ipc",
"$AV_CODEC_ROOT_DIR/services/services/common",
"$AV_CODEC_ROOT_DIR/services/services/muxer/client",
"$AV_CODEC_ROOT_DIR/services/services/muxer/ipc",
"$av_codec_root_dir/services/services/sa_avcodec/client",
"$av_codec_root_dir/services/services/sa_avcodec/ipc",
"$av_codec_root_dir/services/services/common",
"$av_codec_root_dir/services/services/muxer/client",
"$av_codec_root_dir/services/services/muxer/ipc",
]
}
config("av_codec_client_public_config") {
include_dirs = [
"$AV_CODEC_ROOT_DIR/frameworks/native/avcodec",
"$AV_CODEC_ROOT_DIR/frameworks/native/avdemuxer",
"$AV_CODEC_ROOT_DIR/frameworks/native/avmuxer",
"$AV_CODEC_ROOT_DIR/frameworks/native/avsource",
"$AV_CODEC_ROOT_DIR/interfaces/inner_api/native",
"$AV_CODEC_ROOT_DIR/interfaces/kits/c",
"$AV_CODEC_ROOT_DIR/services/utils",
"$AV_CODEC_ROOT_DIR/services/include",
"$AV_CODEC_ROOT_DIR/services/dfx/include",
"$AV_CODEC_ROOT_DIR/services/utils/include",
"$av_codec_root_dir/frameworks/native/avcodec",
"$av_codec_root_dir/frameworks/native/avdemuxer",
"$av_codec_root_dir/frameworks/native/avmuxer",
"$av_codec_root_dir/frameworks/native/avsource",
"$av_codec_root_dir/interfaces/inner_api/native",
"$av_codec_root_dir/interfaces/kits/c",
"$av_codec_root_dir/services/utils",
"$av_codec_root_dir/services/include",
"$av_codec_root_dir/services/dfx/include",
"$av_codec_root_dir/services/utils/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//utils/system/safwk/native/include",
"//third_party/bounds_checking_function/include",
@ -180,54 +155,54 @@ ohos_shared_library("av_codec_client") {
]
sources = [
# "$AV_CODEC_ROOT_DIR/frameworks/native/avsource/avsource_impl.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/common/avcodec_errors.cpp",
"$AV_CODEC_ROOT_DIR/services/services/common/avsharedmemory_ipc.cpp",
"$AV_CODEC_ROOT_DIR/services/services/sa_avcodec/client/avcodec_client.cpp",
"$AV_CODEC_ROOT_DIR/services/services/sa_avcodec/ipc/avcodec_listener_stub.cpp",
"$AV_CODEC_ROOT_DIR/services/services/sa_avcodec/ipc/avcodec_parcel.cpp",
"$AV_CODEC_ROOT_DIR/services/services/sa_avcodec/ipc/avcodec_service_proxy.cpp",
# "$av_codec_root_dir/frameworks/native/avsource/avsource_impl.cpp",
"$av_codec_root_dir/frameworks/native/common/avcodec_errors.cpp",
"$av_codec_root_dir/services/services/common/avsharedmemory_ipc.cpp",
"$av_codec_root_dir/services/services/sa_avcodec/client/avcodec_client.cpp",
"$av_codec_root_dir/services/services/sa_avcodec/ipc/avcodec_listener_stub.cpp",
"$av_codec_root_dir/services/services/sa_avcodec/ipc/avcodec_parcel.cpp",
"$av_codec_root_dir/services/services/sa_avcodec/ipc/avcodec_service_proxy.cpp",
]
if (multimedia_av_codec_support_codec) {
sources += [
"$AV_CODEC_ROOT_DIR/frameworks/native/avcodec/avcodec_audio_decoder_impl.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/avcodec/avcodec_audio_encoder_impl.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/avcodec/avcodec_video_decoder_impl.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/avcodec/avcodec_video_encoder_impl.cpp",
"$AV_CODEC_ROOT_DIR/services/services/codec/client/codec_client.cpp",
"$AV_CODEC_ROOT_DIR/services/services/codec/ipc/codec_listener_stub.cpp",
"$AV_CODEC_ROOT_DIR/services/services/codec/ipc/codec_service_proxy.cpp",
"$av_codec_root_dir/frameworks/native/avcodec/avcodec_audio_decoder_impl.cpp",
"$av_codec_root_dir/frameworks/native/avcodec/avcodec_audio_encoder_impl.cpp",
"$av_codec_root_dir/frameworks/native/avcodec/avcodec_video_decoder_impl.cpp",
"$av_codec_root_dir/frameworks/native/avcodec/avcodec_video_encoder_impl.cpp",
"$av_codec_root_dir/services/services/codec/client/codec_client.cpp",
"$av_codec_root_dir/services/services/codec/ipc/codec_listener_stub.cpp",
"$av_codec_root_dir/services/services/codec/ipc/codec_service_proxy.cpp",
]
}
if (multimedia_av_codec_support_codeclist) {
sources += [
"$AV_CODEC_ROOT_DIR/frameworks/native/avcodeclist/avcodeclist_impl.cpp",
"$AV_CODEC_ROOT_DIR/services/services/avcodeclist/client/avcodeclist_client.cpp",
"$AV_CODEC_ROOT_DIR/services/services/avcodeclist/ipc/avcodeclist_service_proxy.cpp",
"$av_codec_root_dir/frameworks/native/avcodeclist/avcodeclist_impl.cpp",
"$av_codec_root_dir/services/services/avcodeclist/client/avcodeclist_client.cpp",
"$av_codec_root_dir/services/services/avcodeclist/ipc/avcodeclist_service_proxy.cpp",
]
}
if (multimedia_av_codec_support_demuxer) {
sources += [
# "$AV_CODEC_ROOT_DIR/frameworks/native/avdemuxer/avdemuxer_impl.cpp",
# "$av_codec_root_dir/frameworks/native/avdemuxer/avdemuxer_impl.cpp",
]
}
if (multimedia_av_codec_support_muxer) {
sources += [
"$AV_CODEC_ROOT_DIR/frameworks/native/avmuxer/avmuxer_impl.cpp",
"$AV_CODEC_ROOT_DIR/services/services/muxer/client/muxer_client.cpp",
"$AV_CODEC_ROOT_DIR/services/services/muxer/ipc/muxer_service_proxy.cpp",
"$av_codec_root_dir/frameworks/native/avmuxer/avmuxer_impl.cpp",
"$av_codec_root_dir/services/services/muxer/client/muxer_client.cpp",
"$av_codec_root_dir/services/services/muxer/ipc/muxer_service_proxy.cpp",
]
}
deps = [
"$AV_CODEC_ROOT_DIR/services/utils:av_codec_format",
"$av_codec_root_dir/services/utils:av_codec_format",
"//third_party/bounds_checking_function:libsec_static",
"$AV_CODEC_ROOT_DIR/services/dfx:av_codec_service_dfx",
"$av_codec_root_dir/services/dfx:av_codec_service_dfx",
]
if (multimedia_av_codec_support_codeclist) {
deps += [
"$AV_CODEC_ROOT_DIR/services/engine:av_codec_engine_package",
"$av_codec_root_dir/services/engine:av_codec_engine_package",
]
}

View File

@ -14,98 +14,70 @@
import("//build/ohos.gni")
import("//foundation/multimedia/av_codec/config.gni")
AV_CODEC_ROOT_DIR = "//foundation/multimedia/av_codec"
group("capi_packages") {
deps = []
if (multimedia_av_codec_support_capi) {
deps += [
"//foundation/multimedia/av_codec/interfaces/kits/c:native_av_codec_core",
"//foundation/multimedia/av_codec/interfaces/kits/c:native_av_codec_codec",
"//foundation/multimedia/av_codec/interfaces/kits/c:native_av_codec_avmuxer",
"$av_codec_root_dir/interfaces/kits/c:native_av_codec_core",
"$av_codec_root_dir/interfaces/kits/c:native_av_codec_codec",
"$av_codec_root_dir/interfaces/kits/c:native_av_codec_avmuxer",
]
}
}
config("av_codec_capi_config") {
# include_dirs = [
# "$AV_CODEC_ROOT_DIR/interfaces/inner_api/native",
# "$AV_CODEC_ROOT_DIR/interfaces/kits/c",
# "$AV_CODEC_ROOT_DIR/frameworks/native/capi/avmuxer",
# "$AV_CODEC_ROOT_DIR/frameworks/native/capi/common",
# "$AV_CODEC_ROOT_DIR/services/utils",
# "$AV_CODEC_ROOT_DIR/services/dfx/include",
# "$av_codec_root_dir/interfaces/inner_api/native",
# "$av_codec_root_dir/interfaces/kits/c",
# "$av_codec_root_dir/frameworks/native/capi/avmuxer",
# "$av_codec_root_dir/frameworks/native/capi/common",
# "$av_codec_root_dir/services/utils",
# "$av_codec_root_dir/services/dfx/include",
# "foundation/multimedia/av_codec/interfaces/kits/c",
# ]
include_dirs = [
"//foundation/multimedia/av_codec/",
"//foundation/multimedia/av_codec/frameworks/",
"//foundation/multimedia/av_codec/frameworks/native/",
"//foundation/multimedia/av_codec/frameworks/native/avcodec/",
"//foundation/multimedia/av_codec/frameworks/native/avcodeclist/",
"//foundation/multimedia/av_codec/frameworks/native/avdemuxer/",
"//foundation/multimedia/av_codec/frameworks/native/avmuxer/",
"//foundation/multimedia/av_codec/frameworks/native/avsource/",
"//foundation/multimedia/av_codec/frameworks/native/capi/",
"//foundation/multimedia/av_codec/frameworks/native/capi/avcodec",
"//foundation/multimedia/av_codec/frameworks/native/capi/avdemuxer",
"//foundation/multimedia/av_codec/frameworks/native/capi/avmuxer",
"//foundation/multimedia/av_codec/frameworks/native/capi/common",
"//foundation/multimedia/av_codec/frameworks/native/common",
"//foundation/multimedia/av_codec/interfaces/",
"//foundation/multimedia/av_codec/interfaces/inner_api/",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/interfaces/kits/",
"//foundation/multimedia/av_codec/interfaces/kits/c/",
"//foundation/multimedia/av_codec/interfaces/kits/c/avmuxer/",
"//foundation/multimedia/av_codec/services/",
"//foundation/multimedia/av_codec/services/dfx/",
"//foundation/multimedia/av_codec/services/dfx/include/",
"//foundation/multimedia/av_codec/services/engine/",
"//foundation/multimedia/av_codec/services/engine/avcodeclist",
"//foundation/multimedia/av_codec/services/engine/plugin/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/demuxer/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/demuxer/ffmpeg_demuxer/",
"//foundation/multimedia/av_codec/services/include/",
"//foundation/multimedia/av_codec/services/services/",
"//foundation/multimedia/av_codec/services/services/avcodeclist/",
"//foundation/multimedia/av_codec/services/services/avcodeclist/client",
"//foundation/multimedia/av_codec/services/services/avcodeclist/ipc",
"//foundation/multimedia/av_codec/services/services/avcodeclist/server",
"//foundation/multimedia/av_codec/services/services/codec/",
"//foundation/multimedia/av_codec/services/services/codec/client",
"//foundation/multimedia/av_codec/services/services/codec/ipc",
"//foundation/multimedia/av_codec/services/services/codec/server",
# "//foundation/multimedia/av_codec/services/services/codecbase/",
# "//foundation/multimedia/av_codec/services/services/codecbase/server/",
# "//foundation/multimedia/av_codec/services/services/codecbase/server/include/",
"//foundation/multimedia/av_codec/services/engine/base/",
"//foundation/multimedia/av_codec/services/engine/base/include/",
"//foundation/multimedia/av_codec/services/services/common/",
"//foundation/multimedia/av_codec/services/services/demuxer/",
"//foundation/multimedia/av_codec/services/services/demuxer/client/",
"//foundation/multimedia/av_codec/services/services/demuxer/ipc/",
"//foundation/multimedia/av_codec/services/services/demuxer/server/",
"//foundation/multimedia/av_codec/services/services/muxer/",
"//foundation/multimedia/av_codec/services/services/muxer/client/",
"//foundation/multimedia/av_codec/services/services/muxer/ipc/",
"//foundation/multimedia/av_codec/services/services/muxer/server/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/client/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/ipc/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/server/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/server/include/",
"//foundation/multimedia/av_codec/services/services/source/",
"//foundation/multimedia/av_codec/services/services/source/client/",
"//foundation/multimedia/av_codec/services/services/source/ipc/",
"//foundation/multimedia/av_codec/services/services/source/server/",
"//foundation/multimedia/av_codec/services/services/sourcebase/",
"//foundation/multimedia/av_codec/services/services/sourcebase/server/",
"//foundation/multimedia/av_codec/services/services/sourcebase/server/include/",
"//foundation/multimedia/av_codec/services/utils/",
"//foundation/multimedia/av_codec/services/utils/include/",
"$av_codec_root_dir/frameworks/native/avcodec/",
"$av_codec_root_dir/frameworks/native/avcodeclist/",
"$av_codec_root_dir/frameworks/native/avdemuxer/",
"$av_codec_root_dir/frameworks/native/avmuxer/",
"$av_codec_root_dir/frameworks/native/avsource/",
"$av_codec_root_dir/frameworks/native/capi/common/",
"$av_codec_root_dir/interfaces/inner_api/native/",
"$av_codec_root_dir/interfaces/kits/c/",
"$av_codec_root_dir/services/dfx/include/",
"$av_codec_root_dir/services/engine/avcodeclist/",
"$av_codec_root_dir/services/engine/base/include/",
"$av_codec_root_dir/services/engine/muxer/",
"$av_codec_root_dir/services/engine/plugin/core/",
"$av_codec_root_dir/services/engine/plugin/interface/",
"$av_codec_root_dir/services/engine/plugin/plugins/demuxer/ffmpeg_demuxer/",
"$av_codec_root_dir/services/engine/plugin/plugins/muxer/ffmpeg_muxer/",
"$av_codec_root_dir/services/include/",
"$av_codec_root_dir/services/services/avcodeclist/client/",
"$av_codec_root_dir/services/services/avcodeclist/ipc/",
"$av_codec_root_dir/services/services/avcodeclist/server/",
"$av_codec_root_dir/services/services/codec/client/",
"$av_codec_root_dir/services/services/codec/ipc/",
"$av_codec_root_dir/services/services/codec/server/",
"$av_codec_root_dir/services/services/common/",
"$av_codec_root_dir/services/services/demuxer/client/include/",
"$av_codec_root_dir/services/services/demuxer/ipc/include/",
"$av_codec_root_dir/services/services/demuxer/server/include/",
"$av_codec_root_dir/services/services/factory/",
"$av_codec_root_dir/services/services/muxer/client/",
"$av_codec_root_dir/services/services/muxer/ipc/",
"$av_codec_root_dir/services/services/muxer/server/",
"$av_codec_root_dir/services/services/sa_avcodec/client/",
"$av_codec_root_dir/services/services/sa_avcodec/ipc/",
"$av_codec_root_dir/services/services/sa_avcodec/server/include/",
"$av_codec_root_dir/services/services/source/client/",
"$av_codec_root_dir/services/services/source/ipc/",
"$av_codec_root_dir/services/services/source/server/",
"$av_codec_root_dir/services/utils/include/",
# "$av_codec_root_dir/services/services/codecbase/",
# "$av_codec_root_dir/services/services/codecbase/server/",
# "$av_codec_root_dir/services/services/codecbase/server/include/",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
]
@ -142,19 +114,19 @@ ohos_shared_library("native_av_codec_core") {
configs = [ ":av_codec_capi_config" ]
sources = [
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/common/native_avformat.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/common/native_avmemory.cpp",
"$av_codec_root_dir/frameworks/native/capi/common/native_avformat.cpp",
"$av_codec_root_dir/frameworks/native/capi/common/native_avmemory.cpp",
]
if (multimedia_av_codec_support_codeclist) {
sources += [
# "$AV_CODEC_ROOT_DIR/frameworks/native/capi/common/native_avcapability.cpp",
# "$av_codec_root_dir/frameworks/native/capi/common/native_avcapability.cpp",
]
}
deps = [
"//foundation/multimedia/av_codec/interfaces/inner_api/native:av_codec_client",
"//foundation/multimedia/av_codec/services/utils:av_codec_format",
"$av_codec_root_dir/interfaces/inner_api/native:av_codec_client",
"$av_codec_root_dir/services/utils:av_codec_format",
]
external_deps = [
@ -177,19 +149,19 @@ ohos_shared_library("native_av_codec_codec") {
}
sources = [
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avcodec/native_avcodec_base.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avcodec/native_audio_decoder.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avcodec/native_audio_encoder.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avcodec/native_video_decoder.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avcodec/native_video_encoder.cpp",
"$av_codec_root_dir/frameworks/native/capi/avcodec/native_avcodec_base.cpp",
"$av_codec_root_dir/frameworks/native/capi/avcodec/native_audio_decoder.cpp",
"$av_codec_root_dir/frameworks/native/capi/avcodec/native_audio_encoder.cpp",
"$av_codec_root_dir/frameworks/native/capi/avcodec/native_video_decoder.cpp",
"$av_codec_root_dir/frameworks/native/capi/avcodec/native_video_encoder.cpp",
]
configs = [ ":av_codec_capi_config" ]
deps = [
"//foundation/multimedia/av_codec/interfaces/inner_api/native:av_codec_client",
"//foundation/multimedia/av_codec/services/utils:av_codec_format",
"//foundation/multimedia/av_codec/interfaces/kits/c:native_av_codec_core",
"$av_codec_root_dir/interfaces/inner_api/native:av_codec_client",
"$av_codec_root_dir/services/utils:av_codec_format",
"$av_codec_root_dir/interfaces/kits/c:native_av_codec_core",
]
external_deps = [
@ -206,17 +178,17 @@ ohos_shared_library("native_av_codec_codec") {
ohos_shared_library("native_av_codec_avmuxer") {
install_enable = true
sources = [
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avcodec/native_avcodec_base.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/common/native_avformat.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/common/native_avmemory.cpp",
"$AV_CODEC_ROOT_DIR/frameworks/native/capi/avmuxer/native_avmuxer.cpp",
"$av_codec_root_dir/frameworks/native/capi/avcodec/native_avcodec_base.cpp",
"$av_codec_root_dir/frameworks/native/capi/common/native_avformat.cpp",
"$av_codec_root_dir/frameworks/native/capi/common/native_avmemory.cpp",
"$av_codec_root_dir/frameworks/native/capi/avmuxer/native_avmuxer.cpp",
]
public_configs = [ ":av_codec_capi_config" ]
deps = [
"//foundation/multimedia/av_codec/interfaces/inner_api/native:av_codec_client",
"//foundation/multimedia/av_codec/services/utils:av_codec_format",
"$av_codec_root_dir/interfaces/inner_api/native:av_codec_client",
"$av_codec_root_dir/services/utils:av_codec_format",
]
external_deps = [

View File

@ -16,7 +16,7 @@ import("//foundation/multimedia/av_codec/config.gni")
config("av_codec_service_log_dfx_public_config") {
cflags = [ "-DOHOS_AV_CODEC_LOG_DFX" ]
include_dirs = [ "//foundation/multimedia/av_codec/services/dfx/include" ]
include_dirs = [ "$av_codec_root_dir/services/dfx/include" ]
}
ohos_shared_library("av_codec_service_dfx") {
@ -37,8 +37,8 @@ ohos_shared_library("av_codec_service_dfx") {
include_dirs = [
"include",
"//commonlibrary/c_utils/base/include",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/interfaces/kits/c",
"$av_codec_root_dir/interfaces/inner_api/native",
"$av_codec_root_dir/interfaces/kits/c",
]
defines = []

View File

@ -1,4 +1,4 @@
# Copyright (C) 2021 Huawei Device Co., Ltd.
# Copyright (C) 2023 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

View File

@ -14,14 +14,15 @@
import("//build/ohos.gni")
import("//foundation/multimedia/av_codec/config.gni")
config("plugin_presets") {
include_dirs = [
"//foundation/multimedia/av_codec/interfaces/kits/c",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/services/dfx/include",
"//foundation/multimedia/av_codec/services/utils/include",
"//foundation/multimedia/av_codec/services/engine/plugin/core",
"//foundation/multimedia/av_codec/services/engine/plugin/interface",
"$av_codec_root_dir/interfaces/kits/c",
"$av_codec_root_dir/interfaces/inner_api/native",
"$av_codec_root_dir/services/dfx/include",
"$av_codec_root_dir/services/utils/include",
"$av_codec_root_dir/services/engine/plugin/core",
"$av_codec_root_dir/services/engine/plugin/interface",
"//third_party/bounds_checking_function/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]

View File

@ -31,12 +31,12 @@ ohos_shared_library("av_codec_plugin_FFmpegMuxer") {
]
public_configs = [
"//foundation/multimedia/av_codec/services/engine/plugin:plugin_presets",
"$av_codec_root_dir/services/engine/plugin:plugin_presets",
]
public_deps = [
"$av_codec_root_dir/services/utils:av_codec_format",
"//third_party/bounds_checking_function:libsec_static",
"//foundation/multimedia/av_codec/services/utils:av_codec_format",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//third_party/ffmpeg:libohosffmpeg",
]

View File

@ -14,8 +14,6 @@
import("//build/ohos.gni")
import("//foundation/multimedia/av_codec/config.gni")
AV_CODEC_ROOT_DIR = "//foundation/multimedia/av_codec"
config("av_codec_service_config") {
visibility = [ ":*" ]
@ -46,87 +44,57 @@ config("av_codec_service_config") {
# "avcodeclist/client",
# "codec/server/include",
# "source/server/include",
# "$AV_CODEC_ROOT_DIR/services/include",
# "$AV_CODEC_ROOT_DIR/services/services/codec",
# "$AV_CODEC_ROOT_DIR/services/services/source",
# "$AV_CODEC_ROOT_DIR/services/dfx/include",
# "$AV_CODEC_ROOT_DIR/services/engine/avcodeclist",
# "$AV_CODEC_ROOT_DIR/interfaces/inner_api/native",
# "$AV_CODEC_ROOT_DIR/interfaces/kits/c",
# "$av_codec_root_dir/services/include",
# "$av_codec_root_dir/services/services/codec",
# "$av_codec_root_dir/services/services/source",
# "$av_codec_root_dir/services/dfx/include",
# "$av_codec_root_dir/services/engine/avcodeclist",
# "$av_codec_root_dir/interfaces/inner_api/native",
# "$av_codec_root_dir/interfaces/kits/c",
# ]
include_dirs = [
"//foundation/multimedia/av_codec/",
"//foundation/multimedia/av_codec/frameworks/",
"//foundation/multimedia/av_codec/frameworks/native/",
"//foundation/multimedia/av_codec/frameworks/native/avcodec/",
"//foundation/multimedia/av_codec/frameworks/native/avcodeclist/",
"//foundation/multimedia/av_codec/frameworks/native/avdemuxer/",
"//foundation/multimedia/av_codec/frameworks/native/avmuxer/",
"//foundation/multimedia/av_codec/frameworks/native/avsource/",
"//foundation/multimedia/av_codec/frameworks/native/capi/",
"//foundation/multimedia/av_codec/frameworks/native/capi/avcodec",
"//foundation/multimedia/av_codec/frameworks/native/capi/avdemuxer",
"//foundation/multimedia/av_codec/frameworks/native/capi/avmuxer",
"//foundation/multimedia/av_codec/frameworks/native/capi/common",
"//foundation/multimedia/av_codec/frameworks/native/common",
"//foundation/multimedia/av_codec/interfaces/",
"//foundation/multimedia/av_codec/interfaces/inner_api/",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/interfaces/kits/",
"//foundation/multimedia/av_codec/interfaces/kits/c/",
"//foundation/multimedia/av_codec/interfaces/kits/c/avmuxer/",
"//foundation/multimedia/av_codec/services/",
"//foundation/multimedia/av_codec/services/dfx/",
"//foundation/multimedia/av_codec/services/dfx/include/",
"//foundation/multimedia/av_codec/services/engine/",
"//foundation/multimedia/av_codec/services/engine/avcodeclist",
"//foundation/multimedia/av_codec/services/engine/muxer",
"//foundation/multimedia/av_codec/services/engine/plugin/core",
"//foundation/multimedia/av_codec/services/engine/plugin/interface",
"//foundation/multimedia/av_codec/services/engine/plugin/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/demuxer/",
"//foundation/multimedia/av_codec/services/engine/plugin/plugins/demuxer/ffmpeg_demuxer/",
"//foundation/multimedia/av_codec/services/include/",
"//foundation/multimedia/av_codec/services/services/",
"//foundation/multimedia/av_codec/services/services/factory",
"//foundation/multimedia/av_codec/services/services/avcodeclist/",
"//foundation/multimedia/av_codec/services/services/avcodeclist/client",
"//foundation/multimedia/av_codec/services/services/avcodeclist/ipc",
"//foundation/multimedia/av_codec/services/services/avcodeclist/server",
"//foundation/multimedia/av_codec/services/services/codec/",
"//foundation/multimedia/av_codec/services/services/codec/client",
"//foundation/multimedia/av_codec/services/services/codec/ipc",
"//foundation/multimedia/av_codec/services/services/codec/server",
# "//foundation/multimedia/av_codec/services/services/codecbase/",
# "//foundation/multimedia/av_codec/services/services/codecbase/server/",
# "//foundation/multimedia/av_codec/services/services/codecbase/server/include/",
"//foundation/multimedia/av_codec/services/engine/base/",
"//foundation/multimedia/av_codec/services/engine/base/include/",
"//foundation/multimedia/av_codec/services/services/common/",
"//foundation/multimedia/av_codec/services/services/demuxer/",
"//foundation/multimedia/av_codec/services/services/demuxer/client/",
"//foundation/multimedia/av_codec/services/services/demuxer/ipc/",
"//foundation/multimedia/av_codec/services/services/demuxer/server/",
"//foundation/multimedia/av_codec/services/services/muxer/",
"//foundation/multimedia/av_codec/services/services/muxer/client",
"//foundation/multimedia/av_codec/services/services/muxer/ipc",
"//foundation/multimedia/av_codec/services/services/muxer/server",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/client/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/ipc/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/server/",
"//foundation/multimedia/av_codec/services/services/sa_avcodec/server/include/",
"//foundation/multimedia/av_codec/services/services/source/",
"//foundation/multimedia/av_codec/services/services/source/client/",
"//foundation/multimedia/av_codec/services/services/source/ipc/",
"//foundation/multimedia/av_codec/services/services/source/server/",
"//foundation/multimedia/av_codec/services/services/sourcebase/",
"//foundation/multimedia/av_codec/services/services/sourcebase/server/",
"//foundation/multimedia/av_codec/services/services/sourcebase/server/include/",
"//foundation/multimedia/av_codec/services/utils/",
"//foundation/multimedia/av_codec/services/utils/include/",
"$av_codec_root_dir/frameworks/native/avcodec/",
"$av_codec_root_dir/frameworks/native/avcodeclist/",
"$av_codec_root_dir/frameworks/native/avdemuxer/",
"$av_codec_root_dir/frameworks/native/avmuxer/",
"$av_codec_root_dir/frameworks/native/avsource/",
"$av_codec_root_dir/frameworks/native/capi/common/",
"$av_codec_root_dir/interfaces/inner_api/native/",
"$av_codec_root_dir/interfaces/kits/c/",
"$av_codec_root_dir/services/dfx/include/",
"$av_codec_root_dir/services/engine/avcodeclist/",
"$av_codec_root_dir/services/engine/base/include/",
"$av_codec_root_dir/services/engine/muxer/",
"$av_codec_root_dir/services/engine/plugin/core/",
"$av_codec_root_dir/services/engine/plugin/interface/",
"$av_codec_root_dir/services/engine/plugin/plugins/demuxer/ffmpeg_demuxer/",
"$av_codec_root_dir/services/engine/plugin/plugins/muxer/ffmpeg_muxer/",
"$av_codec_root_dir/services/include/",
"$av_codec_root_dir/services/services/avcodeclist/client/",
"$av_codec_root_dir/services/services/avcodeclist/ipc/",
"$av_codec_root_dir/services/services/avcodeclist/server/",
"$av_codec_root_dir/services/services/codec/client/",
"$av_codec_root_dir/services/services/codec/ipc/",
"$av_codec_root_dir/services/services/codec/server/",
"$av_codec_root_dir/services/services/common/",
"$av_codec_root_dir/services/services/demuxer/client/include/",
"$av_codec_root_dir/services/services/demuxer/ipc/include/",
"$av_codec_root_dir/services/services/demuxer/server/include/",
"$av_codec_root_dir/services/services/factory/",
"$av_codec_root_dir/services/services/muxer/client/",
"$av_codec_root_dir/services/services/muxer/ipc/",
"$av_codec_root_dir/services/services/muxer/server/",
"$av_codec_root_dir/services/services/sa_avcodec/client/",
"$av_codec_root_dir/services/services/sa_avcodec/ipc/",
"$av_codec_root_dir/services/services/sa_avcodec/server/include/",
"$av_codec_root_dir/services/services/source/client/",
"$av_codec_root_dir/services/services/source/ipc/",
"$av_codec_root_dir/services/services/source/server/",
"$av_codec_root_dir/services/utils/include/",
# "$av_codec_root_dir/services/services/codecbase/",
# "$av_codec_root_dir/services/services/codecbase/server/",
# "$av_codec_root_dir/services/services/codecbase/server/include/",
]
defines = []
@ -159,21 +127,21 @@ ohos_shared_library("av_codec_service") {
configs = [
":av_codec_service_config",
"$AV_CODEC_ROOT_DIR/services/dfx:av_codec_service_log_dfx_public_config",
"$av_codec_root_dir/services/dfx:av_codec_service_log_dfx_public_config",
]
sources = [
"$AV_CODEC_ROOT_DIR/frameworks/native/common/avcodec_errors.cpp",
"$av_codec_root_dir/frameworks/native/common/avcodec_errors.cpp",
"common/avsharedmemory_ipc.cpp",
"sa_avcodec/ipc/avcodec_listener_proxy.cpp",
"sa_avcodec/ipc/avcodec_parcel.cpp",
"sa_avcodec/ipc/avcodec_service_stub.cpp",
"sa_avcodec/server/avcodec_server.cpp",
"sa_avcodec/server/avcodec_server_manager.cpp",
"//foundation/multimedia/av_codec/services/engine/muxer/muxer_engine_impl.cpp",
"//foundation/multimedia/av_codec/services/engine/plugin/core/muxer_factory.cpp",
"//foundation/multimedia/av_codec/services/engine/plugin/core/muxer.cpp",
"//foundation/multimedia/av_codec/services/engine/plugin/core/plugin_loader.cpp",
"$av_codec_root_dir/services/engine/muxer/muxer_engine_impl.cpp",
"$av_codec_root_dir/services/engine/plugin/core/muxer_factory.cpp",
"$av_codec_root_dir/services/engine/plugin/core/muxer.cpp",
"$av_codec_root_dir/services/engine/plugin/core/plugin_loader.cpp",
]
@ -182,7 +150,7 @@ ohos_shared_library("av_codec_service") {
"codec/ipc/codec_listener_proxy.cpp",
"codec/ipc/codec_service_stub.cpp",
"codec/server/codec_server.cpp",
"$AV_CODEC_ROOT_DIR/services/engine/base/codecbase.cpp",
"$av_codec_root_dir/services/engine/base/codecbase.cpp",
]
}
if (multimedia_av_codec_support_codeclist) {
@ -200,10 +168,10 @@ ohos_shared_library("av_codec_service") {
deps = [
"$AV_CODEC_ROOT_DIR/services/dfx:av_codec_service_dfx",
"$AV_CODEC_ROOT_DIR/services/utils:av_codec_format",
"$AV_CODEC_ROOT_DIR/services/utils:av_codec_service_utils",
"$AV_CODEC_ROOT_DIR/services/engine:av_codec_engine_package",
"$av_codec_root_dir/services/dfx:av_codec_service_dfx",
"$av_codec_root_dir/services/utils:av_codec_format",
"$av_codec_root_dir/services/utils:av_codec_service_utils",
"$av_codec_root_dir/services/engine:av_codec_engine_package",
]
external_deps = [

View File

@ -18,16 +18,16 @@ ohos_static_library("av_codec_format") {
sources = [ "format.cpp" ]
include_dirs = [
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/interfaces/kits/c",
"//foundation/multimedia/av_codec/services/utils/include",
"//foundation/multimedia/av_codec/services/dfx/include",
"$av_codec_root_dir/interfaces/inner_api/native",
"$av_codec_root_dir/interfaces/kits/c",
"$av_codec_root_dir/services/utils/include",
"$av_codec_root_dir/services/dfx/include",
"//commonlibrary/c_utils/base/include",
]
defines = []
defines += av_codec_defines
deps = [ "//foundation/multimedia/av_codec/services/utils:av_codec_service_utils" ]
deps = [ "$av_codec_root_dir/services/utils:av_codec_service_utils" ]
external_deps = [
"c_utils:utils",
@ -49,10 +49,10 @@ ohos_shared_library("av_codec_service_utils") {
include_dirs = [
"//commonlibrary/c_utils/base/include",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/interfaces/kits/c",
"//foundation/multimedia/av_codec/services/utils/include",
"//foundation/multimedia/av_codec/services/dfx/include",
"$av_codec_root_dir/interfaces/inner_api/native",
"$av_codec_root_dir/interfaces/kits/c",
"$av_codec_root_dir/services/utils/include",
"$av_codec_root_dir/services/dfx/include",
]
sources = [

View File

@ -16,14 +16,14 @@ import("//foundation/multimedia/av_codec/config.gni")
ohos_executable("av_codec_demo") {
include_dirs = [
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer",
"//foundation/multimedia/av_codec/interfaces/kits/c",
"//foundation/multimedia/av_codec/interfaces/inner_api/native",
"//foundation/multimedia/av_codec/services/services/factory",
"//foundation/multimedia/av_codec/services/engine/plugin/core",
"//foundation/multimedia/av_codec/services/engine/plugin/interface",
"//foundation/multimedia/av_codec/services/dfx/include",
"//foundation/multimedia/av_codec/services/utils/include",
"$av_codec_root_dir/test/nativedemo/avmuxer",
"$av_codec_root_dir/interfaces/kits/c",
"$av_codec_root_dir/interfaces/inner_api/native",
"$av_codec_root_dir/services/services/factory",
"$av_codec_root_dir/services/engine/plugin/core",
"$av_codec_root_dir/services/engine/plugin/interface",
"$av_codec_root_dir/services/dfx/include",
"$av_codec_root_dir/services/utils/include",
"./av_codec_audio",
"./audio_demo",
"./include",
@ -55,24 +55,24 @@ ohos_executable("av_codec_demo") {
cflags_cc += ["-std=c++17"]
sources = [
"//foundation/multimedia/av_codec/test/nativedemo/av_codec_demo.cpp",
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer/avmuxer_demo_base.cpp",
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer/avmuxer_demo.cpp",
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer/avmuxer_engine_demo.cpp",
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer/avmuxer_ffmpeg_demo.cpp",
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer/avmuxer_demo_common.c",
"//foundation/multimedia/av_codec/test/nativedemo/avmuxer/native_avmuxer_demo.c",
"$av_codec_root_dir/test/nativedemo/av_codec_demo.cpp",
"$av_codec_root_dir/test/nativedemo/avmuxer/avmuxer_demo_base.cpp",
"$av_codec_root_dir/test/nativedemo/avmuxer/avmuxer_demo.cpp",
"$av_codec_root_dir/test/nativedemo/avmuxer/avmuxer_engine_demo.cpp",
"$av_codec_root_dir/test/nativedemo/avmuxer/avmuxer_ffmpeg_demo.cpp",
"$av_codec_root_dir/test/nativedemo/avmuxer/avmuxer_demo_common.c",
"$av_codec_root_dir/test/nativedemo/avmuxer/native_avmuxer_demo.c",
"./audio_demo/avcodec_audio_encoder_inner_demo.cpp",
"./audio_demo/avcodec_audio_decoder_demo.cpp",
"./audio_demo/avcodec_audio_encoder_demo.cpp"
]
deps = [
"//foundation/multimedia/av_codec/interfaces/kits/c:native_av_codec_avmuxer",
"//foundation/multimedia/av_codec/interfaces/inner_api/native:av_codec_client",
"//foundation/multimedia/av_codec/services/services:av_codec_service",
"//foundation/multimedia/av_codec/services/utils:av_codec_format",
"//foundation/multimedia/av_codec/interfaces/kits/c:capi_packages"
"$av_codec_root_dir/interfaces/kits/c:native_av_codec_avmuxer",
"$av_codec_root_dir/interfaces/inner_api/native:av_codec_client",
"$av_codec_root_dir/services/services:av_codec_service",
"$av_codec_root_dir/services/utils:av_codec_format",
"$av_codec_root_dir/interfaces/kits/c:capi_packages"
]
external_deps = [