Overview

Request 224 (accepted)

Update to version 1.5.3

Submit package home:zaitor:branches:Essentials / guvcview to package Essentials / guvcview

guvcview.changes Changed
x
 
1
@@ -1,4 +1,15 @@
2
 -------------------------------------------------------------------
3
+Sun May 20 14:28:10 UTC 2012 - zaitor@opensuse.org
4
+
5
+- Update to version 1.5.3:
6
+  + Update libavcodec API.
7
+  + Add libavutil dependency.
8
+  + Fix pulse interface.
9
+  + Update language catalogs.
10
+- Drop guvcview-pulseaudio-fix.patch, fixed upstream.
11
+- Change BuildRequires: pulseaudio-devel to libpulse-devel. 
12
+
13
+-------------------------------------------------------------------
14
 Sun Feb 26 15:52:45 UTC 2012 - zaitor@opensuse.org
15
 
16
 - Update to version 1.5.2: 
17
guvcview.spec Changed
36
 
1
@@ -13,7 +13,7 @@
2
 # published by the Open Source Initiative.
3
 
4
 Name:           guvcview
5
-Version:        1.5.2
6
+Version:        1.5.3
7
 Release:        0
8
 # Reference to GPL-2.0 in some files?
9
 License:        GPL-3.0
10
@@ -21,8 +21,6 @@
11
 Url:            http://guvcview.sourceforge.net/
12
 Group:          Productivity/Multimedia/Video/Players
13
 Source0:        http://voxel.dl.sourceforge.net/project/guvcview/source/%{name}-src-%{version}.tar.gz
14
-# PATCH-FIX-UPSTREAM guvcview-pulseaudio-fix.patch zaitor@opensuse.org -- Fix pulse interface.
15
-Patch0:        guvcview-pulseaudio-fix.patch
16
 BuildRequires:  SDL-devel
17
 BuildRequires:  fdupes
18
 BuildRequires:  gettext
19
@@ -32,7 +30,7 @@
20
 BuildRequires:  libudev-devel
21
 BuildRequires:  libv4l-devel
22
 BuildRequires:  portaudio-devel
23
-BuildRequires:  pulseaudio-devel
24
+BuildRequires:  libpulse-devel
25
 BuildRequires:  update-desktop-files
26
 Recommends:     %{name}-lang
27
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
28
@@ -46,7 +44,6 @@
29
 
30
 %prep
31
 %setup -q -n %{name}-src-%{version}
32
-%patch0 -p2
33
 
34
 %build
35
 CPPFLAGS=-I/usr/include/ffmpeg
36
guvcview-pulseaudio-fix.patch Deleted
151
 
