From: Gilbok Lee Date: Wed, 13 Nov 2024 01:30:05 +0000 (+0900) Subject: Merge branch 'tizen_vault' into tizen X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen;p=platform%2Fcore%2Fmultimedia%2Fesplusplayer.git Merge branch 'tizen_vault' into tizen Change-Id: I15a4fc50b2e00cebb64c78a4a7b71d805ec3bf0c --- a99515d3a30e36802afff40a13d3e4561316a46a diff --cc include/esplusplayer/decodedvideopacketex.h index ad1aa85,86eea3c..708e876 mode 100644,100755..100755 --- a/include/esplusplayer/decodedvideopacketex.h +++ b/include/esplusplayer/decodedvideopacketex.h @@@ -29,7 -29,15 +29,15 @@@ namespace esplusplayer class DecodedVideoPacketEx : private boost::noncopyable { public: using Ptr = std::unique_ptr; - + /** + * @brief Create a new DecodedVideoPacketEx object. + * @param [in] pts : timestamp of decoded packet. + * @param [in] duration : duration of decoded packet. + * @param [in] surface_data : surface data address which store the decoded data. + * @param [in] scaler_index : the scaler index. + * @exception None - * @return DecodedVideoPacketEx object. ++ * @return DecodedVideoPacketEx object. + */ static Ptr Create(const uint64_t pts = 0, const uint64_t duration = 0, tbm_surface_h surface_data = nullptr, const void* scaler_index = nullptr); diff --cc include/esplusplayer/elementary_stream.h index 1bc1ce7,dc2af22..dc2af22 mode 100644,100755..100644 --- a/include/esplusplayer/elementary_stream.h +++ b/include/esplusplayer/elementary_stream.h diff --cc include/esplusplayer/es_eventlistener.h index 8ab9720,8bfe130..595216c mode 100644,100755..100755 --- a/include/esplusplayer/es_eventlistener.h +++ b/include/esplusplayer/es_eventlistener.h diff --cc include/esplusplayer/espacket.h index 9d51c9f,765b2ee..1222db5 mode 100644,100755..100755 --- a/include/esplusplayer/espacket.h +++ b/include/esplusplayer/espacket.h diff --cc include/esplusplayer/track.h index 51d1b1d,5aeb543..6d68832 mode 100644,100755..100755 --- a/include/esplusplayer/track.h +++ b/include/esplusplayer/track.h diff --cc include/esplusplayer_capi/esplusplayer_capi.h index e683f9a,e7c0ad7..e7c0ad7 mode 100644,100755..100644 --- a/include/esplusplayer_capi/esplusplayer_capi.h +++ b/include/esplusplayer_capi/esplusplayer_capi.h diff --cc include/esplusplayer_capi/esplusplayer_internal.h index 9909853,c90b7fa..5529ced mode 100644,100755..100755 --- a/include/esplusplayer_capi/esplusplayer_internal.h +++ b/include/esplusplayer_capi/esplusplayer_internal.h @@@ -137,6 -148,16 +148,16 @@@ int get_size_of_esplusplayer_video_stre */ int get_size_of_esplusplayer_drm_info(void); + /** + * @brief Set the mode of virtual mic + * @param [in] handle : esplusplayer handle. - * @return int ++ * @return int + * @pre None + * @post None + * @exception None + */ + int esplusplayer_set_virtual_mic_mode(esplusplayer_handle handle); + #ifdef __cplusplus } #endif diff --cc include/esplusplayer_capi/stream.h index 14130f1,14e4457..14e4457 mode 100644,100755..100644 --- a/include/esplusplayer_capi/stream.h +++ b/include/esplusplayer_capi/stream.h diff --cc packaging/esplusplayer.spec index 3fe7fca,836cb53..f4308cf mode 100644,100755..100755 --- a/packaging/esplusplayer.spec +++ b/packaging/esplusplayer.spec @@@ -8,11 -6,10 +8,11 @@@ %bcond_with ESPLUSPLAYER_UT %endif #echo "Product Type: %{_vd_cfg_product_type}" + Name: esplusplayer Summary: new multimedia streaming player - Version: 1.3.7 - Release: 6 + Version: 1.4.0 + Release: 0 Group: Multimedia/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@@ -51,10 -48,11 +51,9 @@@ BuildRequires: pkgconfig(icu-i18n BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libtbm) --BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(capi-system-info) - -%if ("%{sec_buildconf_product_lite_tizen}" == "n") +%if (("%{sec_buildconf_product_lite_tizen}" == "n") || %{with TIZEN_PUBLIC}) # for ut BuildRequires: gtest-devel BuildRequires: pkgconfig(appcore-efl) diff --cc src/esplusplayer/src/elementary_stream.cpp index baa321f,cb098f7..cb098f7 mode 100644,100755..100644 --- a/src/esplusplayer/src/elementary_stream.cpp +++ b/src/esplusplayer/src/elementary_stream.cpp diff --cc src/esplusplayer/src/esplayer.cpp index 260db00,d320e06..549e33d mode 100644,100755..100644 --- a/src/esplusplayer/src/esplayer.cpp +++ b/src/esplusplayer/src/esplayer.cpp diff --cc src/mixer/src/sys/tbminterface.cpp index 4a7d39f,5ca1147..bac98b6 --- a/src/mixer/src/sys/tbminterface.cpp +++ b/src/mixer/src/sys/tbminterface.cpp @@@ -51,16 -51,16 +51,16 @@@ BufferDefaultType TBMInterface::BoImpor return tbm_bo_import(bufmgr, key); } - int TBMInterface::GAScale(tbm_bufmgr bufmgr, GraphicsGAScaleInfo* info) { - return Gfx_GA_Scale(bufmgr, info); + int TBMInterface::GAScale(tbm_bufmgr bufmgr, ppi_graphics_control_ga_scale_info_s* info) { + return ppi_graphics_control_ga_scale(bufmgr, info) == 0 ? 1 : 0; } - int TBMInterface::GACopy(tbm_bufmgr bufmgr, GraphicsGABltRopInfo* info) { - return Gfx_GA_BltRop(bufmgr, info); + int TBMInterface::GACopy(tbm_bufmgr bufmgr, ppi_graphics_control_ga_blt_rop_info_s* info) { + return ppi_graphics_control_ga_bltrop(bufmgr, info) == 0 ? 1 : 0; } - int TBMInterface::GAFill(tbm_bufmgr bufmgr, GraphicsGAFillRectInfo* info) { - return Gfx_GA_FillRect(bufmgr, info); + int TBMInterface::GAFill(tbm_bufmgr bufmgr, ppi_graphics_control_ga_fill_rect_info_s* info) { + return ppi_graphics_control_ga_fillrect(bufmgr, info) == 0 ? 1 : 0; } } // namespace tizen -} // namespace esplusplayer +} // namespace esplusplayer diff --cc ut/src/utils/utility.cpp index 518f74f,5c5fe3b..935da1b mode 100644,100755..100755 --- a/ut/src/utils/utility.cpp +++ b/ut/src/utils/utility.cpp @@@ -39,10 -25,12 +39,12 @@@ #include #include #include - +#include "ivideocapture.hpp" #include "capi-video-capture.h" - #include "iaudio-control.hpp" - #include "diagnosis-audio-control.hpp" + #include + + #include + #include "ivideocapture.hpp" #endif using namespace std; @@@ -505,17 -492,17 +507,18 @@@ int Utility::CheckYUV(int x, int y) LOGE("Y value : %d", (int)ybuff[position]); return (int)ybuff[position]; } +#endif +#ifndef TIZEN_FEATURE_PUBLIC bool Utility::IsAudioDisconnected() { TZTVAudioSource src = AUDIO_SOURCE_MAX; - EXPECT_EQ(audioControl->getMainOutSourceSelect(&src), 0); + EXPECT_EQ(ppi_audio_control_get_main_out_source_select(&src), 0); return (src != AUDIO_MULTIMEDIA_DEC0); } - bool Utility::IsAudioMute() { long audioMute = 0; - EXPECT_EQ(audioDiagnoser->Diagnosis_GetBoolean(0, "main out mute", &audioMute), 0); + EXPECT_EQ( + ppi_diagnosis_audio_control_diagnosis_get_boolean(0, "main out mute", &audioMute), 0); return (audioMute != 0); } #endif