Rename histreamer to media_foundation

Signed-off-by: l30053383 <liyang782@huawei.com>
Change-Id: I94e52cd4137a872f650ebb13664f526dbb506d83
This commit is contained in:
l30053383 2023-12-28 18:54:27 +08:00
parent 8f8483f9de
commit c5e0fb5630
45 changed files with 64 additions and 64 deletions

View File

@ -56,7 +56,7 @@
"safwk",
"samgr",
"window_manager",
"histreamer",
"media_foundation",
"audio_framework"
],
"third_party": [

View File

@ -31,7 +31,7 @@ av_codec_sanitize = {
debug = false
}
av_codec_root_dir = "//foundation/multimedia/av_codec"
media_foundation_root_dir = "//foundation/multimedia/histreamer"
media_foundation_root_dir = "//foundation/multimedia/media_foundation"
audio_framework_root_dir = "//foundation/multimedia/audio_framework"
graphic_2d_root_dir = "//foundation/graphic/graphic_2d"
c_utils_root_dir = "//commonlibrary/c_utils"

View File

@ -322,7 +322,7 @@ ohos_shared_library("av_codec_client") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"samgr:samgr_proxy",
]

View File

@ -79,7 +79,7 @@ ohos_shared_library("native_media_avmuxer") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -100,7 +100,7 @@ ohos_shared_library("native_media_avdemuxer") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -121,7 +121,7 @@ ohos_shared_library("native_media_avsource") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -147,7 +147,7 @@ ohos_shared_library("native_media_codecbase") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -172,7 +172,7 @@ ohos_shared_library("native_media_audiocodec") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -194,7 +194,7 @@ ohos_shared_library("native_media_adec") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -216,7 +216,7 @@ ohos_shared_library("native_media_aenc") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -239,7 +239,7 @@ ohos_shared_library("native_media_vdec") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"
@ -262,7 +262,7 @@ ohos_shared_library("native_media_venc") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
output_extension = "so"
subsystem_name = "multimedia"

View File

@ -71,7 +71,7 @@ ohos_shared_library("av_codec_service_dfx") {
"hicollie:libhicollie",
"hidumper:lib_dump_usage",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
"init:libbegetutil",

View File

@ -63,7 +63,7 @@ ohos_static_library("av_codec_codec_base") {
external_deps = [
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
]

View File

@ -101,7 +101,7 @@ ohos_static_library("av_codec_audio_ffmpeg_codec") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
]

View File

@ -57,7 +57,7 @@ ohos_static_library("av_codec_video_ffmpeg_codec") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
]

View File

@ -74,7 +74,7 @@ ohos_shared_library("hcodec") {
"graphic_2d:sync_fence",
"hdf_core:libhdi",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"init:libbegetutil",
"ipc:ipc_core",
]

View File

@ -52,7 +52,7 @@ ohos_static_library("av_codec_engine_common") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
]

View File