1
@@ -1,149 +0,0 @@
2
---- a/trunk/src/sound.c 
3
-+++ b/trunk/src/sound.c 
4
-@@ -255,7 +255,8 @@
5
-   {
6
- #ifdef PULSEAUDIO
7
-       case PULSE:
8
--          if(err = pulse_init_audio(pdata))
9
-+          err = pulse_init_audio(pdata);
10
-+          if(err)
11
-               goto error;
12
-           break;
13
- #endif
14
-
15
---- a/trunk/src/sound.h 
16
-+++ b/trunk/src/sound.h 
17
-@@ -103,7 +103,7 @@
18
-   //PULSE SUPPORT
19
- #ifdef PULSEAUDIO
20
-   pa_simple *pulse_simple;
21
--  GThread *pulse_read_th;
22
-+   __THREAD_TYPE pulse_read_th;
23
- #endif
24
- };
25
-
26
---- a/trunk/src/pulse_audio.c 
27
-+++ b/trunk/src/pulse_audio.c 
28
-@@ -29,116 +29,100 @@
29
- 
30
- #include <errno.h>
31
- 
32
--#if GLIB_MINOR_VERSION < 31
33
--  #define __AMUTEX pdata->mutex
34
--#else
35
--  #define __AMUTEX &pdata->mutex
36
--#endif
37
--
38
-+#define __AMUTEX &pdata->mutex
39
-+
40
- //run in separate thread
41
- static void* pulse_read_audio(void *userdata) 
42
- {
43
-   int error;
44
-   
45
-   struct paRecordData *pdata = (struct paRecordData*) userdata;
46
-   /* The sample type to use */
47
-   pa_sample_spec ss;
48
-   if (BIGENDIAN)
49
-       ss.format = PA_SAMPLE_FLOAT32BE;
50
-   else
51
-       ss.format = PA_SAMPLE_FLOAT32LE;
52
-   
53
-   __LOCK_MUTEX(__AMUTEX);
54
-       gboolean capVid = pdata->capVid;
55
-       int skip_n = pdata->skip_n;
56
-       pdata->streaming = TRUE;
57
-       ss.rate = pdata->samprate;
58
-       ss.channels = pdata->channels;
59
-   __UNLOCK_MUTEX(__AMUTEX);
60
- 
61
--  printf("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
62
-+  g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
63
-   if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
64
-   {
65
-       g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
66
-       goto finish;
67
-   }
68
-   
69
-   /* Record some data ... */
70
-   while(capVid)
71
-   {
72
-       if (pa_simple_read(pdata->pulse_simple, pdata->recordedSamples, pdata->aud_numBytes, &error) < 0) 
73
-       {
74
-           g_printerr("pulse: pa_simple_read() failed: %s\n", pa_strerror(error));
75
-           goto finish;
76
-       }
77
- 
78
-       __LOCK_MUTEX(__AMUTEX);
79
-           capVid = pdata->capVid;
80
-           /*first frame time stamp*/
81
-           if(pdata->a_ts <= 0)
82
-           {
83
-               if((pdata->ts_ref > 0) && (pdata->ts_ref < pdata->snd_begintime)) 
84
-                   pdata->a_ts = pdata->snd_begintime - pdata->ts_ref;
85
-               else pdata->a_ts = 1;
86
-           }
87
-           else /*increment time stamp for audio frame*/
88
-               pdata->a_ts += (G_NSEC_PER_SEC * pdata->aud_numSamples)/(pdata->samprate * pdata->channels);
89
-   
90
-           skip_n = pdata->skip_n;
91
-       __UNLOCK_MUTEX(__AMUTEX);
92
-       
93
-       if (!skip_n) //skip audio while were skipping video frames
94
-       {
95
-           __LOCK_MUTEX( __AMUTEX );
96
-               if(!pdata->audio_buff[pdata->w_ind].used)
97
-               {
98
-                   
99
-                   /*copy data to audio buffer*/
100
-                   memcpy(pdata->audio_buff[pdata->w_ind].frame, pdata->recordedSamples, pdata->aud_numBytes);
101
-                   pdata->audio_buff[pdata->w_ind].time_stamp = pdata->a_ts + pdata->delay;
102
-                   pdata->audio_buff[pdata->w_ind].used = TRUE;
103
-                   NEXT_IND(pdata->w_ind, AUDBUFF_SIZE);
104
-               }
105
-               else
106
-               {
107
-                   //drop audio data
108
-                   g_printerr("AUDIO: droping audio data\n");
109
-               }
110
-           __UNLOCK_MUTEX( __AMUTEX );
111
-       }
112
-       else 
113
-       {
114
-           pdata->snd_begintime = ns_time_monotonic();
115
-           pdata->a_ts = 0;
116
-       }
117
-   }
118
- 
119
- finish:
120
--  printf("audio thread exited\n");
121
-+  g_print("audio thread exited\n");
122
-   pdata->streaming = FALSE;
123
-   if (pdata->pulse_simple)
124
-       pa_simple_free(pdata->pulse_simple);
125
-   return (NULL);
126
- }
127
- 
128
- 
129
- int
130
- pulse_init_audio(struct paRecordData* pdata)
131
- { 
132
-   //start audio capture thread
133
--#if GLIB_MINOR_VERSION < 31 
134
--  if( (pdata->pulse_read_th = g_thread_create(
135
--      (GThreadFunc) pulse_read_audio,
136
--      pdata, //data
137
--      FALSE,    //joinable - no need waiting for thread to finish
138
--      NULL)    //error
139
--      ) == NULL)
140
--#else
141
--  if( (pdata->pulse_read_th = g_thread_new("pulse thread",
142
--      (GThreadFunc) pulse_read_audio,
143
--      pdata)
144
--      ) == NULL)
145
--#endif  
146
-+  if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
147
-   {
148
-       g_printerr("Pulse thread creation failed\n");
149
-       return (-1);
150
-       
151
guvcview-src-1.5.2.tar.gz/ChangeLog -> guvcview-src-1.5.3.tar.gz/ChangeLog Changed
22
 
1
@@ -1,3 +1,12 @@
2
+guvcview (1.5.3)
3
+
4
+    * update libavcodec API
5
+    * add libavutil dependency
6
+    * fix pulse interface
7
+    * update language catalogs (add bs and fo)
8
+    
9
+ -- Paulo Assis <pj.assis@gmail.com>  Mon, 27 Feb 2011 23:18:00 +0000
10
+ 
11
 guvcview (1.5.2)
12
 
13
     * move to pthreads (fix gthread API 2 issues)
14
@@ -6,6 +15,7 @@
15
     * fix some gtk3 widgets
16
     
17
  -- Paulo Assis <pj.assis@gmail.com>  Wed, 1 Feb 2012 23:01:00 +0000
18
+ 
19
 guvcview (1.5.1)
20
 
21
     * move to gtk3
22
guvcview-src-1.5.2.tar.gz/configure -> guvcview-src-1.5.3.tar.gz/configure Changed
142
 
1
@@ -1,6 +1,6 @@
2
 #! /bin/sh
3
 # Guess values for system-dependent variables and create Makefiles.
4
-# Generated by GNU Autoconf 2.68 for guvcview 1.5.2.
5
+# Generated by GNU Autoconf 2.68 for guvcview 1.5.3.
6
 #
7
 # Report bugs to <<pj.assis@gmail.com>>.
8
 #
9
@@ -560,8 +560,8 @@
10
 # Identity of this package.
11
 PACKAGE_NAME='guvcview'
12
 PACKAGE_TARNAME='guvcview'
13
-PACKAGE_VERSION='1.5.2'
14
-PACKAGE_STRING='guvcview 1.5.2'
15
+PACKAGE_VERSION='1.5.3'
16
+PACKAGE_STRING='guvcview 1.5.3'
17
 PACKAGE_BUGREPORT='<pj.assis@gmail.com>'
18
 PACKAGE_URL=''
19
 
20
@@ -1297,7 +1297,7 @@
21
   # Omit some internal or obsolete options to make the list less imposing.
22
   # This message is too long to be a string in the A/UX 3.1 sh.
23
   cat <<_ACEOF
24
-\`configure' configures guvcview 1.5.2 to adapt to many kinds of systems.
25
+\`configure' configures guvcview 1.5.3 to adapt to many kinds of systems.
26
 
27
 Usage: $0 [OPTION]... [VAR=VALUE]...
28
 
29
@@ -1367,7 +1367,7 @@
30
 
31
 if test -n "$ac_init_help"; then
32
   case $ac_init_help in
33
-     short | recursive ) echo "Configuration of guvcview 1.5.2:";;
34
+     short | recursive ) echo "Configuration of guvcview 1.5.3:";;
35
    esac
36
   cat <<\_ACEOF
37
 
38
@@ -1471,7 +1471,7 @@
39
 test -n "$ac_init_help" && exit $ac_status
40
 if $ac_init_version; then
41
   cat <<\_ACEOF
42
-guvcview configure 1.5.2
43
+guvcview configure 1.5.3
44
 generated by GNU Autoconf 2.68
45
 
46
 Copyright (C) 2010 Free Software Foundation, Inc.
47
@@ -1840,7 +1840,7 @@
48
 This file contains any messages produced by compilers while
49
 running configure, to aid debugging if configure makes a mistake.
50
 
51
-It was created by guvcview $as_me 1.5.2, which was
52
+It was created by guvcview $as_me 1.5.3, which was
53
 generated by GNU Autoconf 2.68.  Invocation command line was
54
 
55
   $ $0 $@
56
@@ -2655,7 +2655,7 @@
57
 
58
 # Define the identity of the package.
59
  PACKAGE='guvcview'
60
- VERSION='1.5.2'
61
+ VERSION='1.5.3'
62
 
63
 
64
 cat >>confdefs.h <<_ACEOF
65
@@ -5271,7 +5271,7 @@
66
 _ACEOF
67
 
68
 
69
-ALL_LINGUAS="cs da de es eu fr gl he hr it ja nl pl pt pt_BR ru sr tr uk zh_TW"
70
+ALL_LINGUAS="bs cs da de es eu fo fr gl he hr it ja nl pl pt pt_BR ru sr tr uk zh_TW"
71
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
72
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
73
          inttypes.h stdint.h unistd.h
74
@@ -6123,12 +6123,12 @@
75
     pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
76
  elif test -n "$PKG_CONFIG"; then
77
     if test -n "$PKG_CONFIG" && \
78
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev\""; } >&5
79
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev") 2>&5
80
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev\""; } >&5
81
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev") 2>&5
82
   ac_status=$?
83
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
84
   test $ac_status = 0; }; then
85
-  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev" 2>/dev/null`
86
+  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>/dev/null`
87
              test "x$?" != "x0" && pkg_failed=yes
88
 else
89
   pkg_failed=yes
90
@@ -6140,12 +6140,12 @@
91
     pkg_cv_DEPS_LIBS="$DEPS_LIBS"
92
  elif test -n "$PKG_CONFIG"; then
93
     if test -n "$PKG_CONFIG" && \
94
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev\""; } >&5
95
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev") 2>&5
96
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev\""; } >&5
97
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev") 2>&5
98
   ac_status=$?
99
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
100
   test $ac_status = 0; }; then
101
-  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev" 2>/dev/null`
102
+  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>/dev/null`
103
              test "x$?" != "x0" && pkg_failed=yes
104
 else
105
   pkg_failed=yes
106
@@ -6166,14 +6166,14 @@
107
         _pkg_short_errors_supported=no
108
 fi
109
         if test $_pkg_short_errors_supported = yes; then
110
-           DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev" 2>&1`
111
+           DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>&1`
112
         else
113
-           DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev" 2>&1`
114
+           DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev" 2>&1`
115
         fi
116
    # Put the nasty error message in config.log where it belongs
117
    echo "$DEPS_PKG_ERRORS" >&5
118
 
119
-   as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev) were not met:
120
+   as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev) were not met:
121
 
122
 $DEPS_PKG_ERRORS
123
 
124
@@ -7165,7 +7165,7 @@
125
 # report actual input values of CONFIG_FILES etc. instead of their
126
 # values after options handling.
127
 ac_log="
128
-This file was extended by guvcview $as_me 1.5.2, which was
129
+This file was extended by guvcview $as_me 1.5.3, which was
130
 generated by GNU Autoconf 2.68.  Invocation command line was
131
 
132
   CONFIG_FILES    = $CONFIG_FILES
133
@@ -7231,7 +7231,7 @@
134
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
135
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
136
 ac_cs_version="\\
137
-guvcview config.status 1.5.2
138
+guvcview config.status 1.5.3
139
 configured by $0, generated by GNU Autoconf 2.68,
140
   with options \\"\$ac_cs_config\\"
141
 
142
guvcview-src-1.5.2.tar.gz/configure.ac -> guvcview-src-1.5.3.tar.gz/configure.ac Changed
26
 
1
@@ -8,7 +8,7 @@
2
 dnl Package definitions and initialization
3
 dnl --------------------------------------------------------------------------
4
 
5
-AC_INIT(guvcview, 1.5.2, [<pj.assis@gmail.com>])
6
+AC_INIT(guvcview, 1.5.3, [<pj.assis@gmail.com>])
7
 AM_INIT_AUTOMAKE([gnu])
8
 AC_CONFIG_MACRO_DIR([m4])
9
 AM_CONFIG_HEADER(config.h)
10
@@ -81,13 +81,13 @@
11
 dnl --------------------------------------------------------------------------
12
 dnl Languages supported by guvcview.
13
 dnl --------------------------------------------------------------------------
14
-ALL_LINGUAS="cs da de es eu fr gl he hr it ja nl pl pt pt_BR ru sr tr uk zh_TW"
15
+ALL_LINGUAS="bs cs da de es eu fo fr gl he hr it ja nl pl pt pt_BR ru sr tr uk zh_TW"
16
 AM_GLIB_GNU_GETTEXT([external])
17
 
18
 dnl --------------------------------------------------------------------------
19
 dnl check for dependencies
20
 dnl --------------------------------------------------------------------------
21
-PKG_CHECK_MODULES(DEPS, [gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libv4l2 libudev])
22
+PKG_CHECK_MODULES(DEPS, [gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.10.0 sdl >= 1.2.10 portaudio-2.0 libpng libavcodec libavutil libv4l2 libudev])
23
 AC_SUBST(DEPS_CFLAGS)
24
 AC_SUBST(DEPS_LIBS)
25
 
26
guvcview-src-1.5.2.tar.gz/debian/changelog -> guvcview-src-1.5.3.tar.gz/debian/changelog Changed
12
 
1
@@ -1,3 +1,10 @@
2
+guvcview (1.5.3-ubuntu1~oneiric~ppa1) oneiric; urgency=low
3
+
4
+    * update libavcodec API
5
+    * add libavutil dependency
6
+    
7
+ -- Paulo Assis <pj.assis@gmail.com>  Sat, 11 Feb 2011 14:27:00 +0000
8
+  
9
 guvcview (1.5.2-ubuntu1~oneiric~ppa1) oneiric; urgency=low
10
 
11
     * move to pthreads (fix gthread API 2 issues)
12
guvcview-src-1.5.2.tar.gz/debian/control -> guvcview-src-1.5.3.tar.gz/debian/control Changed
10
 
1
@@ -2,7 +2,7 @@
2
 Section: graphics
3
 Priority: extra
4
 Maintainer: Paulo Assis <pj.assis@gmail.com>
5
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, quilt, libsdl1.2-dev, libgtk-3-dev, portaudio19-dev, libpng12-dev, libavcodec-dev, libv4l-dev, libudev-dev
6
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, quilt, libsdl1.2-dev, libgtk-3-dev, portaudio19-dev, libpng12-dev, libavcodec-dev, libavutil-dev, libv4l-dev, libudev-dev
7
 Standards-Version: 3.9.2
8
 Homepage: http://guvcview.sourceforge.net/
9
 
10
guvcview-src-1.5.3.tar.gz/po/bs.po Added
975
 
1
@@ -0,0 +1,973 @@
2
+# Bosnian translation for guvcview
3
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
4
+# This file is distributed under the same license as the guvcview package.
5
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
6
+#
7
+msgid ""
8
+msgstr ""
9
+"Project-Id-Version: guvcview\n"
10
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11
+"POT-Creation-Date: 2011-10-17 22:15+0100\n"
12
+"PO-Revision-Date: 2011-06-27 19:11+0000\n"
13
+"Last-Translator: Stefan Ivanović <Unknown>\n"
14
+"Language-Team: Bosnian <bs@li.org>\n"
15
+"MIME-Version: 1.0\n"
16
+"Content-Type: text/plain; charset=UTF-8\n"
17
+"Content-Transfer-Encoding: 8bit\n"
18
+"X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
19
+"X-Generator: Launchpad (build 14868)\n"
20
+
21
+#: src/guvcview.c:289
22
+msgid "Guvcview Video Capture"
23
+msgstr "GUVCVju Snimanje video zapisa"
24
+
25
+#: src/guvcview.c:301
26
+msgid "GUVCViewer Controls"
27
+msgstr "GUVCVjuer Kontrole"
28
+
29
+#. can't open device
30
+#: src/guvcview.c:346
31
+msgid ""
32
+"Guvcview error:\n"
33
+"\n"
34
+"Unable to open device"
35
+msgstr ""
36
+"GUVCVju greška:\n"
37
+"\n"
38
+"Nije moguće otvoriti uređaj"
39
+
40
+#: src/guvcview.c:347
41
+msgid ""
42
+"Please make sure the camera is connected\n"
43
+"and that the correct driver is installed."
44
+msgstr ""
45
+"Postarajte se da je kamera konektovana\n"
46
+"i da su pravi upravljački programi instalirani."
47
+
48
+#. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
49
+#: src/guvcview.c:352
50
+msgid ""
51
+"Guvcview:\n"
52
+"\n"
53
+"UVC Extension controls"
54
+msgstr ""
55
+"GUVCVju:\n"
56
+"\n"
57
+"UVC Kontrola dodataka"
58
+
59
+#: src/guvcview.c:353
60
+msgid "Extension controls were added to the UVC driver"
61
+msgstr "Kontrola dodataka je dodata na UVC drajver"
62
+
63
+#. uvc extension controls error - EACCES (needs root user)
64
+#: src/guvcview.c:360
65
+msgid ""
66
+"Guvcview error:\n"
67
+"\n"
68
+"UVC Extension controls"
69
+msgstr ""
70
+"GUVCVju greška:\n"
71
+"\n"
72
+"UVC kontrola dodataka"
73
+
74
+#: src/guvcview.c:361
75
+msgid ""
76
+"An error occurred while adding extension\n"
77
+"controls to the UVC driver\n"
78
+"Make sure you run guvcview as root (or sudo)."
79
+msgstr ""
80
+"Greška se dogodila dok sam dodavao kontrolu\n"
81
+"dodataka na UVC drajver\n"
82
+"Morate pokrenuti GUVCVju kao korjen ili sudo"
83
+
84
+#: src/guvcview.c:387 src/guvcview.c:465
85
+msgid ""
86
+"Guvcview error:\n"
87
+"\n"
88
+"Can't set a valid video stream for guvcview"
89
+msgstr ""
90
+
91
+#: src/guvcview.c:388 src/guvcview.c:466
92
+msgid ""
93
+"Make sure your device driver is v4l2 compliant\n"
94
+"and that it is properly installed."
95
+msgstr ""
96
+
97
+#: src/guvcview.c:410 src/guvcview.c:432
98
+msgid ""
99
+"Guvcview error:\n"
100
+"\n"
101
+"Unable to start with minimum setup"
102
+msgstr ""
103
+
104
+#: src/guvcview.c:411 src/guvcview.c:433
105
+msgid "Please reconnect your camera."
106
+msgstr ""
107
+
108
+#: src/guvcview.c:440
109
+msgid ""
110
+"Guvcview error:\n"
111
+"\n"
112
+"Couldn't query device capabilities"
113
+msgstr ""
114
+
115
+#: src/guvcview.c:441
116
+msgid "Make sure the device driver supports v4l2."
117
+msgstr ""
118
+
119
+#: src/guvcview.c:445
120
+msgid ""
121
+"Guvcview error:\n"
122
+"\n"
123
+"Read method error"
124
+msgstr ""
125
+
126
+#: src/guvcview.c:446
127
+msgid "Please try mmap instead (--capture_method=1)."
128
+msgstr ""
129
+
130
+#: src/guvcview.c:454
131
+msgid ""
132
+"Guvcview error:\n"
133
+"\n"
134
+"Unable to allocate Buffers"
135
+msgstr ""
136
+
137
+#: src/guvcview.c:455
138
+msgid "Please try restarting your system."
139
+msgstr ""
140
+
141
+#: src/guvcview.c:494
142
+msgid "Image Controls"
143
+msgstr ""
144
+
145
+#: src/guvcview.c:529
146
+msgid "Capture:"
147
+msgstr ""
148
+
149
+#. increment column for labels
150
+#. end of control only exclusion
151
+#: src/guvcview.c:537
152
+msgid "Control Profiles:"
153
+msgstr ""
154
+
155
+#: src/guvcview.c:552
156
+msgid "Defaults"
157
+msgstr ""
158
+
159
+#. image auto capture
160
+#: src/guvcview.c:565
161
+msgid "Stop Auto"
162
+msgstr ""
163
+
164
+#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
165
+msgid "Cap. Image"
166
+msgstr ""
167
+
168
+#. vid capture enabled from start
169
+#: src/guvcview.c:574 src/callbacks.c:1261
170
+msgid "Stop Video"
171
+msgstr ""
172
+
173
+#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
174
+#: src/create_video.c:878
175
+msgid "Cap. Video"
176
+msgstr ""
177
+
178
+#: src/guvcview.c:735
179
+msgid ""
180
+"Guvcview error:\n"
181
+"\n"
182
+"Unable to create Video Thread"
183
+msgstr ""
184
+
185
+#: src/guvcview.c:736
186
+msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
187
+msgstr ""
188
+
189
+#. needed only for language files (not used)
190
+#. V4L2 control strings
191
+#: src/v4l2uvc.c:54
192
+msgid "User Controls"
193
+msgstr ""
194
+
195
+#: src/v4l2uvc.c:55
196
+msgid "Brightness"
197
+msgstr ""
198
+
199
+#: src/v4l2uvc.c:56
200
+msgid "Contrast"
201
+msgstr ""
202
+
203
+#: src/v4l2uvc.c:57
204
+msgid "Hue"
205
+msgstr ""
206
+
207
+#: src/v4l2uvc.c:58
208
+msgid "Saturation"
209
+msgstr ""
210
+
211
+#: src/v4l2uvc.c:59
212
+msgid "Sharpness"
213
+msgstr ""
214
+
215
+#: src/v4l2uvc.c:60
216
+msgid "Gamma"
217
+msgstr ""
218
+
219
+#: src/v4l2uvc.c:61
220
+msgid "Backlight Compensation"
221
+msgstr ""
222
+
223
+#: src/v4l2uvc.c:62
224
+msgid "Power Line Frequency"
225
+msgstr ""
226
+
227
+#: src/v4l2uvc.c:63
228
+msgid "Hue, Automatic"
229
+msgstr ""
230
+
231
+#: src/v4l2uvc.c:64
232
+msgid "Focus, Auto"
233
+msgstr ""
234
+
235
+#: src/v4l2uvc.c:65
236
+msgid "Manual Mode"
237
+msgstr ""
238
+
239
+#: src/v4l2uvc.c:66
240
+msgid "Auto Mode"
241
+msgstr ""
242
+
243
+#: src/v4l2uvc.c:67
244
+msgid "Shutter Priority Mode"
245
+msgstr ""
246
+
247
+#: src/v4l2uvc.c:68
248
+msgid "Aperture Priority Mode"
249
+msgstr ""
250
+
251
+#: src/v4l2uvc.c:69
252
+msgid "Black Level"
253
+msgstr ""
254
+
255
+#: src/v4l2uvc.c:70
256
+msgid "White Balance, Automatic"
257
+msgstr ""
258
+
259
+#: src/v4l2uvc.c:71
260
+msgid "Do White Balance"
261
+msgstr ""
262
+
263
+#: src/v4l2uvc.c:72
264
+msgid "Red Balance"
265
+msgstr ""
266
+
267
+#: src/v4l2uvc.c:73
268
+msgid "Blue Balance"
269
+msgstr ""
270
+
271
+#: src/v4l2uvc.c:74
272
+msgid "Exposure"
273
+msgstr ""
274
+
275
+#: src/v4l2uvc.c:75
276
+msgid "Gain, Automatic"
277
+msgstr ""
278
+
279
+#: src/v4l2uvc.c:76
280
+msgid "Gain"
281
+msgstr ""
282
+
283
+#: src/v4l2uvc.c:77
284
+msgid "Horizontal Flip"
285
+msgstr ""
286
+
287
+#: src/v4l2uvc.c:78
288
+msgid "Vertical Flip"
289
+msgstr ""
290
+
291
+#: src/v4l2uvc.c:79
292
+msgid "Horizontal Center"
293
+msgstr ""
294
+
295
+#: src/v4l2uvc.c:80
296
+msgid "Vertical Center"
297
+msgstr ""
298
+
299
+#: src/v4l2uvc.c:81
300
+msgid "Chroma AGC"
301
+msgstr ""
302
+
303
+#: src/v4l2uvc.c:82
304
+msgid "Color Killer"
305
+msgstr ""
306
+
307
+#: src/v4l2uvc.c:83
308
+msgid "Color Effects"
309
+msgstr ""
310
+
311
+#. CAMERA CLASS control strings
312
+#: src/v4l2uvc.c:86
313
+msgid "Camera Controls"
314
+msgstr ""
315
+
316
+#: src/v4l2uvc.c:87
317
+msgid "Auto Exposure"
318
+msgstr ""
319
+
320
+#: src/v4l2uvc.c:88
321
+msgid "Exposure Time, Absolute"
322
+msgstr ""
323
+
324
+#: src/v4l2uvc.c:89
325
+msgid "Exposure, Dynamic Framerate"
326
+msgstr ""
327
+
328
+#: src/v4l2uvc.c:90
329
+msgid "Pan, Relative"
330
+msgstr ""
331
+
332
+#: src/v4l2uvc.c:91
333
+msgid "Tilt, Relative"
334
+msgstr ""
335
+
336
+#: src/v4l2uvc.c:92
337
+msgid "Pan, Reset"
338
+msgstr ""
339
+
340
+#: src/v4l2uvc.c:93
341
+msgid "Tilt, Reset"
342
+msgstr ""
343
+
344
+#: src/v4l2uvc.c:94
345
+msgid "Pan, Absolute"
346
+msgstr ""
347
+
348
+#: src/v4l2uvc.c:96
349
+msgid "Focus, Absolute"
350
+msgstr ""
351
+
352
+#: src/v4l2uvc.c:97
353
+msgid "Focus, Relative"
354
+msgstr ""
355
+
356
+#: src/v4l2uvc.c:98
357
+msgid "Focus, Automatic"
358
+msgstr ""
359
+
360
+#: src/v4l2uvc.c:99
361
+msgid "Zoom, Absolute"
362
+msgstr ""
363
+
364
+#: src/v4l2uvc.c:100
365
+msgid "Zoom, Relative"
366
+msgstr ""
367
+
368
+#: src/v4l2uvc.c:101
369
+msgid "Zoom, Continuous"
370
+msgstr ""
371
+
372
+#: src/v4l2uvc.c:102
373
+msgid "Privacy"
374
+msgstr ""
375
+
376
+#. UVC specific control strings
377
+#: src/v4l2uvc.c:105
378
+msgid "Exposure, Auto"
379
+msgstr ""
380
+
381
+#: src/v4l2uvc.c:106
382
+msgid "Exposure, Auto Priority"
383
+msgstr ""
384
+
385
+#: src/v4l2uvc.c:107
386
+msgid "Exposure (Absolute)"
387
+msgstr ""
388
+
389
+#: src/v4l2uvc.c:108
390
+msgid "White Balance Temperature, Auto"
391
+msgstr ""
392
+
393
+#: src/v4l2uvc.c:109
394
+msgid "White Balance Temperature"
395
+msgstr ""
396
+
397
+#: src/v4l2uvc.c:110
398
+msgid "White Balance Component, Auto"
399
+msgstr ""
400
+
401
+#: src/v4l2uvc.c:111
402
+msgid "White Balance Blue Component"
403
+msgstr ""
404
+
405
+#: src/v4l2uvc.c:112
406
+msgid "White Balance Red Component"
407
+msgstr ""
408
+
409
+#. libwebcam specific control strings
410
+#: src/v4l2uvc.c:115
411
+msgid "Focus"
412
+msgstr ""
413
+
414
+#: src/v4l2uvc.c:116
415
+msgid "Focus (Absolute)"
416
+msgstr ""
417
+
418
+#: src/video_tab.c:41 src/callbacks.c:1331
419
+msgid "Save File"
420
+msgstr ""
421
+
422
+#. if auto naming restart counter
423
+#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
424
+#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
425
+#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
426
+#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
427
+#, c-format
428
+msgid "File num:%d"
429
+msgstr ""
430
+
431
+#: src/video_tab.c:126
432
+msgid "codec values"
433
+msgstr ""
434
+
435
+#: src/video_tab.c:137
436
+msgid ""
437
+"                              encoder fps:   \n"
438
+" (0 - use fps combobox value)"
439
+msgstr ""
440
+
441
+#: src/video_tab.c:152
442
+msgid " monotonic pts"
443
+msgstr ""
444
+
445
+#. bit rate
446
+#: src/video_tab.c:160 src/audio_tab.c:58
447
+msgid "bit rate:   "
448
+msgstr ""
449
+
450
+#: src/video_tab.c:175
451
+msgid "qmax:   "
452
+msgstr ""
453
+
454
+#: src/video_tab.c:190
455
+msgid "qmin:   "
456
+msgstr ""
457
+
458
+#: src/video_tab.c:205
459
+msgid "max. qdiff:   "
460
+msgstr ""
461
+
462
+#: src/video_tab.c:220
463
+msgid "dia size:   "
464
+msgstr ""
465
+
466
+#: src/video_tab.c:235
467
+msgid "pre dia size:   "
468
+msgstr ""
469
+
470
+#: src/video_tab.c:250
471
+msgid "pre me:   "
472
+msgstr ""
473
+
474
+#: src/video_tab.c:265
475
+msgid "pre cmp:   "
476
+msgstr ""
477
+
478
+#: src/video_tab.c:280
479
+msgid "cmp:   "
480
+msgstr ""
481
+
482
+#: src/video_tab.c:295
483
+msgid "sub cmp:   "
484
+msgstr ""
485
+
486
+#: src/video_tab.c:310
487
+msgid "last predictor count:   "
488
+msgstr ""
489
+
490
+#: src/video_tab.c:325
491
+msgid "gop size:   "
492
+msgstr ""
493
+
494
+#: src/video_tab.c:340
495
+msgid "qcompress:   "
496
+msgstr ""
497
+
498
+#: src/video_tab.c:355
499
+msgid "qblur:   "
500
+msgstr ""
501
+
502
+#: src/video_tab.c:370
503
+msgid "subq:   "
504
+msgstr ""
505
+
506
+#: src/video_tab.c:385
507
+msgid "framerefs:   "
508
+msgstr ""
509
+
510
+#: src/video_tab.c:400
511
+msgid "me method:   "
512
+msgstr ""
513
+
514
+#: src/video_tab.c:415
515
+msgid "mb decision:   "
516
+msgstr ""
517
+
518
+#: src/video_tab.c:430
519
+msgid "max B frames:   "
520
+msgstr ""
521
+
522
+#: src/video_tab.c:445
523
+msgid "num threads:   "
524
+msgstr ""
525
+
526
+#: src/video_tab.c:555
527
+msgid "Video & Files"
528
+msgstr ""
529
+
530
+#. Devices
531
+#: src/video_tab.c:571 src/callbacks.c:136
532
+msgid "Device:"
533
+msgstr ""
534
+
535
+#: src/video_tab.c:673
536
+msgid "Frame Rate:"
537
+msgstr ""
538
+
539
+#: src/video_tab.c:681
540
+msgid " Show"
541
+msgstr ""
542
+
543
+#: src/video_tab.c:705
544
+msgid "Resolution:"
545
+msgstr ""
546
+
547
+#: src/video_tab.c:731
548
+msgid "Camera Output:"
549
+msgstr ""
550
+
551
+#: src/video_tab.c:753
552
+msgid "Apply"
553
+msgstr ""
554
+
555
+#: src/video_tab.c:761
556
+msgid "Quality:"
557
+msgstr ""
558
+
559
+#: src/video_tab.c:771
560
+msgid "Image File:"
561
+msgstr ""
562
+
563
+#: src/video_tab.c:804 src/video_tab.c:898
564
+msgid "File,Auto"
565
+msgstr ""
566
+
567
+#: src/video_tab.c:815
568
+msgid "Image Format:"
569
+msgstr ""
570
+
571
+#: src/video_tab.c:841
572
+msgid "Take Picture by Default"
573
+msgstr ""
574
+
575
+#: src/video_tab.c:853
576
+msgid "Video File:"
577
+msgstr ""
578
+
579
+#: src/video_tab.c:931
580
+msgid "Video Codec:"
581
+msgstr ""
582
+
583
+#. lavc codec properties button
584
+#: src/video_tab.c:939 src/audio_tab.c:346
585
+msgid "properties"
586
+msgstr ""
587
+
588
+#: src/video_tab.c:966
589
+msgid "Video Format:"
590
+msgstr ""
591
+
592
+#: src/video_tab.c:973
593
+msgid "Take Video by Default"
594
+msgstr ""
595
+
596
+#: src/video_tab.c:984
597
+msgid "---- Video Filters ----"
598
+msgstr ""
599
+
600
+#. Mirror
601
+#: src/video_tab.c:999
602
+msgid " Mirror"
603
+msgstr ""
604
+
605
+#. Upturn
606
+#: src/video_tab.c:1009
607
+msgid " Invert"
608
+msgstr ""
609
+
610
+#. Negate
611
+#: src/video_tab.c:1019
612
+msgid " Negative"
613
+msgstr ""
614
+
615
+#. Mono
616
+#: src/video_tab.c:1029
617
+msgid " Mono"
618
+msgstr ""
619
+
620
+#. Pieces
621
+#: src/video_tab.c:1040
622
+msgid " Pieces"
623
+msgstr ""
624
+
625
+#. Particles
626
+#: src/video_tab.c:1051
627
+msgid " Particles"
628
+msgstr ""
629
+
630
+#: src/audio_tab.c:46
631
+msgid "audio codec values"
632
+msgstr ""
633
+
634
+#: src/audio_tab.c:132
635
+msgid "Audio"
636
+msgstr ""
637
+
638
+#: src/audio_tab.c:150
639
+msgid " Sound"
640
+msgstr ""
641
+
642
+#. VU meter on the image (OSD)
643
+#: src/audio_tab.c:162
644
+msgid " Show VU meter"
645
+msgstr ""
646
+
647
+#: src/audio_tab.c:175
648
+msgid "Audio API:"
649
+msgstr ""
650
+
651
+#: src/audio_tab.c:185
652
+msgid "PORTAUDIO"
653
+msgstr ""
654
+
655
+#: src/audio_tab.c:186
656
+msgid "PULSEAUDIO"
657
+msgstr ""
658
+
659
+#: src/audio_tab.c:202 src/audio_tab.c:225
660
+msgid "Input Device:"
661
+msgstr ""
662
+
663
+#: src/audio_tab.c:236 src/audio_tab.c:268
664
+msgid "Dev. Default"
665
+msgstr ""
666
+
667
+#: src/audio_tab.c:257
668
+msgid "Sample Rate:"
669
+msgstr ""
670
+
671
+#: src/audio_tab.c:269
672
+msgid "1 - mono"
673
+msgstr ""
674
+
675
+#: src/audio_tab.c:270
676
+msgid "2 - stereo"
677
+msgstr ""
678
+
679
+#: src/audio_tab.c:304
680
+msgid "Channels:"
681
+msgstr ""
682
+
683
+#: src/audio_tab.c:338
684
+msgid "Audio Format:"
685
+msgstr ""
686
+
687
+#: src/audio_tab.c:356
688
+msgid "---- Audio Effects ----"
689
+msgstr ""
690
+
691
+#. Echo
692
+#: src/audio_tab.c:375
693
+msgid " Echo"
694
+msgstr ""
695
+
696
+#. FUZZ
697
+#: src/audio_tab.c:385
698
+msgid " Fuzz"
699
+msgstr ""
700
+
701
+#. Reverb
702
+#: src/audio_tab.c:396
703
+msgid " Reverb"
704
+msgstr ""
705
+
706
+#. WahWah
707
+#: src/audio_tab.c:407
708
+msgid " WahWah"
709
+msgstr ""
710
+
711
+#. Ducky
712
+#: src/audio_tab.c:418
713
+msgid " Ducky"
714
+msgstr ""
715
+
716
+#: src/v4l2_controls.c:732
717
+msgid "Left"
718
+msgstr ""
719
+
720
+#: src/v4l2_controls.c:733
721
+msgid "Right"
722
+msgstr ""
723
+
724
+#: src/v4l2_controls.c:737
725
+msgid "Down"
726
+msgstr ""
727
+
728
+#: src/v4l2_controls.c:738
729
+msgid "Up"
730
+msgstr ""
731
+
732
+#: src/v4l2_controls.c:787
733
+msgid "Off"
734
+msgstr ""
735
+
736
+#: src/v4l2_controls.c:790
737
+msgid "On"
738
+msgstr ""
739
+
740
+#: src/v4l2_controls.c:793
741
+msgid "Blinking"
742
+msgstr ""
743
+
744
+#: src/v4l2_controls.c:796
745
+msgid "Auto"
746
+msgstr ""
747
+
748
+#: src/v4l2_controls.c:814
749
+msgid "8 bit"
750
+msgstr ""
751
+
752
+#: src/v4l2_controls.c:817
753
+msgid "12 bit"
754
+msgstr ""
755
+
756
+#: src/v4l2_dyna_ctrls.c:89
757
+msgid "Pan (relative)"
758
+msgstr ""
759
+
760
+#: src/v4l2_dyna_ctrls.c:99
761
+msgid "Tilt (relative)"
762
+msgstr ""
763
+
764
+#: src/v4l2_dyna_ctrls.c:109
765
+msgid "Pan Reset"
766
+msgstr ""
767
+
768
+#: src/v4l2_dyna_ctrls.c:119
769
+msgid "Tilt Reset"
770
+msgstr ""
771
+
772
+#: src/v4l2_dyna_ctrls.c:129
773
+msgid "Pan/tilt Reset"
774
+msgstr ""
775
+
776
+#: src/v4l2_dyna_ctrls.c:139
777
+msgid "Focus (absolute)"
778
+msgstr ""
779
+
780
+#: src/v4l2_dyna_ctrls.c:149
781
+msgid "LED1 Mode"
782
+msgstr ""
783
+
784
+#: src/v4l2_dyna_ctrls.c:159
785
+msgid "LED1 Frequency"
786
+msgstr ""
787
+
788
+#: src/v4l2_dyna_ctrls.c:169
789
+msgid "Disable video processing"
790
+msgstr ""
791
+
792
+#: src/v4l2_dyna_ctrls.c:179
793
+msgid "Raw bits per pixel"
794
+msgstr ""
795
+
796
+#: src/vcodecs.c:62
797
+msgid "MJPG - compressed"
798
+msgstr ""
799
+
800
+#: src/vcodecs.c:97
801
+msgid "YUY2 - uncomp YUV"
802
+msgstr ""
803
+
804
+#: src/vcodecs.c:132
805
+msgid "RGB - uncomp BMP"
806
+msgstr ""
807
+
808
+#: src/vcodecs.c:167
809
+msgid "MPEG video 1"
810
+msgstr ""
811
+
812
+#: src/vcodecs.c:202
813
+msgid "FLV1 - flash video 1"
814
+msgstr ""
815
+
816
+#: src/vcodecs.c:237
817
+msgid "WMV1 - win. med. video 7"
818
+msgstr ""
819
+
820
+#: src/vcodecs.c:272
821
+msgid "MPG2 - MPG2 format"
822
+msgstr ""
823
+
824
+#: src/vcodecs.c:307
825
+msgid "MS MP4 V3"
826
+msgstr ""
827
+
828
+#: src/vcodecs.c:342
829
+msgid "MPEG4-ASP"
830
+msgstr ""
831
+
832
+#: src/vcodecs.c:377
833
+msgid "MPEG4-AVC (H264)"
834
+msgstr ""
835
+
836
+#: src/options.c:753
837
+msgid "Prints version"
838
+msgstr ""
839
+
840
+#: src/options.c:754
841
+msgid "Displays debug information"
842
+msgstr ""
843
+
844
+#: src/options.c:755
845
+msgid "Video Device to use [default: /dev/video0]"
846
+msgstr ""
847
+
848
+#: src/options.c:756
849
+msgid "Exit after adding UVC extension controls (needs root/sudo)"
850
+msgstr ""
851
+
852
+#: src/options.c:757
853
+msgid "Don't stream video (image controls only)"
854
+msgstr ""
855
+
856
+#: src/options.c:758
857
+msgid "Don't display a GUI"
858
+msgstr ""
859
+
860
+#: src/options.c:759
861
+msgid "Capture method (1-mmap (default)  2-read)"
862
+msgstr ""
863
+
864
+#: src/options.c:760
865
+msgid "Configuration file"
866
+msgstr ""
867
+
868
+#: src/options.c:761
869
+msgid "Hardware accelaration (enable(1) | disable(0))"
870
+msgstr ""
871
+
872
+#: src/options.c:762
873
+msgid ""
874
+"Pixel "
875
+"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
876
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
877
+msgstr ""
878
+
879
+#: src/options.c:763
880
+msgid "Frame size, default: 640x480"
881
+msgstr ""
882
+
883
+#: src/options.c:764
884
+msgid "Image File name"
885
+msgstr ""
886
+
887
+#: src/options.c:765
888
+msgid "Image capture interval in seconds"
889
+msgstr ""
890
+
891
+#: src/options.c:766
892
+msgid "Number of Pictures to capture"
893
+msgstr ""
894
+
895
+#: src/options.c:767
896
+msgid "Video File name (capture from start)"
897
+msgstr ""
898
+
899
+#: src/options.c:768
900
+msgid "Video capture time (in seconds)"
901
+msgstr ""
902
+
903
+#: src/options.c:769
904
+msgid "Exits guvcview after closing video"
905
+msgstr ""
906
+
907
+#: src/options.c:770
908
+msgid "Number of initial frames to skip"
909
+msgstr ""
910
+
911
+#: src/options.c:771
912
+msgid "Show FPS value (enable(1) | disable (0))"
913
+msgstr ""
914
+
915
+#: src/options.c:772
916
+msgid "Load Profile at start"
917
+msgstr ""
918
+
919
+#: src/options.c:778
920
+msgid "- local options"
921
+msgstr ""
922
+
923
+#: src/img_controls.c:117
924
+msgid "Auto Focus (continuous)"
925
+msgstr ""
926
+
927
+#: src/img_controls.c:118
928
+msgid "set Focus"
929
+msgstr ""
930
+
931
+#: src/callbacks.c:102
932
+msgid "Error"
933
+msgstr ""
934
+
935
+#: src/callbacks.c:128
936
+msgid ""
937
+"\n"
938
+"You have more than one video device installed.\n"
939
+"Do you want to try another one ?\n"
940
+msgstr ""
941
+
942
+#: src/callbacks.c:659
943
+msgid "start new"
944
+msgstr ""
945
+
946
+#: src/callbacks.c:662
947
+msgid "restart"
948
+msgstr ""
949
+
950
+#: src/callbacks.c:664
951
+msgid "new"
952
+msgstr ""
953
+
954
+#: src/callbacks.c:666
955
+msgid "cancel"
956
+msgstr ""
957
+
958
+#: src/callbacks.c:671
959
+msgid ""
960
+"launch new process or restart?.\n"
961
+"\n"
962
+msgstr ""
963
+
964
+#: src/callbacks.c:1344
965
+msgid "Load File"
966
+msgstr ""
967
+
968
+#: src/timers.c:212
969
+msgid "Guvcview Warning:"
970
+msgstr ""
971
+
972
+#: src/timers.c:212
973
+msgid "Not enough free space left on disk"
974
+msgstr ""
975
guvcview-src-1.5.3.tar.gz/po/fo.po Added
964
 
1
@@ -0,0 +1,962 @@
2
+# Faroese translation for guvcview
3
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
4
+# This file is distributed under the same license as the guvcview package.
5
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
6
+#
7
+msgid ""
8
+msgstr ""
9
+"Project-Id-Version: guvcview\n"
10
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11
+"POT-Creation-Date: 2011-10-17 22:15+0100\n"
12
+"PO-Revision-Date: 2010-08-05 18:25+0000\n"
13
+"Last-Translator: Gunleif Joensen <Unknown>\n"
14
+"Language-Team: Faroese <fo@li.org>\n"
15
+"MIME-Version: 1.0\n"
16
+"Content-Type: text/plain; charset=UTF-8\n"
17
+"Content-Transfer-Encoding: 8bit\n"
18
+"X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
19
+"X-Generator: Launchpad (build 14868)\n"
20
+
21
+#: src/guvcview.c:289
22
+msgid "Guvcview Video Capture"
23
+msgstr ""
24
+
25
+#: src/guvcview.c:301
26
+msgid "GUVCViewer Controls"
27
+msgstr ""
28
+
29
+#. can't open device
30
+#: src/guvcview.c:346
31
+msgid ""
32
+"Guvcview error:\n"
33
+"\n"
34
+"Unable to open device"
35
+msgstr ""
36
+"Guvcview villa:\n"
37
+"\n"
38
+"Kundi ikki lata tóleind upp"
39
+
40
+#: src/guvcview.c:347
41
+msgid ""
42
+"Please make sure the camera is connected\n"
43
+"and that the correct driver is installed."
44
+msgstr ""
45
+
46
+#. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
47
+#: src/guvcview.c:352
48
+msgid ""
49
+"Guvcview:\n"
50
+"\n"
51
+"UVC Extension controls"
52
+msgstr ""
53
+
54
+#: src/guvcview.c:353
55
+msgid "Extension controls were added to the UVC driver"
56
+msgstr ""
57
+
58
+#. uvc extension controls error - EACCES (needs root user)
59
+#: src/guvcview.c:360
60
+msgid ""
61
+"Guvcview error:\n"
62
+"\n"
63
+"UVC Extension controls"
64
+msgstr ""
65
+
66
+#: src/guvcview.c:361
67
+msgid ""
68
+"An error occurred while adding extension\n"
69
+"controls to the UVC driver\n"
70
+"Make sure you run guvcview as root (or sudo)."
71
+msgstr ""
72
+
73
+#: src/guvcview.c:387 src/guvcview.c:465
74
+msgid ""
75
+"Guvcview error:\n"
76
+"\n"
77
+"Can't set a valid video stream for guvcview"
78
+msgstr ""
79
+
80
+#: src/guvcview.c:388 src/guvcview.c:466
81
+msgid ""
82
+"Make sure your device driver is v4l2 compliant\n"
83
+"and that it is properly installed."
84
+msgstr ""
85
+
86
+#: src/guvcview.c:410 src/guvcview.c:432
87
+msgid ""
88
+"Guvcview error:\n"
89
+"\n"
90
+"Unable to start with minimum setup"
91
+msgstr ""
92
+
93
+#: src/guvcview.c:411 src/guvcview.c:433
94
+msgid "Please reconnect your camera."
95
+msgstr ""
96
+
97
+#: src/guvcview.c:440
98
+msgid ""
99
+"Guvcview error:\n"
100
+"\n"
101
+"Couldn't query device capabilities"
102
+msgstr ""
103
+
104
+#: src/guvcview.c:441
105
+msgid "Make sure the device driver supports v4l2."
106
+msgstr ""
107
+
108
+#: src/guvcview.c:445
109
+msgid ""
110
+"Guvcview error:\n"
111
+"\n"
112
+"Read method error"
113
+msgstr ""
114
+
115
+#: src/guvcview.c:446
116
+msgid "Please try mmap instead (--capture_method=1)."
117
+msgstr ""
118
+
119
+#: src/guvcview.c:454
120
+msgid ""
121
+"Guvcview error:\n"
122
+"\n"
123
+"Unable to allocate Buffers"
124
+msgstr ""
125
+
126
+#: src/guvcview.c:455
127
+msgid "Please try restarting your system."
128
+msgstr ""
129
+
130
+#: src/guvcview.c:494
131
+msgid "Image Controls"
132
+msgstr ""
133
+
134
+#: src/guvcview.c:529
135
+msgid "Capture:"
136
+msgstr ""
137
+
138
+#. increment column for labels
139
+#. end of control only exclusion
140
+#: src/guvcview.c:537
141
+msgid "Control Profiles:"
142
+msgstr ""
143
+
144
+#: src/guvcview.c:552
145
+msgid "Defaults"
146
+msgstr ""
147
+
148
+#. image auto capture
149
+#: src/guvcview.c:565
150
+msgid "Stop Auto"
151
+msgstr ""
152
+
153
+#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
154
+msgid "Cap. Image"
155
+msgstr ""
156
+
157
+#. vid capture enabled from start
158
+#: src/guvcview.c:574 src/callbacks.c:1261
159
+msgid "Stop Video"
160
+msgstr ""
161
+
162
+#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
163
+#: src/create_video.c:878
164
+msgid "Cap. Video"
165
+msgstr ""
166
+
167
+#: src/guvcview.c:735
168
+msgid ""
169
+"Guvcview error:\n"
170
+"\n"
171
+"Unable to create Video Thread"
172
+msgstr ""
173
+
174
+#: src/guvcview.c:736
175
+msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
176
+msgstr ""
177
+
178
+#. needed only for language files (not used)
179
+#. V4L2 control strings
180
+#: src/v4l2uvc.c:54
181
+msgid "User Controls"
182
+msgstr ""
183
+
184
+#: src/v4l2uvc.c:55
185
+msgid "Brightness"
186
+msgstr ""
187
+
188
+#: src/v4l2uvc.c:56
189
+msgid "Contrast"
190
+msgstr ""
191
+
192
+#: src/v4l2uvc.c:57
193
+msgid "Hue"
194
+msgstr ""
195
+
196
+#: src/v4l2uvc.c:58
197
+msgid "Saturation"
198
+msgstr ""
199
+
200
+#: src/v4l2uvc.c:59
201
+msgid "Sharpness"
202
+msgstr ""
203
+
204
+#: src/v4l2uvc.c:60
205
+msgid "Gamma"
206
+msgstr ""
207
+
208
+#: src/v4l2uvc.c:61
209
+msgid "Backlight Compensation"
210
+msgstr ""
211
+
212
+#: src/v4l2uvc.c:62
213
+msgid "Power Line Frequency"
214
+msgstr ""
215
+
216
+#: src/v4l2uvc.c:63
217
+msgid "Hue, Automatic"
218
+msgstr ""
219
+
220
+#: src/v4l2uvc.c:64
221
+msgid "Focus, Auto"
222
+msgstr ""
223
+
224
+#: src/v4l2uvc.c:65
225
+msgid "Manual Mode"
226
+msgstr ""
227
+
228
+#: src/v4l2uvc.c:66
229
+msgid "Auto Mode"
230
+msgstr ""
231
+
232
+#: src/v4l2uvc.c:67
233
+msgid "Shutter Priority Mode"
234
+msgstr ""
235
+
236
+#: src/v4l2uvc.c:68
237
+msgid "Aperture Priority Mode"
238
+msgstr ""
239
+
240
+#: src/v4l2uvc.c:69
241
+msgid "Black Level"
242
+msgstr ""
243
+
244
+#: src/v4l2uvc.c:70
245
+msgid "White Balance, Automatic"
246
+msgstr ""
247
+
248
+#: src/v4l2uvc.c:71
249
+msgid "Do White Balance"
250
+msgstr ""
251
+
252
+#: src/v4l2uvc.c:72
253
+msgid "Red Balance"
254
+msgstr ""
255
+
256
+#: src/v4l2uvc.c:73
257
+msgid "Blue Balance"
258
+msgstr ""
259
+
260
+#: src/v4l2uvc.c:74
261
+msgid "Exposure"
262
+msgstr ""
263
+
264
+#: src/v4l2uvc.c:75
265
+msgid "Gain, Automatic"
266
+msgstr ""
267
+
268
+#: src/v4l2uvc.c:76
269
+msgid "Gain"
270
+msgstr ""
271
+
272
+#: src/v4l2uvc.c:77
273
+msgid "Horizontal Flip"
274
+msgstr ""
275
+
276
+#: src/v4l2uvc.c:78
277
+msgid "Vertical Flip"
278
+msgstr ""
279
+
280
+#: src/v4l2uvc.c:79
281
+msgid "Horizontal Center"
282
+msgstr ""
283
+
284
+#: src/v4l2uvc.c:80
285
+msgid "Vertical Center"
286
+msgstr ""
287
+
288
+#: src/v4l2uvc.c:81
289
+msgid "Chroma AGC"
290
+msgstr ""
291
+
292
+#: src/v4l2uvc.c:82
293
+msgid "Color Killer"
294
+msgstr ""
295
+
296
+#: src/v4l2uvc.c:83
297
+msgid "Color Effects"
298
+msgstr ""
299
+
300
+#. CAMERA CLASS control strings
301
+#: src/v4l2uvc.c:86
302
+msgid "Camera Controls"
303
+msgstr ""
304
+
305
+#: src/v4l2uvc.c:87
306
+msgid "Auto Exposure"
307
+msgstr ""
308
+
309
+#: src/v4l2uvc.c:88
310
+msgid "Exposure Time, Absolute"
311
+msgstr ""
312
+
313
+#: src/v4l2uvc.c:89
314
+msgid "Exposure, Dynamic Framerate"
315
+msgstr ""
316
+
317
+#: src/v4l2uvc.c:90
318
+msgid "Pan, Relative"
319
+msgstr ""
320
+
321
+#: src/v4l2uvc.c:91
322
+msgid "Tilt, Relative"
323
+msgstr ""
324
+
325
+#: src/v4l2uvc.c:92
326
+msgid "Pan, Reset"
327
+msgstr ""
328
+
329
+#: src/v4l2uvc.c:93
330
+msgid "Tilt, Reset"
331
+msgstr ""
332
+
333
+#: src/v4l2uvc.c:94
334
+msgid "Pan, Absolute"
335
+msgstr ""
336
+
337
+#: src/v4l2uvc.c:96
338
+msgid "Focus, Absolute"
339
+msgstr ""
340
+
341
+#: src/v4l2uvc.c:97
342
+msgid "Focus, Relative"
343
+msgstr ""
344
+
345
+#: src/v4l2uvc.c:98
346
+msgid "Focus, Automatic"
347
+msgstr ""
348
+
349
+#: src/v4l2uvc.c:99
350
+msgid "Zoom, Absolute"
351
+msgstr ""
352
+
353
+#: src/v4l2uvc.c:100
354
+msgid "Zoom, Relative"
355
+msgstr ""
356
+
357
+#: src/v4l2uvc.c:101
358
+msgid "Zoom, Continuous"
359
+msgstr ""
360
+
361
+#: src/v4l2uvc.c:102
362
+msgid "Privacy"
363
+msgstr ""
364
+
365
+#. UVC specific control strings
366
+#: src/v4l2uvc.c:105
367
+msgid "Exposure, Auto"
368
+msgstr ""
369
+
370
+#: src/v4l2uvc.c:106
371
+msgid "Exposure, Auto Priority"
372
+msgstr ""
373
+
374
+#: src/v4l2uvc.c:107
375
+msgid "Exposure (Absolute)"
376
+msgstr ""
377
+
378
+#: src/v4l2uvc.c:108
379
+msgid "White Balance Temperature, Auto"
380
+msgstr ""
381
+
382
+#: src/v4l2uvc.c:109
383
+msgid "White Balance Temperature"
384
+msgstr ""
385
+
386
+#: src/v4l2uvc.c:110
387
+msgid "White Balance Component, Auto"
388
+msgstr ""
389
+
390
+#: src/v4l2uvc.c:111
391
+msgid "White Balance Blue Component"
392
+msgstr ""
393
+
394
+#: src/v4l2uvc.c:112
395
+msgid "White Balance Red Component"
396
+msgstr ""
397
+
398
+#. libwebcam specific control strings
399
+#: src/v4l2uvc.c:115
400
+msgid "Focus"
401
+msgstr ""
402
+
403
+#: src/v4l2uvc.c:116
404
+msgid "Focus (Absolute)"
405
+msgstr ""
406
+
407
+#: src/video_tab.c:41 src/callbacks.c:1331
408
+msgid "Save File"
409
+msgstr ""
410
+
411
+#. if auto naming restart counter
412
+#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
413
+#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
414
+#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
415
+#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
416
+#, c-format
417
+msgid "File num:%d"
418
+msgstr ""
419
+
420
+#: src/video_tab.c:126
421
+msgid "codec values"
422
+msgstr ""
423
+
424
+#: src/video_tab.c:137
425
+msgid ""
426
+"                              encoder fps:   \n"
427
+" (0 - use fps combobox value)"
428
+msgstr ""
429
+
430
+#: src/video_tab.c:152
431
+msgid " monotonic pts"
432
+msgstr ""
433
+
434
+#. bit rate
435
+#: src/video_tab.c:160 src/audio_tab.c:58
436
+msgid "bit rate:   "
437
+msgstr ""
438
+
439
+#: src/video_tab.c:175
440
+msgid "qmax:   "
441
+msgstr ""
442
+
443
+#: src/video_tab.c:190
444
+msgid "qmin:   "
445
+msgstr ""
446
+
447
+#: src/video_tab.c:205
448
+msgid "max. qdiff:   "
449
+msgstr ""
450
+
451
+#: src/video_tab.c:220
452
+msgid "dia size:   "
453
+msgstr ""
454
+
455
+#: src/video_tab.c:235
456
+msgid "pre dia size:   "
457
+msgstr ""
458
+
459
+#: src/video_tab.c:250
460
+msgid "pre me:   "
461
+msgstr ""
462
+
463
+#: src/video_tab.c:265
464
+msgid "pre cmp:   "
465
+msgstr ""
466
+
467
+#: src/video_tab.c:280
468
+msgid "cmp:   "
469
+msgstr ""
470
+
471
+#: src/video_tab.c:295
472
+msgid "sub cmp:   "
473
+msgstr ""
474
+
475
+#: src/video_tab.c:310
476
+msgid "last predictor count:   "
477
+msgstr ""
478
+
479
+#: src/video_tab.c:325
480
+msgid "gop size:   "
481
+msgstr ""
482
+
483
+#: src/video_tab.c:340
484
+msgid "qcompress:   "
485
+msgstr ""
486
+
487
+#: src/video_tab.c:355
488
+msgid "qblur:   "
489
+msgstr ""
490
+
491
+#: src/video_tab.c:370
492
+msgid "subq:   "
493
+msgstr ""
494
+
495
+#: src/video_tab.c:385
496
+msgid "framerefs:   "
497
+msgstr ""
498
+
499
+#: src/video_tab.c:400
500
+msgid "me method:   "
501
+msgstr ""
502
+
503
+#: src/video_tab.c:415
504
+msgid "mb decision:   "
505
+msgstr ""
506
+
507
+#: src/video_tab.c:430
508
+msgid "max B frames:   "
509
+msgstr ""
510
+
511
+#: src/video_tab.c:445
512
+msgid "num threads:   "
513
+msgstr ""
514
+
515
+#: src/video_tab.c:555
516
+msgid "Video & Files"
517
+msgstr ""
518
+
519
+#. Devices
520
+#: src/video_tab.c:571 src/callbacks.c:136
521
+msgid "Device:"
522
+msgstr ""
523
+
524
+#: src/video_tab.c:673
525
+msgid "Frame Rate:"
526
+msgstr ""
527
+
528
+#: src/video_tab.c:681
529
+msgid " Show"
530
+msgstr ""
531
+
532
+#: src/video_tab.c:705
533
+msgid "Resolution:"
534
+msgstr ""
535
+
536
+#: src/video_tab.c:731
537
+msgid "Camera Output:"
538
+msgstr ""
539
+
540
+#: src/video_tab.c:753
541
+msgid "Apply"
542
+msgstr ""
543
+
544
+#: src/video_tab.c:761
545
+msgid "Quality:"
546
+msgstr ""
547
+
548
+#: src/video_tab.c:771
549
+msgid "Image File:"
550
+msgstr ""
551
+
552
+#: src/video_tab.c:804 src/video_tab.c:898
553
+msgid "File,Auto"
554
+msgstr ""
555
+
556
+#: src/video_tab.c:815
557
+msgid "Image Format:"
558
+msgstr ""
559
+
560
+#: src/video_tab.c:841
561
+msgid "Take Picture by Default"
562
+msgstr ""
563
+
564
+#: src/video_tab.c:853
565
+msgid "Video File:"
566
+msgstr ""
567
+
568
+#: src/video_tab.c:931
569
+msgid "Video Codec:"
570
+msgstr ""
571
+
572
+#. lavc codec properties button
573
+#: src/video_tab.c:939 src/audio_tab.c:346
574
+msgid "properties"
575
+msgstr ""
576
+
577
+#: src/video_tab.c:966
578
+msgid "Video Format:"
579
+msgstr ""
580
+
581
+#: src/video_tab.c:973
582
+msgid "Take Video by Default"
583
+msgstr ""
584
+
585
+#: src/video_tab.c:984
586
+msgid "---- Video Filters ----"
587
+msgstr ""
588
+
589
+#. Mirror
590
+#: src/video_tab.c:999
591
+msgid " Mirror"
592
+msgstr ""
593
+
594
+#. Upturn
595
+#: src/video_tab.c:1009
596
+msgid " Invert"
597
+msgstr ""
598
+
599
+#. Negate
600
+#: src/video_tab.c:1019
601
+msgid " Negative"
602
+msgstr ""
603
+
604
+#. Mono
605
+#: src/video_tab.c:1029
606
+msgid " Mono"
607
+msgstr ""
608
+
609
+#. Pieces
610
+#: src/video_tab.c:1040
611
+msgid " Pieces"
612
+msgstr ""
613
+
614
+#. Particles
615
+#: src/video_tab.c:1051
616
+msgid " Particles"
617
+msgstr ""
618
+
619
+#: src/audio_tab.c:46
620
+msgid "audio codec values"
621
+msgstr ""
622
+
623
+#: src/audio_tab.c:132
624
+msgid "Audio"
625
+msgstr ""
626
+
627
+#: src/audio_tab.c:150
628
+msgid " Sound"
629
+msgstr ""
630
+
631
+#. VU meter on the image (OSD)
632
+#: src/audio_tab.c:162
633
+msgid " Show VU meter"
634
+msgstr ""
635
+
636
+#: src/audio_tab.c:175
637
+msgid "Audio API:"
638
+msgstr ""
639
+
640
+#: src/audio_tab.c:185
641
+msgid "PORTAUDIO"
642
+msgstr ""
643
+
644
+#: src/audio_tab.c:186
645
+msgid "PULSEAUDIO"
646
+msgstr ""
647
+
648
+#: src/audio_tab.c:202 src/audio_tab.c:225
649
+msgid "Input Device:"
650
+msgstr ""
651
+
652
+#: src/audio_tab.c:236 src/audio_tab.c:268
653
+msgid "Dev. Default"
654
+msgstr ""
655
+
656
+#: src/audio_tab.c:257
657
+msgid "Sample Rate:"
658
+msgstr ""
659
+
660
+#: src/audio_tab.c:269
661
+msgid "1 - mono"
662
+msgstr ""
663
+
664
+#: src/audio_tab.c:270
665
+msgid "2 - stereo"
666
+msgstr ""
667
+
668
+#: src/audio_tab.c:304
669
+msgid "Channels:"
670
+msgstr ""
671
+
672
+#: src/audio_tab.c:338
673
+msgid "Audio Format:"
674
+msgstr ""
675
+
676
+#: src/audio_tab.c:356
677
+msgid "---- Audio Effects ----"
678
+msgstr ""
679
+
680
+#. Echo
681
+#: src/audio_tab.c:375
682
+msgid " Echo"
683
+msgstr ""
684
+
685
+#. FUZZ
686
+#: src/audio_tab.c:385
687
+msgid " Fuzz"
688
+msgstr ""
689
+
690
+#. Reverb
691
+#: src/audio_tab.c:396
692
+msgid " Reverb"
693
+msgstr ""
694
+
695
+#. WahWah
696
+#: src/audio_tab.c:407
697
+msgid " WahWah"
698
+msgstr ""
699
+
700
+#. Ducky
701
+#: src/audio_tab.c:418
702
+msgid " Ducky"
703
+msgstr ""
704
+
705
+#: src/v4l2_controls.c:732
706
+msgid "Left"
707
+msgstr ""
708
+
709
+#: src/v4l2_controls.c:733
710
+msgid "Right"
711
+msgstr ""
712
+
713
+#: src/v4l2_controls.c:737
714
+msgid "Down"
715
+msgstr ""
716
+
717
+#: src/v4l2_controls.c:738
718
+msgid "Up"
719
+msgstr ""
720
+
721
+#: src/v4l2_controls.c:787
722
+msgid "Off"
723
+msgstr ""
724
+
725
+#: src/v4l2_controls.c:790
726
+msgid "On"
727
+msgstr ""
728
+
729
+#: src/v4l2_controls.c:793
730
+msgid "Blinking"
731
+msgstr ""
732
+
733
+#: src/v4l2_controls.c:796
734
+msgid "Auto"
735
+msgstr ""
736
+
737
+#: src/v4l2_controls.c:814
738
+msgid "8 bit"
739
+msgstr ""
740
+
741
+#: src/v4l2_controls.c:817
742
+msgid "12 bit"
743
+msgstr ""
744
+
745
+#: src/v4l2_dyna_ctrls.c:89
746
+msgid "Pan (relative)"
747
+msgstr ""
748
+
749
+#: src/v4l2_dyna_ctrls.c:99
750
+msgid "Tilt (relative)"
751
+msgstr ""
752
+
753
+#: src/v4l2_dyna_ctrls.c:109
754
+msgid "Pan Reset"
755
+msgstr ""
756
+
757
+#: src/v4l2_dyna_ctrls.c:119
758
+msgid "Tilt Reset"
759
+msgstr ""
760
+
761
+#: src/v4l2_dyna_ctrls.c:129
762
+msgid "Pan/tilt Reset"
763
+msgstr ""
764
+
765
+#: src/v4l2_dyna_ctrls.c:139
766
+msgid "Focus (absolute)"
767
+msgstr ""
768
+
769
+#: src/v4l2_dyna_ctrls.c:149
770
+msgid "LED1 Mode"
771
+msgstr ""
772
+
773
+#: src/v4l2_dyna_ctrls.c:159
774
+msgid "LED1 Frequency"
775
+msgstr ""
776
+
777
+#: src/v4l2_dyna_ctrls.c:169
778
+msgid "Disable video processing"
779
+msgstr ""
780
+
781
+#: src/v4l2_dyna_ctrls.c:179
782
+msgid "Raw bits per pixel"
783
+msgstr ""
784
+
785
+#: src/vcodecs.c:62
786
+msgid "MJPG - compressed"
787
+msgstr ""
788
+
789
+#: src/vcodecs.c:97
790
+msgid "YUY2 - uncomp YUV"
791
+msgstr ""
792
+
793
+#: src/vcodecs.c:132
794
+msgid "RGB - uncomp BMP"
795
+msgstr ""
796
+
797
+#: src/vcodecs.c:167
798
+msgid "MPEG video 1"
799
+msgstr ""
800
+
801
+#: src/vcodecs.c:202
802
+msgid "FLV1 - flash video 1"
803
+msgstr ""
804
+
805
+#: src/vcodecs.c:237
806
+msgid "WMV1 - win. med. video 7"
807
+msgstr ""
808
+
809
+#: src/vcodecs.c:272
810
+msgid "MPG2 - MPG2 format"
811
+msgstr ""
812
+
813
+#: src/vcodecs.c:307
814
+msgid "MS MP4 V3"
815
+msgstr ""
816
+
817
+#: src/vcodecs.c:342
818
+msgid "MPEG4-ASP"
819
+msgstr ""
820
+
821
+#: src/vcodecs.c:377
822
+msgid "MPEG4-AVC (H264)"
823
+msgstr ""
824
+
825
+#: src/options.c:753
826
+msgid "Prints version"
827
+msgstr ""
828
+
829
+#: src/options.c:754
830
+msgid "Displays debug information"
831
+msgstr ""
832
+
833
+#: src/options.c:755
834
+msgid "Video Device to use [default: /dev/video0]"
835
+msgstr ""
836
+
837
+#: src/options.c:756
838
+msgid "Exit after adding UVC extension controls (needs root/sudo)"
839
+msgstr ""
840
+
841
+#: src/options.c:757
842
+msgid "Don't stream video (image controls only)"
843
+msgstr ""
844
+
845
+#: src/options.c:758
846
+msgid "Don't display a GUI"
847
+msgstr ""
848
+
849
+#: src/options.c:759
850
+msgid "Capture method (1-mmap (default)  2-read)"
851
+msgstr ""
852
+
853
+#: src/options.c:760
854
+msgid "Configuration file"
855
+msgstr ""
856
+
857
+#: src/options.c:761
858
+msgid "Hardware accelaration (enable(1) | disable(0))"
859
+msgstr ""
860
+
861
+#: src/options.c:762
862
+msgid ""
863
+"Pixel "
864
+"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
865
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
866
+msgstr ""
867
+
868
+#: src/options.c:763
869
+msgid "Frame size, default: 640x480"
870
+msgstr ""
871
+
872
+#: src/options.c:764
873
+msgid "Image File name"
874
+msgstr ""
875
+
876
+#: src/options.c:765
877
+msgid "Image capture interval in seconds"
878
+msgstr ""
879
+
880
+#: src/options.c:766
881
+msgid "Number of Pictures to capture"
882
+msgstr ""
883
+
884
+#: src/options.c:767
885
+msgid "Video File name (capture from start)"
886
+msgstr ""
887
+
888
+#: src/options.c:768
889
+msgid "Video capture time (in seconds)"
890
+msgstr ""
891
+
892
+#: src/options.c:769
893
+msgid "Exits guvcview after closing video"
894
+msgstr ""
895
+
896
+#: src/options.c:770
897
+msgid "Number of initial frames to skip"
898
+msgstr ""
899
+
900
+#: src/options.c:771
901
+msgid "Show FPS value (enable(1) | disable (0))"
902
+msgstr ""
903
+
904
+#: src/options.c:772
905
+msgid "Load Profile at start"
906
+msgstr ""
907
+
908
+#: src/options.c:778
909
+msgid "- local options"
910
+msgstr ""
911
+
912
+#: src/img_controls.c:117
913
+msgid "Auto Focus (continuous)"
914
+msgstr ""
915
+
916
+#: src/img_controls.c:118
917
+msgid "set Focus"
918
+msgstr ""
919
+
920
+#: src/callbacks.c:102
921
+msgid "Error"
922
+msgstr ""
923
+
924
+#: src/callbacks.c:128
925
+msgid ""
926
+"\n"
927
+"You have more than one video device installed.\n"
928
+"Do you want to try another one ?\n"
929
+msgstr ""
930
+
931
+#: src/callbacks.c:659
932
+msgid "start new"
933
+msgstr ""
934
+
935
+#: src/callbacks.c:662
936
+msgid "restart"
937
+msgstr ""
938
+
939
+#: src/callbacks.c:664
940
+msgid "new"
941
+msgstr ""
942
+
943
+#: src/callbacks.c:666
944
+msgid "cancel"
945
+msgstr ""
946
+
947
+#: src/callbacks.c:671
948
+msgid ""
949
+"launch new process or restart?.\n"
950
+"\n"
951
+msgstr ""
952
+
953
+#: src/callbacks.c:1344
954
+msgid "Load File"
955
+msgstr ""
956
+
957
+#: src/timers.c:212
958
+msgid "Guvcview Warning:"
959
+msgstr ""
960
+
961
+#: src/timers.c:212
962
+msgid "Not enough free space left on disk"
963
+msgstr ""
964
guvcview-src-1.5.2.tar.gz/po/fr.po -> guvcview-src-1.5.3.tar.gz/po/fr.po Changed
141
 
1
@@ -11,15 +11,15 @@
2
 "Project-Id-Version: fr\n"
3
 "Report-Msgid-Bugs-To: \n"
4
 "POT-Creation-Date: 2011-10-17 22:15+0100\n"
5
-"PO-Revision-Date: 2011-07-25 18:46+0000\n"
6
-"Last-Translator: Tubuntu <Unknown>\n"
7
+"PO-Revision-Date: 2012-01-24 18:12+0000\n"
8
+"Last-Translator: Pixep <Unknown>\n"
9
 "Language-Team: Portuguese <pt@li.org>\n"
10
-"Language: pt\n"
11
 "MIME-Version: 1.0\n"
12
 "Content-Type: text/plain; charset=UTF-8\n"
13
 "Content-Transfer-Encoding: 8bit\n"
14
-"X-Launchpad-Export-Date: 2011-08-10 12:28+0000\n"
15
-"X-Generator: Launchpad (build 13636)\n"
16
+"X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
17
+"X-Generator: Launchpad (build 14868)\n"
18
+"Language: pt\n"
19
 
20
 #: src/guvcview.c:289
21
 msgid "Guvcview Video Capture"
22
@@ -208,7 +208,8 @@
23
 
24
 #: src/guvcview.c:736
25
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
26
-msgstr "Veuillez le reporter à http://developer.berlios.de/bugs/?group_id=8179"
27
+msgstr ""
28
+"Veuillez le reporter à http://developer.berlios.de/bugs/?group_id=8179"
29
 
30
 #. needed only for language files (not used)
31
 #. V4L2 control strings
32
@@ -466,7 +467,7 @@
33
 
34
 #: src/video_tab.c:152
35
 msgid " monotonic pts"
36
-msgstr ""
37
+msgstr " Pts monotones"
38
 
39
 #. bit rate
40
 #: src/video_tab.c:160 src/audio_tab.c:58
41
@@ -546,9 +547,8 @@
42
 msgstr "nombre max d'images B:   "
43
 
44
 #: src/video_tab.c:445
45
-#, fuzzy
46
 msgid "num threads:   "
47
-msgstr "méthode me:   "
48
+msgstr "nb threads:   "
49
 
50
 #: src/video_tab.c:555
51
 msgid "Video & Files"
52
@@ -597,7 +597,7 @@
53
 
54
 #: src/video_tab.c:841
55
 msgid "Take Picture by Default"
56
-msgstr ""
57
+msgstr "Captuer une Image par Défaut"
58
 
59
 #: src/video_tab.c:853
60
 msgid "Video File:"
61
@@ -618,7 +618,7 @@
62
 
63
 #: src/video_tab.c:973
64
 msgid "Take Video by Default"
65
-msgstr ""
66
+msgstr "Capturer une Vidéo par Défaut"
67
 
68
 #: src/video_tab.c:984
69
 msgid "---- Video Filters ----"
70
@@ -669,7 +669,7 @@
71
 #. VU meter on the image (OSD)
72
 #: src/audio_tab.c:162
73
 msgid " Show VU meter"
74
-msgstr ""
75
+msgstr " Afficher le VU-mètre"
76
 
77
 #: src/audio_tab.c:175
78
 msgid "Audio API:"
79
@@ -758,28 +758,27 @@
80
 
81
 #: src/v4l2_controls.c:787
82
 msgid "Off"
83
-msgstr ""
84
+msgstr "Désactivé"
85
 
86
 #: src/v4l2_controls.c:790
87
 msgid "On"
88
-msgstr ""
89
+msgstr "Activé"
90
 
91
 #: src/v4l2_controls.c:793
92
 msgid "Blinking"
93
-msgstr ""
94
+msgstr "Clignotement"
95
 
96
 #: src/v4l2_controls.c:796
97
-#, fuzzy
98
 msgid "Auto"
99
-msgstr "Arrêt Automatique"
100
+msgstr "Automatique"
101
 
102
 #: src/v4l2_controls.c:814
103
 msgid "8 bit"
104
-msgstr ""
105
+msgstr "8 bit"
106
 
107
 #: src/v4l2_controls.c:817
108
 msgid "12 bit"
109
-msgstr ""
110
+msgstr "12 bit"
111
 
112
 #: src/v4l2_dyna_ctrls.c:89
113
 msgid "Pan (relative)"
114
@@ -884,7 +883,7 @@
115
 
116
 #: src/options.c:758
117
 msgid "Don't display a GUI"
118
-msgstr ""
119
+msgstr "Ne pas afficher d'interface graphique"
120
 
121
 #: src/options.c:759
122
 msgid "Capture method (1-mmap (default)  2-read)"
123
@@ -900,11 +899,13 @@
124
 
125
 #: src/options.c:762
126
 msgid ""
127
-"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
128
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
129
+"Pixel "
130
+"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
131
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
132
 msgstr ""
133
-"Format des pixels(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|"
134
-"nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
135
+"Format des "
136
+"pixels(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
137
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
138
 
139
 #: src/options.c:763
140
 msgid "Frame size, default: 640x480"
141
guvcview-src-1.5.2.tar.gz/po/pt_BR.po -> guvcview-src-1.5.3.tar.gz/po/pt_BR.po Changed
243
 
1
@@ -9,16 +9,16 @@
2
 "Project-Id-Version: pt_BR\n"
3
 "Report-Msgid-Bugs-To: \n"
4
 "POT-Creation-Date: 2011-10-17 22:15+0100\n"
5
-"PO-Revision-Date: 2011-10-17 22:27+0100\n"
6
-"Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
7
+"PO-Revision-Date: 2012-01-18 14:02+0000\n"
8
+"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
9
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
10
-"Language: pt\n"
11
 "MIME-Version: 1.0\n"
12
 "Content-Type: text/plain; charset=UTF-8\n"
13
 "Content-Transfer-Encoding: 8bit\n"
14
-"X-Launchpad-Export-Date: 2011-08-10 12:28+0000\n"
15
-"X-Generator: Launchpad (build 13636)\n"
16
+"X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
17
+"X-Generator: Launchpad (build 14868)\n"
18
 "X-Project-Style: default\n"
19
+"Language: pt\n"
20
 
21
 #: src/guvcview.c:289
22
 msgid "Guvcview Video Capture"
23
@@ -83,8 +83,7 @@
24
 "controles ao driver UVC\n"
25
 "Verifique se iniciou o guvcview como root (ou sudo)."
26
 
27
-#: src/guvcview.c:387
28
-#: src/guvcview.c:465
29
+#: src/guvcview.c:387 src/guvcview.c:465
30
 msgid ""
31
 "Guvcview error:\n"
32
 "\n"
33
@@ -94,8 +93,7 @@
34
 "\n"
35
 "Não foi possível definir um fluxo de vídeo para o guvcview"
36
 
37
-#: src/guvcview.c:388
38
-#: src/guvcview.c:466
39
+#: src/guvcview.c:388 src/guvcview.c:466
40
 msgid ""
41
 "Make sure your device driver is v4l2 compliant\n"
42
 "and that it is properly installed."
43
@@ -103,8 +101,7 @@
44
 "Verifique se o driver é compatível com v4l2\n"
45
 "e se este se está instalado corretamente."
46
 
47
-#: src/guvcview.c:410
48
-#: src/guvcview.c:432
49
+#: src/guvcview.c:410 src/guvcview.c:432
50
 msgid ""
51
 "Guvcview error:\n"
52
 "\n"
53
@@ -114,8 +111,7 @@
54
 "\n"
55
 "Não foi possível iniciar com as definições mínimas"
56
 
57
-#: src/guvcview.c:411
58
-#: src/guvcview.c:433
59
+#: src/guvcview.c:411 src/guvcview.c:433
60
 msgid "Please reconnect your camera."
61
 msgstr "Por favor, reconecte sua câmera."
62
 
63
@@ -184,21 +180,16 @@
64
 msgid "Stop Auto"
65
 msgstr "Parar auto:"
66
 
67
-#: src/guvcview.c:569
68
-#: src/callbacks.c:1118
69
-#: src/timers.c:114
70
+#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
71
 msgid "Cap. Image"
72
 msgstr "Cap. imagem"
73
 
74
 #. vid capture enabled from start
75
-#: src/guvcview.c:574
76
-#: src/callbacks.c:1261
77
+#: src/guvcview.c:574 src/callbacks.c:1261
78
 msgid "Stop Video"
79
 msgstr "Parar vídeo"
80
 
81
-#: src/guvcview.c:579
82
-#: src/guvcview.c:795
83
-#: src/callbacks.c:1194
84
+#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
85
 #: src/create_video.c:878
86
 msgid "Cap. Video"
87
 msgstr "Cap. vídeo"
88
@@ -215,7 +206,8 @@
89
 
90
 #: src/guvcview.c:736
91
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
92
-msgstr "Por favor, reporte em http://developer.berlios.de/bugs/?group_id=8179"
93
+msgstr ""
94
+"Por favor, reporte em http://developer.berlios.de/bugs/?group_id=8179"
95
 
96
 #. needed only for language files (not used)
97
 #. V4L2 control strings
98
@@ -446,26 +438,15 @@
99
 msgid "Focus (Absolute)"
100
 msgstr "Foco (absoluto)"
101
 
102
-#: src/video_tab.c:41
103
-#: src/callbacks.c:1331
104
+#: src/video_tab.c:41 src/callbacks.c:1331
105
 msgid "Save File"
106
 msgstr "Salvar arquivo"
107
 
108
 #. if auto naming restart counter
109
-#: src/video_tab.c:76
110
-#: src/video_tab.c:106
111
-#: src/globals.c:73
112
-#: src/globals.c:76
113
-#: src/options.c:326
114
-#: src/options.c:445
115
-#: src/options.c:502
116
-#: src/callbacks.c:608
117
-#: src/callbacks.c:890
118
-#: src/callbacks.c:1039
119
-#: src/callbacks.c:1056
120
-#: src/callbacks.c:1092
121
-#: src/callbacks.c:1207
122
-#: src/timers.c:98
123
+#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
124
+#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
125
+#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
126
+#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
127
 #, c-format
128
 msgid "File num:%d"
129
 msgstr "Arquivo num:%d"
130
@@ -484,11 +465,10 @@
131
 
132
 #: src/video_tab.c:152
133
 msgid " monotonic pts"
134
-msgstr "pts monotonico"
135
+msgstr " pts monotonico"
136
 
137
 #. bit rate
138
-#: src/video_tab.c:160
139
-#: src/audio_tab.c:58
140
+#: src/video_tab.c:160 src/audio_tab.c:58
141
 msgid "bit rate:   "
142
 msgstr "taxa de bits:   "
143
 
144
@@ -566,15 +546,14 @@
145
 
146
 #: src/video_tab.c:445
147
 msgid "num threads:   "
148
-msgstr "num threads: "
149
+msgstr "num threads:   "
150
 
151
 #: src/video_tab.c:555
152
 msgid "Video & Files"
153
 msgstr "Vídeo & arquivos"
154
 
155
 #. Devices
156
-#: src/video_tab.c:571
157
-#: src/callbacks.c:136
158
+#: src/video_tab.c:571 src/callbacks.c:136
159
 msgid "Device:"
160
 msgstr "Dispositivo:"
161
 
162
@@ -606,8 +585,7 @@
163
 msgid "Image File:"
164
 msgstr "Arquivo de imagem:"
165
 
166
-#: src/video_tab.c:804
167
-#: src/video_tab.c:898
168
+#: src/video_tab.c:804 src/video_tab.c:898
169
 msgid "File,Auto"
170
 msgstr "Arquivo,Auto"
171
 
172
@@ -628,8 +606,7 @@
173
 msgstr "Codec de vídeo:"
174
 
175
 #. lavc codec properties button
176
-#: src/video_tab.c:939
177
-#: src/audio_tab.c:346
178
+#: src/video_tab.c:939 src/audio_tab.c:346
179
 msgid "properties"
180
 msgstr "propriedades"
181
 
182
@@ -690,7 +667,7 @@
183
 #. VU meter on the image (OSD)
184
 #: src/audio_tab.c:162
185
 msgid " Show VU meter"
186
-msgstr "Mostrar Volume"
187
+msgstr " Mostrar Volume"
188
 
189
 #: src/audio_tab.c:175
190
 msgid "Audio API:"
191
@@ -704,13 +681,11 @@
192
 msgid "PULSEAUDIO"
193
 msgstr "PULSEAUDIO"
194
 
195
-#: src/audio_tab.c:202
196
-#: src/audio_tab.c:225
197
+#: src/audio_tab.c:202 src/audio_tab.c:225
198
 msgid "Input Device:"
199
 msgstr "Dispositivo de entrada:"
200
 
201
-#: src/audio_tab.c:236
202
-#: src/audio_tab.c:268
203
+#: src/audio_tab.c:236 src/audio_tab.c:268
204
 msgid "Dev. Default"
205
 msgstr "Padrão"
206
 
207
@@ -797,11 +772,11 @@
208
 
209
 #: src/v4l2_controls.c:814
210
 msgid "8 bit"
211
-msgstr ""
212
+msgstr "8 bit"
213
 
214
 #: src/v4l2_controls.c:817
215
 msgid "12 bit"
216
-msgstr ""
217
+msgstr "12 bit"
218
 
219
 #: src/v4l2_dyna_ctrls.c:89
220
 msgid "Pan (relative)"
221
@@ -920,8 +895,14 @@
222
 msgstr "Aceleração de hardware (habilitado(1) | desabilitado(0))"
223
 
224
 #: src/options.c:762
225
-msgid "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
226
-msgstr "Formato de pixel(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
227
+msgid ""
228
+"Pixel "
229
+"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
230
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
231
+msgstr ""
232
+"Formato de "
233
+"pixel(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y"
234
+"16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
235
 
236
 #: src/options.c:763
237
 msgid "Frame size, default: 640x480"
238
@@ -1024,4 +1005,3 @@
239
 #: src/timers.c:212
240
 msgid "Not enough free space left on disk"
241
 msgstr "Sem espaço livre suficiente no disco"
242
-
243
guvcview-src-1.5.2.tar.gz/po/ru.po -> guvcview-src-1.5.3.tar.gz/po/ru.po Changed
106
 
1
@@ -7,15 +7,15 @@
2
 "Project-Id-Version: guvcview\n"
3
 "Report-Msgid-Bugs-To: \n"
4
 "POT-Creation-Date: 2011-10-17 22:15+0100\n"
5
-"PO-Revision-Date: 2011-03-13 21:08+0000\n"
6
-"Last-Translator: Eugene Marshal <Unknown>\n"
7
+"PO-Revision-Date: 2012-02-24 06:49+0000\n"
8
+"Last-Translator: Auduf <5097@mail.ru>\n"
9
 "Language-Team: Russian <>\n"
10
-"Language: ru\n"
11
 "MIME-Version: 1.0\n"
12
 "Content-Type: text/plain; charset=UTF-8\n"
13
 "Content-Transfer-Encoding: 8bit\n"
14
-"X-Launchpad-Export-Date: 2011-08-10 12:28+0000\n"
15
-"X-Generator: Launchpad (build 13636)\n"
16
+"X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
17
+"X-Generator: Launchpad (build 14868)\n"
18
+"Language: ru\n"
19
 
20
 #: src/guvcview.c:289
21
 msgid "Guvcview Video Capture"
22
@@ -200,8 +200,8 @@
23
 #: src/guvcview.c:736
24
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
25
 msgstr ""
26
-"Следует сообщить об этом сюда: http://developer.berlios.de/bugs/?"
27
-"group_id=8179"
28
+"Следует сообщить об этом сюда: "
29
+"http://developer.berlios.de/bugs/?group_id=8179"
30
 
31
 #. needed only for language files (not used)
32
 #. V4L2 control strings
33
@@ -539,9 +539,8 @@
34
 msgstr ""
35
 
36
 #: src/video_tab.c:445
37
-#, fuzzy
38
 msgid "num threads:   "
39
-msgstr "me-method:   "
40
+msgstr ""
41
 
42
 #: src/video_tab.c:555
43
 msgid "Video & Files"
44
@@ -751,28 +750,27 @@
45
 
46
 #: src/v4l2_controls.c:787
47
 msgid "Off"
48
-msgstr ""
49
+msgstr "Откл."
50
 
51
 #: src/v4l2_controls.c:790
52
 msgid "On"
53
-msgstr ""
54
+msgstr "Вкл."
55
 
56
 #: src/v4l2_controls.c:793
57
 msgid "Blinking"
58
-msgstr ""
59
+msgstr "Мерцание"
60
 
61
 #: src/v4l2_controls.c:796
62
-#, fuzzy
63
 msgid "Auto"
64
-msgstr "Авторежим"
65
+msgstr "Авто"
66
 
67
 #: src/v4l2_controls.c:814
68
 msgid "8 bit"
69
-msgstr ""
70
+msgstr "8 бит"
71
 
72
 #: src/v4l2_controls.c:817
73
 msgid "12 bit"
74
-msgstr ""
75
+msgstr "12 бит"
76
 
77
 #: src/v4l2_dyna_ctrls.c:89
78
 msgid "Pan (relative)"
79
@@ -876,7 +874,7 @@
80
 
81
 #: src/options.c:758
82
 msgid "Don't display a GUI"
83
-msgstr ""
84
+msgstr "Не отображать графический интерфейс"
85
 
86
 #: src/options.c:759
87
 msgid "Capture method (1-mmap (default)  2-read)"
88
@@ -892,11 +890,13 @@
89
 
90
 #: src/options.c:762
91
 msgid ""
92
-"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
93
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
94
+"Pixel "
95
+"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
96
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
97
 msgstr ""
98
-"Формат пикселя(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
99
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
100
+"Формат "
101
+"пикселя(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey"
102
+"|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
103
 
104
 #: src/options.c:763
105
 msgid "Frame size, default: 640x480"
106
guvcview-src-1.5.2.tar.gz/po/sr.po -> guvcview-src-1.5.3.tar.gz/po/sr.po Changed
277
 
1
@@ -8,15 +8,15 @@
2
 "Project-Id-Version: guvcview\n"
3
 "Report-Msgid-Bugs-To: \n"
4
 "POT-Creation-Date: 2011-10-17 22:15+0100\n"
5
-"PO-Revision-Date: 2011-03-19 06:21+0000\n"
6
+"PO-Revision-Date: 2011-10-31 21:01+0000\n"
7
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
8
 "Language-Team: Launchpad Serbian Translators\n"
9
-"Language: Serbian (sr)\n"
10
 "MIME-Version: 1.0\n"
11
 "Content-Type: text/plain; charset=UTF-8\n"
12
 "Content-Transfer-Encoding: 8bit\n"
13
-"X-Launchpad-Export-Date: 2011-08-10 12:28+0000\n"
14
-"X-Generator: Launchpad (build 13636)\n"
15
+"X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
16
+"X-Generator: Launchpad (build 14868)\n"
17
+"Language: sr\n"
18
 
19
 #: src/guvcview.c:289
20
 msgid "Guvcview Video Capture"
21
@@ -340,11 +340,11 @@
22
 
23
 #: src/v4l2uvc.c:88
24
 msgid "Exposure Time, Absolute"
25
-msgstr "Време експозиције, апсолутно"
26
+msgstr "Време излагања, апсолутно"
27
 
28
 #: src/v4l2uvc.c:89
29
 msgid "Exposure, Dynamic Framerate"
30
-msgstr "Експозиција, динамички проток кадра"
31
+msgstr "Излагање, динамички проток кадра"
32
 
33
 #: src/v4l2uvc.c:90
34
 msgid "Pan, Relative"
35
@@ -438,7 +438,7 @@
36
 
37
 #: src/video_tab.c:41 src/callbacks.c:1331
38
 msgid "Save File"
39
-msgstr "Сачувај датотеку"
40
+msgstr "Сачувајте датотеку"
41
 
42
 #. if auto naming restart counter
43
 #: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
44
@@ -447,7 +447,7 @@
45
 #: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
46
 #, c-format
47
 msgid "File num:%d"
48
-msgstr "Датотека број:%d"
49
+msgstr "Дат. бр.:%d"
50
 
51
 #: src/video_tab.c:126
52
 msgid "codec values"
53
@@ -463,7 +463,7 @@
54
 
55
 #: src/video_tab.c:152
56
 msgid " monotonic pts"
57
-msgstr ""
58
+msgstr " једнообразне тачке"
59
 
60
 #. bit rate
61
 #: src/video_tab.c:160 src/audio_tab.c:58
62
@@ -516,7 +516,7 @@
63
 
64
 #: src/video_tab.c:340
65
 msgid "qcompress:   "
66
-msgstr "q-компримовање:   "
67
+msgstr "q-сажимање:   "
68
 
69
 #: src/video_tab.c:355
70
 msgid "qblur:   "
71
@@ -543,9 +543,8 @@
72
 msgstr "највише Б оквира:   "
73
 
74
 #: src/video_tab.c:445
75
-#, fuzzy
76
 msgid "num threads:   "
77
-msgstr "ме начин:   "
78
+msgstr "бр. нити:   "
79
 
80
 #: src/video_tab.c:555
81
 msgid "Video & Files"
82
@@ -586,7 +585,7 @@
83
 
84
 #: src/video_tab.c:804 src/video_tab.c:898
85
 msgid "File,Auto"
86
-msgstr "Датотека,аутоматски"
87
+msgstr "Датотека, самостално"
88
 
89
 #: src/video_tab.c:815
90
 msgid "Image Format:"
91
@@ -594,7 +593,7 @@
92
 
93
 #: src/video_tab.c:841
94
 msgid "Take Picture by Default"
95
-msgstr ""
96
+msgstr "Сними слику по основи"
97
 
98
 #: src/video_tab.c:853
99
 msgid "Video File:"
100
@@ -611,11 +610,11 @@
101
 
102
 #: src/video_tab.c:966
103
 msgid "Video Format:"
104
-msgstr "формат видеа:"
105
+msgstr "Формат снимка:"
106
 
107
 #: src/video_tab.c:973
108
 msgid "Take Video by Default"
109
-msgstr ""
110
+msgstr "Сними видео по основи"
111
 
112
 #: src/video_tab.c:984
113
 msgid "---- Video Filters ----"
114
@@ -653,7 +652,7 @@
115
 
116
 #: src/audio_tab.c:46
117
 msgid "audio codec values"
118
-msgstr "вредности аудио кодека"
119
+msgstr "вредност кодека звука"
120
 
121
 #: src/audio_tab.c:132
122
 msgid "Audio"
123
@@ -666,7 +665,7 @@
124
 #. VU meter on the image (OSD)
125
 #: src/audio_tab.c:162
126
 msgid " Show VU meter"
127
-msgstr ""
128
+msgstr " Прикажи ВУ метар"
129
 
130
 #: src/audio_tab.c:175
131
 msgid "Audio API:"
132
@@ -686,7 +685,7 @@
133
 
134
 #: src/audio_tab.c:236 src/audio_tab.c:268
135
 msgid "Dev. Default"
136
-msgstr "Основни уређаја"
137
+msgstr "Основни са уређаја"
138
 
139
 #: src/audio_tab.c:257
140
 msgid "Sample Rate:"
141
@@ -706,7 +705,7 @@
142
 
143
 #: src/audio_tab.c:338
144
 msgid "Audio Format:"
145
-msgstr "Формат аудиа:"
146
+msgstr "Формат звука:"
147
 
148
 #: src/audio_tab.c:356
149
 msgid "---- Audio Effects ----"
150
@@ -755,28 +754,27 @@
151
 
152
 #: src/v4l2_controls.c:787
153
 msgid "Off"
154
-msgstr ""
155
+msgstr "Искљ."
156
 
157
 #: src/v4l2_controls.c:790
158
 msgid "On"
159
-msgstr ""
160
+msgstr "Укљ."
161
 
162
 #: src/v4l2_controls.c:793
163
 msgid "Blinking"
164
-msgstr ""
165
+msgstr "Треперење"
166
 
167
 #: src/v4l2_controls.c:796
168
-#, fuzzy
169
 msgid "Auto"
170
-msgstr "Заустави аутоматско"
171
+msgstr "Самостално"
172
 
173
 #: src/v4l2_controls.c:814
174
 msgid "8 bit"
175
-msgstr ""
176
+msgstr "8 бита"
177
 
178
 #: src/v4l2_controls.c:817
179
 msgid "12 bit"
180
-msgstr ""
181
+msgstr "12 бита"
182
 
183
 #: src/v4l2_dyna_ctrls.c:89
184
 msgid "Pan (relative)"
185
@@ -788,15 +786,15 @@
186
 
187
 #: src/v4l2_dyna_ctrls.c:109
188
 msgid "Pan Reset"
189
-msgstr "Праћење поновно"
190
+msgstr "Поновно праћење"
191
 
192
 #: src/v4l2_dyna_ctrls.c:119
193
 msgid "Tilt Reset"
194
-msgstr "Нагибање поновно"
195
+msgstr "Поновно нагибање"
196
 
197
 #: src/v4l2_dyna_ctrls.c:129
198
 msgid "Pan/tilt Reset"
199
-msgstr "Праћење/нагибање поновно"
200
+msgstr "Поновно праћење/нагибање"
201
 
202
 #: src/v4l2_dyna_ctrls.c:139
203
 msgid "Focus (absolute)"
204
@@ -820,15 +818,15 @@
205
 
206
 #: src/vcodecs.c:62
207
 msgid "MJPG - compressed"
208
-msgstr "МЈПГ — компримовани"
209
+msgstr "МЈПГ — сажети"
210
 
211
 #: src/vcodecs.c:97
212
 msgid "YUY2 - uncomp YUV"
213
-msgstr "ЈУЈ2 — некомпримовани ЈУВ"
214
+msgstr "ЈУЈ2 — несажети ЈУВ"
215
 
216
 #: src/vcodecs.c:132
217
 msgid "RGB - uncomp BMP"
218
-msgstr "РГБ — некомпримовани БМП"
219
+msgstr "РГБ — несажети БМП"
220
 
221
 #: src/vcodecs.c:167
222
 msgid "MPEG video 1"
223
@@ -880,7 +878,7 @@
224
 
225
 #: src/options.c:758
226
 msgid "Don't display a GUI"
227
-msgstr ""
228
+msgstr "Не приказује ГКС"
229
 
230
 #: src/options.c:759
231
 msgid "Capture method (1-mmap (default)  2-read)"
232
@@ -896,11 +894,13 @@
233
 
234
 #: src/options.c:762
235
 msgid ""
236
-"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
237
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
238
+"Pixel "
239
+"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
240
+"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
241
 msgstr ""
242
-"Формат тачака (mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
243
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
244
+"Формат тачака "
245
+"(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 "
246
+"|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
247
 
248
 #: src/options.c:763
249
 msgid "Frame size, default: 640x480"
250
@@ -948,7 +948,7 @@
251
 
252
 #: src/img_controls.c:117
253
 msgid "Auto Focus (continuous)"
254
-msgstr "Аутоматско фокусирање (непрекидно)"
255
+msgstr "Самостално фокусирање (непрекидно)"
256
 
257
 #: src/img_controls.c:118
258
 msgid "set Focus"
259
@@ -982,7 +982,7 @@
260
 
261
 #: src/callbacks.c:666
262
 msgid "cancel"
263
-msgstr "отказжи"
264
+msgstr "откажи"
265
 
266
 #: src/callbacks.c:671
267
 msgid ""
268
@@ -994,7 +994,7 @@
269
 
270
 #: src/callbacks.c:1344
271
 msgid "Load File"
272
-msgstr "Учитај датотеку"
273
+msgstr "Учитајте датотеку"
274
 
275
 #: src/timers.c:212
276
 msgid "Guvcview Warning:"
277
guvcview-src-1.5.2.tar.gz/src/acodecs.c -> guvcview-src-1.5.3.tar.gz/src/acodecs.c Changed
52
 
1
@@ -66,6 +66,7 @@
2
        .avcodec      = TRUE,
3
        .valid        = TRUE,
4
        .bits         = 0,
5
+       .monotonic_pts= 1,
6
        .avi_4cc      = WAVE_FORMAT_MPEG12,
7
        .mkv_codec    = "A_MPEG/L2",
8
        .description  = N_("MPEG2 - (lavc)"),
9
@@ -80,6 +81,7 @@
10
        .avcodec      = TRUE,
11
        .valid        = TRUE,
12
        .bits         = 0,
13
+       .monotonic_pts= 1,
14
        .avi_4cc      = WAVE_FORMAT_MP3,
15
        .mkv_codec    = "A_MPEG/L3",
16
        .description  = N_("MP3 - (lavc)"),
17
@@ -94,6 +96,7 @@
18
        .avcodec      = TRUE,
19
        .valid        = TRUE,
20
        .bits         = 0,
21
+       .monotonic_pts= 1,
22
        .avi_4cc      = WAVE_FORMAT_AC3,
23
        .mkv_codec    = "A_AC3",
24
        .description  = N_("Dolby AC3 - (lavc)"),
25
@@ -108,6 +111,7 @@
26
        .avcodec      = TRUE,
27
        .valid        = TRUE,
28
        .bits         = 16,
29
+       .monotonic_pts= 1,
30
        .avi_4cc      = WAVE_FORMAT_AAC,
31
        .mkv_codec    = "A_AAC",
32
        .description  = N_("ACC Low - (faac)"),
33
@@ -297,14 +301,17 @@
34
    AudBuff *proc_buff)
