[Pkg-voip-commits] r7894 - in /qutecom/trunk/debian: changelog patches/debian/force-palette.patch patches/generic/fix-codec-name.patch patches/series
cavedon at alioth.debian.org
cavedon at alioth.debian.org
Thu Dec 17 13:15:08 UTC 2009
Author: cavedon
Date: Thu Dec 17 13:15:02 2009
New Revision: 7894
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7894
Log:
Add debian/force-palette.patch: ability to force a numeric webcam palette
with OWWEBCAM_FORCE_PALETTE environment variable.
Add generic/fix-codec-name.patch, for fixing wrong plette name in debug
output.
Added:
qutecom/trunk/debian/patches/debian/force-palette.patch
qutecom/trunk/debian/patches/generic/fix-codec-name.patch
Modified:
qutecom/trunk/debian/changelog
qutecom/trunk/debian/patches/series
Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=7894&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Thu Dec 17 13:15:02 2009
@@ -2,8 +2,12 @@
* Change Uploader to debian email and remove DM-Upload-Allowed.
* Switch to source format 3.0 (quilt).
-
- -- Ludovico Cavedon <cavedon at debian.org> Thu, 17 Dec 2009 13:54:20 +0100
+ * Add debian/force-palette.patch: ability to force a numeric webcam palette
+ with OWWEBCAM_FORCE_PALETTE environment variable.
+ * Add generic/fix-codec-name.patch, for fixing wrong plette name in debug
+ output.
+
+ -- Ludovico Cavedon <cavedon at debian.org> Thu, 17 Dec 2009 14:00:02 +0100
qutecom (2.2~rc3.hg396~dfsg1-3) unstable; urgency=low
Added: qutecom/trunk/debian/patches/debian/force-palette.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/force-palette.patch?rev=7894&op=file
==============================================================================
--- qutecom/trunk/debian/patches/debian/force-palette.patch (added)
+++ qutecom/trunk/debian/patches/debian/force-palette.patch Thu Dec 17 13:15:02 2009
@@ -1,0 +1,35 @@
+# HG changeset patch
+# User Ludovico Cavedon <ludovico.cavedon at gmail.com>
+# Date 1261054231 -3600
+# Node ID b98492b2d423bcbcf2729bf345db2c4ce7519dd9
+# Parent bdfc9e3aba4a0dd87eada8d5bc6a377a97560854
+Description: add OWWEBCAM_FORCE_PALETTE env variable to force palette on the webcam
+Author: Ludovico Cavedon <cavedon at debian.org>
+
+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
+@@ -27,6 +27,8 @@
+
+ WebcamDriverFactory * WebcamDriver::_factory = NULL;
+
++#include <boost/lexical_cast.hpp>
++
+ #include <iostream>
+ using namespace std;
+
+@@ -192,6 +194,14 @@
+ if (_startCounter == 0) {
+ if (_webcamPrivate->setPalette(palette) == WEBCAM_NOK) {
+ LOG_DEBUG("this webcam does not support palette #" + String::fromNumber(palette));
++ const char *force_palette = getenv("OWWEBCAM_FORCE_PALETTE");
++ if(force_palette) {
++ pixosi forced_palette = pixosi(boost::lexical_cast<int>(force_palette));
++ LOG_DEBUG("trying with palette #" + String::fromNumber(forced_palette));
++ if (_webcamPrivate->setPalette(forced_palette) == WEBCAM_NOK) {
++ LOG_DEBUG("this webcam does not support palette #" + String::fromNumber(palette));
++ }
++ }
+ if (isFormatForced()) {
+ LOG_DEBUG("palette conversion will be forced");
+ _desiredPalette = palette;
Added: qutecom/trunk/debian/patches/generic/fix-codec-name.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/fix-codec-name.patch?rev=7894&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/fix-codec-name.patch (added)
+++ qutecom/trunk/debian/patches/generic/fix-codec-name.patch Thu Dec 17 13:15:02 2009
@@ -1,0 +1,50 @@
+# HG changeset patch
+# User Ludovico Cavedon <ludovico.cavedon at gmail.com>
+# Date 1261048727 -3600
+# Node ID bdfc9e3aba4a0dd87eada8d5bc6a377a97560854
+# Parent 572dec0fba53c85dd2cd1ea0dfa571a835797824
+Description: fix webcam codec name in debug messages
+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
+@@ -125,7 +125,7 @@
+ * @param pixfmt format identifier to get the name from
+ * @return The name of the pixel format
+ */
+-PIXERTOOL_API const char *pix_get_fmt_name(int pixfmt);
++PIXERTOOL_API const char *pix_get_fmt_name(pixosi pixfmt);
+
+ /**
+ * 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
+@@ -79,11 +79,11 @@
+ }
+
+ unsigned pix_size(pixosi pix, unsigned width, unsigned height) {
+- return avpicture_get_size((PixelFormat)pix_ffmpeg_from_pix_osi(pix), width, height);
++ return avpicture_get_size(pix_ffmpeg_from_pix_osi(pix), width, height);
+ }
+
+-const char *pix_get_fmt_name(int pixfmt) {
+- return avcodec_get_pix_fmt_name((PixelFormat)pixfmt);
++const char *pix_get_fmt_name(pixosi pixfmt) {
++ return avcodec_get_pix_fmt_name(pix_ffmpeg_from_pix_osi(pixfmt));
+ }
+
+ pixerrorcode pix_convert(int flags, piximage * img_dst, piximage * img_src) {
+@@ -112,8 +112,8 @@
+
+ //int len_target = pix_size(img_dst->palette, img_src->width, img_src->height);
+
+- enum PixelFormat pix_fmt_source = (PixelFormat)pix_ffmpeg_from_pix_osi(img_src->palette);
+- enum PixelFormat pix_fmt_target = (PixelFormat)pix_ffmpeg_from_pix_osi(img_dst->palette);
++ enum PixelFormat pix_fmt_source = pix_ffmpeg_from_pix_osi(img_src->palette);
++ enum PixelFormat pix_fmt_target = pix_ffmpeg_from_pix_osi(img_dst->palette);
+
+ AVPicture avp_source, avp_target;
+ avpicture_fill(&avp_source, buf_source, pix_fmt_source, img_src->width, img_src->height);
Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=7894&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Thu Dec 17 13:15:02 2009
@@ -3,7 +3,9 @@
generic/google-breakpad-gcc44.patch
generic/track-sipaccount-init.patch
generic/cleanlook-startup-fix.patch
+generic/fix-codec-name.patch
debian/cmake-noavformat.patch
debian/remove-extra-copying-file.patch
debian/cmake-force-fpic.patch
#debian/purple_perl_tcl_noload.patch
+debian/force-palette.patch
More information about the Pkg-voip-commits
mailing list