diff --git a/frameworks/videodisplaymanager/include/videodisplaymanager.h b/frameworks/videodisplaymanager/include/videodisplaymanager.h index 183e923b58a1b74282484df084e01c9148ce53ed..15e282c18020fc581ae21e4434277d561d88faa0 100644 --- a/frameworks/videodisplaymanager/include/videodisplaymanager.h +++ b/frameworks/videodisplaymanager/include/videodisplaymanager.h @@ -19,7 +19,7 @@ #include #include -#include "display_type.h" +#include "surface_type.h" #include "ibuffer_producer.h" namespace OHOS { diff --git a/services/engine/gstreamer/avcodec/sink_wrapper/sink_surface_impl.cpp b/services/engine/gstreamer/avcodec/sink_wrapper/sink_surface_impl.cpp index c5e94cf67e0079eb48e8c66b2561300488a332b5..33543dabc0c64fea197348f7213df4e3bc66bb82 100644 --- a/services/engine/gstreamer/avcodec/sink_wrapper/sink_surface_impl.cpp +++ b/services/engine/gstreamer/avcodec/sink_wrapper/sink_surface_impl.cpp @@ -14,7 +14,7 @@ */ #include "sink_surface_impl.h" -#include "display_type.h" +#include "surface_type.h" #include "media_log.h" #include "scope_guard.h" #include "gst_surface_memory.h" diff --git a/services/engine/gstreamer/player/player_sinkprovider.cpp b/services/engine/gstreamer/player/player_sinkprovider.cpp index 87e3e2b4c1f1ad35660b6a45b2e77f519c11d7b5..f824fbc709d39e1b0150bd35bf88378d33dfad72 100644 --- a/services/engine/gstreamer/player/player_sinkprovider.cpp +++ b/services/engine/gstreamer/player/player_sinkprovider.cpp @@ -16,7 +16,7 @@ #include "player_sinkprovider.h" #include #include "securec.h" -#include "display_type.h" +#include "surface_type.h" #include "param_wrapper.h" #include "surface_buffer_impl.h" #include "gst/video/gstvideometa.h" diff --git a/services/engine/gstreamer/plugins/codec/hdi/common/src/gst_dec_surface.cpp b/services/engine/gstreamer/plugins/codec/hdi/common/src/gst_dec_surface.cpp index 9b8236eaa0c37e4b0d124034b632efcd186a20a3..166e2abfc393a0a5c5664acab559645c5cf65bb7 100644 --- a/services/engine/gstreamer/plugins/codec/hdi/common/src/gst_dec_surface.cpp +++ b/services/engine/gstreamer/plugins/codec/hdi/common/src/gst_dec_surface.cpp @@ -16,7 +16,7 @@ #include "gst_dec_surface.h" #include #include "dec_surface_buffer_wrapper.h" -#include "display_type.h" +#include "surface_type.h" using namespace OHOS; namespace { diff --git a/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.cpp b/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.cpp index 2ef98c0506486d9de920932fa2f2b2aa3355481d..5e411d702735e4a681f3b5295494cad476c2b215 100644 --- a/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.cpp +++ b/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.cpp @@ -15,7 +15,7 @@ #include "hdi_codec_util.h" #include -#include "display_type.h" +#include "surface_type.h" #include "media_log.h" #include "media_errors.h" diff --git a/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.h b/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.h index c40c3945f7c753b55da689193f8ad8555bd5e79a..4f6f793d8a88c3dae38fbbfb1932c4e4d2921da5 100644 --- a/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.h +++ b/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_codec_util.h @@ -23,7 +23,7 @@ #include "i_gst_codec.h" #include "OMX_Core.h" #include "OMX_Component.h" -#include "display_type.h" +#include "surface_type.h" #include "codec_component_if.h" #include "codec_omx_ext.h" diff --git a/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_init.cpp b/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_init.cpp index 6d15b22882a3376168c283ecfd3079516b6cf008..4763995f7e14f409fcea1a02ed6cc904be87226d 100644 --- a/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_init.cpp +++ b/services/engine/gstreamer/plugins/codec/hdi_plugins/hdi_init.cpp @@ -17,7 +17,7 @@ #include #include "media_log.h" #include "media_errors.h" -#include "display_type.h" +#include "surface_type.h" #include "scope_guard.h" #include "hdi_codec_util.h" diff --git a/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.cpp b/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.cpp index 0b8f939e3507964a9f9dda1b0f7d08de7919165c..2c824ba5004e901395d4159d06eac6aeee2e94db 100644 --- a/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.cpp +++ b/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.cpp @@ -17,7 +17,7 @@ #include #include #include "media_log.h" -#include "display_type.h" +#include "surface_type.h" #include "surface_buffer.h" #include "buffer_type_meta.h" #include "gst_surface_allocator.h" diff --git a/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.h b/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.h index 647a2500fbf929644e8c75adccc0a5636ab95c1b..caccd127ca84ad417877f16039c04f59b4d99035 100644 --- a/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.h +++ b/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool.h @@ -20,7 +20,7 @@ #include #include "surface.h" #include "gst_surface_allocator.h" -#include "display_type.h" +#include "surface_type.h" G_BEGIN_DECLS diff --git a/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool_no_stride.cpp b/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool_no_stride.cpp index 0863a30fa86e6742f1064e9a510f110731d0da7f..59f11da01b1dfd1b086dbcb6acd719242689348d 100644 --- a/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool_no_stride.cpp +++ b/services/engine/gstreamer/plugins/sink/memsink/gst_producer_surface_pool_no_stride.cpp @@ -17,7 +17,7 @@ #include #include #include "media_log.h" -#include "display_type.h" +#include "surface_type.h" #include "surface_buffer.h" #include "buffer_type_meta.h" #include "gst_surface_allocator.h" diff --git a/services/engine/gstreamer/plugins/sink/memsink/gst_surface_allocator.h b/services/engine/gstreamer/plugins/sink/memsink/gst_surface_allocator.h index ff10155198b7c3e1e9295974e164dc773869fba6..2c14c37d7496d18e039abf81f0672816d76604d3 100644 --- a/services/engine/gstreamer/plugins/sink/memsink/gst_surface_allocator.h +++ b/services/engine/gstreamer/plugins/sink/memsink/gst_surface_allocator.h @@ -17,7 +17,7 @@ #define GST_SURFACE_ALLOCATOR_H #include -#include "display_type.h" +#include "surface_type.h" #include "gst_surface_memory.h" G_BEGIN_DECLS diff --git a/services/engine/gstreamer/plugins/source/memsource/gst_surface_src.cpp b/services/engine/gstreamer/plugins/source/memsource/gst_surface_src.cpp index 9e7ed833f2e1207913b2853f25bcce96391fd4c8..0b4140c2b27e38bfbd288ae85f9aa5393ab3bb79 100644 --- a/services/engine/gstreamer/plugins/source/memsource/gst_surface_src.cpp +++ b/services/engine/gstreamer/plugins/source/memsource/gst_surface_src.cpp @@ -22,7 +22,7 @@ #include "surface_buffer.h" #include "buffer_type_meta.h" #include "scope_guard.h" -#include "display_type.h" +#include "surface_type.h" #define gst_surface_src_parent_class parent_class using namespace OHOS; diff --git a/services/engine/gstreamer/plugins/source/videocapture/src/gst_video_capture_src.cpp b/services/engine/gstreamer/plugins/source/videocapture/src/gst_video_capture_src.cpp index da2ddbd06c47637d2e03ecc7c0a7b288e4104694..5f9a90bdd060f659fd5d92c5b77b49e7f33a3df4 100644 --- a/services/engine/gstreamer/plugins/source/videocapture/src/gst_video_capture_src.cpp +++ b/services/engine/gstreamer/plugins/source/videocapture/src/gst_video_capture_src.cpp @@ -17,7 +17,7 @@ #include #include "gst_video_capture_pool.h" #include "media_errors.h" -#include "display_type.h" +#include "surface_type.h" #include "buffer_type_meta.h" using namespace OHOS::Media; diff --git a/test/fuzztest/test_metadata.h b/test/fuzztest/test_metadata.h index 350e4b79f11d8698ea7af4f22a7faad5eef91b55..e4907d6610517f1e1374d76bb115ae9af1af0dbd 100644 --- a/test/fuzztest/test_metadata.h +++ b/test/fuzztest/test_metadata.h @@ -19,7 +19,7 @@ #include "avmetadatahelper.h" #include "window.h" #include "surface.h" -#include "display_type.h" +#include "surface_type.h" namespace OHOS { namespace Media { diff --git a/test/fuzztest/test_player.h b/test/fuzztest/test_player.h index f7fd3107864b0bba00f473e7c54d5166594db363..9910907c553834e89150f50bd86ed5b7c4dd2987 100644 --- a/test/fuzztest/test_player.h +++ b/test/fuzztest/test_player.h @@ -19,7 +19,7 @@ #include "player.h" #include "window.h" #include "surface.h" -#include "display_type.h" +#include "surface_type.h" namespace OHOS { namespace Media { diff --git a/test/jsdemo/napi_demo.cpp b/test/jsdemo/napi_demo.cpp index bfacfcb2bcdb9be66e8b3caa70b212a8a05fe5ea..a5241ab307cfedc76ef456c64f796f75438226e6 100644 --- a/test/jsdemo/napi_demo.cpp +++ b/test/jsdemo/napi_demo.cpp @@ -18,7 +18,7 @@ #include "scope_guard.h" #include "media_errors.h" #include "media_log.h" -#include "display_type.h" +#include "surface_type.h" #include "securec.h" #include "surface_utils.h" diff --git a/test/nativedemo/avcodecvenc/avcodec_venc_demo.cpp b/test/nativedemo/avcodecvenc/avcodec_venc_demo.cpp index 3f7173b7f30e0ddd41d79f4c1487f741070fedb0..e0f87b8c7d991579244c41546bc696beb0e486d0 100644 --- a/test/nativedemo/avcodecvenc/avcodec_venc_demo.cpp +++ b/test/nativedemo/avcodecvenc/avcodec_venc_demo.cpp @@ -18,7 +18,7 @@ #include #include "securec.h" #include "demo_log.h" -#include "display_type.h" +#include "surface_type.h" #include "media_errors.h" using namespace OHOS; diff --git a/test/nativedemo/player/player_demo.h b/test/nativedemo/player/player_demo.h index 2a3d84c7df0ea2c9bf895b1965117f9abe0682ae..009f28ce9556dac379e7938f1c90ff172295fff7 100644 --- a/test/nativedemo/player/player_demo.h +++ b/test/nativedemo/player/player_demo.h @@ -20,7 +20,7 @@ #include "player.h" #include "window.h" #include "surface.h" -#include "display_type.h" +#include "surface_type.h" #include "nocopyable.h" #include "media_data_source_demo.h" diff --git a/test/nativedemo/recorder/recorder_demo.cpp b/test/nativedemo/recorder/recorder_demo.cpp index 0dfbc0038a4cf90d1a4230bdea21fe1157174db5..9dd2092d926ba9e61fb2c16e1e8c17106d325d54 100644 --- a/test/nativedemo/recorder/recorder_demo.cpp +++ b/test/nativedemo/recorder/recorder_demo.cpp @@ -18,7 +18,7 @@ #include #include #include -#include "display_type.h" +#include "surface_type.h" #include "securec.h" #include "demo_log.h" #include "media_errors.h" diff --git a/test/unittest/recorder_test/src/recorder_mock.cpp b/test/unittest/recorder_test/src/recorder_mock.cpp index 27549071000f213d058399f68a278c7ae25ffe8c..bf36276cc5bfc757d9a07eff681d2944e7dfe524 100644 --- a/test/unittest/recorder_test/src/recorder_mock.cpp +++ b/test/unittest/recorder_test/src/recorder_mock.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "display_type.h" +#include "surface_type.h" using namespace std; using namespace OHOS::Media;