35
 {
36
    struct paRecordData *pdata = all_data->pdata;
37
+   struct VideoFormatData *videoF = all_data->videoF;
38
    
39
    int framesize = 0;
40
    int ret = 0;
41
    
42
+   videoF->old_apts = videoF->apts;
43
+   
44
    if(lavc_data)
45
    {
46
        /*lavc is initialized when setting sound*/
47
-       framesize= encode_lavc_audio_frame (pdata->pcm_sndBuff, lavc_data);
48
+       framesize= encode_lavc_audio_frame (pdata->pcm_sndBuff, lavc_data, videoF);
49
        
50
        ret = write_audio_data (all_data, lavc_data->outbuf, framesize, proc_buff->time_stamp);
51
    }
52
guvcview-src-1.5.2.tar.gz/src/acodecs.h -> guvcview-src-1.5.3.tar.gz/src/acodecs.h Changed
9
 
1
@@ -37,6 +37,7 @@
2
    gboolean avcodec;         //is a avcodec codec
3
    gboolean valid;           //the encoding codec exists in ffmpeg
4
    int bits;                 //bits per sample (pcm only) 
5
+   int monotonic_pts;
6
    WORD avi_4cc;             //fourcc WORD value
7
    const char *mkv_codec;    //mkv codecID
8
    const char *description;  //codec description
9
guvcview-src-1.5.2.tar.gz/src/guvcview.c -> guvcview-src-1.5.3.tar.gz/src/guvcview.c Changed
31
 
1
@@ -50,6 +50,7 @@
2
 #include "string_utils.h"
3
 #include "options.h"
4
 #include "video.h"
5
+#include "lavc_common.h"
6
 #include "vcodecs.h"
7
 #include "create_video.h"
8
 #include "profile.h"
9
@@ -138,7 +139,7 @@
10
        */
11
       if(bytes_read != sizeof(int)){
12
    fprintf(stderr, "lost data in signal pipe (expected %lu, received %lu)\n",
13
-       sizeof(int), bytes_read);
14
+       (long unsigned int) sizeof(int), (long unsigned int) bytes_read);
15
    continue;         /* discard the garbage and keep fingers crossed */
16
       }
