summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfred <fred@home.lan>2011-05-02 18:56:50 (GMT)
committer fred <fred@home.lan>2011-05-02 18:56:50 (GMT)
commit0e9b4c5925ac99dc1c43caa0624c99dc2aab6103 (patch)
tree5ce937c6f4fa4213cc6e540cc424bc70b716bdef
parentc8fe933d8daf0f0b61a1e0f420ecbcdf76d006f5 (diff)
closing and re-opening v4l2 device now works
- 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.
-rw-r--r--qt/.gitignore1
-rw-r--r--qt/qEncoder.cpp1
-rw-r--r--qt/qJackClient.cpp2
-rw-r--r--src/v4l2_layer.cpp1
4 files changed, 4 insertions, 1 deletions
diff --git a/qt/.gitignore b/qt/.gitignore
index f0be531..cf2f31d 100644
--- a/qt/.gitignore
+++ b/qt/.gitignore
@@ -1,4 +1,5 @@
tmp/*
+avideo-2011-04-30-16-40-54.3gp
*.swp
toto*
thedaytrip_512kb.*
diff --git a/qt/qEncoder.cpp b/qt/qEncoder.cpp
index e70f519..d8a81d2 100644
--- a/qt/qEncoder.cpp
+++ b/qt/qEncoder.cpp
@@ -82,6 +82,7 @@ void QEncoder::init()
m_dumpButton = new QRadioButton("Dump", this);
m_dumpButton->setAutoExclusive(false);
+ m_dumpButton->setToolTip("needs to be streamed too to have a good A/V sync");
layoutG->addWidget(m_dumpButton, 6, 0);
m_FileName = new QLineEdit;
diff --git a/qt/qJackClient.cpp b/qt/qJackClient.cpp
index 1ff8d5f..a1c555a 100644
--- a/qt/qJackClient.cpp
+++ b/qt/qJackClient.cpp
@@ -112,7 +112,7 @@ void QJackClient::changeMixCoef(int val)
{
if ((m_Enc = m_Qfreej->getEnc()))
{
- float value = (float)val / 100.0;
+ float value = (float)val / 200.0;
m_Enc->setMixCoef(value);
}
}
diff --git a/src/v4l2_layer.cpp b/src/v4l2_layer.cpp
index 8d9955a..19b35d0 100644
--- a/src/v4l2_layer.cpp
+++ b/src/v4l2_layer.cpp
@@ -117,6 +117,7 @@ V4L2CamLayer::V4L2CamLayer()
}
V4L2CamLayer::~V4L2CamLayer() {
+ this->close();
if(m_res) delete(m_res);
if(fd) ::close(fd);
if(buffers) ::free(buffers);