From b50f90b91661d05287a8fb5ee7b7f963f47c4f45 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Mon, 25 Sep 2023 18:40:59 +0800 Subject: [PATCH] Code format for plusplayer header file --- .../example/tizen/tizen-manifest.xml | 2 +- .../tizen/inc/plusplayer/appinfo.h | 4 +- .../tizen/inc/plusplayer/drm.h | 56 ++-- .../tizen/inc/plusplayer/eventlistener.h | 170 +++++------ .../tizen/inc/plusplayer/plusplayer.h | 269 +++++++++--------- .../tizen/inc/plusplayer/track.h | 109 ++++--- .../tizen/inc/plusplayer/types/buffer.h | 44 +-- .../tizen/inc/plusplayer/types/display.h | 42 +-- .../tizen/inc/plusplayer/types/error.h | 127 +++++---- .../tizen/inc/plusplayer/types/latency.h | 59 ++-- .../inc/plusplayer/types/picturequality.h | 50 ++-- .../tizen/inc/plusplayer/types/resource.h | 2 +- .../tizen/inc/plusplayer/types/source.h | 55 ++-- .../inc/plusplayer/types/streaming_message.h | 44 +-- .../tizen/inc/plusplayer/types/submitdata.h | 44 +-- 15 files changed, 554 insertions(+), 523 deletions(-) diff --git a/packages/video_player_avplayer/example/tizen/tizen-manifest.xml b/packages/video_player_avplayer/example/tizen/tizen-manifest.xml index 980b889a4..f396efd5d 100644 --- a/packages/video_player_avplayer/example/tizen/tizen-manifest.xml +++ b/packages/video_player_avplayer/example/tizen/tizen-manifest.xml @@ -1,5 +1,5 @@ - + diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/appinfo.h b/packages/video_player_avplayer/tizen/inc/plusplayer/appinfo.h index 2b0106b86..36ad69e28 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/appinfo.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/appinfo.h @@ -28,8 +28,8 @@ namespace plusplayer { /** -* @brief Player app information. -*/ + * @brief Player app information. + */ struct PlayerAppInfo { std::string id; /**< App id */ std::string version; /**< App version */ diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/drm.h b/packages/video_player_avplayer/tizen/inc/plusplayer/drm.h index be2e214d0..0a7a4245b 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/drm.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/drm.h @@ -1,25 +1,25 @@ /** -* @file drm.h -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file drm.h + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_DRM_H__ #define __PLUSPLAYER_DRM_H__ @@ -51,13 +51,15 @@ enum class Type { // post from hlsdemux for getright struct Property { - Type type = Type::kNone; // Drm type - DrmHandle handle = 0; // Drm handle - bool external_decryption = false; // External Decryption Mode - LicenseAcquiredCb license_acquired_cb = nullptr; // The cb will be invoked when license was acquired. - UserData license_acquired_userdata = nullptr; // The userdata will be sent by license_acquired_cb + Type type = Type::kNone; // Drm type + DrmHandle handle = 0; // Drm handle + bool external_decryption = false; // External Decryption Mode + LicenseAcquiredCb license_acquired_cb = + nullptr; // The cb will be invoked when license was acquired. + UserData license_acquired_userdata = + nullptr; // The userdata will be sent by license_acquired_cb }; - + } // namespace drm } // namespace plusplayer diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/eventlistener.h b/packages/video_player_avplayer/tizen/inc/plusplayer/eventlistener.h index 4963ed610..b27e278b5 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/eventlistener.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/eventlistener.h @@ -32,7 +32,6 @@ #define PLUS_PLAYER_AI_DATA_COLLECTION #endif - namespace plusplayer { /** @@ -101,60 +100,62 @@ class EventListener { const MessageParam& msg, UserData userdata) {} /** -* @brief It will be invoked when queue in hls event triggered for cue -* advetisment start -* @param [in] msgType : #event name -* @param [in] MessageParam : #MessageParam -*/ - virtual void OnCueEvent(const char *CueData, - UserData userdata) {} + * @brief It will be invoked when queue in hls event triggered for cue + * advetisment start + * @param [in] msgType : #event name + * @param [in] MessageParam : #MessageParam + */ + virtual void OnCueEvent(const char* CueData, UserData userdata) {} /** -* @brief It will be invoked when InteractiveAd event triggered -* @param [in] msgType : #event name -* @param [in] MessageParam : #MessageParam -*/ - virtual void OnInteractiveAd(const char *InteractiveAdData, - UserData userdata) {} - /** -* @brief It will be invoked when InteractiveAd start -* @param [in] msgType : #event name -* @param [in] MessageParam : #MessageParam -*/ - virtual void OnInteractiveAdStart(const char *InteractiveAdID, - UserData userdata) {} + * @brief It will be invoked when InteractiveAd event triggered + * @param [in] msgType : #event name + * @param [in] MessageParam : #MessageParam + */ + virtual void OnInteractiveAd(const char* InteractiveAdData, + UserData userdata) {} + /** + * @brief It will be invoked when InteractiveAd start + * @param [in] msgType : #event name + * @param [in] MessageParam : #MessageParam + */ + virtual void OnInteractiveAdStart(const char* InteractiveAdID, + UserData userdata) {} - /** -* @brief It will be invoked when InteractiveAd stop reaches -* @param [in] msgType : #event name -* @param [in] MessageParam : #MessageParam -*/ - virtual void OnInteractiveAdStop(const char *InteractiveAdID, - UserData userdata) {} + /** + * @brief It will be invoked when InteractiveAd stop reaches + * @param [in] msgType : #event name + * @param [in] MessageParam : #MessageParam + */ + virtual void OnInteractiveAdStop(const char* InteractiveAdID, + UserData userdata) {} virtual void OnDateRangeEvent(const char* DateRangeData, UserData userdata) {} virtual void OnStopReachEvent(bool StopReach, UserData userdata) {} virtual void OnCueOutContEvent(const char* CueOutContData, - UserData userdata) {} - - virtual void OnSwitchDoneEvent(UserData userdata) {} + UserData userdata) {} + + virtual void OnSwitchDoneEvent(UserData userdata) {} /** * @brief It will be invoked when dash scte:35 cue event is parsed * @param [in] Ad : # Ad information c_str ends with '\0' - * @pre This callback will not be invoked before player prepare + * @pre This callback will not be invoked before player prepare * @post None * @exception None */ virtual void OnADEventFromDash(const char* ADData, UserData userdata) {} /** - * @brief It will be invoked when HbbTV preselection case by using dashplusplayer with appid "org.tizen.hbbtv" - * @param [in] ps_data : string stored preselection info followed json format - * @pre This callback will not be invoked before player prepare + * @brief It will be invoked when HbbTV preselection case by using + * dashplusplayer with appid "org.tizen.hbbtv" + * @param [in] ps_data : string stored preselection info followed json + * format + * @pre This callback will not be invoked before player prepare * @post None * @exception None */ - virtual void OnAudioPreselectionInfoFromDash(const char * PsData, UserData userdata) {} + virtual void OnAudioPreselectionInfoFromDash(const char* PsData, + UserData userdata) {} /** * @brief It will be invoked when player is prepared to be started @@ -196,29 +197,30 @@ class EventListener { SubtitleAttrListPtr attr_list, UserData userdata) {} /** - * @brief It will be invoked when player state was changed to playing - * @param [in] userdata : userdata of event - * @pre None - * @post The player state will be #State::kPlaying - * @return None - * @exception None - */ + * @brief It will be invoked when player state was changed to playing + * @param [in] userdata : userdata of event + * @pre None + * @post The player state will be #State::kPlaying + * @return None + * @exception None + */ virtual void OnStateChangedToPlaying(UserData userdata) {} -#ifdef DRM_MAPI_AARCH_64 +#ifdef DRM_MAPI_AARCH_64 virtual void OnDrmInitData(unsigned long* drmhandle, unsigned int len, #else virtual void OnDrmInitData(int* drmhandle, unsigned int len, -#endif +#endif unsigned char* psshdata, TrackType type, - UserData userdata) {} + UserData userdata) { + } /** -* @brief It will be invoked to post AI data collection -* @param [in] userdata : userdata of event -* @pre None -* @post The player state will be #State::kPlaying -* @return None -* @exception None -*/ + * @brief It will be invoked to post AI data collection + * @param [in] userdata : userdata of event + * @pre None + * @post The player state will be #State::kPlaying + * @return None + * @exception None + */ #ifdef PLUS_PLAYER_AI_DATA_COLLECTION virtual void OnAIDataCollection(std::unique_ptr ai_data, UserData userdata) {} @@ -230,44 +232,44 @@ class EventListener { #endif /** - * @brief It will be invoked when demux found drm caps - * @param [in] userdata : userdata of event - * @return None - * @exception None - */ + * @brief It will be invoked when demux found drm caps + * @param [in] userdata : userdata of event + * @return None + * @exception None + */ virtual void OnDrmType(plusplayer::drm::Type drmtype, UserData userdata) {} /** - * @brief It will be invoked when pes data received from demux - * @param [in] pid : pkt indetifier - * @param [in] data : pes data - * @param [in] size : size of pes data - * @param [in] userdata : userdata of event - * @return None - * @exception None - */ - virtual void OnPesData(int pid, std::unique_ptr data, - const int size,UserData userdata) {} - - virtual void OnPSSHData(const StreamingMessageType& type, - const MessageParam& msg, UserData userdata){} - + * @brief It will be invoked when pes data received from demux + * @param [in] pid : pkt indetifier + * @param [in] data : pes data + * @param [in] size : size of pes data + * @param [in] userdata : userdata of event + * @return None + * @exception None + */ + virtual void OnPesData(int pid, std::unique_ptr data, const int size, + UserData userdata) {} + + virtual void OnPSSHData(const StreamingMessageType& type, + const MessageParam& msg, UserData userdata) {} + /** - * @brief It will be invoked when section data received from demux - * @param [in] pid : pkt indetifier - * @param [in] data : section data - * @param [in] size : size of section data - * @param [in] userdata : userdata of event - * @return None - * @exception None - */ + * @brief It will be invoked when section data received from demux + * @param [in] pid : pkt indetifier + * @param [in] data : section data + * @param [in] size : size of section data + * @param [in] userdata : userdata of event + * @return None + * @exception None + */ virtual void OnSectionData(int pid, std::unique_ptr data, - const int size,UserData userdata) {} + const int size, UserData userdata) {} #ifdef PLUS_PLAYER_ENABLE_ERROR_FRAMEWORK - virtual void OnErrorFW(std::unique_ptr error_data, UserData userdata){} -#endif - + virtual void OnErrorFW(std::unique_ptr error_data, + UserData userdata) {} +#endif }; } // namespace plusplayer diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/plusplayer.h b/packages/video_player_avplayer/tizen/inc/plusplayer/plusplayer.h index aab7a487b..3b62dea91 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/plusplayer.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/plusplayer.h @@ -31,7 +31,7 @@ #include #include -//plusplayer should disable mix feature temporarily. +// plusplayer should disable mix feature temporarily. //#ifndef IS_AUDIO_PRODUCT //#include "mixer/mixer.h" //#endif @@ -42,9 +42,9 @@ #include "plusplayer/track.h" #include "plusplayer/types/buffer.h" #include "plusplayer/types/display.h" +#include "plusplayer/types/picturequality.h" #include "plusplayer/types/resource.h" #include "plusplayer/types/source.h" -#include "plusplayer/types/picturequality.h" //#ifndef PLUS_PLAYER_ENABLE_AI_ABR //#define PLUS_PLAYER_ENABLE_AI_ABR @@ -82,7 +82,7 @@ struct PlayerMemento { double current_playback_rate = 1.0; /**< Playback rate of current player */ }; - /** +/** * @brief Enumerations for player codec type */ enum PlayerCodecType { @@ -104,7 +104,7 @@ enum VideoResourceType { * @description video resource(main), default type */ kVideoResource, - /** + /** * @description sub video resource. */ kVideoResourceSub, @@ -118,7 +118,7 @@ enum PlayerType { * @description default player type */ kDefault, - /** + /** * @description for dash extened player. */ kDASH, @@ -408,13 +408,13 @@ class PlusPlayer : private boost::noncopyable { /** * @brief Set stop point for playback. * @remarks Only support hls. If stop position is set, media playeback will - * stop at time_millisecond instead of eos. + * stop at time_millisecond instead of eos. * @param [in] time_millisecond : the absolute position(playingtime) of * the stream in milliseconds * @pre The player state must be one of #State::kTrackSourceReady, * #State::kReady, #State::kPlaying or #State::kPaused * @post None - * @exception None + * @exception None * @see EventListener::OnStopReachEvent() */ virtual void SetStopPosition(const uint64_t time_millisecond) { return; } @@ -460,8 +460,10 @@ class PlusPlayer : private boost::noncopyable { * @param [in] serface_id : resource id of window. * @param [in] x : x param of display window * @param [in] y : y param of display window - * @param [in] w : width of display window. This value should be greater than 0. - * @param [in] h : height of display window. This value should be greater than 0. + * @param [in] w : width of display window. This value should be greater + * than 0. + * @param [in] h : height of display window. This value should be greater + * than 0. * @pre The player state can be all of #State except #State::kNone * @return @c True on success, otherwise @c False * @see DisplayType \n @@ -490,8 +492,8 @@ class PlusPlayer : private boost::noncopyable { */ virtual bool SetDisplay(const DisplayType& type, void* obj) { return false; } -//plusplayer should disable mix feature temporarily. -//#ifndef IS_AUDIO_PRODUCT + // plusplayer should disable mix feature temporarily. + //#ifndef IS_AUDIO_PRODUCT /** * @brief Set the video display * @remarks We are not supporting changing display. @@ -508,10 +510,10 @@ class PlusPlayer : private boost::noncopyable { * PlusPlayer::SetDisplayVisible() * @exception None */ -// virtual bool SetDisplay(const DisplayType& type, Mixer* handle) { -// return false; -// } -//#endif + // virtual bool SetDisplay(const DisplayType& type, Mixer* handle) { + // return false; + // } + //#endif /** * @brief Set the video display mode @@ -527,7 +529,8 @@ class PlusPlayer : private boost::noncopyable { /** * @brief Set the ROI(Region Of Interest) area of display * @remarks The minimum value of width and height are 1. - * @param [in] roi : Roi Geometry. width and height value in Geometry should be greater than 0. + * @param [in] roi : Roi Geometry. width and height value in Geometry + * should be greater than 0. * @pre The player state can be all of #State except #State::kNone \n * Before set display ROI, #DisplayMode::kDstRoi must be set with * PlusPlayer::SetDisplayMode(). @@ -588,7 +591,8 @@ class PlusPlayer : private boost::noncopyable { /** * @brief Set the ROI(Region Of Interest) area of video * @remarks The minimum value of width and height are 1. - * @param [in] roi : Roi CropArea. width and height value in CropArea should be greater than 0. + * @param [in] roi : Roi CropArea. width and height value in CropArea + * should be greater than 0. * @pre The player state can be all of #State except #State::kNone * @post None * @return @c True on success, otherwise @c False @@ -651,26 +655,25 @@ class PlusPlayer : private boost::noncopyable { */ virtual std::vector GetTrackInfo() { return {}; } /** - * @brief Get Caption track infomation of the associated media. - * @pre The player can be one of #State::kTrackSourceReady, #State::kReady, - * #State::kPlaying or #State::kPaused - * @return std::vector of #CaptionTrack infomation of stream - */ - virtual std::vector GetCaptionTrackInfo() { - return {}; - } + * @brief Get Caption track infomation of the associated media. + * @pre The player can be one of #State::kTrackSourceReady, + * #State::kReady, #State::kPlaying or #State::kPaused + * @return std::vector of #CaptionTrack infomation of stream + */ + virtual std::vector GetCaptionTrackInfo() { return {}; } /** - * @brief Get activated(selected) track infomation of the associated media. - * @remarks In the case of Adaptive Streaming such as HLS,DASH, - * Track.bitrate might be different from current bitrate - * because it can be changed based on network bandwidth whenever. - * If you need the current bitrate instantly, - * you can get it from OnAdaptiveStreamingControlEvent(). - * @pre The player must be one of #State::kTrackSourceReady, #State::kReady, - * #State::kPlaying or #State::kPaused - * @return std::vector of activated(selected) #Track infomation of stream - * @see EventListener::OnAdaptiveStreamingControlEvent(kBitrateChange) - */ + * @brief Get activated(selected) track infomation of the associated + * media. + * @remarks In the case of Adaptive Streaming such as HLS,DASH, + * Track.bitrate might be different from current bitrate + * because it can be changed based on network bandwidth whenever. + * If you need the current bitrate instantly, + * you can get it from OnAdaptiveStreamingControlEvent(). + * @pre The player must be one of #State::kTrackSourceReady, + * #State::kReady, #State::kPlaying or #State::kPaused + * @return std::vector of activated(selected) #Track infomation of stream + * @see EventListener::OnAdaptiveStreamingControlEvent(kBitrateChange) + */ virtual std::vector GetActiveTrackInfo() { return {}; } /** * @brief Get the duration of the stream set by url. @@ -799,7 +802,7 @@ class PlusPlayer : private boost::noncopyable { /** * @brief api to support stand-alone-mode. */ - virtual void SetWindowStandAloneMode() {return;} + virtual void SetWindowStandAloneMode() { return; } /** * @brief SetPreferredLanguage @@ -827,25 +830,28 @@ class PlusPlayer : private boost::noncopyable { virtual bool GetMALOGStatus() { return false; } #endif - /** - * @brief Activates stream. - * @param [in] type : track type - * @pre The player state can be all of #State except #State::kNone - */ - virtual bool Activate(const TrackType type) {return false;} - /** - * @brief Deactivates stream. - * @param [in] type : track type - * @pre The player state can be all of #State except #State::kNone - */ - virtual bool Deactivate(const TrackType type) {return false;} /** - * @brief Set decoder type - * @param [in] type : track type - * @param [in] DecoderType : hardware or software decoder type - * @pre The player state can be all of #State except #State::kNone - */ - virtual bool SetCodecType(const TrackType type, const PlayerCodecType& DecoderType) {return false;}; + * @brief Activates stream. + * @param [in] type : track type + * @pre The player state can be all of #State except #State::kNone + */ + virtual bool Activate(const TrackType type) { return false; } + /** + * @brief Deactivates stream. + * @param [in] type : track type + * @pre The player state can be all of #State except #State::kNone + */ + virtual bool Deactivate(const TrackType type) { return false; } + /** + * @brief Set decoder type + * @param [in] type : track type + * @param [in] DecoderType : hardware or software decoder type + * @pre The player state can be all of #State except #State::kNone + */ + virtual bool SetCodecType(const TrackType type, + const PlayerCodecType& DecoderType) { + return false; + }; /** * @brief Set decoded video frame buffer type. @@ -858,101 +864,102 @@ class PlusPlayer : private boost::noncopyable { return; } - /** - * @brief Get virtual resource id - * @param [in] type : The resource type of virtual id. - * @param [out] virtual_id : Stored virtual resource id value. - * @pre The player state should be #State::kReady, #State::kPlaying or - * #State::kPaused - * @post None - * @return @c True on success, otherwise @c False ("virtual_id" will be -1) - * @exception None - * @remark This function returns virtual resource id which player is - * allocated from resource manager. For example, virtual scaler id is - * required for an application to use capture API directly. - */ - virtual bool GetVirtualRscId(const RscType type, int* virtual_id) { - return false; - } - /** - * @brief Provided api for setting alternative video resource(sub decoder - * and sub scaler) - * @param [in] is_set : set alternative video resource - * (@c 0 [defualt] = set all video resources(decoder/scaler) to - * main resources, - * @c 1 = set all video resources(decoder/scaler) to sub - * resources, - * @c 2 = set only decoder to sub resource, - * @c 3 = set only scaler to sub resource) - * @pre The player state should be #State::kIdle - * @return @c True on success, otherwise @c False - */ - virtual bool SetAlternativeVideoResource(unsigned int rsc_type) { + /** + * @brief Get virtual resource id + * @param [in] type : The resource type of virtual id. + * @param [out] virtual_id : Stored virtual resource id value. + * @pre The player state should be #State::kReady, #State::kPlaying or + * #State::kPaused + * @post None + * @return @c True on success, otherwise @c False ("virtual_id" will be -1) + * @exception None + * @remark This function returns virtual resource id which player is + * allocated from resource manager. For example, virtual scaler id + * is required for an application to use capture API directly. + */ + virtual bool GetVirtualRscId(const RscType type, int* virtual_id) { return false; } - - /** - * @brief Provided api for setting advanced picture quality type - * @param [in] quality_type : value of picture quality type - * (@c kTvPlus = TV Plus) - * @pre The player state should be #State::kIdle - * @return @c True on success, otherwise @c False - */ - virtual bool SetAdvancedPictureQualityType(const AdvPictureQualityType quality_type) { + /** + * @brief Provided api for setting alternative video resource(sub decoder + * and sub scaler) + * @param [in] is_set : set alternative video resource + * (@c 0 [defualt] = set all video resources(decoder/scaler) to + * main resources, + * @c 1 = set all video resources(decoder/scaler) to sub + * resources, + * @c 2 = set only decoder to sub resource, + * @c 3 = set only scaler to sub resource) + * @pre The player state should be #State::kIdle + * @return @c True on success, otherwise @c False + */ + virtual bool SetAlternativeVideoResource(unsigned int rsc_type) { return false; } + /** + * @brief Provided api for setting advanced picture quality type + * @param [in] quality_type : value of picture quality type + * (@c kTvPlus = TV Plus) + * @pre The player state should be #State::kIdle + * @return @c True on success, otherwise @c False + */ + virtual bool SetAdvancedPictureQualityType( + const AdvPictureQualityType quality_type) { + return false; + } /** * @brief Below apis used for open section and pes filter callback - from ts sgment + from ts sgment * @param [in] pid : program id in ts pkt * @pre The player state can be all of #State except #State::kNone */ - virtual void OpenSecInfoCb(int pid){return ;} - virtual void OpenPesInfoCb(int pid){return ;} + virtual void OpenSecInfoCb(int pid) { return; } + virtual void OpenPesInfoCb(int pid) { return; } /** - * @brief Below apis used for closing the callback set in openSection/pes - * @param [in] pid : program id in ts pkt - * @pre The player state should be #State::kReady, #State::kPlaying or #State::kPaused - */ - virtual void CloseSecInfo(int pid){return ;} - virtual void ClosePesInfo(int pid){return ;} + * @brief Below apis used for closing the callback set in + * openSection/pes + * @param [in] pid : program id in ts pkt + * @pre The player state should be #State::kReady, #State::kPlaying or + * #State::kPaused + */ + virtual void CloseSecInfo(int pid) { return; } + virtual void ClosePesInfo(int pid) { return; } /** - * @brief Set audio easing to avoid acoustic shock at play starts. - * @pre The player state can be all of #State except #State::kNone and #State::kPlaying - */ - virtual bool SetAntiAcousticShock(){ return false; } - - - - /** - * @brief Set audio volume level - * @pre The player state can be #State::kPlaying or #State::kPaused - * @param [in] volume range [0,100] - * @return If set action excuted sucessfully - */ - virtual bool SetVolume(int volume){ return false; } - - /** - * @brief Get audio volume level - * @pre The player state can be #State::kPlaying or #State::kPaused - * @param [out] volume , - * @return If Get action excuted sucessfully - */ + * @brief Set audio easing to avoid acoustic shock at play starts. + * @pre The player state can be all of #State except #State::kNone and + * #State::kPlaying + */ + virtual bool SetAntiAcousticShock() { return false; } + + /** + * @brief Set audio volume level + * @pre The player state can be #State::kPlaying or #State::kPaused + * @param [in] volume range [0,100] + * @return If set action excuted sucessfully + */ + virtual bool SetVolume(int volume) { return false; } + + /** + * @brief Get audio volume level + * @pre The player state can be #State::kPlaying or #State::kPaused + * @param [out] volume , + * @return If Get action excuted sucessfully + */ virtual bool GetVolume(int* volume) { return false; } - /** - * @brief Get audio muted state - * @pre The player state can be any besides #State::kNone - * @return If audio muted - */ - virtual bool IsMuted() { return false; } + /** + * @brief Get audio muted state + * @pre The player state can be any besides #State::kNone + * @return If audio muted + */ + virtual bool IsMuted() { return false; } - virtual bool SwitchUri(int64_t ms){return false;} + virtual bool SwitchUri(int64_t ms) { return false; } protected: /** diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/track.h b/packages/video_player_avplayer/tizen/inc/plusplayer/track.h index b0690b0b4..3b95f4f6a 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/track.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/track.h @@ -1,25 +1,25 @@ /** -* @file -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TRACK_H__ #define __PLUSPLAYER_TRACK_H__ @@ -73,28 +73,53 @@ struct Track { bool use_swdecoder = false; std::string language_code; std::string subtitle_format; - Track() {}; - Track(int _index, int _id, std::string _mimetype, std::string _streamtype, std::string _container_type, - TrackType _type, std::shared_ptr _codec_data, unsigned int _codec_tag, int _codec_data_len, - int _width, int _height, int _maxwidth, int _maxheight, int _framerate_num, int _framerate_den, - int _sample_rate, int _sample_format, int _channels, int _version, int _layer, int _bits_per_sample, - int _block_align, int _bitrate, int _endianness, bool _is_signed, bool _active, bool _use_swdecoder, - std::string _language_code, std::string _subtitle_format) - : index(_index), id(_id), mimetype(_mimetype), streamtype(_streamtype), container_type(_container_type), - type(_type), codec_data(_codec_data), codec_tag(_codec_tag), codec_data_len(_codec_data_len), - width(_width), height(_height), maxwidth(_maxwidth), maxheight(_maxheight), framerate_num(_framerate_num), framerate_den(_framerate_den), - sample_rate(_sample_rate), sample_format(_sample_format), channels(_channels), version(_version), layer(_layer), bits_per_sample(_bits_per_sample), - block_align(_block_align), bitrate(_bitrate), endianness(_endianness), is_signed(_is_signed), active(_active), use_swdecoder(_use_swdecoder), - language_code(_language_code), subtitle_format(_subtitle_format) {}; + Track(){}; + Track(int _index, int _id, std::string _mimetype, std::string _streamtype, + std::string _container_type, TrackType _type, + std::shared_ptr _codec_data, unsigned int _codec_tag, + int _codec_data_len, int _width, int _height, int _maxwidth, + int _maxheight, int _framerate_num, int _framerate_den, + int _sample_rate, int _sample_format, int _channels, int _version, + int _layer, int _bits_per_sample, int _block_align, int _bitrate, + int _endianness, bool _is_signed, bool _active, bool _use_swdecoder, + std::string _language_code, std::string _subtitle_format) + : index(_index), + id(_id), + mimetype(_mimetype), + streamtype(_streamtype), + container_type(_container_type), + type(_type), + codec_data(_codec_data), + codec_tag(_codec_tag), + codec_data_len(_codec_data_len), + width(_width), + height(_height), + maxwidth(_maxwidth), + maxheight(_maxheight), + framerate_num(_framerate_num), + framerate_den(_framerate_den), + sample_rate(_sample_rate), + sample_format(_sample_format), + channels(_channels), + version(_version), + layer(_layer), + bits_per_sample(_bits_per_sample), + block_align(_block_align), + bitrate(_bitrate), + endianness(_endianness), + is_signed(_is_signed), + active(_active), + use_swdecoder(_use_swdecoder), + language_code(_language_code), + subtitle_format(_subtitle_format){}; }; -typedef struct _CaptionTracks -{ +typedef struct _CaptionTracks { int index = kInvalidTrackIndex; std::string name; std::string language; std::string inStreamId; -}CaptionTracks; +} CaptionTracks; enum SubtitleAttrType { kSubAttrRegionXPos = 0, // float type @@ -137,11 +162,7 @@ enum SubtitleAttrType { kSubAttrTypeNone }; -enum class SubtitleType { - kText, - kPicture, - kInvalid -}; +enum class SubtitleType { kText, kPicture, kInvalid }; struct SubtitleAttr { explicit SubtitleAttr(const SubtitleAttrType _type, @@ -161,8 +182,8 @@ struct SubtitleAttr { using SubtitleAttrList = std::list; using SubtitleAttrListPtr = std::unique_ptr; struct Rational { - int num = 0; // the numerator value - int den = 0; // the denominator value + int num = 0; // the numerator value + int den = 0; // the denominator value }; } // namespace plusplayer diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/buffer.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/buffer.h index da87a8420..aaa5540b3 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/buffer.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/buffer.h @@ -1,26 +1,26 @@ /** -* @file buffer.h -* @brief the buffer for playback -* @interfacetype Module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 0.0.1 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file buffer.h + * @brief the buffer for playback + * @interfacetype Module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 0.0.1 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TYPES_BUFFER_H__ #define __PLUSPLAYER_TYPES_BUFFER_H__ diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/display.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/display.h index 39296cdb3..55d049925 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/display.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/display.h @@ -1,25 +1,25 @@ /** -* @file display.h -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file display.h + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TYPES_DISPLAY_H__ #define __PLUSPLAYER_TYPES_DISPLAY_H__ diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/error.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/error.h index 1b95a2dd0..0408d9ffa 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/error.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/error.h @@ -1,25 +1,25 @@ /** -* @file error.h -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file error.h + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TYPES_ERROR_H__ #define __PLUSPLAYER_TYPES_ERROR_H__ @@ -28,47 +28,64 @@ namespace plusplayer { -#define PLUSPLAYER_ERROR_CLASS TIZEN_ERROR_PLAYER | 0x20 +#define PLUSPLAYER_ERROR_CLASS TIZEN_ERROR_PLAYER | 0x20 /* This is for custom defined player error. */ -#define PLUSPLAYER_CUSTOM_ERROR_CLASS TIZEN_ERROR_PLAYER | 0x1000 - +#define PLUSPLAYER_CUSTOM_ERROR_CLASS TIZEN_ERROR_PLAYER | 0x1000 enum class ErrorType { - kNone = TIZEN_ERROR_NONE, /**< Successful */ - kOutOfMemory = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ - kInvalidParameter = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */ - kNoSuchFile = TIZEN_ERROR_NO_SUCH_FILE, /**< No such file or directory */ - kInvalidOperation = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */ - kFileNoSpaceOnDevice = TIZEN_ERROR_FILE_NO_SPACE_ON_DEVICE, /**< No space left on the device */ - kFeatureNotSupportedOnDevice = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ - kSeekFailed = PLUSPLAYER_ERROR_CLASS | 0x01, /**< Seek operation failure */ - kInvalidState = PLUSPLAYER_ERROR_CLASS | 0x02, /**< Invalid state */ - kNotSupportedFile = PLUSPLAYER_ERROR_CLASS | 0x03, /**< File format not supported */ - kInvalidUri = PLUSPLAYER_ERROR_CLASS | 0x04, /**< Invalid URI */ - kSoundPolicy = PLUSPLAYER_ERROR_CLASS | 0x05, /**< Sound policy error */ - kConnectionFailed = PLUSPLAYER_ERROR_CLASS | 0x06, /**< Streaming connection failed */ - kVideoCaptureFailed = PLUSPLAYER_ERROR_CLASS | 0x07, /**< Video capture failed */ - kDrmExpired = PLUSPLAYER_ERROR_CLASS | 0x08, /**< Expired license */ - kDrmNoLicense = PLUSPLAYER_ERROR_CLASS | 0x09, /**< No license */ - kDrmFutureUse = PLUSPLAYER_ERROR_CLASS | 0x0a, /**< License for future use */ - kDrmNotPermitted = PLUSPLAYER_ERROR_CLASS | 0x0b, /**< Format not permitted */ - kResourceLimit = PLUSPLAYER_ERROR_CLASS | 0x0c, /**< Resource limit */ - kPermissionDenied = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */ - kServiceDisconnected = PLUSPLAYER_ERROR_CLASS | 0x0d, /**< Socket connection lost (Since 3.0) */ - kBufferSpace = TIZEN_ERROR_BUFFER_SPACE, /**< No buffer space available (Since 3.0)*/ - kNotSupportedAudioCodec = PLUSPLAYER_ERROR_CLASS | 0x0e, /**< Not supported audio codec but video can be played (Since 4.0) */ - kNotSupportedVideoCodec = PLUSPLAYER_ERROR_CLASS | 0x0f, /**< Not supported video codec but audio can be played (Since 4.0) */ - kNotSupportedSubtitle = PLUSPLAYER_ERROR_CLASS | 0x10, /**< Not supported subtitle format (Since 4.0) */ - - // TODO(euna7.ko) Can be removed. refer to http://168.219.243.246:8090/pages/viewpage.action?pageId=27269511 - kDrmInfo = PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x05, /**< playready drm error info */ + kNone = TIZEN_ERROR_NONE, /**< Successful */ + kOutOfMemory = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ + kInvalidParameter = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */ + kNoSuchFile = TIZEN_ERROR_NO_SUCH_FILE, /**< No such file or directory */ + kInvalidOperation = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */ + kFileNoSpaceOnDevice = + TIZEN_ERROR_FILE_NO_SPACE_ON_DEVICE, /**< No space left on the device */ + kFeatureNotSupportedOnDevice = + TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ + kSeekFailed = PLUSPLAYER_ERROR_CLASS | 0x01, /**< Seek operation failure */ + kInvalidState = PLUSPLAYER_ERROR_CLASS | 0x02, /**< Invalid state */ + kNotSupportedFile = + PLUSPLAYER_ERROR_CLASS | 0x03, /**< File format not supported */ + kInvalidUri = PLUSPLAYER_ERROR_CLASS | 0x04, /**< Invalid URI */ + kSoundPolicy = PLUSPLAYER_ERROR_CLASS | 0x05, /**< Sound policy error */ + kConnectionFailed = + PLUSPLAYER_ERROR_CLASS | 0x06, /**< Streaming connection failed */ + kVideoCaptureFailed = + PLUSPLAYER_ERROR_CLASS | 0x07, /**< Video capture failed */ + kDrmExpired = PLUSPLAYER_ERROR_CLASS | 0x08, /**< Expired license */ + kDrmNoLicense = PLUSPLAYER_ERROR_CLASS | 0x09, /**< No license */ + kDrmFutureUse = PLUSPLAYER_ERROR_CLASS | 0x0a, /**< License for future use */ + kDrmNotPermitted = PLUSPLAYER_ERROR_CLASS | 0x0b, /**< Format not permitted */ + kResourceLimit = PLUSPLAYER_ERROR_CLASS | 0x0c, /**< Resource limit */ + kPermissionDenied = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */ + kServiceDisconnected = + PLUSPLAYER_ERROR_CLASS | 0x0d, /**< Socket connection lost (Since 3.0) */ + kBufferSpace = + TIZEN_ERROR_BUFFER_SPACE, /**< No buffer space available (Since 3.0)*/ + kNotSupportedAudioCodec = + PLUSPLAYER_ERROR_CLASS | 0x0e, /**< Not supported audio codec but video + can be played (Since 4.0) */ + kNotSupportedVideoCodec = + PLUSPLAYER_ERROR_CLASS | 0x0f, /**< Not supported video codec but audio + can be played (Since 4.0) */ + kNotSupportedSubtitle = + PLUSPLAYER_ERROR_CLASS | + 0x10, /**< Not supported subtitle format (Since 4.0) */ + + // TODO(euna7.ko) Can be removed. refer to + // http://168.219.243.246:8090/pages/viewpage.action?pageId=27269511 + kDrmInfo = + PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x05, /**< playready drm error info */ kNotSupportedFormat = PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x08, kStreamingPlayer = PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x09, kDtcpFsk = PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x0a, - kPreLoadingTimeOut =PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x0b, /**< can't finish preloading in time*/ - kNetworkError = PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x0c, /**< for network error */ - kChannelSurfingFailed = PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x0d, /**< for channel surfing error */ + kPreLoadingTimeOut = PLUSPLAYER_CUSTOM_ERROR_CLASS | + 0x0b, /**< can't finish preloading in time*/ + kNetworkError = + PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x0c, /**< for network error */ + kChannelSurfingFailed = + PLUSPLAYER_CUSTOM_ERROR_CLASS | 0x0d, /**< for channel surfing error */ kUnknown }; diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/latency.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/latency.h index 87a8e65c6..25073c6a3 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/latency.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/latency.h @@ -1,44 +1,35 @@ /** -* @file -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 3.0 -* @SDK_Support N -* -* Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 3.0 + * @SDK_Support N + * + * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TYPES_LATENCY_H__ #define __PLUSPLAYER_TYPES_LATENCY_H__ namespace plusplayer { -enum class CatchUpSpeed { - kNone, - kSlow, - kNormal, - kFast -}; - -enum class LatencyStatus { - kLow, - kMid, - kHigh -}; - +enum class CatchUpSpeed { kNone, kSlow, kNormal, kFast }; + +enum class LatencyStatus { kLow, kMid, kHigh }; + } // namespace plusplayer #endif // __PLUSPLAYER_TYPES_LATENCY_H__ \ No newline at end of file diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/picturequality.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/picturequality.h index 1cd673fde..704b28a27 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/picturequality.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/picturequality.h @@ -1,25 +1,25 @@ /** -* @file -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_PICTUREQUALITY_H__ #define __PLUSPLAYER_PICTUREQUALITY_H__ @@ -27,11 +27,9 @@ namespace plusplayer { /** -* @brief Advanced Picture Quality Type. -*/ -enum class AdvPictureQualityType { - kTvPlus -}; + * @brief Advanced Picture Quality Type. + */ +enum class AdvPictureQualityType { kTvPlus }; } // namespace plusplayer #endif // __PLUSPLAYER_PICTUREQUALITY_H__ \ No newline at end of file diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/resource.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/resource.h index d4df6bfc9..df3a607e3 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/resource.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/resource.h @@ -46,7 +46,7 @@ enum class RscAllocPolicy { }; /** - * @brief Enumerations for audio resource type + * @brief Enumerations for audio resource type */ enum PlayerAudioResourceType { /** diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/source.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/source.h index 897517293..590efb71d 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/source.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/source.h @@ -1,26 +1,26 @@ /** -* @file source.h -* @brief Types related to TrackSource -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file source.h + * @brief Types related to TrackSource + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_SRC_TRACKSOURCE_TYPES_H__ #define __PLUSPLAYER_SRC_TRACKSOURCE_TYPES_H__ @@ -58,16 +58,9 @@ enum class ContentFormat { kUnknown }; -enum class TrickPlayMode { - kNone, - kDefault, - kBySeek -}; +enum class TrickPlayMode { kNone, kDefault, kBySeek }; -enum class PlayingTimeSupport { - kNone, - kNeeded -}; +enum class PlayingTimeSupport { kNone, kNeeded }; } // namespace plusplayer diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/streaming_message.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/streaming_message.h index 3a6e18257..3b2e1ef36 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/streaming_message.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/streaming_message.h @@ -1,25 +1,25 @@ /** -* @file streaming_message.h -* @interfacetype module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 1.0 -* @SDK_Support N -* -* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file streaming_message.h + * @interfacetype module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 1.0 + * @SDK_Support N + * + * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TYPES_STREAMING_MESSAGE_H__ #define __PLUSPLAYER_TYPES_STREAMING_MESSAGE_H__ @@ -57,7 +57,7 @@ enum class StreamingMessageType { struct MessageParam { std::string data; int size = 0; - int code = 0; // Error or warning code + int code = 0; // Error or warning code }; } // namespace plusplayer diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/submitdata.h b/packages/video_player_avplayer/tizen/inc/plusplayer/types/submitdata.h index 8ade19f19..7148683dc 100644 --- a/packages/video_player_avplayer/tizen/inc/plusplayer/types/submitdata.h +++ b/packages/video_player_avplayer/tizen/inc/plusplayer/types/submitdata.h @@ -1,26 +1,26 @@ /** -* @file submitdata.h -* @brief the data type to submit -* @interfacetype Module -* @privlevel None-privilege -* @privilege None -* @product TV, AV, B2B -* @version 0.0.1 -* @SDK_Support N -* -* Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved -* PROPRIETARY/CONFIDENTIAL -* This software is the confidential and proprietary -* information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall -* not disclose such Confidential Information and shall use it only in -* accordance with the terms of the license agreement you entered into with -* SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the -* suitability of the software, either express or implied, including but not -* limited to the implied warranties of merchantability, fitness for a -* particular purpose, or non-infringement. SAMSUNG shall not be liable for any -* damages suffered by licensee as a result of using, modifying or distributing -* this software or its derivatives. -*/ + * @file submitdata.h + * @brief the data type to submit + * @interfacetype Module + * @privlevel None-privilege + * @privilege None + * @product TV, AV, B2B + * @version 0.0.1 + * @SDK_Support N + * + * Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved + * PROPRIETARY/CONFIDENTIAL + * This software is the confidential and proprietary + * information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall + * not disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into with + * SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the + * suitability of the software, either express or implied, including but not + * limited to the implied warranties of merchantability, fitness for a + * particular purpose, or non-infringement. SAMSUNG shall not be liable for any + * damages suffered by licensee as a result of using, modifying or distributing + * this software or its derivatives. + */ #ifndef __PLUSPLAYER_TYPES_SUBMITDATA_H__ #define __PLUSPLAYER_TYPES_SUBMITDATA_H__