17
 
18
@@ -260,9 +261,10 @@
19
 
20
        /* Allocate the video Format struct */
21
        videoF = g_new0(struct VideoFormatData, 1);
22
-
23
-       // must be called before using avcodec lib
24
+       
25
+#if !LIBAVCODEC_VER_AT_LEAST(53,34)
26
        avcodec_init();
27
+#endif
28
 
29
        // register all the codecs (you can also register only the codec
30
        //you wish to have smaller code)
31
guvcview-src-1.5.2.tar.gz/src/lavc_common.c -> guvcview-src-1.5.3.tar.gz/src/lavc_common.c Changed
113
 
1
@@ -128,7 +128,7 @@
2
    //videoF->frame_number++;
3
    
4
    if(!data->monotonic_pts) //generate a real pts based on the frame timestamp
5
-       data->picture->pts += ((videoF->vpts - videoF->old_vpts)/1000) * 90;
6
+       data->picture->pts += ((videoF->apts - videoF->old_apts)/1000) * 90;
7
    else  //generate a true monotonic pts based on the codec fps
8
        data->picture->pts += (data->codec_context->time_base.num*1000/data->codec_context->time_base.den) * 90;
9
    
10
@@ -136,12 +136,42 @@
11
    return (out_size);
12
 }
13
 
