openharmony/multimedia_av_codec
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_av_codec synced 2024-10-07 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cfi整改

Browse Source 
Signed-off-by: linziming <linziming2@huawei.com>
Change-Id: I2fe3f95a0b9d5c493964870ce5fae0ec3f2b8bb7
This commit is contained in:
linziming 2024-04-16 06:36:44 +00:00
parent b80ecf842b
commit 4a8009ddca
28 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfi_blocklist.txt
View File

@ -1,4 +0,0 @@
src:*services/engine/*
src:*frameworks/native/capi/*
src:*services/engine/codec/audio/encoder/*
src:*services/engine/plugin/core/hevc_parser_manager.cpp

3
config.gni
View File

@ -35,6 +35,9 @@ av_codec_sanitize = {
ubsan = true
debug = false
}
av_codec_test_sanitize = {
debug = false
}
av_codec_root_dir = "//foundation/multimedia/av_codec"
media_foundation_root_dir = "//foundation/multimedia/media_foundation"
audio_framework_root_dir = "//foundation/multimedia/audio_framework"

10
interfaces/inner_api/native/BUILD.gn
View File

@ -181,15 +181,7 @@ ohos_shared_library("av_codec_client") {
"media_foundation:media_foundation",
]
sanitize = {
boundary_sanitize = true
cfi = true
cfi_cross_dso = true
integer_overflow = true
ubsan = true
debug = false
blocklist = "$av_codec_root_dir/cfi_blocklist.txt"
}
sanitize = av_codec_sanitize
configs = [
":av_codec_packege_include",

10
services/engine/codec/audio/BUILD.gn
View File

@ -40,15 +40,7 @@ ohos_static_library("av_codec_audio_ffmpeg_codec") {
"-Wunused-parameter",
]
sanitize = {
boundary_sanitize = true
cfi = true
cfi_cross_dso = true
integer_overflow = true
ubsan = true
debug = false
blocklist = "$av_codec_root_dir/cfi_blocklist.txt"
}
sanitize = av_codec_sanitize
include_dirs = [
"$av_codec_root_dir/interfaces/inner_api/native",

1
test/moduletest/audio_decoder/BUILD.gn
View File

@ -19,6 +19,7 @@ module_output_path = "av_codec/moduletest"
AUDIO_ROOT_DIR = "//foundation/multimedia/audio_framework/"
ohos_unittest("audio_decoder_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
sources = [
"Avbuffer/src/avcodec_audio_avbuffer_decoder_demo.cpp",

1
test/moduletest/audio_encoder/BUILD.gn
View File

@ -18,6 +18,7 @@ MEDIA_ROOT_DIR = "//foundation/multimedia/av_codec/"
module_output_path = "av_codec/moduletest"
ohos_unittest("audio_encoder_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
sources = [
"Avbuffer/src/avcodec_audio_avbuffer_encoder_demo.cpp",

1
test/moduletest/demuxer/BUILD.gn
View File

@ -48,6 +48,7 @@ demuxer_moduletest_cflags = [
##################################################################################################################
ohos_unittest("demuxer_native_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = demuxer_moduletest_native_include_dirs
include_dirs += [ "./" ]

1
test/moduletest/muxer/BUILD.gn
View File

@ -18,6 +18,7 @@ MEDIA_ROOT_DIR = "//foundation/multimedia/av_codec/"
module_output_path = "av_codec/moduletest"
ohos_unittest("muxer_native_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
sources = [
"Common/src/AVMuxerDemo.cpp",

1
test/moduletest/vcodec/encoder/BUILD.gn
View File

@ -49,6 +49,7 @@ encoder_moduletest_cflags = [
##################################################################################################################
ohos_unittest("encoder_native_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = encoder_moduletest_native_include_dirs
include_dirs += [ "./" ]

1
test/moduletest/vcodec/hdrcodec/BUILD.gn
View File

@ -49,6 +49,7 @@ hdrcodec_moduletest_cflags = [
##################################################################################################################
ohos_unittest("hdrcodec_native_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = hdrcodec_moduletest_native_include_dirs
include_dirs += [ "./" ]

1
test/moduletest/vcodec/hwdecoder/BUILD.gn
View File

@ -49,6 +49,7 @@ hwdecoder_moduletest_cflags = [
##################################################################################################################
ohos_unittest("hwdecoder_native_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = hwdecoder_moduletest_native_include_dirs
include_dirs += [ "./" ]

1
test/moduletest/vcodec/swdecoder/BUILD.gn
View File

@ -51,6 +51,7 @@ swdecoder_moduletest_cflags = [
##################################################################################################################
ohos_unittest("swdecoder_native_module_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = swdecoder_moduletest_native_include_dirs
include_dirs += [ "./" ]

1
test/unittest/audio_capture_test/BUILD.gn
View File

@ -45,6 +45,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("audio_capture_module_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [

7
test/unittest/audio_test/BUILD.gn
View File

@ -45,6 +45,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("av_audio_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -87,6 +88,7 @@ ohos_unittest("av_audio_capi_unit_test") {
##################################################################################################################
ohos_unittest("av_audio_codecbase_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -129,6 +131,7 @@ ohos_unittest("av_audio_codecbase_unit_test") {
##################################################################################################################
ohos_unittest("av_audio_decode_ability_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -171,6 +174,7 @@ ohos_unittest("av_audio_decode_ability_unit_test") {
##################################################################################################################
ohos_unittest("av_audio_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -210,6 +214,7 @@ ohos_unittest("av_audio_inner_unit_test") {
##################################################################################################################
ohos_unittest("av_audio_encoder_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -252,6 +257,7 @@ ohos_unittest("av_audio_encoder_capi_unit_test") {
##################################################################################################################
ohos_unittest("av_audio_encoder_avbuffer_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -295,6 +301,7 @@ ohos_unittest("av_audio_encoder_avbuffer_capi_unit_test") {
##################################################################################################################
ohos_unittest("av_audio_decoder_avbuffer_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [

3
test/unittest/audio_vivid_test/BUILD.gn
View File

@ -44,6 +44,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("audio_vivid_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -86,6 +87,7 @@ ohos_unittest("audio_vivid_capi_unit_test") {
##################################################################################################################
ohos_unittest("audio_vivid_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [
@ -128,6 +130,7 @@ ohos_unittest("audio_vivid_inner_unit_test") {
##################################################################################################################
ohos_unittest("audio_vivid_ability_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [

2
test/unittest/avmuxer_test/BUILD.gn
View File

@ -40,6 +40,7 @@ avmuxer_unittest_cflags = [
#################################################################################################################muxer
ohos_unittest("avmuxer_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -83,6 +84,7 @@ ohos_unittest("avmuxer_capi_unit_test") {
#################################################################################################################muxer
ohos_unittest("avmuxer_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

2
test/unittest/avsource_test/BUILD.gn
View File

@ -40,6 +40,7 @@ avsource_unittest_cflags = [
################################################################################################################muxer
ohos_unittest("avsource_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -92,6 +93,7 @@ ohos_unittest("avsource_capi_unit_test") {
#################################################################################################################muxer
ohos_unittest("avsource_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

2
test/unittest/codeclist_test/BUILD.gn
View File

@ -40,6 +40,7 @@ codeclist_unittest_cflags = [
#################################################################################################################codeclist
ohos_unittest("codeclist_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -77,6 +78,7 @@ ohos_unittest("codeclist_capi_unit_test") {
#################################################################################################################codeclist
ohos_unittest("codeclist_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

4
test/unittest/demuxer_test/BUILD.gn
View File

@ -40,6 +40,7 @@ demuxer_unittest_cflags = [
#################################################################################################################
ohos_unittest("demuxer_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -99,6 +100,7 @@ ohos_unittest("demuxer_capi_unit_test") {
#################################################################################################################muxer
ohos_unittest("demuxer_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -155,6 +157,7 @@ ohos_unittest("demuxer_inner_unit_test") {
#################################################################################################################
ohos_unittest("demuxer_capi_buffer_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -214,6 +217,7 @@ ohos_unittest("demuxer_capi_buffer_unit_test") {
#################################################################################################################muxer
ohos_unittest("demuxer_inner_buffer_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

1
test/unittest/dfx_test/BUILD.gn
View File

@ -15,6 +15,7 @@ import("//build/test.gni")
import("//foundation/multimedia/av_codec/config.gni")
ohos_unittest("av_codec_dfx_test") {
sanitize = av_codec_test_sanitize
module_out_path = "av_codec/unittest"
include_dirs = [

6
test/unittest/hcodec_test/unittest/BUILD.gn
View File

@ -30,6 +30,7 @@ config("hcodec_unittest_cfg") {
}
ohos_unittest("hdecoder_unit_test") {
sanitize = av_codec_test_sanitize
testonly = true
configs = [ ":hcodec_unittest_cfg" ]
module_out_path = "av_codec/hcodec"
@ -50,6 +51,7 @@ ohos_unittest("hdecoder_unit_test") {
}
ohos_unittest("hencoder_unit_test") {
sanitize = av_codec_test_sanitize
testonly = true
configs = [ ":hcodec_unittest_cfg" ]
module_out_path = "av_codec/hcodec"
@ -70,6 +72,7 @@ ohos_unittest("hencoder_unit_test") {
}
ohos_unittest("hcodec_list_unit_test") {
sanitize = av_codec_test_sanitize
testonly = true
configs = [ ":hcodec_unittest_cfg" ]
module_out_path = "av_codec/hcodec"
@ -88,6 +91,7 @@ ohos_unittest("hcodec_list_unit_test") {
}
ohos_unittest("hencoder_buffer_unit_test") {
sanitize = av_codec_test_sanitize
testonly = true
configs = [ ":hcodec_unittest_cfg" ]
module_out_path = "av_codec/hcodec"
@ -112,6 +116,7 @@ ohos_unittest("hencoder_buffer_unit_test") {
}
ohos_unittest("hdecoder_buffer_unit_test") {
sanitize = av_codec_test_sanitize
testonly = true
configs = [ ":hcodec_unittest_cfg" ]
module_out_path = "av_codec/hcodec"
@ -136,6 +141,7 @@ ohos_unittest("hdecoder_buffer_unit_test") {
}
ohos_unittest("hcodec_type_converter_unit_test") {
sanitize = av_codec_test_sanitize
testonly = true
configs = [ ":hcodec_unittest_cfg" ]
module_out_path = "av_codec/hcodec"

4
test/unittest/hls_test/BUILD.gn
View File

@ -63,6 +63,7 @@ config("hls_unittest_cfg") {
#################################################################################################################
ohos_unittest("hls_media_downloader_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
testonly = true
configs = [
@ -91,6 +92,7 @@ ohos_unittest("hls_media_downloader_unit_test") {
#################################################################################################################
ohos_unittest("hls_playlist_downloader_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
testonly = true
configs = [
@ -119,6 +121,7 @@ ohos_unittest("hls_playlist_downloader_unit_test") {
#################################################################################################################
ohos_unittest("hls_tags_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
testonly = true
configs = [
@ -147,6 +150,7 @@ ohos_unittest("hls_tags_unit_test") {
#################################################################################################################
ohos_unittest("m3u8_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
testonly = true
configs = [

1
test/unittest/media_sink_test/BUILD.gn
View File

@ -43,6 +43,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("av_audio_sink_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [

1
test/unittest/sa_avcodec_test/BUILD.gn
View File

@ -42,6 +42,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("sa_avcodec_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

1
test/unittest/video_test/BUILD.gn
View File

@ -45,6 +45,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("av_video_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = av_codec_unittest_include_dirs
include_dirs += [

6
test/unittest/video_test/vcodec_framework_test/BUILD.gn
View File

@ -57,6 +57,7 @@ group("vcodec_framework_test") {
#################################################################################################################videodec
ohos_unittest("videodec_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -100,6 +101,7 @@ ohos_unittest("videodec_capi_unit_test") {
#################################################################################################################videodec
ohos_unittest("videodec_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -141,6 +143,7 @@ ohos_unittest("videodec_inner_unit_test") {
#################################################################################################################videoenc
ohos_unittest("videoenc_capi_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -186,6 +189,7 @@ ohos_unittest("videoenc_capi_unit_test") {
#################################################################################################################videoenc
ohos_unittest("videoenc_inner_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -229,6 +233,7 @@ ohos_unittest("videoenc_inner_unit_test") {
#################################################################################################################videoenc
ohos_unittest("videodec_stable_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",
@ -264,6 +269,7 @@ ohos_unittest("videodec_stable_unit_test") {
#################################################################################################################videoenc
ohos_unittest("videoenc_stable_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

1
test/unittest/video_test/vcodec_server_test/BUILD.gn
View File

@ -42,6 +42,7 @@ av_codec_unittest_cflags = [
##################################################################################################################
ohos_unittest("codec_server_coverage_unit_test") {
sanitize = av_codec_test_sanitize
module_out_path = module_output_path
include_dirs = [
"./",

1
test/unittest/video_test/video_perf_test/BUILD.gn
View File

@ -81,6 +81,7 @@ ohos_source_set("video_sample") {
}
ohos_unittest("video_perf_test") {
sanitize = av_codec_test_sanitize
module_out_path = "av_codec/unittest/perf_test"
sources = [ "./test_suilt/video_perf_test_suilt.cpp" ]