From: joogab.yun Date: Wed, 24 Jan 2024 06:16:40 +0000 (+0900) Subject: Change Vector to list. X-Git-Tag: dali_2.3.9~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48e5e6a8307ef7e2741416d58ac0b34d7d9c4450;p=platform%2Fcore%2Fuifw%2Fdali-extension.git Change Vector to list. The order of packets is important. However, when using Vector, the order cannot be guaranteed when removing. Change-Id: I806110a358f4663a3af4d7d42d111abebcb515d9 --- diff --git a/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp b/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp index a96ca8d..2345d3e 100755 --- a/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp +++ b/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp @@ -315,7 +315,7 @@ TizenVideoPlayer::TizenVideoPlayer(Dali::Actor actor, Dali::VideoSyncMode syncMo mBackgroundColor(Dali::Vector4(1.0f, 1.0f, 1.0f, 0.0f)), mTargetType(NATIVE_IMAGE), mPacketMutex(), - mPacketVector(), + mPacketList(), mStreamInfo(NULL), mStreamType(SOUND_STREAM_TYPE_MEDIA), mCodecType(PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT), @@ -1028,10 +1028,10 @@ bool TizenVideoPlayer::Update() mPacket = NULL; } - if(!mPacketVector.Empty()) + if(!mPacketList.empty()) { - mPacket = static_cast(mPacketVector[0]); - mPacketVector.Remove(mPacketVector.Begin()); + mPacket = static_cast< media_packet_h >( mPacketList.front() ); + mPacketList.pop_front(); } if(mPacket == NULL) @@ -1065,20 +1065,21 @@ void TizenVideoPlayer::DestroyPackets() mPacket = NULL; } - for(unsigned int i = 0; i < mPacketVector.Size(); ++i) + std::list::iterator iter = mPacketList.begin(); + for (; iter != mPacketList.end(); ++iter) { - mPacket = static_cast(mPacketVector[i]); - error = media_packet_destroy(mPacket); - DALI_LOG_ERROR("Media packet destroy error: %d\n", error); + mPacket = *iter; + error = media_packet_destroy( mPacket ); + DALI_LOG_ERROR( "Media packet destroy error: %d\n", error ); mPacket = NULL; } - mPacketVector.Clear(); + mPacketList.clear(); } void TizenVideoPlayer::PushPacket(media_packet_h packet) { Dali::Mutex::ScopedLock lock(mPacketMutex); - mPacketVector.PushBack(packet); + mPacketList.push_back(packet); } void TizenVideoPlayer::SetDisplayArea(DisplayArea area) diff --git a/dali-extension/video-player/ecore-wl2/tizen-video-player.h b/dali-extension/video-player/ecore-wl2/tizen-video-player.h index fde2a7e..3c74721 100755 --- a/dali-extension/video-player/ecore-wl2/tizen-video-player.h +++ b/dali-extension/video-player/ecore-wl2/tizen-video-player.h @@ -27,6 +27,7 @@ #include #include #include +#include #ifndef HAVE_WAYLAND #define HAVE_WAYLAND @@ -295,8 +296,8 @@ private: Dali::Vector4 mBackgroundColor; ///< Current background color, which texturestream mode needs. RenderingTargetType mTargetType; ///< Current rendering target type - Dali::Mutex mPacketMutex; - Dali::Vector mPacketVector; ///< Container for media packet handle from Tizen player callback + Dali::Mutex mPacketMutex; + std::list mPacketList; ///< Container for media packet handle from Tizen player callback sound_stream_info_h mStreamInfo; sound_stream_type_e mStreamType;