summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* deactivated video_layer and minor fix to compileHEADmasterJaromil2016-04-074-53/+52
|
* seems that BSD has fixed this issue with dirent*Jaromil2013-09-081-4/+0
|
* cleanupJaromil2013-09-0331-4688/+4
| | | | old website removed and goom layer obsoleted
* fix for distcheck on static libsdl_gfx buildJaromil2013-08-291-0/+7
|
* fix to compile freetype (tested on ubuntu 12)Jaromil2013-08-291-1/+1
|
* ffmpeg api update <http://bugs.dyne.org/view.php?id=342>Jaromil2013-03-062-6/+7
|
* build system updates and fixesJaromil2013-03-068-3108/+18
|
* Merge branch 'sound'Jaromil2011-09-045-8/+1587
|\
| * Modified QqWidget textlayer behaviour.fred2011-07-125-1/+1569
| | | | | | | | | | | | | | | | | | | | - in QqWidget::QqWidget, connected the texto's textChanged signal to the modTextLayer slot. -in QqWidget::modTextLayer, added a call to resseZoom function so that the text is displayed correctly. - in theorautils, still work needs to be done for the skeleton
| * a Vorbis Theora sync bug fixed when dumping in a filefred2011-06-162-7/+18
| | | | | | | | | | | | | | - in theorautils add_fishead_packet, added time and modified the skeleton version from 3.0 to 4.0 ..... still in progress. In oggmux_flish(), only calculate the ratio for audio re-sampling if the videotime as changed .... avoids a sync bug
* | better autoconf macro for pythonJaromil2011-05-271-4/+18
|/
* fixes for make distcheckJaromil2011-05-263-8/+5
|
* using autoreconf to generate those filesJaromil2011-05-262-1614/+0
|
* now file dumped synced when done without streamingfred2011-05-061-0/+2
| | | | | | - in VideoEncoder::thread_loop, putted back fps->calc and fps->delay calls, this corrects a sync bug when a file was dumped on the disk without streaming at the same time.
* closing and re-opening v4l2 device now worksfred2011-05-024-1/+4
| | | | | | | | | | | - In V4L2CamLayer destructor, now call close() method to release the v4l2 device unmap buffers. - In QEncoder::init, added a momentary for the Dump button to explain that the A/V sync is ok when video dumped, only if it is streamed on an icecast server at the same time .... needs to be fixed :) - In QJackClient::changeMixCoef, devided the input mix value by two.
* Enhance FPS class to control the drift.fred2011-04-303-54/+43
| | | | | | | | - In QqWidget::changeFps, sets fps to origin fps when slider back to the middle. - In FPS class, added a coefficient (_ratio) to control the drift by adjusting the time (_period) to wait for.
* Sets the default v4l2 resolution to 640x480fred2011-04-271-13/+13
| | | | | - with my webcam, the image freezes if not set up with 640x480 resolution. Moved the m_res->setsX() to fill the list with the right resolution.
* correct check for v4l2Jaromil2011-04-271-1/+1
|
* Merge branch 'sound'Jaromil2011-04-2716-48/+397
|\
| * Some cleaning in the V4L2CamLayer, and Res classesfred2011-04-267-76/+6
| | | | | | | | | | - In Res::, removed the chgRes method. In V4L2CamLayer::open, replaced some std::cerr by error() function.
| * Merge branch 'master' of git@code.dyne.org:freej.git into soundfred2011-04-233-8/+14
| |\
| * | Added the ability to change the V4L2 devices resolutionfred2011-04-2214-28/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Created a QqComboRes class. - In Layer class, added the types VIDEOLAYER and V4L2LAYER. - In v4l2_layer.h and .cpp, created a Res class containing the available resolutions. - In QqWidget conctructor, determines if the layer is a v4l2 layer, added a combobox with the different resolutions if it is. - In a Qfreej menu, added the full screen function.
* | | link libshout to qtfreejJaromil2011-04-261-1/+1
| |/ |/|
* | fixes for make distcheckJaromil2011-04-202-2/+6
| |
* | Merge remote branch 'origin/sound'Jaromil2011-04-2020-139/+213
|\ \ | |/
| * In VideoEncoder::thread_loop, removed fps calls to be like it was originallyfred2011-04-104-6/+3
| | | | | | | | | | | | | | | | | | - in VideoEncoder::thread_loop, FPS::calc and ::delay calls added for streaming to work at the good speed were removed. - In FPS::delay, waitTime removed as not used. wake_ts.tv_sec init also removed as it is already done by the ::calc() method.
| * In OggTheoraEncoder, test if shout_new succeeded.fred2011-04-091-12/+24
| | | | | | | | | | - Also added possibility to see how long it takes between two thread_loops.
| * tried to tune the FPS (frame rate)fred2011-04-096-25/+58
| | | | | | | | | | | | | | | | | | | | - in FPS::calc, rate renamed _period and now in the class declaration. commented out the stats stuff ... does not seem to be used. In FPS::delay, added an other nanosleep function for the last 100 us + a viariable for fine tuning. Seems to work not to bad on my machine, but needs to be tested on others. - In VideoLayer, deleted some printed information.
| * There was a bug in qfreej frame rate initfred2011-04-092-14/+4
| |
| * modified remaining fps rate declaration from int to floatfred2011-04-083-10/+10
| | | | | | | | - In FPS::FPS and destructor, commented out the mutex creation.
| * Added and removed .cpp files since master merge.fred2011-04-062-7/+7
| | | | | | | | | | | | - removed Sound.cpp - added qLogging.cpp - modified the Makefile.am in accordance.
| * Merge branch 'master' into soundfred2011-04-0611-9/+93
| |\
| * | Not the big one .... necessary before merging :)fred2011-04-063-14/+9
| | |
| * | Now stops encoder when closing the QJackClientfred2011-04-063-0/+7
| | | | | | | | | | | | | | | | | | | | | - In Qfreej:: added the getQEnc() method. - In QJackClient destructor, now deletes the QEncoder if there is one when deleting QJackClient.
| * | try to manage videos which frame rate is not an integer.fred2011-04-068-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In QqWidget::QqWidget, modified the FPS to be changed in percentage. changed actualFps and normalFps to be taken as a float. - In FPS:: , modified to use float instead of int. - In oggmux_add_audio, limit the ratio to +- 10% resampling, which is a lot ..... just in case of big drift.
| * | qfreej now compils with the libs compiled at the same time.fred2011-04-061-1/+1
| | | | | | | | | | | | | | | - In Qfreej.pro, now tells to link with the previously compiled libs, located in ../src/.libs
| * | Lower the vorbis distortion.fred2011-04-052-9/+20
| | | | | | | | | | | | | | | | | | | | | - In oggmux_flush, now allowing re-sampling no more than 1% around the average drift. - In VideoEncoder::thread_loop(), un-commented shout_sync.
| * | Sync Audio with video, re-sampling audio according to the driftfred2011-03-316-38/+58
| | | | | | | | | | | | | | | | | | | | | | | | - in oggmux_init, initialised the SRC_DATA struct. In oggmux_add_audio, resample with src_process function. In oggmux_flush, calculate the ratio in accordance with difference between vorbis and theora. There is some work to do to avoid sound distortion :)
| * | Modified encoder sample rate to sync sound with videofred2011-03-285-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - in QJackClient, modified sample rate parameter when creating the AudioCollector object. This modify the vorbis speed when streaming. Commented out ::chgSampleRate() since it is not used - in init_info(), use again the skeleton. - VideoEncoder::thread_loop(), shaws the shout delay for testing.
* | | added Fredd in AUTHORSJaromil2011-04-201-6/+8
| |/ |/|
* | Fix build failure with ld --no-add-needed (Closes Debian bug #606717)Jaromil2011-03-281-1/+1
| |
* | Merge branch 'master' into soundJaromil2011-03-2810-8/+92
|\ \ | |/ |/|
| * fix crash to virtual method not being implemented in python class.Pablo Martin2011-03-281-0/+2
| |
| * correct --enable-qt-gui at configure helpJaromil2011-03-101-1/+1
| |
| * Merge branch 'sound'Jaromil2011-03-088-24/+67
| |\
| * | better link to libfreej.laJaromil2011-03-081-1/+1
| | |
| * | full path in qt4 built sourcesJaromil2011-03-071-1/+1
| | |
| * | using BUILT_SOURCES to pre-build uic and moc stuff for qt4Jaromil2011-03-071-17/+27
| | |
| * | exclude subdir qt if qt-gui is not enabledJaromil2011-03-072-3/+6
| | |
| * | generate qt ui files with uicJaromil2011-03-072-1/+14
| | |