mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 23:15:43 +00:00
Code Issues Releases Wiki Activity

Simplify PacketQueue::get

Browse source
This commit is contained in:
Chris Robinson 2012-12-15 02:50:59 -08:00
parent b41a77648e
commit eb0e8d9e37
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw/mwrender/videoplayer.cpp
View file

@ -42,7 +42,7 @@ struct PacketQueue {
boost::condition_variable cond; boost::condition_variable cond;
void put(AVPacket *pkt); void put(AVPacket *pkt);
int get(AVPacket *pkt, VideoState *is, int block); int get(AVPacket *pkt, VideoState *is);
void flush(); void flush();
}; };
@ -181,21 +181,12 @@ void PacketQueue::put(AVPacket *pkt)
this->mutex.unlock(); this->mutex.unlock();
} }
int PacketQueue::get(AVPacket *pkt, VideoState *is, int block) int PacketQueue::get(AVPacket *pkt, VideoState *is)
{ {
AVPacketList *pkt1;
int ret;
boost::unique_lock<boost::mutex> lock(this->mutex); boost::unique_lock<boost::mutex> lock(this->mutex);
for(;;) while(!is->quit)
{ {
if(is->quit) AVPacketList *pkt1 = this->first_pkt;
{
ret = -1;
break;
}
pkt1 = this->first_pkt;
if(pkt1) if(pkt1)
{ {
this->first_pkt = pkt1->next; this->first_pkt = pkt1->next;
@ -207,20 +198,13 @@ int PacketQueue::get(AVPacket *pkt, VideoState *is, int block)
*pkt = pkt1->pkt; *pkt = pkt1->pkt;
av_free(pkt1); av_free(pkt1);
ret = 1; return 1;
break;
}
if (!block)
{
ret = 0;
break;
} }
this->cond.wait(lock); this->cond.wait(lock);
} }
return ret; return -1;
} }
void PacketQueue::flush() void PacketQueue::flush()
@ -324,7 +308,7 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
return -1; return -1;
/* next packet */ /* next packet */
if(is->audioq.get(pkt, is, 1) < 0) if(is->audioq.get(pkt, is) < 0)
return -1; return -1;
/* if update, update the audio clock w/pts */ /* if update, update the audio clock w/pts */
@ -714,7 +698,7 @@ void VideoState::video_thread_loop(VideoState *self)
self->rgbaFrame = avcodec_alloc_frame(); self->rgbaFrame = avcodec_alloc_frame();
avpicture_alloc((AVPicture*)self->rgbaFrame, PIX_FMT_RGBA, self->video_st->codec->width, self->video_st->codec->height); avpicture_alloc((AVPicture*)self->rgbaFrame, PIX_FMT_RGBA, self->video_st->codec->width, self->video_st->codec->height);
while(self->videoq.get(packet, self, 1) >= 0) while(self->videoq.get(packet, self) >= 0)
{ {
// Save global pts to be stored in pFrame // Save global pts to be stored in pFrame
global_video_pkt_pts = packet->pts; global_video_pkt_pts = packet->pts;