[ingex-commits] ingex/common multicast_defs.h, NONE, 1.1 multicast_video.h, 1.6, 1.7

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/common
In directory vz-cvs-4.sog:/tmp/cvs-serv28246

Modified Files:
	multicast_video.h 
Added Files:
	multicast_defs.h 
Log Message:
Moved defs to separate file


Index: multicast_video.h
===================================================================
RCS file: /cvsroot/ingex/ingex/common/multicast_video.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** multicast_video.h	22 Oct 2008 09:32:18 -0000	1.6
--- multicast_video.h	22 May 2012 14:46:26 -0000	1.7
***************
*** 2,5 ****
--- 2,7 ----
  #define __MULTICAST_VIDEO_H__
  
+ #include "multicast_defs.h"
+ 
  #include <stdio.h>
  #include <sys/types.h>
***************
*** 15,27 ****
  #endif
  
- #define MULTICAST_SOURCE_NAME_SIZE 64
- 
- // Payload size of 1472 chosen through experiment to get the maximum payload
- // without any IP fragmentation observed using network tracing.
- // Wireshark shows fragmentation as "IP  Fragmented IP Protocol (proto=UDP 0x11, off=0)".
- #define PACKET_SIZE 1472
- 
- #define MULTICAST_DEFAULT_PORT 2000
- 
  typedef struct {
  	uint32_t	frame_number;
--- 17,20 ----

--- NEW FILE: multicast_defs.h ---
/*
 * $Id: multicast_defs.h,v 1.1 2012/05/22 14:46:26 john_f Exp $
 *
 * Copyright (C) 2012  British Broadcasting Corporation
 * All rights reserved
 *
 * 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 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., 51 Franklin Street, Fifth Floor, Boston, MA
 * 02110-1301, USA.
 */

#ifndef multicast_defs_h
#define multicast_defs_h

#define MULTICAST_SOURCE_NAME_SIZE 64

// Payload size of 1472 chosen through experiment to get the maximum payload
// without any IP fragmentation observed using network tracing.
// Wireshark shows fragmentation as "IP  Fragmented IP Protocol (proto=UDP 0x11, off=0)".
#define PACKET_SIZE 1472

#define MULTICAST_DEFAULT_PORT 2000

#endif // ifndef multicast_defs_h