[Pkg-voip-commits] r7909 - in /qutecom/trunk/debian/patches: fix-codec-name.patch force-palette.patch
cavedon at alioth.debian.org
cavedon at alioth.debian.org
Sun Dec 20 23:56:16 UTC 2009
Author: cavedon
Date: Sun Dec 20 23:56:16 2009
New Revision: 7909
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7909
Log:
bugfix in fix-codec-name.patch
Modified:
qutecom/trunk/debian/patches/fix-codec-name.patch
qutecom/trunk/debian/patches/force-palette.patch
Modified: qutecom/trunk/debian/patches/fix-codec-name.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/fix-codec-name.patch?rev=7909&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/fix-codec-name.patch (original)
+++ qutecom/trunk/debian/patches/fix-codec-name.patch Sun Dec 20 23:56:16 2009
@@ -7,9 +7,10 @@
Author: Ludovico Cavedon <cavedon at debian.org>
Forwarded: http://trac.qutecom.org/ticket/178
-diff -r 572dec0fba53 -r bdfc9e3aba4a libs/pixertool/include/pixertool/pixertool.h
---- a/libs/pixertool/include/pixertool/pixertool.h Mon Dec 14 17:05:08 2009 +0100
-+++ b/libs/pixertool/include/pixertool/pixertool.h Thu Dec 17 12:18:47 2009 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/pixertool/include/pixertool/pixertool.h
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/pixertool/include/pixertool/pixertool.h 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/pixertool/include/pixertool/pixertool.h 2009-12-21 00:50:45.000000000 +0100
@@ -125,7 +125,7 @@
* @param pixfmt format identifier to get the name from
* @return The name of the pixel format
@@ -19,9 +20,10 @@
/**
* Converts image data from original palette to desired palette.
-diff -r 572dec0fba53 -r bdfc9e3aba4a libs/pixertool/src/pixertool.cpp
---- a/libs/pixertool/src/pixertool.cpp Mon Dec 14 17:05:08 2009 +0100
-+++ b/libs/pixertool/src/pixertool.cpp Thu Dec 17 12:18:47 2009 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/pixertool/src/pixertool.cpp
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/pixertool/src/pixertool.cpp 2009-12-21 00:50:41.000000000 +0100
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/pixertool/src/pixertool.cpp 2009-12-21 00:50:45.000000000 +0100
@@ -79,11 +79,11 @@
}
@@ -48,3 +50,34 @@
AVPicture avp_source, avp_target;
avpicture_fill(&avp_source, buf_source, pix_fmt_source, img_src->width, img_src->height);
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/webcam/src/WebcamDriver.cpp
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/webcam/src/WebcamDriver.cpp 2009-12-21 00:53:04.000000000 +0100
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/webcam/src/WebcamDriver.cpp 2009-12-21 00:54:09.000000000 +0100
+@@ -192,7 +192,7 @@
+ if (_startCounter == 0) {
+ if (_webcamPrivate->setPalette(palette) == WEBCAM_NOK) {
+ LOG_DEBUG("this webcam does not support palette #" + String::fromNumber(palette));
+- if (isFormatForced()) {
++ if (_webcamPrivate->getPalette() != PIX_OSI_UNSUPPORTED && isFormatForced()) {
+ LOG_DEBUG("palette conversion will be forced");
+ _desiredPalette = palette;
+ initializeConvImage();
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/webcam/src/v4l2/V4L2WebcamDriver.cpp
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/webcam/src/v4l2/V4L2WebcamDriver.cpp 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/webcam/src/v4l2/V4L2WebcamDriver.cpp 2009-12-21 00:53:36.000000000 +0100
+@@ -690,7 +690,12 @@
+
+ try { readCaps(); } catch (runtime_error& er) { return WEBCAM_NOK; }
+
+- LOG_DEBUG("Webcam pixelformat is " + std::string(pix_get_fmt_name(pix_v4l2_to_pix_osi(_vPixFormat.fmt.pix.pixelformat))) + " (" + String::fromNumber(pix_v4l2_to_pix_osi(_vPixFormat.fmt.pix.pixelformat)) + ")");
++ pixosi actual_palette = pix_v4l2_to_pix_osi(_vPixFormat.fmt.pix.pixelformat);
++ if(actual_palette == PIX_OSI_UNSUPPORTED) {
++ LOG_DEBUG("Webcam pixelformat is unsupported (v4l2 pixelformat " + String::fromNumber(_vPixFormat.fmt.pix.pixelformat) + ")");
++ } else {
++ LOG_DEBUG("Webcam pixelformat is " + std::string(pix_get_fmt_name(pix_v4l2_to_pix_osi(_vPixFormat.fmt.pix.pixelformat))) + " (" + String::fromNumber(pix_v4l2_to_pix_osi(_vPixFormat.fmt.pix.pixelformat)) + ")");
++ }
+
+ return (r == 0 && _vPixFormat.fmt.pix.pixelformat == pixelformat ? WEBCAM_OK : WEBCAM_NOK);
+ }
Modified: qutecom/trunk/debian/patches/force-palette.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/force-palette.patch?rev=7909&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/force-palette.patch (original)
+++ qutecom/trunk/debian/patches/force-palette.patch Sun Dec 20 23:56:16 2009
@@ -7,9 +7,10 @@
Author: Ludovico Cavedon <cavedon at debian.org>
Forwarded: http://trac.qutecom.org/ticket/179
-diff -r bdfc9e3aba4a -r b98492b2d423 libs/webcam/src/WebcamDriver.cpp
---- a/libs/webcam/src/WebcamDriver.cpp Thu Dec 17 12:18:47 2009 +0100
-+++ b/libs/webcam/src/WebcamDriver.cpp Thu Dec 17 13:50:31 2009 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/webcam/src/WebcamDriver.cpp
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/webcam/src/WebcamDriver.cpp 2009-12-21 00:54:09.000000000 +0100
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/webcam/src/WebcamDriver.cpp 2009-12-21 00:55:30.000000000 +0100
@@ -27,6 +27,8 @@
WebcamDriverFactory * WebcamDriver::_factory = NULL;
@@ -31,6 +32,6 @@
+ LOG_DEBUG("this webcam does not support palette #" + String::fromNumber(palette));
+ }
+ }
- if (isFormatForced()) {
+ if (_webcamPrivate->getPalette() != PIX_OSI_UNSUPPORTED && isFormatForced()) {
LOG_DEBUG("palette conversion will be forced");
_desiredPalette = palette;
More information about the Pkg-voip-commits
mailing list