14
-int encode_lavc_audio_frame (short *audio_buf, struct lavcAData* data)
15
+int encode_lavc_audio_frame (short *audio_buf, struct lavcAData* data, struct VideoFormatData *videoF)
16
 {
17
    int out_size = 0;
18
    
19
    /* encode the audio */
20
+#if LIBAVCODEC_VER_AT_LEAST(53,34)
21
+   AVPacket pkt;
22
+   int got_packet;
23
+   av_init_packet(&pkt);
24
+   pkt.data = data->outbuf;
25
+   pkt.size = data->outbuf_size;
26
+   
27
+   data->frame->nb_samples  = data->codec_context->frame_size;
28
+   int samples_size = av_samples_get_buffer_size(NULL, data->codec_context->channels,
29
+                                                 data->frame->nb_samples,
30
+                                                  data->codec_context->sample_fmt, 1);
31
+                                                  
32
+    avcodec_fill_audio_frame(data->frame, data->codec_context->channels,
33
+                                   data->codec_context->sample_fmt,
34
+                                   (const uint8_t *) audio_buf, samples_size, 1);
35
+   if(!data->monotonic_pts) //generate a real pts based on the frame timestamp
36
+       data->frame->pts += ((videoF->apts - videoF->old_apts)/1000) * 90;
37
+   else  //generate a true monotonic pts based on the codec fps
38
+       data->frame->pts += (data->codec_context->time_base.num*1000/data->codec_context->time_base.den) * 90;
39
+                                    
40
+   avcodec_encode_audio2(data->codec_context, &pkt, data->frame, &got_packet);
41
+   /* free any side data since we cannot return it */
42
+   //ff_packet_free_side_data(&pkt);
43
+ 
44
+   if (data->frame && data->frame->extended_data != data->frame->data)
45
+       av_freep(data->frame->extended_data);
46
+       
47
+   out_size = pkt.size;
48
+#else
49
    out_size = avcodec_encode_audio(data->codec_context, data->outbuf, data->outbuf_size, audio_buf);
50
+#endif
51
    return (out_size);
52
 }
