#include <vlc_strings.h>
#include <vlc_charset.h>
+#include <gcrypt.h>
+#include <vlc_gcrypt.h>
+
+#include <vlc_rand.h>
+
#ifndef O_LARGEFILE
# define O_LARGEFILE 0
#endif
#define NUMSEGS_TEXT N_("Number of segments")
#define NUMSEGS_LONGTEXT N_("Number of segments to include in index")
+#define NOCACHE_TEXT N_("Allow cache")
+#define NOCACHE_LONGTEXT N_("Add EXT-X-ALLOW-CACHE:NO directive in playlist-file if this is disabled")
+
#define INDEX_TEXT N_("Index file")
#define INDEX_LONGTEXT N_("Path to the index file to create")
#define RATECONTROL_TEXT N_("Use muxers rate control mechanism")
+#define KEYURI_TEXT N_("AES key URI to place in playlist")
+
+#define KEYFILE_TEXT N_("AES key file")
+#define KEYFILE_LONGTEXT N_("File containing the 16 bytes encryption key")
+
+#define KEYLOADFILE_TEXT N_("File where vlc reads key-uri and keyfile-location")
+#define KEYLOADFILE_LONGTEXT N_("File is read when segment starts and is assumet to be in format: "\
+ "key-uri\\nkey-file. File is read on the segment opening and "\
+ "values are used on that segment.")
+
+#define RANDOMIV_TEXT N_("Use randomized IV for encryption")
+#define RANDOMIV_LONGTEXT N_("Generate IV instead using segment-number as IV")
+
vlc_module_begin ()
set_description( N_("HTTP Live streaming output") )
set_shortname( N_("LiveHTTP" ))
set_capability( "sout access", 0 )
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_ACO )
- 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_integer( SOUT_CFG_PREFIX "seglen", 10, SEGLEN_TEXT, SEGLEN_LONGTEXT, false )
+ add_integer( SOUT_CFG_PREFIX "numsegs", 0, NUMSEGS_TEXT, NUMSEGS_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "splitanywhere", false,
SPLITANYWHERE_TEXT, SPLITANYWHERE_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "delsegs", true,
DELSEGS_TEXT, DELSEGS_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "ratecontrol", false,
RATECONTROL_TEXT, RATECONTROL_TEXT, true )
+ add_bool( SOUT_CFG_PREFIX "caching", false,
+ NOCACHE_TEXT, NOCACHE_LONGTEXT, true )
+ add_bool( SOUT_CFG_PREFIX "generate-iv", false,
+ RANDOMIV_TEXT, RANDOMIV_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "index", NULL,
- INDEX_TEXT, INDEX_LONGTEXT, true )
+ INDEX_TEXT, INDEX_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "index-url", NULL,
- INDEXURL_TEXT, INDEXURL_LONGTEXT, true )
+ INDEXURL_TEXT, INDEXURL_LONGTEXT, false )
+ add_string( SOUT_CFG_PREFIX "key-uri", NULL,
+ KEYURI_TEXT, KEYURI_TEXT, true )
+ add_loadfile( SOUT_CFG_PREFIX "key-file", NULL,
+ KEYFILE_TEXT, KEYFILE_LONGTEXT, true )
+ add_loadfile( SOUT_CFG_PREFIX "key-loadfile", NULL,
+ KEYLOADFILE_TEXT, KEYLOADFILE_LONGTEXT, true )
set_callbacks( Open, Close )
vlc_module_end ()
"index",
"index-url",
"ratecontrol",
+ "caching",
+ "key-uri",
+ "key-file",
+ "key-loadfile",
+ "generate-iv",
NULL
};
static int Seek ( sout_access_out_t *, off_t );
static int Control( sout_access_out_t *, int, va_list );
+typedef struct output_segment
+{
+ char *psz_filename;
+ char *psz_uri;
+ char *psz_key_uri;
+ char *psz_duration;
+ float f_seglength;
+ uint32_t i_segment_number;
+ uint8_t aes_ivs[16];
+} output_segment_t;
+
struct sout_access_out_sys_t
{
char *psz_cursegPath;
char *psz_indexPath;
char *psz_indexUrl;
+ char *psz_keyfile;
+ mtime_t i_keyfile_modification;
mtime_t i_opendts;
mtime_t i_seglenm;
uint32_t i_segment;
size_t i_seglen;
- float *p_seglens;
+ float f_seglen;
block_t *block_buffer;
int i_handle;
unsigned i_numsegs;
- unsigned i_seglens;
bool b_delsegs;
bool b_ratecontrol;
bool b_splitanywhere;
+ bool b_caching;
+ bool b_generate_iv;
+ uint8_t aes_ivs[16];
+ gcry_cipher_hd_t aes_ctx;
+ char *key_uri;
+ uint8_t stuffing_bytes[16];
+ ssize_t stuffing_size;
+ vlc_array_t *segments_t;
};
+static int LoadCryptFile( sout_access_out_t *p_access);
+static int CryptSetup( sout_access_out_t *p_access, char *keyfile );
/*****************************************************************************
* Open: open the file
*****************************************************************************/
p_sys->b_splitanywhere = var_GetBool( p_access, SOUT_CFG_PREFIX "splitanywhere" );
p_sys->b_delsegs = var_GetBool( p_access, SOUT_CFG_PREFIX "delsegs" );
p_sys->b_ratecontrol = var_GetBool( p_access, SOUT_CFG_PREFIX "ratecontrol") ;
+ p_sys->b_caching = var_GetBool( p_access, SOUT_CFG_PREFIX "caching") ;
+ p_sys->b_generate_iv = var_GetBool( p_access, SOUT_CFG_PREFIX "generate-iv") ;
+ p_sys->segments_t = vlc_array_new();
- /* 5 elements is from harrison-stetson algorithm to start from some number
- * if we don't have numsegs defined
- */
- p_sys->i_seglens = 5;
- if( p_sys->i_numsegs )
- p_sys->i_seglens = p_sys->i_numsegs+1;
- p_sys->p_seglens = malloc( sizeof(float) * p_sys->i_seglens );
- if( unlikely( !p_sys->p_seglens ) )
- {
- free( p_sys );
- return VLC_ENOMEM;
- }
+ p_sys->stuffing_size = 0;
+ p_sys->i_opendts = VLC_TS_INVALID;
p_sys->psz_indexPath = NULL;
psz_idx = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "index" );
}
p_sys->psz_indexUrl = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "index-url" );
+ p_sys->psz_keyfile = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "key-loadfile" );
+ p_sys->key_uri = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "key-uri" );
p_access->p_sys = p_sys;
+
+ if( p_sys->psz_keyfile && ( LoadCryptFile( p_access ) < 0 ) )
+ {
+ free( p_sys->psz_indexUrl );
+ free( p_sys->psz_indexPath );
+ free( p_sys );
+ msg_Err( p_access, "Encryption init failed" );
+ return VLC_EGENERIC;
+ }
+ else if( !p_sys->psz_keyfile && ( CryptSetup( p_access, NULL ) < 0 ) )
+ {
+ free( p_sys->psz_indexUrl );
+ free( p_sys->psz_indexPath );
+ free( p_sys );
+ msg_Err( p_access, "Encryption init failed" );
+ return VLC_EGENERIC;
+ }
+
p_sys->i_handle = -1;
p_sys->i_segment = 0;
p_sys->psz_cursegPath = NULL;
return VLC_SUCCESS;
}
+/************************************************************************
+ * CryptSetup: Initialize encryption
+ ************************************************************************/
+static int CryptSetup( sout_access_out_t *p_access, char *key_file )
+{
+ sout_access_out_sys_t *p_sys = p_access->p_sys;
+ uint8_t key[16];
+ char *keyfile = NULL;
+
+ if( key_file )
+ keyfile = strdup( key_file );
+ else
+ keyfile = var_InheritString( p_access, SOUT_CFG_PREFIX "key-file" );
+
+ if( !p_sys->key_uri ) /*No key uri, assume no encryption wanted*/
+ {
+ msg_Dbg( p_access, "No key uri, no encryption");
+ return VLC_SUCCESS;
+ }
+ vlc_gcrypt_init();
+
+ /*Setup encryption cipher*/
+ gcry_error_t err = gcry_cipher_open( &p_sys->aes_ctx, GCRY_CIPHER_AES,
+ GCRY_CIPHER_MODE_CBC, 0 );
+ if( err )
+ {
+ msg_Err( p_access, "Openin AES Cipher failed: %s", gpg_strerror(err));
+ return VLC_EGENERIC;
+ }
+
+ if( unlikely(keyfile == NULL) )
+ {
+ msg_Err( p_access, "No key-file, no encryption" );
+ return VLC_EGENERIC;
+ }
+
+ int keyfd = vlc_open( keyfile, O_RDONLY | O_NONBLOCK );
+ if( unlikely( keyfd == -1 ) )
+ {
+ msg_Err( p_access, "Unable to open keyfile %s: %m", keyfile );
+ free( keyfile );
+ return VLC_EGENERIC;
+ }
+ free( keyfile );
+
+ ssize_t keylen = read( keyfd, key, 16 );
+
+ close( keyfd );
+ if( keylen < 16 )
+ {
+ msg_Err( p_access, "No key at least 16 octects (you provided %zd), no encryption", keylen );
+ return VLC_EGENERIC;
+ }
+
+ err = gcry_cipher_setkey( p_sys->aes_ctx, key, 16 );
+ if(err)
+ {
+ msg_Err(p_access, "Setting AES key failed: %s", gpg_strerror(err));
+ gcry_cipher_close( p_sys->aes_ctx);
+ return VLC_EGENERIC;
+ }
+
+ if( p_sys->b_generate_iv )
+ vlc_rand_bytes( p_sys->aes_ivs, sizeof(uint8_t)*16);
+
+ return VLC_SUCCESS;
+}
+
+
+/************************************************************************
+ * LoadCryptFile: Try to parse key_uri and keyfile-location from file
+ ************************************************************************/
+static int LoadCryptFile( sout_access_out_t *p_access )
+{
+ sout_access_out_sys_t *p_sys = p_access->p_sys;
+
+ FILE *stream = vlc_fopen( p_sys->psz_keyfile, "rt" );
+ char *key_file=NULL,*key_uri=NULL;
+
+ if( unlikely( stream == NULL ) )
+ {
+ msg_Err( p_access, "Unable to open keyloadfile %s: %m", p_sys->psz_keyfile );
+ return VLC_EGENERIC;
+ }
+
+
+ //First read key_uri
+ ssize_t len = getline( &key_uri, &(size_t){0}, stream );
+ if( unlikely( len == -1 ) )
+ {
+ msg_Err( p_access, "Cannot read %s: %m", p_sys->psz_keyfile );
+ clearerr( stream );
+ fclose( stream );
+ free( key_uri );
+ return VLC_EGENERIC;
+ }
+ //Strip the newline from uri, maybe scanf would be better?
+ key_uri[len-1]='\0';
+
+ len = getline( &key_file, &(size_t){0}, stream );
+ if( unlikely( len == -1 ) )
+ {
+ msg_Err( p_access, "Cannot read %s: %m", p_sys->psz_keyfile );
+ clearerr( stream );
+ fclose( stream );
+
+ free( key_uri );
+ free( key_file );
+ return VLC_EGENERIC;
+ }
+ // Strip the last newline from filename
+ key_file[len-1]='\0';
+ fclose( stream );
+
+ int returncode = VLC_SUCCESS;
+ if( !p_sys->key_uri || strcmp( p_sys->key_uri, key_uri ) )
+ {
+ if( p_sys->key_uri )
+ {
+ free( p_sys->key_uri );
+ p_sys->key_uri = NULL;
+ }
+ p_sys->key_uri = strdup( key_uri );
+ returncode = CryptSetup( p_access, key_file );
+ }
+ free( key_file );
+ free( key_uri );
+ return returncode;
+}
+
+/************************************************************************
+ * CryptKey: Set encryption IV to current segment number
+ ************************************************************************/
+static int CryptKey( sout_access_out_t *p_access, uint32_t i_segment )
+{
+ sout_access_out_sys_t *p_sys = p_access->p_sys;
+
+ if( !p_sys->b_generate_iv )
+ {
+ /* Use segment number as IV if randomIV isn't selected*/
+ memset( p_sys->aes_ivs, 0, 16 * sizeof(uint8_t));
+ p_sys->aes_ivs[15] = i_segment & 0xff;
+ p_sys->aes_ivs[14] = (i_segment >> 8 ) & 0xff;
+ p_sys->aes_ivs[13] = (i_segment >> 16 ) & 0xff;
+ p_sys->aes_ivs[12] = (i_segment >> 24 ) & 0xff;
+ }
+
+ gcry_error_t err = gcry_cipher_setiv( p_sys->aes_ctx,
+ p_sys->aes_ivs, 16);
+ if( err )
+ {
+ msg_Err(p_access, "Setting AES IVs failed: %s", gpg_strerror(err) );
+ gcry_cipher_close( p_sys->aes_ctx);
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
+
#define SEG_NUMBER_PLACEHOLDER "#"
/*****************************************************************************
* formatSegmentPath: create segment path name based on seg #
return NULL;
psz_firstNumSign = psz_result + strcspn( psz_result, SEG_NUMBER_PLACEHOLDER );
- if ( *psz_firstNumSign ) {
+ if ( *psz_firstNumSign )
+ {
char *psz_newResult;
int i_cnt = strspn( psz_firstNumSign, SEG_NUMBER_PLACEHOLDER );
int ret;
return psz_result;
}
+static void destroySegment( output_segment_t *segment )
+{
+ free( segment->psz_filename );
+ free( segment->psz_duration );
+ free( segment->psz_uri );
+ free( segment->psz_key_uri );
+ free( segment );
+}
+
+/************************************************************************
+ * segmentAmountNeeded: check that playlist has atleast 3*p_sys->i_seglength of segments
+ * return how many segments are needed for that (max of p_sys->i_segment )
+ ************************************************************************/
+static uint32_t segmentAmountNeeded( sout_access_out_sys_t *p_sys )
+{
+ float duration = .0f;
+ for( unsigned index = 1; index <= vlc_array_count( p_sys->segments_t ) ; index++ )
+ {
+ output_segment_t* segment = vlc_array_item_at_index( p_sys->segments_t, vlc_array_count( p_sys->segments_t ) - index );
+ duration += segment->f_seglength;
+
+ if( duration >= (float)( 3 * p_sys->i_seglen ) )
+ return __MAX(index, p_sys->i_numsegs);
+ }
+ return vlc_array_count( p_sys->segments_t )-1;
+
+}
+
+
+/************************************************************************
+ * isFirstItemRemovable: Check for draft 11 section 6.2.2
+ * check that the first item has been around outside playlist
+ * segment->f_seglength + p_sys->i_seglen before it is removed.
+ ************************************************************************/
+static bool isFirstItemRemovable( sout_access_out_sys_t *p_sys, uint32_t i_firstseg, uint32_t i_index_offset )
+{
+ float duration = .0f;
+
+ /* Check that segment has been out of playlist for seglenght + p_sys->i_seglen amount
+ * We check this by calculating duration of the items that replaced first item in playlist
+ */
+ for(int index=0; index < i_index_offset; index++ )
+ {
+ output_segment_t *segment = vlc_array_item_at_index( p_sys->segments_t, p_sys->i_segment - i_firstseg + index );
+ duration += segment->f_seglength;
+ }
+ output_segment_t *first = vlc_array_item_at_index( p_sys->segments_t, 0 );
+
+ return duration >= (first->f_seglength + (float)p_sys->i_seglen);
+}
+
/************************************************************************
* updateIndexAndDel: If necessary, update index file & delete old segments
************************************************************************/
{
uint32_t i_firstseg;
+ unsigned i_index_offset = 0;
if ( p_sys->i_numsegs == 0 || p_sys->i_segment < p_sys->i_numsegs )
- {
i_firstseg = 1;
-
- if( p_sys->i_segment >= (p_sys->i_seglens-1) )
- {
- p_sys->i_seglens <<= 1;
- msg_Dbg( p_access, "Segment amount %u", p_sys->i_seglens );
- p_sys->p_seglens = realloc( p_sys->p_seglens, sizeof(float) * p_sys->i_seglens );
- if( unlikely( !p_sys->p_seglens ) )
- return -1;
- }
- }
else
- i_firstseg = ( p_sys->i_segment - p_sys->i_numsegs ) + 1;
+ {
+ unsigned numsegs = segmentAmountNeeded( p_sys );
+ i_firstseg = ( p_sys->i_segment - numsegs ) + 1;
+ i_index_offset = vlc_array_count( p_sys->segments_t ) - numsegs;
+ }
// First update index
if ( p_sys->psz_indexPath )
return -1;
}
- if ( fprintf( fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%zu\n#EXT-X-VERSION:3\n#EXT-X-MEDIA-SEQUENCE:%"PRIu32"\n", p_sys->i_seglen, i_firstseg ) < 0 )
+ if ( fprintf( fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%zu\n#EXT-X-VERSION:3\n#EXT-X-ALLOW-CACHE:%s"
+ "%s\n#EXT-X-MEDIA-SEQUENCE:%"PRIu32"\n", p_sys->i_seglen,
+ p_sys->b_caching ? "YES" : "NO",
+ p_sys->i_numsegs > 0 ? "" : b_isend ? "\n#EXT-X-PLAYLIST-TYPE:VOD" : "\n#EXT-X-PLAYLIST-TYPE:EVENT",
+ i_firstseg ) < 0 )
{
free( psz_idxTmp );
fclose( fp );
return -1;
}
+ char *psz_current_uri=NULL;
+
- char *psz_idxFormat = p_sys->psz_indexUrl ? p_sys->psz_indexUrl : p_access->psz_path;
for ( uint32_t i = i_firstseg; i <= p_sys->i_segment; i++ )
{
- char *psz_name;
- char *psz_duration = NULL;
- if ( ! ( psz_name = formatSegmentPath( psz_idxFormat, i, false ) ) )
- {
- free( psz_idxTmp );
- fclose( fp );
- return -1;
- }
- if( ! ( us_asprintf( &psz_duration, "%.2f", p_sys->p_seglens[i % p_sys->i_seglens ], psz_name ) ) )
+ //scale to i_index_offset..numsegs + i_index_offset
+ uint32_t index = i - i_firstseg + i_index_offset;
+
+ output_segment_t *segment = (output_segment_t *)vlc_array_item_at_index( p_sys->segments_t, index );
+ if( p_sys->key_uri &&
+ ( !psz_current_uri || strcmp( psz_current_uri, segment->psz_key_uri ) )
+ )
{
- free( psz_idxTmp );
- fclose( fp );
- return -1;
+ int ret = 0;
+ free( psz_current_uri );
+ psz_current_uri = strdup( segment->psz_key_uri );
+ if( p_sys->b_generate_iv )
+ {
+ unsigned long long iv_hi = 0, iv_lo = 0;
+ for( unsigned short i = 0; i < 8; i++ )
+ {
+ iv_hi |= segment->aes_ivs[i] & 0xff;
+ iv_hi <<= 8;
+ iv_lo |= segment->aes_ivs[8+i] & 0xff;
+ iv_lo <<= 8;
+ }
+ ret = fprintf( fp, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\",IV=0X%16.16llx%16.16llx\n",
+ segment->psz_key_uri, iv_hi, iv_lo );
+
+ } else {
+ ret = fprintf( fp, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"\n", segment->psz_key_uri );
+ }
+ if( ret < 0 )
+ {
+ free( psz_idxTmp );
+ fclose( fp );
+ return -1;
+ }
}
- val = fprintf( fp, "#EXTINF:%s,\n%s\n", psz_duration, psz_name );
- free( psz_duration );
- free( psz_name );
+
+ val = fprintf( fp, "#EXTINF:%s,\n%s\n", segment->psz_duration, segment->psz_uri);
if ( val < 0 )
{
- free( psz_idxTmp );
fclose( fp );
return -1;
}
}
+ free( psz_current_uri );
if ( b_isend )
{
msg_Err( p_access, "Error moving LiveHttp index file" );
}
else
- msg_Info( p_access, "LiveHttpIndexComplete: %s" , p_sys->psz_indexPath );
+ msg_Dbg( p_access, "LiveHttpIndexComplete: %s" , p_sys->psz_indexPath );
free( psz_idxTmp );
}
// Then take care of deletion
- if ( p_sys->b_delsegs && i_firstseg > 1 )
+ // Try to follow pantos draft 11 section 6.2.2
+ while( p_sys->b_delsegs && p_sys->i_numsegs &&
+ isFirstItemRemovable( p_sys, i_firstseg, i_index_offset )
+ )
{
- char *psz_name = formatSegmentPath( p_access->psz_path, i_firstseg-1, true );
- if ( psz_name )
+ output_segment_t *segment = vlc_array_item_at_index( p_sys->segments_t, 0 );
+ msg_Dbg( p_access, "Removing segment number %d", segment->i_segment_number );
+ vlc_array_remove( p_sys->segments_t, 0 );
+
+ if ( segment->psz_filename )
{
- vlc_unlink( psz_name );
- free( psz_name );
+ vlc_unlink( segment->psz_filename );
}
+
+ destroySegment( segment );
+ i_index_offset -=1;
}
+
+
return 0;
}
{
if ( p_sys->i_handle >= 0 )
{
+ output_segment_t *segment = (output_segment_t *)vlc_array_item_at_index( p_sys->segments_t, vlc_array_count( p_sys->segments_t ) - 1 );
+
+ if( p_sys->key_uri )
+ {
+ size_t pad = 16 - p_sys->stuffing_size;
+ memset(&p_sys->stuffing_bytes[p_sys->stuffing_size], pad, pad);
+ gcry_error_t err = gcry_cipher_encrypt( p_sys->aes_ctx, p_sys->stuffing_bytes, 16, NULL, 0 );
+
+ if( err ) {
+ msg_Err( p_access, "Couldn't encrypt 16 bytes: %s", gpg_strerror(err) );
+ } else {
+ int ret = write( p_sys->i_handle, p_sys->stuffing_bytes, 16 );
+ if( ret != 16 )
+ msg_Err( p_access, "Couldn't write 16 bytes" );
+ }
+ p_sys->stuffing_size = 0;
+ }
+
+
close( p_sys->i_handle );
p_sys->i_handle = -1;
+
+ if( ! ( us_asprintf( &segment->psz_duration, "%.2f", p_sys->f_seglen ) ) )
+ {
+ msg_Err( p_access, "Couldn't set duration on closed segment");
+ return;
+ }
+ segment->f_seglength = p_sys->f_seglen;
+
+ segment->i_segment_number = p_sys->i_segment;
+
if ( p_sys->psz_cursegPath )
{
- msg_Info( p_access, "LiveHttpSegmentComplete: %s (%"PRIu32")" , p_sys->psz_cursegPath, p_sys->i_segment );
+ msg_Dbg( p_access, "LiveHttpSegmentComplete: %s (%"PRIu32")" , p_sys->psz_cursegPath, p_sys->i_segment );
free( p_sys->psz_cursegPath );
p_sys->psz_cursegPath = 0;
updateIndexAndDel( p_access, p_sys, b_isend );
sout_access_out_sys_t *p_sys = p_access->p_sys;
msg_Dbg( p_access, "Flushing buffer to last file");
+ bool crypted = false;
while( p_sys->block_buffer )
{
+ if( p_sys->key_uri && !crypted)
+ {
+ if( p_sys->stuffing_size )
+ {
+ p_sys->block_buffer = block_Realloc( p_sys->block_buffer, p_sys->stuffing_size, p_sys->block_buffer->i_buffer );
+ if( unlikely(!p_sys->block_buffer) )
+ return;
+ memcpy( p_sys->block_buffer->p_buffer, p_sys->stuffing_bytes, p_sys->stuffing_size );
+ p_sys->stuffing_size = 0;
+ }
+ size_t original = p_sys->block_buffer->i_buffer;
+ size_t padded = (original + 15 ) & ~15;
+ size_t pad = padded - original;
+ if( pad )
+ {
+ p_sys->stuffing_size = 16 - pad;
+ p_sys->block_buffer->i_buffer -= p_sys->stuffing_size;
+ memcpy( p_sys->stuffing_bytes, &p_sys->block_buffer->p_buffer[p_sys->block_buffer->i_buffer], p_sys->stuffing_size );
+ }
+
+ gcry_error_t err = gcry_cipher_encrypt( p_sys->aes_ctx,
+ p_sys->block_buffer->p_buffer, p_sys->block_buffer->i_buffer, NULL, 0 );
+ if( err )
+ {
+ msg_Err( p_access, "Encryption failure: %s ", gpg_strerror(err) );
+ break;
+ }
+ crypted = true;
+ }
ssize_t val = write( p_sys->i_handle, p_sys->block_buffer->p_buffer, p_sys->block_buffer->i_buffer );
if ( val == -1 )
{
}
if( !p_sys->block_buffer->p_next )
{
- p_sys->p_seglens[p_sys->i_segment % p_sys->i_seglens ] =
- (float)( p_sys->block_buffer->i_length / (1000000)) +
- (float)(p_sys->block_buffer->i_dts - p_sys->i_opendts) / CLOCK_FREQ;
+ p_sys->f_seglen = (float)( p_sys->block_buffer->i_length / (1000000)) +
+ (float)(p_sys->block_buffer->i_dts - p_sys->i_opendts) / CLOCK_FREQ;
}
- if ( (size_t)val >= p_sys->block_buffer->i_buffer )
+ if ( likely( (size_t)val >= p_sys->block_buffer->i_buffer ) )
{
block_t *p_next = p_sys->block_buffer->p_next;
block_Release (p_sys->block_buffer);
p_sys->block_buffer = p_next;
+ crypted=false;
}
else
{
}
closeCurrentSegment( p_access, p_sys, true );
+
+ if( p_sys->key_uri )
+ {
+ gcry_cipher_close( p_sys->aes_ctx );
+ free( p_sys->key_uri );
+ }
+
+ while( vlc_array_count( p_sys->segments_t ) > 0 )
+ {
+ output_segment_t *segment = vlc_array_item_at_index( p_sys->segments_t, 0 );
+ vlc_array_remove( p_sys->segments_t, 0 );
+ destroySegment( segment );
+ }
+ vlc_array_destroy( p_sys->segments_t );
+
free( p_sys->psz_indexUrl );
free( p_sys->psz_indexPath );
- free( p_sys->p_seglens );
free( p_sys );
msg_Dbg( p_access, "livehttp access output closed" );
uint32_t i_newseg = p_sys->i_segment + 1;
- char *psz_seg = formatSegmentPath( p_access->psz_path, i_newseg, true );
- if ( !psz_seg )
+ /* Create segment and fill it info that we can (everything excluding duration */
+ output_segment_t *segment = (output_segment_t*)malloc(sizeof(output_segment_t));
+ if( unlikely( !segment ) )
+ return -1;
+
+ memset( segment, 0 , sizeof( output_segment_t ) );
+
+ segment->i_segment_number = i_newseg;
+ segment->psz_filename = formatSegmentPath( p_access->psz_path, i_newseg, true );
+ char *psz_idxFormat = p_sys->psz_indexUrl ? p_sys->psz_indexUrl : p_access->psz_path;
+ segment->psz_uri = formatSegmentPath( psz_idxFormat , i_newseg, false );
+
+ if ( unlikely( !segment->psz_filename ) )
+ {
+ msg_Err( p_access, "Format segmentpath failed");
return -1;
+ }
- fd = vlc_open( psz_seg, O_WRONLY | O_CREAT | O_LARGEFILE |
+ fd = vlc_open( segment->psz_filename, O_WRONLY | O_CREAT | O_LARGEFILE |
O_TRUNC, 0666 );
if ( fd == -1 )
{
- msg_Err( p_access, "cannot open `%s' (%m)", psz_seg );
- free( psz_seg );
+ msg_Err( p_access, "cannot open `%s' (%m)", segment->psz_filename );
+ destroySegment( segment );
return -1;
}
- msg_Dbg( p_access, "Successfully opened livehttp file: %s (%"PRIu32")" , psz_seg, i_newseg );
+ vlc_array_append( p_sys->segments_t, segment);
+
+ if( p_sys->psz_keyfile )
+ {
+ LoadCryptFile( p_access );
+ }
+
+ if( p_sys->key_uri )
+ {
+ segment->psz_key_uri = strdup( p_sys->key_uri );
+ CryptKey( p_access, i_newseg );
+ if( p_sys->b_generate_iv )
+ memcpy( segment->aes_ivs, p_sys->aes_ivs, sizeof(uint8_t)*16 );
+ }
+ msg_Dbg( p_access, "Successfully opened livehttp file: %s (%"PRIu32")" , segment->psz_filename, i_newseg );
- //free( psz_seg );
- p_sys->psz_cursegPath = psz_seg;
+ p_sys->psz_cursegPath = strdup(segment->psz_filename);
p_sys->i_handle = fd;
p_sys->i_segment = i_newseg;
return fd;
{
if ( ( p_sys->b_splitanywhere || ( p_buffer->i_flags & BLOCK_FLAG_HEADER ) ) )
{
+ bool crypted = false;
block_t *output = p_sys->block_buffer;
p_sys->block_buffer = NULL;
if ( p_sys->i_handle < 0 )
{
p_sys->i_opendts = output ? output->i_dts : p_buffer->i_dts;
+ //For first segment we can get negative duration otherwise...?
+ if( ( p_sys->i_opendts != VLC_TS_INVALID ) &&
+ ( p_buffer->i_dts < p_sys->i_opendts ) )
+ p_sys->i_opendts = p_buffer->i_dts;
if ( openNextFile( p_access, p_sys ) < 0 )
return -1;
}
while( output )
{
+ if( p_sys->key_uri && !crypted )
+ {
+ if( p_sys->stuffing_size )
+ {
+ output = block_Realloc( output, p_sys->stuffing_size, output->i_buffer );
+ if( unlikely(!output ) )
+ return VLC_ENOMEM;
+ memcpy( output->p_buffer, p_sys->stuffing_bytes, p_sys->stuffing_size );
+ p_sys->stuffing_size = 0;
+ }
+ size_t original = output->i_buffer;
+ size_t padded = (output->i_buffer + 15 ) & ~15;
+ size_t pad = padded - original;
+ if( pad )
+ {
+ p_sys->stuffing_size = 16-pad;
+ output->i_buffer -= p_sys->stuffing_size;
+ memcpy(p_sys->stuffing_bytes, &output->p_buffer[output->i_buffer], p_sys->stuffing_size);
+ }
+
+ gcry_error_t err = gcry_cipher_encrypt( p_sys->aes_ctx,
+ output->p_buffer, output->i_buffer, NULL, 0 );
+ if( err )
+ {
+ msg_Err( p_access, "Encryption failure: %s ", gpg_strerror(err) );
+ return -1;
+ }
+ crypted=true;
+
+ }
ssize_t val = write( p_sys->i_handle, output->p_buffer, output->i_buffer );
if ( val == -1 )
{
block_ChainRelease ( p_buffer );
return -1;
}
- p_sys->p_seglens[p_sys->i_segment % p_sys->i_seglens ] =
+ p_sys->f_seglen =
(float)output->i_length / INT64_C(1000000) +
(float)(output->i_dts - p_sys->i_opendts) / CLOCK_FREQ;
block_t *p_next = output->p_next;
block_Release (output);
output = p_next;
+ crypted=false;
}
else
{
projects / vlc / blobdiff