summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfred <fred@home.lan>2011-04-06 16:17:11 (GMT)
committer fred <fred@home.lan>2011-04-06 16:17:11 (GMT)
commit9ae9b42cc30678e74ed860e245595b5a523b1b2c (patch)
tree7e34e1e2c9f7fa2ccdd0e2d7b41657aaf1b5ef8d
parent3f4f5f1f2e2f216f978aafc5dc3098fad6bf93c6 (diff)
Not the big one .... necessary before merging :)
-rw-r--r--qt/.gitignore11
-rw-r--r--qt/TODO10
-rw-r--r--src/v4l2_layer.cpp2
3 files changed, 9 insertions, 14 deletions
diff --git a/qt/.gitignore b/qt/.gitignore
index ef7f961..28c373b 100644
--- a/qt/.gitignore
+++ b/qt/.gitignore
@@ -1,4 +1,5 @@
tmp/*
+*.swp
toto*
thedaytrip_512kb.*
Qfreej.pro.user.2.1pre1
@@ -29,24 +30,16 @@ dump.*
dump_t.*
capture_client
capture_client.*
-aaa.avi
atime.3gp
film.mp4
-film2.avi
-film_mono.avi
-film_org.avi
-kury_s.avi
-kury_s_mono.avi
*.o
qfreej_s
git_doc.txt
Qfreej.pro.user
Qfreej.pro.user.1.3
moc_*
-kury.avi
-term.avi
ui_qfreej.h
*.ods
TODO.txt
-atruc.avi
Video/*
+*.avi
diff --git a/qt/TODO b/qt/TODO
index 08120df..88b64c2 100644
--- a/qt/TODO
+++ b/qt/TODO
@@ -1,7 +1,6 @@
//move main window in accordance with the size
//resize ViewPort in accordance to the biggest layer .... (not sure it is good thing)
//be able to record all marked opened layers with the same quality .... a challenge :)
-//see to use Linklist.completion to add blit, filters and generators
//devide the fake size window by two .... not sure :)
//insert STRING filters parameters
//add a x:x ratio button, resizing to the closest width and lenght to obtain this ratio
@@ -13,8 +12,11 @@ the QJackClient of the time you waited to open the QJackClient .... see if a fix
//try to fix sound problem issue when opening several VideoLayer with audio
//add the capability to keep the actual config in a file..... important :)
//if resizing the wiewport when the layer is bigger, you just need to touch the layer size to display it correctly
-//why qfreej doesn't install with the AUR packages
//see if possible to manage an audio layer
//be able to change v4l2 resolution from the graphic interface and to disable it for some bad v4l2 devices
-//see why sound delay increases on video during streaming (sound slower than video ... or video too fast)
-//see why sound coming from the jack input stops after a whyle when streaming .... have to deconnect jack ports and reconnect
+//try to suppress the drift taken when applying an effect
+//streaming a/v, when stopping audio, the stream is corrupted and the client stops (oggmux_flush)
+//needs to launch QJackClient before start streaming when you want audio.
+//needs to re-launch streaming when disconnect and reconnect the jack input port
+//try to see why there is around 100 us more in between each call to the fps class (40100 instead od 40000 for 25fps)
+//merge with mastr branch ..... mainly for qt config modif \ No newline at end of file
diff --git a/src/v4l2_layer.cpp b/src/v4l2_layer.cpp
index b65dc97..352322c 100644
--- a/src/v4l2_layer.cpp
+++ b/src/v4l2_layer.cpp
@@ -129,7 +129,7 @@ bool V4L2CamLayer::open(const char *devfile) {
return (false);
}
-// memset(&format, 0, sizeof format);
+///////////// does not work with my ricoh and the uvcvideo module .... just comment out if needed
format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
format.fmt.pix.width = 352;
format.fmt.pix.height = 288;