53
 
54
@@ -155,6 +185,11 @@
55
        avcodec_flush_buffers((*data)->codec_context);
56
        //close codec 
57
        avcodec_close((*data)->codec_context);
58
+#if LIBAVCODEC_VER_AT_LEAST(53,6)
59
+       //free private options;
60
+       struct lavcData *pdata = *data;
61
+       av_dict_free(&(pdata->private_options));
62
+#endif
63
        //free codec context
64
        g_free((*data)->codec_context);
65
        (*data)->codec_context = NULL;
66
@@ -181,6 +216,7 @@
67
        g_free((*data)->codec_context);
68
        (*data)->codec_context = NULL;
69
        g_free((*data)->outbuf);
70
+       g_free((*data)->frame);
71
        g_free(*data);
72
        *data = NULL;
73
    }
74
@@ -278,8 +314,12 @@
75
    {
76
        data->codec_context->me_range = 16;
77
        //the first compressed frame will be empty (1 frame out of sync)
78
-       //but avoids x264 warning on lookaheadless mb-tree 
79
+       //but avoids x264 warning on lookaheadless mb-tree
80
+#if LIBAVCODEC_VER_AT_LEAST(53,6)
81
+       av_dict_set(&data->private_options, "rc_lookahead", "1", 0);
82
+#else 
83
        data->codec_context->rc_lookahead=1;
84
+#endif
85
         //TODO:
86
         // add rc_lookahead to codec properties and handle it gracefully by
87
         // fixing the frames timestamps => shift them by rc_lookahead frames 
88
@@ -287,7 +327,7 @@
89
    
90
    // open codec
91
 #if LIBAVCODEC_VER_AT_LEAST(53,6)
92
-   if (avcodec_open2(data->codec_context, data->codec, NULL) < 0)
93
+   if (avcodec_open2(data->codec_context, data->codec, &data->private_options) < 0)
94
 #else
95
    if (avcodec_open(data->codec_context, data->codec) < 0) 
96
 #endif
97
@@ -364,9 +404,15 @@
98
    int frame_size = data->codec_context->frame_size;  
99
    g_print("Audio frame size is %d samples for selected codec\n", frame_size);
100
    
101
+   data->monotonic_pts = defaults->monotonic_pts;
102
+   
103
    //alloc outbuf
104
    data->outbuf_size = 240000;
105
    data->outbuf = g_new0(BYTE, data->outbuf_size);
106
    
107
+#if LIBAVCODEC_VER_AT_LEAST(53,34) 
108
+   data->frame= avcodec_alloc_frame();
109
+   avcodec_get_frame_defaults(data->frame);
110
+#endif
111
    return(data);
112
 }
