/*****************************************************************************
* livehttp.c: Live HTTP Streaming
*****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
- * Copyright (C) 2009-2010 by Keary Griffin
- * $Id$
+ * Copyright © 2001, 2002 VLC authors and VideoLAN
+ * Copyright © 2009-2010 by Keary Griffin
*
* Authors: Keary Griffin <kearygriffin at gmail.com>
*
- * 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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.
*****************************************************************************/
/*****************************************************************************
#include <time.h>
#include <fcntl.h>
#include <errno.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
set_description( N_("HTTP Live streaming output") )
set_shortname( N_("LiveHTTP" ))
add_shortcut( "livehttp" )
- set_capability( "sout access", 50 )
+ set_capability( "sout access", 0 )
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_ACO )
- add_integer( SOUT_CFG_PREFIX "seglen", 10, NULL, SEGLEN_TEXT, SEGLEN_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "numsegs", 0, NULL, NUMSEGS_TEXT, NUMSEGS_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "splitanywhere", false, NULL,
+ add_integer( SOUT_CFG_PREFIX "seglen", 10, SEGLEN_TEXT, SEGLEN_LONGTEXT, true )
+ add_integer( SOUT_CFG_PREFIX "numsegs", 0, NUMSEGS_TEXT, NUMSEGS_LONGTEXT, true )
+ add_bool( SOUT_CFG_PREFIX "splitanywhere", false,
SPLITANYWHERE_TEXT, SPLITANYWHERE_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "delsegs", true, NULL,
+ add_bool( SOUT_CFG_PREFIX "delsegs", true,
DELSEGS_TEXT, DELSEGS_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "ratecontrol", false, NULL,
+ add_bool( SOUT_CFG_PREFIX "ratecontrol", false,
RATECONTROL_TEXT, RATECONTROL_TEXT, true )
add_string( SOUT_CFG_PREFIX "index", NULL,
INDEX_TEXT, INDEX_LONGTEXT, true )
return VLC_ENOMEM;
p_sys->i_seglen = var_GetInteger( p_access, SOUT_CFG_PREFIX "seglen" );
- p_sys->i_seglenm = CLOCK_FREQ * p_sys->i_seglen;
+ /* Try to get within +-10% of asked segment length, so lower limit is 90% of segment length*/
+ p_sys->i_seglenm = CLOCK_FREQ * p_sys->i_seglen * 0.9;
p_sys->i_numsegs = var_GetInteger( p_access, SOUT_CFG_PREFIX "numsegs" );
p_sys->b_splitanywhere = var_GetBool( p_access, SOUT_CFG_PREFIX "splitanywhere" );
if ( psz_idx )
{
char *psz_tmp;
- psz_tmp = str_format( p_access, psz_idx );
+ psz_tmp = str_format_time( psz_idx );
free( psz_idx );
if ( !psz_tmp )
{
/*****************************************************************************
* formatSegmentPath: create segment path name based on seg #
*****************************************************************************/
-static char *formatSegmentPath( sout_access_out_t *p_access, char *psz_path, uint32_t i_seg, bool b_sanitize )
+static char *formatSegmentPath( char *psz_path, uint32_t i_seg, bool b_sanitize )
{
char *psz_result;
char *psz_firstNumSign;
- if ( ! ( psz_result = str_format( p_access, psz_path ) ) )
+ if ( ! ( psz_result = str_format_time( psz_path ) ) )
return NULL;
psz_firstNumSign = psz_result + strcspn( psz_result, SEG_NUMBER_PLACEHOLDER );
for ( uint32_t i = i_firstseg; i <= p_sys->i_segment; i++ )
{
char *psz_name;
- if ( ! ( psz_name = formatSegmentPath( p_access, psz_idxFormat, i, false ) ) )
+ if ( ! ( psz_name = formatSegmentPath( psz_idxFormat, i, false ) ) )
{
free( psz_idxTmp );
fclose( fp );
// Then take care of deletion
if ( p_sys->b_delsegs && i_firstseg > 1 )
{
- char *psz_name = formatSegmentPath( p_access, p_access->psz_path, i_firstseg-1, true );
+ char *psz_name = formatSegmentPath( p_access->psz_path, i_firstseg-1, true );
if ( psz_name )
{
vlc_unlink( psz_name );
uint32_t i_newseg = p_sys->i_segment + 1;
- char *psz_seg = formatSegmentPath( p_access, p_access->psz_path, i_newseg, true );
+ char *psz_seg = formatSegmentPath( p_access->psz_path, i_newseg, true );
if ( !psz_seg )
return -1;
while( p_buffer )
{
- if ( p_sys->i_handle >= 0 && ( p_sys->b_splitanywhere || ( p_buffer->i_flags & BLOCK_FLAG_TYPE_I ) ) && ( p_buffer->i_dts-p_sys->i_opendts ) > p_sys->i_seglenm )
+ if ( p_sys->i_handle >= 0 && ( p_sys->b_splitanywhere || ( p_buffer->i_flags & BLOCK_FLAG_HEADER ) ) && ( p_buffer->i_dts-p_sys->i_opendts ) > p_sys->i_seglenm )
{
closeCurrentSegment( p_access, p_sys, false );
}
projects / vlc / blobdiff