/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ *
*/
void DeviceMPEGInput::set_captioning(int strk)
{
- mLock holds(decoder_lock);
+ decoder_lock->lock("DeviceMPEGInput::set_captioning");
captioning = strk;
if( src && video_stream >= 0 )
src->show_subtitle(video_stream, strk);
+ decoder_lock->unlock();
}
int DeviceMPEGInput::drop_frames(int frames)
{
- mLock holds(decoder_lock);
+ decoder_lock->lock("DeviceMPEGInput::drop_frames");
double result = -1.;
if( src && video_stream >= 0 )
result = src->drop_frames(frames,video_stream);
+ decoder_lock->unlock();
return result;
}
double DeviceMPEGInput::audio_timestamp()
{
- mLock holds(decoder_lock);
+ decoder_lock->lock("DeviceMPEGInput::audio_timestamp");
double result = -1.;
if( src && audio_stream >= 0 )
result = src->get_audio_time(audio_stream);
+ decoder_lock->unlock();
return result;
}
double DeviceMPEGInput::video_timestamp()
{
- mLock holds(decoder_lock);
+ decoder_lock->lock("DeviceMPEGInput::video_timestamp");
double ret = -1.;
if( src && video_stream >= 0 )
ret = src->get_video_time(video_stream);
+ decoder_lock->unlock();
return ret;
}
int DeviceMPEGInput::get_video_info(int track, int &pid, double &framerate,
int &width, int &height, char *title)
{
- //mLock holds(decoder_lock); caller of callback holds lock
+ //caller of callback holds decoder_lock;
if( !src ) return 1;
pid = src->video_pid(track);
framerate = src->frame_rate(track);