@ -43,7 +43,7 @@ ohos_shared_library("av_codec_plugin_FFmpegDemuxer") {
external_deps = [
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
relative_install_dir = "media/av_codec_plugins"

View File

@ -46,7 +46,7 @@ ohos_shared_library("av_codec_plugin_FFmpegMuxer") {
external_deps = [
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
relative_install_dir = "media/av_codec_plugins"

View File

@ -85,7 +85,7 @@ ohos_shared_library("av_codec_media_engine_filters") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -91,7 +91,7 @@ ohos_shared_library("av_codec_media_engine_modules") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -74,7 +74,7 @@ ohos_shared_library("media_plugin_FFmpegMuxer") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
relative_install_dir = "media/media_plugins"
@ -110,7 +110,7 @@ ohos_shared_library("media_plugin_FFmpegDemuxer") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
relative_install_dir = "media/media_plugins"

View File

@ -85,7 +85,7 @@ ohos_shared_library("media_plugin_FFmpegAudioDecoders") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -64,7 +64,7 @@ ohos_shared_library("media_plugin_G711muAudioDecoder") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
relative_install_dir = "media/media_plugins"

View File

@ -77,7 +77,7 @@ ohos_shared_library("media_plugin_FFmpegAudioEncoders") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -64,7 +64,7 @@ ohos_shared_library("media_plugin_G711muAudioEncoder") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
relative_install_dir = "media/media_plugins"

View File

@ -71,7 +71,7 @@ ohos_shared_library("media_plugin_AudioServerSink") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -67,7 +67,7 @@ ohos_shared_library("media_plugin_FileFdSource") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -76,7 +76,7 @@ ohos_shared_library("media_plugin_HttpSource") {
"c_utils:utils",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -155,7 +155,7 @@ ohos_shared_library("av_codec_service") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_single",
"safwk:system_ability_fwk",
]

View File

@ -32,7 +32,7 @@ ohos_fuzztest("DemuxerFuzzTest") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -48,7 +48,7 @@ ohos_fuzztest("EncoderConfigureFuzzTest") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -47,7 +47,7 @@ ohos_fuzztest("EncoderSetParameterFuzzTest") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -48,7 +48,7 @@ ohos_fuzztest("SwdecoderConfigureFuzzTest") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -47,7 +47,7 @@ ohos_fuzztest("SwdecoderResourceFuzzTest") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -47,7 +47,7 @@ ohos_fuzztest("SwdecoderSetParameterFuzzTest") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -83,7 +83,7 @@ ohos_unittest("audio_decoder_module_test") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
]

View File

@ -83,7 +83,7 @@ ohos_unittest("audio_encoder_module_test") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
]

View File

@ -68,7 +68,7 @@ ohos_unittest("demuxer_native_module_test") {
"c_utils:utils",
"graphic_2d:librender_service_client",
"graphic_2d:surface",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"window_manager:libwm",
]

View File

@ -79,7 +79,7 @@ ohos_unittest("encoder_native_module_test") {
"graphic_2d:librender_service_client",
"graphic_2d:surface",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -83,7 +83,7 @@ ohos_unittest("hwdecoder_native_module_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -83,7 +83,7 @@ ohos_unittest("swdecoder_native_module_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -110,7 +110,7 @@ ohos_executable("av_codec_demo") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
"window_manager:libwm",
]

View File

@ -76,7 +76,7 @@ ohos_static_library("av_codec_demo_muxer") {
"c_utils:utils",
"graphic_2d:surface",
"graphic_2d:sync_fence",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
subsystem_name = "multimedia"

View File

@ -273,7 +273,7 @@ ohos_unittest("av_audio_encoder_avbuffer_capi_unit_test") {
external_deps = [
"graphic_2d:surface",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =
@ -315,7 +315,7 @@ ohos_unittest("av_audio_decoder_avbuffer_capi_unit_test") {
external_deps = [
"graphic_2d:surface",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =

View File

@ -80,7 +80,7 @@ ohos_unittest("avsource_capi_unit_test") {
"av_codec:av_codec_client",
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =
@ -130,7 +130,7 @@ ohos_unittest("avsource_inner_unit_test") {
"av_codec:av_codec_client",
"c_utils:utils",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =

View File

@ -67,7 +67,7 @@ ohos_unittest("codeclist_capi_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =
@ -103,7 +103,7 @@ ohos_unittest("codeclist_inner_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =

View File

@ -84,7 +84,7 @@ ohos_static_library("av_codec_capi_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
"init:libbegetutil",
@ -161,7 +161,7 @@ ohos_source_set("av_codec_inner_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
"init:libbegetutil",

View File

@ -38,7 +38,7 @@ ohos_executable("hcodec_demo") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"window_manager:libwm",
]
}

View File

@ -50,7 +50,7 @@ ohos_static_library("hcodec_test_helper") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"window_manager:libwm",
]
}

View File

@ -22,8 +22,8 @@
#include <memory>
#include "surface.h"
#include "wm/window.h" // foundation/window/window_manager/interfaces/innerkits/
#include "native_avbuffer.h" // foundation/multimedia/histreamer/interface/kits/c
#include "buffer/avbuffer.h" // foundation/multimedia/histreamer/interface/inner_api
#include "native_avbuffer.h" // foundation/multimedia/media_foundation/interface/kits/c
#include "buffer/avbuffer.h" // foundation/multimedia/media_foundation/interface/inner_api
#include "native_avcodec_base.h" // foundation/multimedia/av_codec/interfaces/kits/c/
#include "command_parser.h"
#include "start_code_detector.h"

View File

@ -47,7 +47,7 @@ ohos_unittest("hdecoder_unit_test") {
"graphic_2d:surface",
"hdf_core:libhdi",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
}
@ -66,7 +66,7 @@ ohos_unittest("hencoder_unit_test") {
"graphic_2d:surface",
"hdf_core:libhdi",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
}
@ -82,7 +82,7 @@ ohos_unittest("hcodec_list_unit_test") {
"graphic_2d:surface",
"hdf_core:libhdi",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"ipc:ipc_core",
]
}
@ -101,7 +101,7 @@ ohos_unittest("hencoder_buffer_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"init:libbegetutil",
"window_manager:libwm",
]
@ -124,7 +124,7 @@ ohos_unittest("hdecoder_buffer_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
"window_manager:libwm",
]
@ -143,6 +143,6 @@ ohos_unittest("hcodec_type_converter_unit_test") {
"graphic_2d:surface",
"graphic_2d:sync_fence",
"hilog:libhilog",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
}