From: Joogab Yun Date: Mon, 13 Jan 2020 08:17:54 +0000 (+0900) Subject: Add api for get the internal media player handle of the VideoView X-Git-Tag: dali_1.4.55~10^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=dc3bbd29a417e1fbc7f81104c60c5ba90212f216 Add api for get the internal media player handle of the VideoView Change-Id: I1671caaa688038c6ee15622c72317b4c90487b98 --- diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp index b79213d..957681e 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp @@ -93,6 +93,11 @@ public: mDisplyMode = mode; } + Any GetMediaPlayer() + { + return NULL; + } + public: @@ -288,5 +293,10 @@ Dali::VideoPlayerPlugin::DisplayMode::Type VideoPlayer::GetDisplayMode() const return Internal::Adaptor::GetImplementation( *this ).GetDisplayMode(); } +Any VideoPlayer::GetMediaPlayer() +{ + return Internal::Adaptor::GetImplementation( *this ).GetMediaPlayer(); +} + } // namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp index 03da3ff..a38ec18 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp @@ -20,6 +20,7 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -301,6 +302,9 @@ int UtcDaliVideoViewMethodsForCoverage(void) videoView.Stop(); videoView.Forward(10); videoView.Backward(10); + + Toolkit::DevelVideoView::GetMediaPlayer( videoView ); + VideoView::VideoViewSignalType& signal = videoView.FinishedSignal(); DALI_TEST_EQUALS( 0, signal.GetConnectionCount(), TEST_LOCATION ); diff --git a/dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp b/dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp new file mode 100755 index 0000000..317d34d --- /dev/null +++ b/dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2020 Samsung Electronics 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// INTERNAL INCLUDES +#include +#include + +namespace Dali +{ + +namespace Toolkit +{ + +namespace DevelVideoView +{ + +Any GetMediaPlayer( VideoView videoView ) +{ + return Dali::Toolkit::GetImpl( videoView ).GetMediaPlayer(); +} + + +} // namespace DevelVideoView + +} // namespace Toolkit + +} // namespace Dali diff --git a/dali-toolkit/devel-api/controls/video-view/video-view-devel.h b/dali-toolkit/devel-api/controls/video-view/video-view-devel.h new file mode 100755 index 0000000..b121506 --- /dev/null +++ b/dali-toolkit/devel-api/controls/video-view/video-view-devel.h @@ -0,0 +1,49 @@ +#ifndef DALI_TOOLKIT_VIDEO_VIEW_DEVEL_H +#define DALI_TOOLKIT_VIDEO_VIEW_DEVEL_H + +/* + * Copyright (c) 2020 Samsung Electronics 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// INTERNAL INCLUDES +#include +#include + +namespace Dali +{ + +namespace Toolkit +{ + +namespace DevelVideoView +{ + + +/** + * @brief Returns the internal media player. + * @param[in] videoView The current VideoView + * @return The internal media player of current VideoView + */ +DALI_TOOLKIT_API Any GetMediaPlayer( VideoView videoView ); + + +} // namespace DevelVideoView + +} // namespace Toolkit + +} // namespace Dali + +#endif // DALI_TOOLKIT_VIDEO_VIEW_DEVEL_H diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list old mode 100644 new mode 100755 index 41fae57..fad069b --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -29,6 +29,7 @@ SET( devel_api_src_files ${devel_api_src_dir}/controls/text-controls/text-selection-popup.cpp ${devel_api_src_dir}/controls/text-controls/text-selection-toolbar.cpp ${devel_api_src_dir}/controls/tool-bar/tool-bar.cpp + ${devel_api_src_dir}/controls/video-view/video-view-devel.cpp ${devel_api_src_dir}/controls/web-view/web-view.cpp ${devel_api_src_dir}/focus-manager/keyinput-focus-manager.cpp ${devel_api_src_dir}/focus-manager/keyboard-focus-manager-devel.cpp @@ -202,6 +203,10 @@ SET( devel_api_gaussian_blur_view_header_files ${devel_api_src_dir}/controls/gaussian-blur-view/gaussian-blur-view.h ) +SET( devel_api_video_view_header_files + ${devel_api_src_dir}/controls/video-view/video-view-devel.h +) + SET( devel_api_web_view_header_files ${devel_api_src_dir}/controls/web-view/web-view.h ) @@ -242,6 +247,7 @@ SET( DEVEL_API_HEADERS ${DEVEL_API_HEADERS} ${devel_api_tooltip_header_files} ${devel_api_transition_effects_header_files} ${devel_api_gaussian_blur_view_header_files} + ${devel_api_video_view_header_files} ${devel_api_web_view_header_files} ${devel_api_drag_and_drop_detector_header_files} ) diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp index 7fcab03..8c34ab5 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -808,6 +808,11 @@ int VideoView::GetDisplayMode() const return static_cast< int >( mVideoPlayer.GetDisplayMode() ); } +Any VideoView::GetMediaPlayer() +{ + return mVideoPlayer.GetMediaPlayer(); +} + Dali::Shader VideoView::CreateShader() { std::string fragmentShader = "#extension GL_OES_EGL_image_external:require\n"; diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h index ca8a2f8..3d345a3 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.h +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h @@ -251,6 +251,11 @@ public: */ int GetDisplayMode() const; + /** + * @brief Gets internal media player. + */ + Any GetMediaPlayer(); + private: // From Control /**