pool/libraw1394
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libraw1394?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-01-29 16:04:14 +00:00 committed by Git OBS Bridge
parent 84c8d7b27d
commit 9f570963fb
4 changed files with 311 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraw1394.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 29 12:56:37 CET 2007 - olh@suse.de
- add mpg1394grab (#236537)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 18 07:43:33 CEST 2006 - olh@suse.de Tue Jul 18 07:43:33 CEST 2006 - olh@suse.de

81
libraw1394.mpg1394grab-beautify.patch Normal file
View File

@ -0,0 +1,81 @@
---
tools/mpg1394grab.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
Index: libraw1394-1.2.1/tools/mpg1394grab.c
===================================================================
--- libraw1394-1.2.1.orig/tools/mpg1394grab.c
+++ libraw1394-1.2.1/tools/mpg1394grab.c
@@ -29,10 +29,11 @@
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <netinet/in.h>
/* linux1394 includes */
-#include <libraw1394/raw1394.h>
+#include "../src/raw1394.h"
/* constant for the iso receive channel */
#define RX_CHANNEL 63
@@ -40,10 +41,10 @@
#define RAW_BUF_SIZE 4096
/* global vars */
-unsigned char g_rx_packet[RAW_BUF_SIZE]; /* the received packet data */
-int g_rx_length; /* the size of a received packet */
-int g_alldone = 0; /* flag to indicate when to quit */
-int g_rx_channel = RX_CHANNEL;
+static unsigned char g_rx_packet[RAW_BUF_SIZE]; /* the received packet data */
+static int g_rx_length; /* the size of a received packet */
+static int g_alldone; /* flag to indicate when to quit */
+static int g_rx_channel = RX_CHANNEL;
/*************************************************************************/
@@ -53,7 +54,7 @@ int g_rx_channel = RX_CHANNEL;
/* a callback function executed by libraw1394 when a packet is received. */
/* iso packet header is included */
/* libraw1394 has its own handle type */
-int raw_iso_handler(raw1394handle_t handle, int channel, size_t length,
+static int raw_iso_handler(raw1394handle_t handle, int channel, size_t length,
quadlet_t *data)
{
/* is this a packet for me? */
@@ -67,7 +68,7 @@ int raw_iso_handler(raw1394handle_t hand
/* libraw1394 executes this when there is a bus reset. We'll just keep it
simple and quit */
-int reset_handler(raw1394handle_t handle, unsigned int generation)
+static int reset_handler(raw1394handle_t handle, unsigned int generation)
{
raw1394_update_generation(handle, generation);
g_alldone = 1;
@@ -75,7 +76,7 @@ int reset_handler(raw1394handle_t handle
}
-raw1394handle_t open_raw1394(void)
+static raw1394handle_t open_raw1394(void)
{
int numcards;
struct raw1394_portinfo pinf[16];
@@ -121,7 +122,7 @@ raw1394handle_t open_raw1394(void)
}
-void close_raw1394(raw1394handle_t handle)
+static void close_raw1394(raw1394handle_t handle)
{
raw1394_stop_iso_rcv(handle, g_rx_channel);
raw1394_destroy_handle(handle);
@@ -130,7 +131,7 @@ void close_raw1394(raw1394handle_t handl
/* this is a common unix function that gets called when a process
receives a signal (e.g. ctrl-c) */
-void signal_handler(int sig)
+static void signal_handler(int sig)
{
/* replace this signal handler with the default (which aborts) */
signal(SIGINT, SIG_DFL);

215
libraw1394.mpg1394grab.patch Normal file
View File

@ -0,0 +1,215 @@
http://www.kinodv.org/filemanager/download/5/mpg1394grab.c
---
tools/Makefile.am | 2
tools/mpg1394grab.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 194 insertions(+), 1 deletion(-)
Index: libraw1394-1.2.1/tools/mpg1394grab.c
===================================================================
--- /dev/null
+++ libraw1394-1.2.1/tools/mpg1394grab.c
@@ -0,0 +1,193 @@
+/* mpg1394grab.c v0.1.0 -- a program to capture IEC 61883-4 streams
+ *
+ * Copyright (C) 2003 Dan Dennedy <dan@dennedy.org>
+ *
+ * Build:
+ * % gcc -lraw1394 -o mpg1394grab mpg1394grab.c -D_FILE_OFFSET_BITS=64
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+/* standard system includes */
+#include <sys/poll.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+
+/* linux1394 includes */
+#include <libraw1394/raw1394.h>
+
+/* constant for the iso receive channel */
+#define RX_CHANNEL 63
+/* constant for the iso receive packet buffer size */
+#define RAW_BUF_SIZE 4096
+
+/* global vars */
+unsigned char g_rx_packet[RAW_BUF_SIZE]; /* the received packet data */
+int g_rx_length; /* the size of a received packet */
+int g_alldone = 0; /* flag to indicate when to quit */
+int g_rx_channel = RX_CHANNEL;
+
+
+/*************************************************************************/
+/* raw1394 section - reception */
+/*************************************************************************/
+
+/* a callback function executed by libraw1394 when a packet is received. */
+/* iso packet header is included */
+/* libraw1394 has its own handle type */
+int raw_iso_handler(raw1394handle_t handle, int channel, size_t length,
+ quadlet_t *data)
+{
+ /* is this a packet for me? */
+ if (length < RAW_BUF_SIZE && channel == g_rx_channel) {
+ //fprintf(stderr, "received a packet with length %03d (%08x) (%08x)\n", length-4, *(unsigned long*)(data+3),*(unsigned long*)(data+4));
+ g_rx_length = length;
+ memcpy(g_rx_packet, data, length);
+ }
+ return 0;
+}
+
+/* libraw1394 executes this when there is a bus reset. We'll just keep it
+ simple and quit */
+int reset_handler(raw1394handle_t handle, unsigned int generation)
+{
+ raw1394_update_generation(handle, generation);
+ g_alldone = 1;
+ return 0;
+}
+
+
+raw1394handle_t open_raw1394(void)
+{
+ int numcards;
+ struct raw1394_portinfo pinf[16];
+ raw1394handle_t handle;
+ struct pollfd raw1394_poll;
+
+ if (!(handle = raw1394_new_handle())) {
+ perror("raw1394 - couldn't get handle");
+ fprintf(stderr, "This error usually means that the ieee1394 driver is not loaded or that /dev/raw1394 does not exist.\n");
+ exit( -1);
+ }
+
+ if ((numcards = raw1394_get_port_info(handle, pinf, 16)) < 0) {
+ perror("raw1394 - couldn't get card info");
+ exit( -1);
+ }
+
+ /* port 0 is the first host adapter card */
+ if (raw1394_set_port(handle, 0) < 0) {
+ perror("raw1394 - couldn't set port");
+ exit( -1);
+ }
+
+ /* tell libraw1394 the names of our callback functions */
+ raw1394_set_iso_handler(handle, g_rx_channel, raw_iso_handler);
+ raw1394_set_bus_reset_handler(handle, reset_handler);
+
+ /* poll for leftover events */
+ raw1394_poll.fd = raw1394_get_fd(handle);
+ raw1394_poll.events = POLLIN;
+ while(1) {
+ if ( poll( &raw1394_poll, 1, 10) < 1 )
+ break;
+ raw1394_loop_iterate(handle);
+ }
+
+ /* Starting iso receive */
+ if (raw1394_start_iso_rcv(handle, g_rx_channel) < 0) {
+ perror("raw1394 - couldn't start iso receive");
+ exit( -1);
+ }
+ return handle;
+}
+
+
+void close_raw1394(raw1394handle_t handle)
+{
+ raw1394_stop_iso_rcv(handle, g_rx_channel);
+ raw1394_destroy_handle(handle);
+}
+
+
+/* this is a common unix function that gets called when a process
+ receives a signal (e.g. ctrl-c) */
+void signal_handler(int sig)
+{
+ /* replace this signal handler with the default (which aborts) */
+ signal(SIGINT, SIG_DFL);
+
+ /* setting these variables will let us fall out of the main loop */
+ g_alldone = 1;
+}
+
+
+int main(int argc, const char** argv)
+{
+ raw1394handle_t handle;
+ unsigned short dbs_fn_qpc_sph;
+ unsigned char fmt;
+ struct pollfd raw1394_poll;
+
+ signal(SIGINT, signal_handler);
+
+ handle = open_raw1394();
+
+ /* initialize the poll control structure */
+ raw1394_poll.fd = raw1394_get_fd(handle);
+ raw1394_poll.events = POLLIN;
+
+ /* the main loop */
+ while (g_alldone == 0) {
+
+ /* check for pending events before using raw1394 */
+ if ( poll( &raw1394_poll, 1, 10) > 0 ) {
+ if (raw1394_poll.revents & POLLIN) {
+
+ /* wait for a packet to arrive */
+ /* printf("waiting to receive...\n"); */
+ raw1394_loop_iterate(handle);
+
+ /* check various fields of CIP header for valid packet */
+ dbs_fn_qpc_sph = (htonl(*(unsigned long*)(g_rx_packet+4)) >> 10) & 0x3fff;
+ fmt = (htonl(*(unsigned long*)(g_rx_packet+8)) >> 24) & 0x3f;
+ if (g_rx_length > 188 && fmt == 0x20 && dbs_fn_qpc_sph == 0x01b1) {
+
+ unsigned char *data = g_rx_packet + 16; /* skip over iso header, CIP header, and SPH */
+ size_t len = g_rx_length;
+
+ /* write each TSP in the iso packet minus SPH */
+ for ( ; len > 188; len -= 192, data += 192 )
+ if ( fwrite( data, 188, 1, stdout ) != 1 ) {
+ g_alldone = 1;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ close_raw1394(handle);
+ fprintf(stderr, "quitting\n");
+ return EXIT_SUCCESS;
+}
+
+
Index: libraw1394-1.2.1/tools/Makefile.am
===================================================================
--- libraw1394-1.2.1.orig/tools/Makefile.am
+++ libraw1394-1.2.1/tools/Makefile.am
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
# testlibraw
-bin_PROGRAMS = testlibraw sendiso dumpiso
+bin_PROGRAMS = testlibraw sendiso dumpiso mpg1394grab
LDADD = ../src/libraw1394.la

13
libraw1394.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libraw1394 (Version 1.2.1) # spec file for package libraw1394 (Version 1.2.1)
# #
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -12,13 +12,15 @@
Name: libraw1394 Name: libraw1394
Version: 1.2.1 Version: 1.2.1
Release: 1 Release: 24
License: LGPL License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Summary: A Firewire Interface Summary: A Firewire Interface
URL: http://www.linux1394.org/ URL: http://www.linux1394.org/
Group: System/Kernel Group: System/Kernel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.linux1394.org/files/libraw1394/%{name}-%{version}.tar.bz2 Source0: http://www.linux1394.org/files/libraw1394/%{name}-%{version}.tar.bz2
Patch10: libraw1394.mpg1394grab.patch
Patch11: libraw1394.mpg1394grab-beautify.patch
%description %description
A library for the Linux IEEE-1394 subsystem, which provides direct A library for the Linux IEEE-1394 subsystem, which provides direct
@ -68,6 +70,8 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch10 -p1
%patch11 -p1
%build %build
%{?suse_update_config -ft} %{?suse_update_config -ft}
@ -97,6 +101,7 @@ export CFLAGS="%optflags"
%{_bindir}/testlibraw %{_bindir}/testlibraw
%{_bindir}/dumpiso %{_bindir}/dumpiso
%{_bindir}/sendiso %{_bindir}/sendiso
%{_bindir}/mpg1394grab
%{_libdir}/libraw1394.so.* %{_libdir}/libraw1394.so.*
%doc %{_mandir}/man[15]/*.gz %doc %{_mandir}/man[15]/*.gz
@ -110,6 +115,8 @@ export CFLAGS="%optflags"
%{_libdir}/pkgconfig/libraw1394.pc %{_libdir}/pkgconfig/libraw1394.pc
%changelog -n libraw1394 %changelog -n libraw1394
* Mon Jan 29 2007 - olh@suse.de
- add mpg1394grab (#236537)
* Tue Jul 18 2006 - olh@suse.de * Tue Jul 18 2006 - olh@suse.de
- update to version 1.2.1 - update to version 1.2.1
generate compiler warnings on deprecated functions (legacy isochronous). generate compiler warnings on deprecated functions (legacy isochronous).