Added dv1394 object

5 files changed, 170 insertions, 12 deletions

diff --git a/src/decoder.cc b/src/decoder.cc
index 4bdf2cf..d8ae2f5 100644
--- a/src/decoder.cc
+++ b/src/decoder.cc
@@ -123,7 +123,7 @@ void Decoder::decode()
 {
   // FIXME: Read port and channel data from config.
 	int port = 0;
-	int channel = 63;
+	int channel = 63; // 63 is default channel... sucks.
 
 	int n_ports;
 	struct raw1394_portinfo pinf[ 16 ];
@@ -146,11 +146,11 @@ void Decoder::decode()
 	// Tell raw1394 which host adapter to use
 	if(raw1394_set_port(handle, port) < 0 ) {
     errobj->pushError("Error while opening codec for input stream.");
-		fprintf( stderr, "raw1394 - failed to set set port: %s.\n", strerror( errno ) );
+		fprintf( stderr, "raw1394 - failed to set port: %s.\n", strerror( errno ) );
 		exit( EXIT_FAILURE );
 	}
 
-	raw1394_set_iso_handler( handle, channel, raw_reader); // 63 is default channel... sucks.
+	raw1394_set_iso_handler( handle, channel, raw_reader);
 	raw1394_set_userdata( handle, ( void* ) NULL);
   raw1394_start_iso_rcv( handle, channel);
 
diff --git a/src/dv1394.cc b/src/dv1394.cc
new file mode 100644
index 0000000..ea702a6
--- /dev/null
+++ b/src/dv1394.cc
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            dv1394.cc
+ *
+ *  Tue Apr 19 12:10:34 CEST 2005
+ *  Copyright  2005 Bent Bisballe
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  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.
+ */
+
+#include <config.h>
+#include "dv1394.h"
+
+init {
+  // FIXME: Read port and channel data from config.
+	int port = 0;
+	int channel = 63; // 63 is default channel... sucks.
+
+	int n_ports;
+	struct raw1394_portinfo pinf[ 16 ];
+	raw1394handle_t handle;
+
+  // Get handle to firewire channels
+	handle = raw1394_new_handle();
+	if(!handle) {
+		fprintf( stderr, "raw1394 - failed to get handle: %s.\n", strerror( errno ) );
+		exit( EXIT_FAILURE );
+	}
+
+  // how many adapters are hook in?
+	if((n_ports = raw1394_get_port_info(handle, pinf, 16)) < 0 ) {
+		fprintf( stderr, "raw1394 - failed to get port info: %s.\n", strerror( errno ) );
+		raw1394_destroy_handle( handle );
+		exit( EXIT_FAILURE );
+	}
+
+	// Tell raw1394 which host adapter to use
+	if(raw1394_set_port(handle, port) < 0 ) {
+    errobj->pushError("Error while opening codec for input stream.");
+		fprintf( stderr, "raw1394 - failed to set port: %s.\n", strerror( errno ) );
+		exit( EXIT_FAILURE );
+	}
+
+	raw1394_set_iso_handler( handle, channel, raw_reader);
+	raw1394_set_userdata( handle, ( void* ) NULL);
+  raw1394_start_iso_rcv( handle, channel);
+
+}
+
+static int raw_reader( raw1394handle_t handle, int channel, size_t length, quadlet_t *data )
+{
+	static char *framedata = NULL;
+
+  // Only process packets with reasonable length.
+	if ( length > 16 )
+	{
+		unsigned char * p = ( unsigned char* ) & data[ 3 ];
+		int section_type = p[ 0 ] >> 5;           // section type is in bits 5 - 7
+		int dif_sequence = p[ 1 ] >> 4;           // dif sequence number is in bits 4 - 7
+		int dif_block = p[ 2 ];
+
+		if ( section_type == 0 && dif_sequence == 0 )
+		{
+			if ( framedata != NULL )
+			{
+				raw1394_set_userdata(handle, (void *)framedata);
+				framedata = NULL;
+			}
+		}
+
+		if(!framedata)
+		{
+			framedata = (char *)malloc(DVPACKAGE_SIZE); // dvframe.h
+			if(!framedata)
+			{
+				// We're fucked
+				exit(1);
+			}
+		}
+
+		switch ( section_type )
+		{
+		case 0:    // 1 Header block
+			// p[3] |= 0x80; // hack to force PAL data
+			memcpy( framedata + dif_sequence * 150 * 80, p, 480 );
+			break;
+
+		case 1:    // 2 Subcode blocks
+			memcpy( framedata + dif_sequence * 150 * 80 + ( 1 + dif_block ) * 80, p, 480 );
+			break;
+
+		case 2:    // 3 VAUX blocks
+			memcpy( framedata + dif_sequence * 150 * 80 + ( 3 + dif_block ) * 80, p, 480 );
+			break;
+
+		case 3:    // 9 Audio blocks interleaved with video
+			memcpy( framedata + dif_sequence * 150 * 80 + ( 6 + dif_block * 16 ) * 80, p, 480 );
+			break;
+
+		case 4:    // 135 Video blocks interleaved with audio
+			memcpy( framedata + dif_sequence * 150 * 80 + ( 7 + ( dif_block / 15 ) + dif_block ) * 80, p, 480 );
+			break;
+
+		default:   // we can't handle any other data
+			break;
+		}
+	}
+	return 0;
+}
diff --git a/src/dv1394.h b/src/dv1394.h
new file mode 100644
index 0000000..47d9e56
--- /dev/null
+++ b/src/dv1394.h
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            dv1394.h
+ *
+ *  Tue Apr 19 12:10:34 CEST 2005
+ *  Copyright  2005 Bent Bisballe
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  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.
+ */
+
+#include <config.h>
+#ifndef __MIAV_DV1394_H__
+#define __MIAV_DV1394_H__
+#endif/*__MIAV_DV1394_H__*/
diff --git a/src/miav.conf b/src/miav.conf
index e595762..9394469 100644
--- a/src/miav.conf
+++ b/src/miav.conf
@@ -18,4 +18,5 @@ pixel_height	= 768
 
 # How and where to connect to the miav server?
 server_addr	= "192.168.0.10"
-server_port	= 30000
\ No newline at end of file
+server_port	= 30001
+
diff --git a/src/player.cc b/src/player.cc
index 88566e1..085f4df 100644
--- a/src/player.cc
+++ b/src/player.cc
@@ -91,9 +91,16 @@ void Player::player()
   SDL_Rect rect;
   Frame *frame;
   //  AVPicture pict;
-  unsigned char pixel_buffer[720 * 576][3];
+  unsigned char pixel_buffer[720 * 576 * 3];
+  unsigned char *pxs[3];
   int pitches[3];
 
+  pitches[0] = 720 * 2;
+  pxs[0] = pixel_buffer;
+  pxs[1] = pixel_buffer;
+  pxs[2] = pixel_buffer;
+  
+
   int i;
   struct timespec ts;
 
@@ -113,7 +120,7 @@ void Player::player()
   }
   */
 	dv_decoder_t *decoder = NULL;
-	decoder = dv_decoder_new(FALSE, TRUE, TRUE);
+	decoder = dv_decoder_new(FALSE, FALSE, TRUE);
 	decoder->quality = DV_QUALITY_BEST;
 
   while(*running) {
@@ -145,20 +152,17 @@ void Player::player()
 
 
       // libdv img decode
-      SDL_LockYUVOverlay(overlay);	
-
 			dv_decode_full_frame(decoder, 
                            (const uint8_t*)frame->data, 
                            e_dv_color_yuv, 
-                           overlay->pixels, 
+                           pxs, 
                            pitches);
 
+      SDL_LockYUVOverlay(overlay);	
       overlay->pitches[0] = pitches[0];
       overlay->pitches[1] = pitches[1];
       overlay->pitches[2] = pitches[2];
-
-      //      SDL_LockYUVOverlay(overlay);	
-      //      overlay->pixels = (Uint8**)pixel_buffer;
+      overlay->pixels = pxs;
       SDL_UnlockYUVOverlay(overlay);
       SDL_DisplayYUVOverlay(overlay, &rect);
       //      delete f;