+ if( pi_stream )
+ {
+ *pi_stream = i_stream;
+ }
+ if( pi_dts )
+ {
+ *pi_dts = i_dts;
+ }
+ return i_stream;
+}
+
+/*****************************************************************************
+ * Mux:
+ *****************************************************************************/
+static int Mux( sout_mux_t *p_mux )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+
+ for( ;; )
+ {
+ sout_input_t *p_input;
+ int i_stream;
+ mp4_stream_t *p_stream;
+ block_t *p_data;
+ mtime_t i_dts;
+
+ if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 )
+ {
+ return( VLC_SUCCESS );
+ }
+
+ p_input = p_mux->pp_inputs[i_stream];
+ p_stream = (mp4_stream_t*)p_input->p_sys;
+
+again:
+ p_data = block_FifoGet( p_input->p_fifo );
+ if( p_stream->fmt.i_codec == VLC_FOURCC( 'h', '2', '6', '4' ) )
+ {
+ p_data = ConvertAVC1( p_mux, p_stream, p_data );
+ }
+ else if( p_stream->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
+ {
+ p_data = ConvertSUBT( p_mux, p_stream, p_data );
+ }
+ if( p_data == NULL ) goto again;
+
+ if( p_stream->fmt.i_cat != SPU_ES )
+ {
+ /* Fix length of the sample */
+ if( p_input->p_fifo->i_depth > 0 )
+ {
+ block_t *p_next = block_FifoShow( p_input->p_fifo );
+ int64_t i_diff = p_next->i_dts - p_data->i_dts;
+
+ if( i_diff < I64C(1000000 ) ) /* protection */
+ {
+ p_data->i_length = i_diff;
+ }
+ }
+ if( p_data->i_length <= 0 )
+ {
+ msg_Warn( p_mux, "i_length <= 0" );
+ p_stream->i_length_neg += p_data->i_length - 1;
+ p_data->i_length = 1;
+ }
+ else if( p_stream->i_length_neg < 0 )
+ {
+ int64_t i_recover = __MIN( p_data->i_length / 4, - p_stream->i_length_neg );
+
+ p_data->i_length -= i_recover;
+ p_stream->i_length_neg += i_recover;
+ }
+ }
+
+ /* Save starting time */
+ if( p_stream->i_entry_count == 0 )
+ {
+ p_stream->i_dts_start = p_data->i_dts;
+
+ /* Update global dts_start */
+ if( p_sys->i_dts_start <= 0 ||
+ p_stream->i_dts_start < p_sys->i_dts_start )
+ {
+ p_sys->i_dts_start = p_stream->i_dts_start;
+ }
+ }
+
+ if( p_stream->fmt.i_cat == SPU_ES && p_stream->i_entry_count > 0 )
+ {
+ int64_t i_length = p_data->i_dts - p_stream->i_last_dts;
+
+ if( i_length <= 0 )
+ {
+ /* FIXME handle this broken case */
+ i_length = 1;
+ }
+
+ /* Fix last entry */
+ if( p_stream->entry[p_stream->i_entry_count-1].i_length <= 0 )
+ {
+ p_stream->entry[p_stream->i_entry_count-1].i_length = i_length;
+ }
+ }
+
+
+ /* add index entry */
+ p_stream->entry[p_stream->i_entry_count].i_pos = p_sys->i_pos;
+ p_stream->entry[p_stream->i_entry_count].i_size = p_data->i_buffer;
+ p_stream->entry[p_stream->i_entry_count].i_pts_dts=
+ __MAX( p_data->i_pts - p_data->i_dts, 0 );
+ p_stream->entry[p_stream->i_entry_count].i_length = p_data->i_length;
+ p_stream->entry[p_stream->i_entry_count].i_flags = p_data->i_flags;
+
+ p_stream->i_entry_count++;
+ /* XXX: -1 to always have 2 entry for easy adding of empty SPU */
+ if( p_stream->i_entry_count >= p_stream->i_entry_max - 1 )
+ {
+ p_stream->i_entry_max += 1000;
+ p_stream->entry =
+ realloc( p_stream->entry,
+ p_stream->i_entry_max * sizeof( mp4_entry_t ) );
+ }
+
+ /* update */
+ p_stream->i_duration += p_data->i_length;
+ p_sys->i_pos += p_data->i_buffer;
+
+ /* Save the DTS */
+ p_stream->i_last_dts = p_data->i_dts;
+
+ /* write data */
+ sout_AccessOutWrite( p_mux->p_access, p_data );
+
+ if( p_stream->fmt.i_cat == SPU_ES )
+ {
+ int64_t i_length = p_stream->entry[p_stream->i_entry_count-1].i_length;
+
+ if( i_length != 0 )
+ {
+ /* TODO */
+ msg_Dbg( p_mux, "writing an empty sub" ) ;
+
+ /* Append a idx entry */
+ p_stream->entry[p_stream->i_entry_count].i_pos = p_sys->i_pos;
+ p_stream->entry[p_stream->i_entry_count].i_size = 3;
+ p_stream->entry[p_stream->i_entry_count].i_pts_dts= 0;
+ p_stream->entry[p_stream->i_entry_count].i_length = 0;
+ p_stream->entry[p_stream->i_entry_count].i_flags = 0;
+
+ /* XXX: No need to grow the entry here */
+ p_stream->i_entry_count++;
+
+ /* Fix last dts */
+ p_stream->i_last_dts += i_length;
+
+ /* Write a " " */
+ p_data = block_New( p_mux, 3 );
+ p_data->p_buffer[0] = 0;
+ p_data->p_buffer[1] = 1;
+ p_data->p_buffer[2] = ' ';
+
+ p_sys->i_pos += p_data->i_buffer;
+
+ sout_AccessOutWrite( p_mux->p_access, p_data );
+ }
+
+ /* Fix duration */
+ p_stream->i_duration = p_stream->i_last_dts - p_stream->i_dts_start;
+ }
+ }
+
+ return( VLC_SUCCESS );
+}
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static block_t *ConvertSUBT( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block )
+{
+ p_block = block_Realloc( p_block, 2, p_block->i_buffer );
+
+ /* No trailling '\0' */
+ if( p_block->i_buffer > 2 && p_block->p_buffer[p_block->i_buffer-1] == '\0' )
+ p_block->i_buffer--;
+
+ p_block->p_buffer[0] = ( (p_block->i_buffer - 2) >> 8 )&0xff;
+ p_block->p_buffer[1] = ( (p_block->i_buffer - 2) )&0xff;
+
+ return p_block;
+}
+
+static block_t *ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block )
+{
+ uint8_t *last = p_block->p_buffer; /* Assume it starts with 0x00000001 */
+ uint8_t *dat = &p_block->p_buffer[4];
+ uint8_t *end = &p_block->p_buffer[p_block->i_buffer];
+
+
+ /* Replace the 4 bytes start code with 4 bytes size,
+ * FIXME are all startcodes 4 bytes ? (I don't think :( */
+ while( dat < end )
+ {
+ int i_size;
+
+ while( dat < end - 4 )
+ {
+ if( dat[0] == 0x00 && dat[1] == 0x00 &&
+ dat[2] == 0x00 && dat[3] == 0x01 )
+ {
+ break;
+ }
+ dat++;
+ }
+ if( dat >= end - 4 )
+ {
+ dat = end;
+ }
+
+ /* Fix size */
+ i_size = dat - &last[4];
+ last[0] = ( i_size >> 24 )&0xff;
+ last[1] = ( i_size >> 16 )&0xff;
+ last[2] = ( i_size >> 8 )&0xff;
+ last[3] = ( i_size )&0xff;
+
+ /* Skip blocks with SPS/PPS */
+ if( (last[4]&0x1f) == 7 || (last[4]&0x1f) == 8 )
+ {
+ ; // FIXME Find a way to skip dat without frelling everything
+ }
+ last = dat;
+ dat += 4;
+ }
+ return p_block;
+}
+
+static int GetDescrLength( int i_size )
+{
+ if( i_size < 0x00000080 )
+ return 2 + i_size;
+ else if( i_size < 0x00004000 )
+ return 3 + i_size;
+ else if( i_size < 0x00200000 )
+ return 4 + i_size;
+ else
+ return 5 + i_size;
+}
+
+static bo_t *GetESDS( mp4_stream_t *p_stream )
+{
+ bo_t *esds;
+ int i_stream_type;
+ int i_object_type_indication;
+ int i_decoder_specific_info_size;
+ unsigned int i;
+ int64_t i_bitrate_avg = 0;
+ int64_t i_bitrate_max = 0;
+
+ /* Compute avg/max bitrate */
+ for( i = 0; i < p_stream->i_entry_count; i++ )
+ {
+ i_bitrate_avg += p_stream->entry[i].i_size;
+ if( p_stream->entry[i].i_length > 0)
+ {
+ int64_t i_bitrate = I64C(8000000) * p_stream->entry[i].i_size / p_stream->entry[i].i_length;
+ if( i_bitrate > i_bitrate_max )
+ i_bitrate_max = i_bitrate;
+ }
+ }
+
+ if( p_stream->i_duration > 0 )
+ i_bitrate_avg = I64C(8000000) * i_bitrate_avg / p_stream->i_duration;
+ else
+ i_bitrate_avg = 0;
+ if( i_bitrate_max <= 1 )
+ i_bitrate_max = 0x7fffffff;
+
+ /* */
+ if( p_stream->fmt.i_extra > 0 )
+ {
+ i_decoder_specific_info_size =
+ GetDescrLength( p_stream->fmt.i_extra );
+ }
+ else
+ {
+ i_decoder_specific_info_size = 0;
+ }
+
+ esds = box_full_new( "esds", 0, 0 );
+
+ /* ES_Descr */
+ bo_add_descr( esds, 0x03, 3 +
+ GetDescrLength( 13 + i_decoder_specific_info_size ) +
+ GetDescrLength( 1 ) );
+ bo_add_16be( esds, p_stream->i_track_id );
+ bo_add_8 ( esds, 0x1f ); // flags=0|streamPriority=0x1f
+
+ /* DecoderConfigDescr */
+ bo_add_descr( esds, 0x04, 13 + i_decoder_specific_info_size );
+
+ switch( p_stream->fmt.i_codec )
+ {
+ case VLC_FOURCC( 'm', 'p', '4', 'v' ):
+ i_object_type_indication = 0x20;
+ break;
+ case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
+ /* FIXME MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
+ i_object_type_indication = 0x60;
+ break;
+ case VLC_FOURCC( 'm', 'p', '4', 'a' ):
+ /* FIXME for mpeg2-aac == 0x66->0x68 */
+ i_object_type_indication = 0x40;
+ break;
+ case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+ i_object_type_indication =
+ p_stream->fmt.audio.i_rate < 32000 ? 0x69 : 0x6b;
+ break;
+ default:
+ i_object_type_indication = 0x00;
+ break;
+ }
+ i_stream_type = p_stream->fmt.i_cat == VIDEO_ES ? 0x04 : 0x05;
+
+ bo_add_8 ( esds, i_object_type_indication );
+ bo_add_8 ( esds, ( i_stream_type << 2 ) | 1 );
+ bo_add_24be( esds, 1024 * 1024 ); // bufferSizeDB
+ bo_add_32be( esds, i_bitrate_max ); // maxBitrate
+ bo_add_32be( esds, i_bitrate_avg ); // avgBitrate
+
+ if( p_stream->fmt.i_extra > 0 )
+ {
+ int i;
+
+ /* DecoderSpecificInfo */
+ bo_add_descr( esds, 0x05, p_stream->fmt.i_extra );
+
+ for( i = 0; i < p_stream->fmt.i_extra; i++ )
+ {
+ bo_add_8( esds, ((uint8_t*)p_stream->fmt.p_extra)[i] );
+ }
+ }
+
+ /* SL_Descr mandatory */
+ bo_add_descr( esds, 0x06, 1 );
+ bo_add_8 ( esds, 0x02 ); // sl_predefined
+
+ box_fix( esds );
+
+ return esds;
+}
+
+static bo_t *GetWaveTag( mp4_stream_t *p_stream )
+{
+ bo_t *wave;
+ bo_t *box;
+
+ wave = box_new( "wave" );
+
+ box = box_new( "frma" );
+ bo_add_fourcc( box, "mp4a" );
+ box_fix( box );
+ box_gather( wave, box );
+
+ box = box_new( "mp4a" );
+ bo_add_32be( box, 0 );
+ box_fix( box );
+ box_gather( wave, box );
+
+ box = GetESDS( p_stream );
+ box_fix( box );
+ box_gather( wave, box );
+
+ box = box_new( "srcq" );
+ bo_add_32be( box, 0x40 );
+ box_fix( box );
+ box_gather( wave, box );
+
+ /* wazza ? */
+ bo_add_32be( wave, 8 ); /* new empty box */
+ bo_add_32be( wave, 0 ); /* box label */
+
+ box_fix( wave );
+
+ return wave;
+}
+
+static bo_t *GetDamrTag( mp4_stream_t *p_stream )
+{
+ bo_t *damr;
+
+ damr = box_new( "damr" );
+
+ bo_add_fourcc( damr, "REFC" );
+ bo_add_8( damr, 0 );
+
+ if( p_stream->fmt.i_codec == VLC_FOURCC( 's', 'a', 'm', 'r' ) )
+ bo_add_16be( damr, 0x81ff ); /* Mode set (all modes for AMR_NB) */
+ else
+ bo_add_16be( damr, 0x83ff ); /* Mode set (all modes for AMR_WB) */
+ bo_add_16be( damr, 0x1 ); /* Mode change period (no restriction) */
+
+ box_fix( damr );
+
+ return damr;
+}
+
+static bo_t *GetD263Tag( mp4_stream_t *p_stream )
+{
+ bo_t *d263;
+
+ d263 = box_new( "d263" );
+
+ bo_add_fourcc( d263, "VLC " );
+ bo_add_16be( d263, 0xa );
+ bo_add_8( d263, 0 );
+
+ box_fix( d263 );
+
+ return d263;
+}
+
+static bo_t *GetAvcCTag( mp4_stream_t *p_stream )
+{
+ bo_t *avcC = NULL;
+ uint8_t *p_sps = NULL;
+ uint8_t *p_pps = NULL;
+ int i_sps_size = 0;
+ int i_pps_size = 0;
+
+ if( p_stream->fmt.i_extra > 0 )
+ {
+ /* FIXME: take into account multiple sps/pps */
+ uint8_t *p_buffer = p_stream->fmt.p_extra;
+ int i_buffer = p_stream->fmt.i_extra;
+
+ while( i_buffer > 4 &&
+ p_buffer[0] == 0 && p_buffer[1] == 0 &&
+ p_buffer[2] == 0 && p_buffer[3] == 1 )
+ {
+ const int i_nal_type = p_buffer[4]&0x1f;
+ int i_offset = 1;
+ int i_size = 0;
+ int i_startcode = 0;
+
+ //msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
+
+ for( i_offset = 1; i_offset+3 < i_buffer ; i_offset++)
+ {
+ if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 &&
+ p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
+ {
+ /* we found another startcode */
+ i_startcode = i_offset;
+ break;
+ }
+ }
+ i_size = i_startcode ? i_startcode : i_buffer;
+ if( i_nal_type == 7 )
+ {
+ p_sps = &p_buffer[4];
+ i_sps_size = i_size - 4;
+ }
+ if( i_nal_type == 8 )
+ {
+ p_pps = &p_buffer[4];
+ i_pps_size = i_size - 4;
+ }
+ i_buffer -= i_size;
+ p_buffer += i_size;
+ }
+ }
+
+ /* FIXME use better value */
+ avcC = box_new( "avcC" );
+ bo_add_8( avcC, 1 ); /* configuration version */
+ bo_add_8( avcC, i_sps_size ? p_sps[1] : 77 );
+ bo_add_8( avcC, i_sps_size ? p_sps[2] : 64 );
+ bo_add_8( avcC, i_sps_size ? p_sps[3] : 30 ); /* level, 5.1 */
+ bo_add_8( avcC, 0xff ); /* 0b11111100 | lengthsize = 0x11 */
+
+ bo_add_8( avcC, 0xe0 | (i_sps_size > 0 ? 1 : 0) ); /* 0b11100000 | sps_count */
+ if( i_sps_size > 0 )
+ {
+ bo_add_16be( avcC, i_sps_size );
+ bo_add_mem( avcC, i_sps_size, p_sps );
+ }
+
+ bo_add_8( avcC, (i_pps_size > 0 ? 1 : 0) ); /* pps_count */
+ if( i_pps_size > 0 )
+ {
+ bo_add_16be( avcC, i_pps_size );
+ bo_add_mem( avcC, i_pps_size, p_pps );
+ }
+ box_fix( avcC );
+
+ return avcC;
+}
+
+/* TODO: No idea about these values */
+static bo_t *GetSVQ3Tag( mp4_stream_t *p_stream )
+{
+ bo_t *smi = box_new( "SMI " );
+
+ if( p_stream->fmt.i_extra > 0x4e )
+ {
+ uint8_t *p_end = &((uint8_t*)p_stream->fmt.p_extra)[p_stream->fmt.i_extra];
+ uint8_t *p = &((uint8_t*)p_stream->fmt.p_extra)[0x46];
+
+ while( p + 8 < p_end )
+ {
+ int i_size = GetDWBE( p );
+ if( i_size <= 1 )
+ {
+ /* FIXME handle 1 as long size */
+ break;
+ }
+ if( !strncmp( (const char *)&p[4], "SMI ", 4 ) )
+ {
+ bo_add_mem( smi, p_end - p - 8, &p[8] );
+ return smi;
+ }
+ p += i_size;
+ }
+ }
+
+ /* Create a dummy one in fallback */
+ bo_add_fourcc( smi, "SEQH" );
+ bo_add_32be( smi, 0x5 );
+ bo_add_32be( smi, 0xe2c0211d );
+ bo_add_8( smi, 0xc0 );
+ box_fix( smi );
+
+ return smi;
+}
+
+static bo_t *GetUdtaTag( sout_mux_t *p_mux )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ bo_t *udta = box_new( "udta" );
+ vlc_meta_t *p_meta = p_mux->p_sout->p_meta;
+ int i_track;
+
+ /* Requirements */
+ for( i_track = 0; i_track < p_sys->i_nb_streams; i_track++ )
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i_track];
+
+ if( p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','v') ||
+ p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') )
+ {
+ bo_t *box = box_new( "\251req" );
+ /* String length */
+ bo_add_16be( box, sizeof("QuickTime 6.0 or greater") - 1);
+ bo_add_16be( box, 0 );
+ bo_add_mem( box, sizeof("QuickTime 6.0 or greater") - 1,
+ (uint8_t *)"QuickTime 6.0 or greater" );
+ box_fix( box );
+ box_gather( udta, box );
+ break;
+ }
+ }
+
+ /* Encoder */
+ {
+ bo_t *box = box_new( "\251enc" );
+ /* String length */
+ bo_add_16be( box, sizeof(PACKAGE_STRING " stream output") - 1);
+ bo_add_16be( box, 0 );
+ bo_add_mem( box, sizeof(PACKAGE_STRING " stream output") - 1,
+ (uint8_t*)PACKAGE_STRING " stream output" );
+ box_fix( box );
+ box_gather( udta, box );
+ }
+
+ /* Misc atoms */
+ if( p_meta )
+ {
+#define ADD_META_BOX( type, box_string ) { \
+ bo_t *box = NULL; \
+ if( vlc_meta_Get( p_meta, vlc_meta_##type ) ) box = box_new( "\251" box_string ); \
+ if( box ) \
+ { \
+ bo_add_16be( box, strlen( vlc_meta_Get( p_meta, vlc_meta_##type ) )); \
+ bo_add_16be( box, 0 ); \
+ bo_add_mem( box, strlen( vlc_meta_Get( p_meta, vlc_meta_##type ) ), \
+ (uint8_t*)(vlc_meta_Get( p_meta, vlc_meta_##type ) ) ); \
+ box_fix( box ); \
+ box_gather( udta, box ); \
+ } }
+
+ ADD_META_BOX( Title, "nam" );
+ ADD_META_BOX( Artist, "ART" );
+ ADD_META_BOX( Genre, "gen" );
+ ADD_META_BOX( Copyright, "cpy" );
+ ADD_META_BOX( Description, "des" );
+ ADD_META_BOX( Date, "day" );
+ ADD_META_BOX( URL, "url" );
+#undef ADD_META_BOX
+ }
+
+ box_fix( udta );
+ return udta;
+}
+
+static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ vlc_bool_t b_descr = VLC_FALSE;
+ bo_t *soun;
+ char fcc[4] = " ";
+ int i;
+
+ switch( p_stream->fmt.i_codec )
+ {
+ case VLC_FOURCC('m','p','4','a'):
+ memcpy( fcc, "mp4a", 4 );
+ b_descr = VLC_TRUE;
+ break;
+
+ case VLC_FOURCC('s','a','m','r'):
+ case VLC_FOURCC('s','a','w','b'):
+ memcpy( fcc, (char*)&p_stream->fmt.i_codec, 4 );
+ b_descr = VLC_TRUE;
+ break;
+
+ case VLC_FOURCC('m','p','g','a'):
+ if( p_sys->b_mov )
+ memcpy( fcc, ".mp3", 4 );
+ else
+ {
+ memcpy( fcc, "mp4a", 4 );
+ b_descr = VLC_TRUE;
+ }
+ break;
+
+ default:
+ memcpy( fcc, (char*)&p_stream->fmt.i_codec, 4 );
+ break;
+ }
+
+ soun = box_new( fcc );
+ for( i = 0; i < 6; i++ )
+ {
+ bo_add_8( soun, 0 ); // reserved;
+ }
+ bo_add_16be( soun, 1 ); // data-reference-index
+
+ /* SoundDescription */
+ if( p_sys->b_mov &&
+ p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') )
+ {
+ bo_add_16be( soun, 1 ); // version 1;
+ }
+ else
+ {
+ bo_add_16be( soun, 0 ); // version 0;
+ }
+ bo_add_16be( soun, 0 ); // revision level (0)
+ bo_add_32be( soun, 0 ); // vendor
+ // channel-count
+ bo_add_16be( soun, p_stream->fmt.audio.i_channels );
+ // sample size
+ bo_add_16be( soun, p_stream->fmt.audio.i_bitspersample ?
+ p_stream->fmt.audio.i_bitspersample : 16 );
+ bo_add_16be( soun, -2 ); // compression id
+ bo_add_16be( soun, 0 ); // packet size (0)
+ bo_add_16be( soun, p_stream->fmt.audio.i_rate ); // sampleratehi
+ bo_add_16be( soun, 0 ); // sampleratelo
+
+ /* Extended data for SoundDescription V1 */
+ if( p_sys->b_mov &&
+ p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') )
+ {
+ /* samples per packet */
+ bo_add_32be( soun, p_stream->fmt.audio.i_frame_length );
+ bo_add_32be( soun, 1536 ); /* bytes per packet */
+ bo_add_32be( soun, 2 ); /* bytes per frame */
+ /* bytes per sample */
+ bo_add_32be( soun, 2 /*p_stream->fmt.audio.i_bitspersample/8 */);
+ }
+
+ /* Add an ES Descriptor */
+ if( b_descr )
+ {
+ bo_t *box;
+
+ if( p_sys->b_mov &&
+ p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') )
+ {
+ box = GetWaveTag( p_stream );
+ }
+ else if( p_stream->fmt.i_codec == VLC_FOURCC('s','a','m','r') )
+ {
+ box = GetDamrTag( p_stream );
+ }
+ else
+ {
+ box = GetESDS( p_stream );
+ }
+ box_fix( box );
+ box_gather( soun, box );
+ }
+
+ box_fix( soun );
+
+ return soun;
+}
+
+static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
+{
+
+ bo_t *vide;
+ char fcc[4] = " ";
+ int i;
+
+ switch( p_stream->fmt.i_codec )
+ {
+ case VLC_FOURCC('m','p','4','v'):
+ case VLC_FOURCC('m','p','g','v'):
+ memcpy( fcc, "mp4v", 4 );
+ break;
+
+ case VLC_FOURCC('M','J','P','G'):
+ memcpy( fcc, "mjpa", 4 );
+ break;
+
+ case VLC_FOURCC('S','V','Q','1'):
+ memcpy( fcc, "SVQ1", 4 );
+ break;
+
+ case VLC_FOURCC('S','V','Q','3'):
+ memcpy( fcc, "SVQ3", 4 );
+ break;
+
+ case VLC_FOURCC('H','2','6','3'):
+ memcpy( fcc, "s263", 4 );
+ break;
+
+ case VLC_FOURCC('h','2','6','4'):
+ memcpy( fcc, "avc1", 4 );
+ break;
+
+ case VLC_FOURCC('Y','V','1','2'):
+ memcpy( fcc, "yv12", 4 );
+ break;
+
+ case VLC_FOURCC('Y','U','Y','2'):
+ memcpy( fcc, "yuy2", 4 );
+ break;
+
+ default:
+ memcpy( fcc, (char*)&p_stream->fmt.i_codec, 4 );
+ break;
+ }
+
+ vide = box_new( fcc );
+ for( i = 0; i < 6; i++ )
+ {
+ bo_add_8( vide, 0 ); // reserved;
+ }
+ bo_add_16be( vide, 1 ); // data-reference-index
+
+ bo_add_16be( vide, 0 ); // predefined;
+ bo_add_16be( vide, 0 ); // reserved;
+ for( i = 0; i < 3; i++ )
+ {
+ bo_add_32be( vide, 0 ); // predefined;
+ }
+
+ bo_add_16be( vide, p_stream->fmt.video.i_width ); // i_width
+ bo_add_16be( vide, p_stream->fmt.video.i_height ); // i_height
+
+ bo_add_32be( vide, 0x00480000 ); // h 72dpi
+ bo_add_32be( vide, 0x00480000 ); // v 72dpi
+
+ bo_add_32be( vide, 0 ); // data size, always 0
+ bo_add_16be( vide, 1 ); // frames count per sample
+
+ // compressor name;
+ for( i = 0; i < 32; i++ )
+ {
+ bo_add_8( vide, 0 );
+ }
+
+ bo_add_16be( vide, 0x18 ); // depth
+ bo_add_16be( vide, 0xffff ); // predefined
+
+ /* add an ES Descriptor */
+ switch( p_stream->fmt.i_codec )
+ {
+ case VLC_FOURCC('m','p','4','v'):
+ case VLC_FOURCC('m','p','g','v'):
+ {
+ bo_t *esds = GetESDS( p_stream );
+
+ box_fix( esds );
+ box_gather( vide, esds );
+ }
+ break;
+
+ case VLC_FOURCC('H','2','6','3'):
+ {
+ bo_t *d263 = GetD263Tag( p_stream );
+
+ box_fix( d263 );
+ box_gather( vide, d263 );
+ }
+ break;
+
+ case VLC_FOURCC('S','V','Q','3'):
+ {
+ bo_t *esds = GetSVQ3Tag( p_stream );
+
+ box_fix( esds );
+ box_gather( vide, esds );
+ }
+ break;
+
+ case VLC_FOURCC('h','2','6','4'):
+ box_gather( vide, GetAvcCTag( p_stream ) );
+ break;
+
+ default:
+ break;
+ }
+
+ box_fix( vide );
+
+ return vide;
+}
+
+static bo_t *GetTextBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
+{
+
+ bo_t *text = box_new( "text" );
+ int i;
+
+ for( i = 0; i < 6; i++ )
+ {
+ bo_add_8( text, 0 ); // reserved;
+ }
+ bo_add_16be( text, 1 ); // data-reference-index
+
+ bo_add_32be( text, 0 ); // display flags
+ bo_add_32be( text, 0 ); // justification
+ for( i = 0; i < 3; i++ )
+ {
+ bo_add_16be( text, 0 ); // back ground color
+ }
+
+ bo_add_16be( text, 0 ); // box text
+ bo_add_16be( text, 0 ); // box text
+ bo_add_16be( text, 0 ); // box text
+ bo_add_16be( text, 0 ); // box text
+
+ bo_add_64be( text, 0 ); // reserved
+ for( i = 0; i < 3; i++ )
+ {
+ bo_add_16be( text, 0xff ); // foreground color
+ }
+
+ bo_add_8 ( text, 9 );
+ bo_add_mem( text, 9, (uint8_t*)"Helvetica" );
+
+ box_fix( text );
+
+ return text;
+}
+
+static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ unsigned int i_chunk, i_stsc_last_val, i_stsc_entries, i, i_index;
+ bo_t *stbl, *stsd, *stts, *stco, *stsc, *stsz, *stss;
+ uint32_t i_timescale;
+ int64_t i_dts, i_dts_q;
+
+ stbl = box_new( "stbl" );
+
+ /* sample description */
+ stsd = box_full_new( "stsd", 0, 0 );
+ bo_add_32be( stsd, 1 );
+ if( p_stream->fmt.i_cat == AUDIO_ES )
+ {
+ bo_t *soun = GetSounBox( p_mux, p_stream );
+ box_gather( stsd, soun );
+ }
+ else if( p_stream->fmt.i_cat == VIDEO_ES )
+ {
+ bo_t *vide = GetVideBox( p_mux, p_stream );
+ box_gather( stsd, vide );
+ }
+ else if( p_stream->fmt.i_cat == SPU_ES )
+ {
+ box_gather( stsd, GetTextBox( p_mux, p_stream ) );
+ }
+ box_fix( stsd );
+
+ /* chunk offset table */
+ if( p_sys->i_pos >= (((uint64_t)0x1) << 32) )
+ {
+ /* 64 bits version */
+ p_stream->b_stco64 = VLC_TRUE;
+ stco = box_full_new( "co64", 0, 0 );
+ }
+ else
+ {
+ /* 32 bits version */
+ p_stream->b_stco64 = VLC_FALSE;
+ stco = box_full_new( "stco", 0, 0 );
+ }
+ bo_add_32be( stco, 0 ); // entry-count (fixed latter)
+
+ /* sample to chunk table */
+ stsc = box_full_new( "stsc", 0, 0 );
+ bo_add_32be( stsc, 0 ); // entry-count (fixed latter)
+
+ for( i_chunk = 0, i_stsc_last_val = 0, i_stsc_entries = 0, i = 0;
+ i < p_stream->i_entry_count; i_chunk++ )
+ {
+ int i_first = i;
+
+ if( p_stream->b_stco64 )
+ bo_add_64be( stco, p_stream->entry[i].i_pos );
+ else
+ bo_add_32be( stco, p_stream->entry[i].i_pos );
+
+ while( i < p_stream->i_entry_count )
+ {
+ if( i + 1 < p_stream->i_entry_count &&
+ p_stream->entry[i].i_pos + p_stream->entry[i].i_size
+ != p_stream->entry[i + 1].i_pos )
+ {
+ i++;
+ break;
+ }
+
+ i++;
+ }
+
+ /* Add entry to the stsc table */
+ if( i_stsc_last_val != i - i_first )
+ {
+ bo_add_32be( stsc, 1 + i_chunk ); // first-chunk
+ bo_add_32be( stsc, i - i_first ) ; // samples-per-chunk
+ bo_add_32be( stsc, 1 ); // sample-descr-index
+ i_stsc_last_val = i - i_first;
+ i_stsc_entries++;
+ }
+ }
+
+ /* Fix stco entry count */
+ bo_fix_32be( stco, 12, i_chunk );
+ msg_Dbg( p_mux, "created %d chunks (stco)", i_chunk );
+ box_fix( stco );
+
+ /* Fix stsc entry count */
+ bo_fix_32be( stsc, 12, i_stsc_entries );
+ box_fix( stsc );
+
+ /* add stts */
+ stts = box_full_new( "stts", 0, 0 );
+ bo_add_32be( stts, 0 ); // entry-count (fixed latter)
+
+ if( p_stream->fmt.i_cat == AUDIO_ES )
+ i_timescale = p_stream->fmt.audio.i_rate;
+ else
+ i_timescale = 1001;
+
+ /* first, create quantified length */
+ for( i = 0, i_dts = 0, i_dts_q = 0; i < p_stream->i_entry_count; i++ )
+ {
+ int64_t i_dts_deq = i_dts_q * I64C(1000000) / (int64_t)i_timescale;
+ int64_t i_delta = p_stream->entry[i].i_length + i_dts - i_dts_deq;