113
guvcview-src-1.5.2.tar.gz/src/lavc_common.h -> guvcview-src-1.5.3.tar.gz/src/lavc_common.h Changed
39
 
1
@@ -50,12 +50,15 @@
2
 struct lavcData
3
 {
4
    AVCodec *codec;
5
+   AVDictionary *private_options;
6
    AVCodecContext *codec_context;
7
    AVFrame *picture;
8
-
9
+   AVPacket *outpkt;
10
+   
11
    BYTE* tmpbuf;
12
    int outbuf_size;
13
    BYTE* outbuf;
14
+   
15
    int codec_id;
16
    int monotonic_pts;
17
 };
18
@@ -65,14 +68,18 @@
19
 {
20
    AVCodec *codec;
21
    AVCodecContext *codec_context;
22
-
23
+   AVFrame *frame;
24
+   AVPacket *outpkt;
25
+   
26
    int outbuf_size;
27
    BYTE* outbuf;
28
+   
29
+   int monotonic_pts;
30
 };
31
 
32
 int encode_lavc_frame (BYTE *picture_buf, struct lavcData* data, int format, struct VideoFormatData *videoF);
33
 
34
-int encode_lavc_audio_frame (short *audio_buf, struct lavcAData* data);
35
+int encode_lavc_audio_frame (short *audio_buf, struct lavcAData* data, struct VideoFormatData *videoF);
36
 
