Ticket #1871: 1871.patch
File 1871.patch, 1.9 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/videobuffers.h
160 160 uint vpos; 161 161 162 162 mutable QMutex global_lock; 163 QMutex inheritence_lock;164 163 165 164 bool use_frame_locks; 166 165 QMutex frame_lock; -
libs/libmythtv/videobuffers.cpp
84 84 : numbuffers(0), needfreeframes(0), needprebufferframes(0), 85 85 needprebufferframes_normal(0), needprebufferframes_small(0), 86 86 keepprebufferframes(0), need_extra_for_pause(false), rpos(0), vpos(0), 87 global_lock(true), inheritence_lock(false),use_frame_locks(true),87 global_lock(true), use_frame_locks(true), 88 88 frame_lock(true) 89 89 { 90 90 } … … 865 865 { 866 866 (void)frame; 867 867 #ifdef USING_XVMC 868 inheritence_lock.lock();868 global_lock.lock(); 869 869 870 870 frame_map_t::iterator it = parents.find(frame); 871 871 if (it == parents.end()) … … 910 910 children[*it].push_back((VideoFrame*)frame); 911 911 } 912 912 913 inheritence_lock.unlock();913 global_lock.unlock(); 914 914 #endif // USING_XVMC 915 915 } 916 916 917 917 void VideoBuffers::RemoveInheritence(const VideoFrame *frame) 918 918 { 919 inheritence_lock.lock();919 global_lock.lock(); 920 920 921 921 frame_map_t::iterator it = parents.find(frame); 922 922 if (it == parents.end()) 923 923 { 924 inheritence_lock.unlock();924 global_lock.unlock(); 925 925 return; 926 926 } 927 927 … … 953 953 .arg(i).arg(DebugString(*pit))); 954 954 } 955 955 956 inheritence_lock.unlock();956 global_lock.unlock(); 957 957 } 958 958 959 959 frame_queue_t VideoBuffers::Children(const VideoFrame *frame)