Skip to content

Commit

Permalink
Change VideoBuffers method names to StudlyCaps style.
Browse files Browse the repository at this point in the history
  • Loading branch information
@stichnot
stichnot committed Jan 30, 2013
1 parent a8591ad commit 4aabde2
Show file tree
Hide file tree
Showing 11 changed files with 111 additions and 111 deletions.
94 changes: 47 additions & 47 deletions mythtv/libs/libmythtv/videobuffers.cpp
View file
Expand Up @@ -169,11 +169,11 @@ void VideoBuffers::Init(uint numdecode, bool extra_for_pause,
buffers.resize(numcreate);
for (uint i = 0; i < numcreate; i++)
{
memset(at(i), 0, sizeof(VideoFrame));
at(i)->codec = FMT_NONE;
at(i)->interlaced_frame = -1;
at(i)->top_field_first = +1;
vbufferMap[at(i)] = i;
memset(At(i), 0, sizeof(VideoFrame));
At(i)->codec = FMT_NONE;
At(i)->interlaced_frame = -1;
At(i)->top_field_first = +1;
vbufferMap[At(i)] = i;
}

needfreeframes = need_free;
Expand All @@ -184,10 +184,10 @@ void VideoBuffers::Init(uint numdecode, bool extra_for_pause,
createdpauseframe = extra_for_pause;

if (createdpauseframe)
enqueue(kVideoBuffer_pause, at(numcreate - 1));
Enqueue(kVideoBuffer_pause, At(numcreate - 1));

for (uint i = 0; i < numdecode; i++)
enqueue(kVideoBuffer_avail, at(i));
Enqueue(kVideoBuffer_avail, At(i));
}

/**
Expand Down Expand Up @@ -255,7 +255,7 @@ VideoFrame *VideoBuffers::GetNextFreeFrameInternal(BufferType enqueue_to)
}

if (frame)
safeEnqueue(enqueue_to, frame);
SafeEnqueue(enqueue_to, frame);

return frame;
}
Expand Down Expand Up @@ -327,7 +327,7 @@ void VideoBuffers::DeLimboFrame(VideoFrame *frame)
// if decoder didn't release frame and the buffer is getting released by
// the decoder assume that the frame is lost and return to available
if (!decode.contains(frame))
safeEnqueue(kVideoBuffer_avail, frame);
SafeEnqueue(kVideoBuffer_avail, frame);

// remove from decode queue since the decoder is finished
while (decode.contains(frame))
Expand Down Expand Up @@ -355,7 +355,7 @@ void VideoBuffers::DoneDisplayingFrame(VideoFrame *frame)
if(used.contains(frame))
Remove(kVideoBuffer_used, frame);

enqueue(kVideoBuffer_finished, frame);
Enqueue(kVideoBuffer_finished, frame);

// check if any finished frames are no longer used by decoder and return to available
frame_queue_t ula(finished);
Expand All @@ -365,7 +365,7 @@ void VideoBuffers::DoneDisplayingFrame(VideoFrame *frame)
if (!decode.contains(*it))
{
Remove(kVideoBuffer_finished, *it);
enqueue(kVideoBuffer_avail, *it);
Enqueue(kVideoBuffer_avail, *it);
}
}
}
Expand All @@ -378,10 +378,10 @@ void VideoBuffers::DoneDisplayingFrame(VideoFrame *frame)
void VideoBuffers::DiscardFrame(VideoFrame *frame)
{
QMutexLocker locker(&global_lock);
safeEnqueue(kVideoBuffer_avail, frame);
SafeEnqueue(kVideoBuffer_avail, frame);
}

frame_queue_t *VideoBuffers::queue(BufferType type)
frame_queue_t *VideoBuffers::Queue(BufferType type)
{
QMutexLocker locker(&global_lock);

Expand All @@ -405,7 +405,7 @@ frame_queue_t *VideoBuffers::queue(BufferType type)
return q;
}

const frame_queue_t *VideoBuffers::queue(BufferType type) const
const frame_queue_t *VideoBuffers::Queue(BufferType type) const
{
QMutexLocker locker(&global_lock);

Expand All @@ -429,23 +429,23 @@ const frame_queue_t *VideoBuffers::queue(BufferType type) const
return q;
}

VideoFrame *VideoBuffers::dequeue(BufferType type)
VideoFrame *VideoBuffers::Dequeue(BufferType type)
{
QMutexLocker locker(&global_lock);

frame_queue_t *q = queue(type);
frame_queue_t *q = Queue(type);

if (!q)
return NULL;

return q->dequeue();
}

VideoFrame *VideoBuffers::head(BufferType type)
VideoFrame *VideoBuffers::Head(BufferType type)
{
QMutexLocker locker(&global_lock);

frame_queue_t *q = queue(type);
frame_queue_t *q = Queue(type);

if (!q)
return NULL;
Expand All @@ -456,11 +456,11 @@ VideoFrame *VideoBuffers::head(BufferType type)
return NULL;
}

VideoFrame *VideoBuffers::tail(BufferType type)
VideoFrame *VideoBuffers::Tail(BufferType type)
{
QMutexLocker locker(&global_lock);

frame_queue_t *q = queue(type);
frame_queue_t *q = Queue(type);

if (!q)
return NULL;
Expand All @@ -471,12 +471,12 @@ VideoFrame *VideoBuffers::tail(BufferType type)
return NULL;
}

void VideoBuffers::enqueue(BufferType type, VideoFrame *frame)
void VideoBuffers::Enqueue(BufferType type, VideoFrame *frame)
{
if (!frame)
return;

frame_queue_t *q = queue(type);
frame_queue_t *q = Queue(type);
if (!q)
return;

Expand Down Expand Up @@ -511,34 +511,34 @@ void VideoBuffers::Remove(BufferType type, VideoFrame *frame)
finished.remove(frame);
}

void VideoBuffers::requeue(BufferType dst, BufferType src, int num)
void VideoBuffers::Requeue(BufferType dst, BufferType src, int num)
{
QMutexLocker locker(&global_lock);

num = (num <= 0) ? size(src) : num;
num = (num <= 0) ? Size(src) : num;
for (uint i=0; i<(uint)num; i++)
{
VideoFrame *frame = dequeue(src);
VideoFrame *frame = Dequeue(src);
if (frame)
enqueue(dst, frame);
Enqueue(dst, frame);
}
}

void VideoBuffers::safeEnqueue(BufferType dst, VideoFrame* frame)
void VideoBuffers::SafeEnqueue(BufferType dst, VideoFrame* frame)
{
if (!frame)
return;

QMutexLocker locker(&global_lock);

Remove(kVideoBuffer_all, frame);
enqueue(dst, frame);
Enqueue(dst, frame);
}

frame_queue_t::iterator VideoBuffers::begin_lock(BufferType type)
{
global_lock.lock();
frame_queue_t *q = queue(type);
frame_queue_t *q = Queue(type);
if (q)
return q->begin();
else
Expand All @@ -550,7 +550,7 @@ frame_queue_t::iterator VideoBuffers::end(BufferType type)
QMutexLocker locker(&global_lock);

frame_queue_t::iterator it;
frame_queue_t *q = queue(type);
frame_queue_t *q = Queue(type);
if (q)
it = q->end();
else
Expand All @@ -559,22 +559,22 @@ frame_queue_t::iterator VideoBuffers::end(BufferType type)
return it;
}

uint VideoBuffers::size(BufferType type) const
uint VideoBuffers::Size(BufferType type) const
{
QMutexLocker locker(&global_lock);

const frame_queue_t *q = queue(type);
const frame_queue_t *q = Queue(type);
if (q)
return q->size();

return 0;
}

bool VideoBuffers::contains(BufferType type, VideoFrame *frame) const
bool VideoBuffers::Contains(BufferType type, VideoFrame *frame) const
{
QMutexLocker locker(&global_lock);

const frame_queue_t *q = queue(type);
const frame_queue_t *q = Queue(type);
if (q)
return q->contains(frame);

Expand All @@ -583,25 +583,25 @@ bool VideoBuffers::contains(BufferType type, VideoFrame *frame) const

VideoFrame *VideoBuffers::GetScratchFrame(void)
{
if (!createdpauseframe || !head(kVideoBuffer_pause))
if (!createdpauseframe || !Head(kVideoBuffer_pause))
{
LOG(VB_GENERAL, LOG_ERR, "GetScratchFrame() called, but not allocated");
}

QMutexLocker locker(&global_lock);
return head(kVideoBuffer_pause);
return Head(kVideoBuffer_pause);
}

void VideoBuffers::SetLastShownFrameToScratch(void)
{
if (!createdpauseframe || !head(kVideoBuffer_pause))
if (!createdpauseframe || !Head(kVideoBuffer_pause))
{
LOG(VB_GENERAL, LOG_ERR,
"SetLastShownFrameToScratch() called but no pause frame");
return;
}

VideoFrame *pause = head(kVideoBuffer_pause);
VideoFrame *pause = Head(kVideoBuffer_pause);
rpos = vbufferMap[pause];
}

Expand Down Expand Up @@ -646,16 +646,16 @@ void VideoBuffers::DiscardFrames(bool next_frame_keyframe)
{
for (uint i=0; i < Size(); i++)
{
if (!available.contains(at(i)) &&
!pause.contains(at(i)) &&
!displayed.contains(at(i)))
if (!available.contains(At(i)) &&
!pause.contains(At(i)) &&
!displayed.contains(At(i)))
{
LOG(VB_GENERAL, LOG_ERR,
QString("VideoBuffers::DiscardFrames(): ERROR, %1 (%2) not "
"in available, pause, or displayed %3")
.arg(DebugString(at(i), true)).arg((long long)at(i))
.arg(DebugString(At(i), true)).arg((long long)At(i))
.arg(GetStatus()));
DiscardFrame(at(i));
DiscardFrame(At(i));
}
}
}
Expand All @@ -679,7 +679,7 @@ void VideoBuffers::ClearAfterSeek(void)
QMutexLocker locker(&global_lock);

for (uint i = 0; i < Size(); i++)
at(i)->timecode = 0;
At(i)->timecode = 0;

while (used.count() > 1)
{
Expand Down Expand Up @@ -772,11 +772,11 @@ uint VideoBuffers::AddBuffer(int width, int height, void* data,
memset(&buffers[num], 0, sizeof(VideoFrame));
buffers[num].interlaced_frame = -1;
buffers[num].top_field_first = 1;
vbufferMap[at(num)] = num;
vbufferMap[At(num)] = num;
init(&buffers[num], fmt, (unsigned char*)data, width, height, 0);
buffers[num].priv[0] = ffmpeg_hack;
buffers[num].priv[1] = ffmpeg_hack;
enqueue(kVideoBuffer_avail, at(num));
Enqueue(kVideoBuffer_avail, At(num));

return Size();
}
Expand Down Expand Up @@ -852,7 +852,7 @@ QString VideoBuffers::GetStatus(int n) const

void VideoBuffers::Clear(uint i)
{
clear(at(i));
clear(At(i));
}

void VideoBuffers::Clear(void)
Expand Down
42 changes: 21 additions & 21 deletions mythtv/libs/libmythtv/videobuffers.h
View file
Expand Up @@ -87,37 +87,37 @@ class VideoBuffers
void DoneDisplayingFrame(VideoFrame *frame);
void DiscardFrame(VideoFrame *frame);

VideoFrame *at(uint i) { return &buffers[i]; }
VideoFrame *dequeue(BufferType);
VideoFrame *head(BufferType); // peek at next dequeue
VideoFrame *tail(BufferType); // peek at last enqueue
void requeue(BufferType dst, BufferType src, int num = 1);
void enqueue(BufferType, VideoFrame*);
void safeEnqueue(BufferType, VideoFrame* frame);
VideoFrame *At(uint i) { return &buffers[i]; }
VideoFrame *Dequeue(BufferType);
VideoFrame *Head(BufferType); // peek at next dequeue
VideoFrame *Tail(BufferType); // peek at last enqueue
void Requeue(BufferType dst, BufferType src, int num = 1);
void Enqueue(BufferType, VideoFrame*);
void SafeEnqueue(BufferType, VideoFrame* frame);
void Remove(BufferType, VideoFrame *); // multiple buffer types ok
frame_queue_t::iterator begin_lock(BufferType); // this locks VideoBuffer
frame_queue_t::iterator end(BufferType);
void end_lock() { global_lock.unlock(); } // this unlocks VideoBuffer
uint size(BufferType type) const;
bool contains(BufferType type, VideoFrame*) const;
uint Size(BufferType type) const;
bool Contains(BufferType type, VideoFrame*) const;

VideoFrame *GetScratchFrame(void);
VideoFrame *GetLastDecodedFrame(void) { return at(vpos); }
VideoFrame *GetLastShownFrame(void) { return at(rpos); }
VideoFrame *GetLastDecodedFrame(void) { return At(vpos); }
VideoFrame *GetLastShownFrame(void) { return At(rpos); }
void SetLastShownFrameToScratch(void);

uint ValidVideoFrames(void) const { return size(kVideoBuffer_used); }
uint FreeVideoFrames(void) const { return size(kVideoBuffer_avail); }
uint ValidVideoFrames(void) const { return Size(kVideoBuffer_used); }
uint FreeVideoFrames(void) const { return Size(kVideoBuffer_avail); }
bool EnoughFreeFrames(void) const
{ return size(kVideoBuffer_avail) >= needfreeframes; }
{ return Size(kVideoBuffer_avail) >= needfreeframes; }
bool EnoughDecodedFrames(void) const
{ return size(kVideoBuffer_used) >= needprebufferframes; }
{ return Size(kVideoBuffer_used) >= needprebufferframes; }
bool EnoughPrebufferedFrames(void) const
{ return size(kVideoBuffer_used) >= keepprebufferframes; }
{ return Size(kVideoBuffer_used) >= keepprebufferframes; }

const VideoFrame *at(uint i) const { return &buffers[i]; }
const VideoFrame *GetLastDecodedFrame(void) const { return at(vpos); }
const VideoFrame *GetLastShownFrame(void) const { return at(rpos); }
const VideoFrame *At(uint i) const { return &buffers[i]; }
const VideoFrame *GetLastDecodedFrame(void) const { return At(vpos); }
const VideoFrame *GetLastShownFrame(void) const { return At(rpos); }
uint Size() const { return buffers.size(); }

void Clear(uint i);
Expand All @@ -130,8 +130,8 @@ class VideoBuffers

QString GetStatus(int n=-1) const; // debugging method
private:
frame_queue_t *queue(BufferType type);
const frame_queue_t *queue(BufferType type) const;
frame_queue_t *Queue(BufferType type);
const frame_queue_t *Queue(BufferType type) const;
VideoFrame *GetNextFreeFrameInternal(BufferType enqueue_to);

frame_queue_t available, used, limbo, pause, displayed, decode, finished;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/videoout_d3d.cpp
View file
Expand Up @@ -427,7 +427,7 @@ void VideoOutputD3D::Zoom(ZoomDirection direction)
void VideoOutputD3D::UpdatePauseFrame(int64_t &disp_timecode)
{
QMutexLocker locker(&m_lock);
VideoFrame *used_frame = vbuffers.head(kVideoBuffer_used);
VideoFrame *used_frame = vbuffers.Head(kVideoBuffer_used);

if (codec_is_std(video_codec_id))
{
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/videoout_null.cpp
View file
Expand Up @@ -209,8 +209,8 @@ void VideoOutputNull::UpdatePauseFrame(int64_t &disp_timecode)
// Try used frame first, then fall back to scratch frame.
vbuffers.begin_lock(kVideoBuffer_used);
VideoFrame *used_frame = NULL;
if (vbuffers.size(kVideoBuffer_used) > 0)
used_frame = vbuffers.head(kVideoBuffer_used);
if (vbuffers.Size(kVideoBuffer_used) > 0)
used_frame = vbuffers.Head(kVideoBuffer_used);

if (used_frame)
CopyFrame(&av_pause_frame, used_frame);
Expand Down

0 comments on commit 4aabde2

Please sign in to comment.