37
 /* arg = pointer to lavcData struct =>
38
  * *arg = struct lavcData**
39
guvcview-src-1.5.2.tar.gz/src/options.c -> guvcview-src-1.5.3.tar.gz/src/options.c Changed
48
 
1
@@ -54,6 +54,7 @@
2
    if ((fp = g_fopen(tmpfile,"w"))!=NULL) 
3
    {
4
        g_fprintf(fp,"# guvcview configuration file for %s\n\n",videodevice);
5
+       g_fprintf(fp,"version='%s'\n",VERSION);
6
        g_fprintf(fp,"# Thread stack size: default 128 pages of 64k = 8388608 bytes\n");
7
        g_fprintf(fp,"stack_size=%d\n",global->stack_size);
8
        g_fprintf(fp,"# video loop sleep time in ms: 0,1,2,3,...\n");
9
@@ -234,7 +235,7 @@
10
        int vc_gop_size=-1, vc_subq=-1, vc_framerefs=-1, vc_mb_decision=-1, vc_trellis=-1, vc_me_method=-1;
11
        int vc_mpeg_quant=-1, vc_max_b_frames=-1, vc_num_threads=-1, vc_flags=-1, vc_monotonic_pts=-1;
12
        float vc_qcompress=-1, vc_qblur=-1;
13
-       
14
+       int VMAJOR =-1, VMINOR=-1, VMICRO=-1; 
15
        
16
        for (ttype = g_scanner_get_next_token (scanner);
17
            ttype != G_TOKEN_EOF;
18
@@ -273,10 +274,16 @@
19
                        //  g_snprintf(global->videodevice,15,"%s",scanner->value.v_string);
20
                        //}
21
                        
22
-                       /*must check for defaults since ReadOpts runs before ReadConf*/
23
-                       if (g_strcmp0(name,"resolution")==0) 
24
+                       if (g_strcmp0(name,"version")==0)
25
+                       {
26
+                           sscanf(scanner->value.v_string,"%i.%i.%i",
27
+                               &(VMAJOR), 
28
+                               &(VMINOR),
29
+                               &(VMICRO));
30
+                       }
31
+                       else if (g_strcmp0(name,"resolution")==0) 
32
                        {
33
-                           if(global->flg_res < 1)
34
+                           if(global->flg_res < 1) /*must check for defaults since ReadOpts runs before ReadConf*/
35
                                sscanf(scanner->value.v_string,"%ix%i",
36
                                    &(global->width), 
37
                                    &(global->height));
38
@@ -664,7 +671,8 @@
39
         if (ac_bit_rate >= 0) acodec_defaults->bit_rate = ac_bit_rate;
40
         if (vc_bit_rate >= 0) vcodec_defaults->bit_rate = vc_bit_rate;
41
         if (vc_fps >= 0) vcodec_defaults->fps = vc_fps;
42
-        if (vc_monotonic_pts >= 0) vcodec_defaults->monotonic_pts = vc_monotonic_pts;
43
+        //from 1.5.3 onwards we set version on conf file and monotonic is set by default for all codecs
44
+        if ((vc_monotonic_pts >= 0) && (VMAJOR > 0)) vcodec_defaults->monotonic_pts = vc_monotonic_pts;
45
        if (vc_qmax >= 0) vcodec_defaults->qmax = vc_qmax;
46
        if (vc_qmin >= 0) vcodec_defaults->qmin = vc_qmin;
47
        if (vc_max_qdiff >=0) vcodec_defaults->max_qdiff = vc_max_qdiff;
48
guvcview-src-1.5.2.tar.gz/src/pulse_audio.c -> guvcview-src-1.5.3.tar.gz/src/pulse_audio.c Changed
53
 
1
@@ -29,11 +29,7 @@
2
 
3
 #include <errno.h>
4
 
5
-#if GLIB_MINOR_VERSION < 31
6
-   #define __AMUTEX pdata->mutex
7
-#else
8
-   #define __AMUTEX &pdata->mutex
9
-#endif
10
+#define __AMUTEX &pdata->mutex
11
 
12
 //run in separate thread
13
 static void* pulse_read_audio(void *userdata) 
14
@@ -56,7 +52,7 @@
15
        ss.channels = pdata->channels;
16
    __UNLOCK_MUTEX(__AMUTEX);
17
 
18
-   printf("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
19
+   g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
20
    if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
21
    {
22
        g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
23
@@ -114,7 +110,7 @@
24
    }
25
 
26
 finish:
27
-   printf("audio thread exited\n");
28
+   g_print("audio thread exited\n");
29
    pdata->streaming = FALSE;
30
    if (pdata->pulse_simple)
31
        pa_simple_free(pdata->pulse_simple);
32
@@ -126,19 +122,7 @@
33
 pulse_init_audio(struct paRecordData* pdata)
34
 {  
35
    //start audio capture thread
36
-#if GLIB_MINOR_VERSION < 31 
37
-   if( (pdata->pulse_read_th = g_thread_create(
38
-       (GThreadFunc) pulse_read_audio,
39
-       pdata, //data
40
-       FALSE,    //joinable - no need waiting for thread to finish
41
-       NULL)    //error
42
-       ) == NULL)
43
-#else
44
-   if( (pdata->pulse_read_th = g_thread_new("pulse thread",
45
-       (GThreadFunc) pulse_read_audio,
46
-       pdata)
47
-       ) == NULL)
48
-#endif  
49
+   if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
50
    {
51
        g_printerr("Pulse thread creation failed\n");
52
        return (-1);
53
guvcview-src-1.5.3.tar.gz/src/pulse_audio_c.bak Added
273
 
1
@@ -0,0 +1,271 @@
2
+/*******************************************************************************#
3
+#           guvcview              http://guvcview.sourceforge.net               #
4
+#                                                                               #
5
+#           Paulo Assis <pj.assis@gmail.com>                                    #
6
+#                                                                               #
7
+# This program is free software; you can redistribute it and/or modify          #
8
+# it under the terms of the GNU General Public License as published by          #
9
+# the Free Software Foundation; either version 2 of the License, or             #
10
+# (at your option) any later version.                                           #
11
+#                                                                               #
12
+# This program is distributed in the hope that it will be useful,               #
13
+# but WITHOUT ANY WARRANTY; without even the implied warranty of                #
14
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 #
15
+# GNU General Public License for more details.                                  #
16
+#                                                                               #
17
+# You should have received a copy of the GNU General Public License             #
18
+# along with this program; if not, write to the Free Software                   #
19
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA     #
20
+#                                                                               #
21
+********************************************************************************/
22
+#include "../config.h"
23
+
24
+#ifdef PULSEAUDIO
25
+
26
+#include <pulse/pulseaudio.h>
27
+#include <pulse/ext-device-restore.h>
28
+
29
+#include <glib.h>
30
+#include <glib/gprintf.h>
31
+#include <string.h>
32
+#include "audio_effects.h"
33
+#include "ms_time.h"
34
+
35
+#include <errno.h>
36
+
37
+#define __AMUTEX &pdata->mutex
38
+
39
+#define pa_assert(expr)                                              \
40
+    do {                                                                \
41
+        if (!(expr)) {                                     \
42
+            g_printerr("Assertion '%s' failed at %s:%u, function (). Aborting.", #expr , __FILE__, __LINE__); \
43
+            abort();                                                    \
44
+        }                                                               \
45
+    } while (FALSE)
46
+
47
+static pa_context *context = NULL;
48
+static pa_mainloop_api *mainloop_api = NULL;
49
+static pa_proplist *proplist = NULL;
50
+static gboolean nl = FALSE;
51
+static int actions = 1;
52
+
53
+static const char *pa_strnull(const char *x) {
54
+    return x ? x : "(null)";
55
+}
56
+
57
+static const char *pa_yes_no(gboolean b) {
58
+    return b ? "yes" : "no";
59
+}
60
+
61
+static void quit(int ret) 
62
+{
63
+    pa_assert(mainloop_api);
64
+    mainloop_api->quit(mainloop_api, ret);
65
+}
66
+
67
+static void context_drain_complete(pa_context *c, void *userdata) {
68
+    pa_context_disconnect(c);
69
+}
70
+
71
+static void drain(void) {
72
+    pa_operation *o;
73
+
74
+    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
75
+        pa_context_disconnect(context);
76
+    else
77
+        pa_operation_unref(o);
78
+}
79
+
80
+static void complete_action(void) {
81
+    pa_assert(actions > 0);
82
+
83
+    if (!(--actions))
84
+        drain();
85
+    
86
+    
87
+}
88
+
89
+
90
+
91
+static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info *i, int is_last, void *userdata) 
92
+{
93
+    char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX];
94
+    char cv[PA_CVOLUME_SNPRINT_MAX], cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX];
95
+    char cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX];
96
+    char *pl;
97
+
98
+    if (is_last < 0) {
99
+       g_print("Failed to get sink input information: %s", pa_strerror(pa_context_errno(c)));
100
+        quit(1);
101
+        return;
102
+    }
103
+
104
+    if (is_last) {
105
+       g_print("last sink\n");
106
+        complete_action();
107
+        return;
108
+    }
109
+
110
+    pa_assert(i);
111
+
112
+    if (nl)
113
+        printf("\n");
114
+    nl = TRUE;
115
+
116
+    g_snprintf(t, sizeof(t), "%u", i->owner_module);
117
+    g_snprintf(k, sizeof(k), "%u", i->client);
118
+
119
+    g_print("Sink Input #%u\n"
120
+             "\tDriver: %s\n"
121
+             "\tOwner Module: %s\n"
122
+             "\tClient: %s\n"
123
+             "\tSink: %u\n"
124
+             "\tSample Specification: %s\n"
125
+             "\tChannel Map: %s\n"
126
+             "\tFormat: %s\n"
127
+             "\tMute: %s\n"
128
+             "\tVolume: %s\n"
129
+             "\t        %s\n"
130
+             "\t        balance %0.2f\n"
131
+             "\tBuffer Latency: %0.0f usec\n"
132
+             "\tSink Latency: %0.0f usec\n"
133
+             "\tResample method: %s\n"
134
+             "\tProperties:\n\t\t%s\n",
135
+           i->index,
136
+           pa_strnull(i->driver),
137
+           i->owner_module != PA_INVALID_INDEX ? t : "n/a",
138
+           i->client != PA_INVALID_INDEX ? k : "n/a",
139
+           i->sink,
140
+           pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
141
+           pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
142
+           pa_format_info_snprint(f, sizeof(f), i->format),
143
+           pa_yes_no(i->mute),
144
+           pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
145
+           pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume),
146
+           pa_cvolume_get_balance(&i->volume, &i->channel_map),
147
+           (double) i->buffer_usec,
148
+           (double) i->sink_usec,
149
+           i->resample_method ? i->resample_method : "n/a",
150
+           pl = pa_proplist_to_string_sep(i->proplist, "\n\t\t"));
151
+
152
+    pa_xfree(pl);
153
+}
154
+
155
+
156
+static void list_sinks()
157
+{
158
+   int ret = 1;
159
+    char *server = NULL;
160
+   g_print("listing sinks\n");
161
+       pa_mainloop *m = pa_mainloop_new();
162
+       mainloop_api = pa_mainloop_get_api(m);
163
+       proplist = pa_proplist_new();
164
+       context = pa_context_new_with_proplist(mainloop_api, NULL, proplist);
165
+       /*pa_operation_unref(*/pa_context_get_sink_input_info_list(context, get_sink_input_info_callback, NULL)/*)*/;
166
+       //pa_context_set_state_callback(context, context_state_callback, NULL);
167
+       pa_context_connect(context, server, 0, NULL);
168
+       pa_mainloop_run(m, &ret);
169
+}
170
+
171
+
172
+//run in separate thread
173
+static void* pulse_read_audio(void *userdata) 
174
+{
175
+   int error;
176
+   
177
+   struct paRecordData *pdata = (struct paRecordData*) userdata;
178
+   /* The sample type to use */
179
+   pa_sample_spec ss;
180
+   if (BIGENDIAN)
181
+       ss.format = PA_SAMPLE_FLOAT32BE;
182
+   else
183
+       ss.format = PA_SAMPLE_FLOAT32LE;
184
+   
185
+   __LOCK_MUTEX(__AMUTEX);
186
+       gboolean capVid = pdata->capVid;
187
+       int skip_n = pdata->skip_n;
188
+       pdata->streaming = TRUE;
189
+       ss.rate = pdata->samprate;
190
+       ss.channels = pdata->channels;
191
+   __UNLOCK_MUTEX(__AMUTEX);
192
+
193
+   g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
194
+   if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
195
+   {
196
+       g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
197
+       goto finish;
198
+   }
199
+   
200
+   /* Record some data ... */
201
+   while(capVid)
202
+   {
203
+       if (pa_simple_read(pdata->pulse_simple, pdata->recordedSamples, pdata->aud_numBytes, &error) < 0) 
204
+       {
205
+           g_printerr("pulse: pa_simple_read() failed: %s\n", pa_strerror(error));
206
+           goto finish;
207
+       }
208
+
209
+       __LOCK_MUTEX(__AMUTEX);
210
+           capVid = pdata->capVid;
211
+           /*first frame time stamp*/
212
+           if(pdata->a_ts <= 0)
213
+           {
214
+               if((pdata->ts_ref > 0) && (pdata->ts_ref < pdata->snd_begintime)) 
215
+                   pdata->a_ts = pdata->snd_begintime - pdata->ts_ref;
216
+               else pdata->a_ts = 1;
217
+           }
218
+           else /*increment time stamp for audio frame*/
219
+               pdata->a_ts += (G_NSEC_PER_SEC * pdata->aud_numSamples)/(pdata->samprate * pdata->channels);
220
+   
221
+           skip_n = pdata->skip_n;
222
+       __UNLOCK_MUTEX(__AMUTEX);
223
+       
224
+       if (!skip_n) //skip audio while were skipping video frames
225
+       {
226
+           __LOCK_MUTEX( __AMUTEX );
227
+               if(!pdata->audio_buff[pdata->w_ind].used)
228
+               {
229
+                   
230
+                   /*copy data to audio buffer*/
231
+                   memcpy(pdata->audio_buff[pdata->w_ind].frame, pdata->recordedSamples, pdata->aud_numBytes);
232
+                   pdata->audio_buff[pdata->w_ind].time_stamp = pdata->a_ts + pdata->delay;
233
+                   pdata->audio_buff[pdata->w_ind].used = TRUE;
234
+                   NEXT_IND(pdata->w_ind, AUDBUFF_SIZE);
235
+               }
236
+               else
237
+               {
238
+                   //drop audio data
239
+                   g_printerr("AUDIO: droping audio data\n");
240
+               }
241
+           __UNLOCK_MUTEX( __AMUTEX );
242
+       }
243
+       else 
244
+       {
245
+           pdata->snd_begintime = ns_time_monotonic();
246
+           pdata->a_ts = 0;
247
+       }
248
+   }
249
+
250
+finish:
251
+   g_print("audio thread exited\n");
252
+   pdata->streaming = FALSE;
253
+   if (pdata->pulse_simple)
254
+       pa_simple_free(pdata->pulse_simple);
255
+   return (NULL);
256
+}
257
+
258
+
259
+int
260
+pulse_init_audio(struct paRecordData* pdata)
261
+{  
262
+   list_sinks();
263
+   //start audio capture thread
264
+   if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
265
+   {
266
+       g_printerr("Pulse thread creation failed\n");
267
+       return (-1);
268
+   }
269
+   return (0);
270
+} 
271
+
272
+#endif
273
guvcview-src-1.5.2.tar.gz/src/sound.c -> guvcview-src-1.5.3.tar.gz/src/sound.c Changed
20
 
1
@@ -76,7 +76,7 @@
2
        {
3
            /*drop audio data*/
4
            ret = -1;
5
-           g_printerr("AUDIO: droping audio data\n");
6
+           g_printerr("AUDIO: dropping audio data\n");
7
        }
8
    }
9
    
10
@@ -255,7 +255,8 @@
11
    {
12
 #ifdef PULSEAUDIO
13
        case PULSE:
14
-           if(err = pulse_init_audio(pdata))
15
+           err = pulse_init_audio(pdata);
16
+           if(err)
17
                goto error;
18
            break;
19
 #endif
20
guvcview-src-1.5.2.tar.gz/src/sound.h -> guvcview-src-1.5.3.tar.gz/src/sound.h Changed
10
 
1
@@ -103,7 +103,7 @@
2
    //PULSE SUPPORT
3
 #ifdef PULSEAUDIO
4
    pa_simple *pulse_simple;
5
-   GThread *pulse_read_th;
6
+    __THREAD_TYPE pulse_read_th;
7
 #endif
8
 };
9
 
10
guvcview-src-1.5.2.tar.gz/src/vcodecs.c -> guvcview-src-1.5.3.tar.gz/src/vcodecs.c Changed
64
 
1
@@ -166,7 +166,7 @@
2
        .mkv_codecPriv= NULL,
3
        .description  = N_("MPEG video 1"),
4
        .fps          = 30,
5
-       .monotonic_pts= 0,
6
+       .monotonic_pts= 1,
7
        .bit_rate     = 3000000,
8
        .qmax         = 8,
9
        .qmin         = 2,
10
@@ -201,7 +201,7 @@
11
        .mkv_codecPriv= &mkv_codecPriv,
12
        .description  = N_("FLV1 - flash video 1"),
13
        .fps          = 0,
14
-       .monotonic_pts= 0,
15
+       .monotonic_pts= 1,
16
        .bit_rate     = 3000000,
17
        .qmax         = 31,
18
        .qmin         = 2,
19
@@ -236,7 +236,7 @@
20
        .mkv_codecPriv= &mkv_codecPriv,
21
        .description  = N_("WMV1 - win. med. video 7"),
22
        .fps          = 0,
23
-       .monotonic_pts= 0,
24
+       .monotonic_pts= 1,
25
        .bit_rate     = 3000000,
26
        .qmax         = 8,
27
        .qmin         = 2,
28
@@ -271,7 +271,7 @@
29
        .mkv_codecPriv= NULL,
30
        .description  = N_("MPG2 - MPG2 format"),
31
        .fps          = 30,
32
-       .monotonic_pts= 0,
33
+       .monotonic_pts= 1,
34
        .bit_rate     = 3000000,
35
        .qmax         = 31,
36
        .qmin         = 2,
37
@@ -306,7 +306,7 @@
38
        .mkv_codecPriv= NULL,
39
        .description  = N_("MS MP4 V3"),
40
        .fps          = 0,
41
-       .monotonic_pts= 0,
42
+       .monotonic_pts= 1,
43
        .bit_rate     = 3000000,
44
        .qmax         = 31,
45
        .qmin         = 2,
46
@@ -341,7 +341,7 @@
47
        .mkv_codecPriv= NULL,
48
        .description  = N_("MPEG4-ASP"),
49
        .fps          = 0,
50
-       .monotonic_pts= 0,
51
+       .monotonic_pts= 1,
52
        .bit_rate     = 1500000,
53
        .qmax         = 31,
54
        .qmin         = 2,
55
@@ -376,7 +376,7 @@
56
        .mkv_codecPriv= NULL,
57
        .description  = N_("MPEG4-AVC (H264)"),
58
        .fps          = 0,
59
-       .monotonic_pts= 0,
60
+       .monotonic_pts= 1,
61
        .bit_rate     = 1500000,
62
        .qmax         = 21,
63
        .qmin         = 10,
64
Refresh

No build results available

Refresh

No rpmlint results available

Request History
Bjørn Lie's avatar

zaitor created request over 11 years ago

Update to version 1.5.3