#include <vlc_sout.h>
#include <vlc_block.h>
+#include <vlc_bits.h>
+
#include <time.h>
#include <vlc_iso_lang.h>
#include <vlc_meta.h>
#include "../demux/mpeg/mpeg_parser_helpers.h"
+#include "../demux/mp4/libmp4.h"
+#include "assert.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
+static int OpenFrag (vlc_object_t *);
+static void CloseFrag (vlc_object_t *);
#define SOUT_CFG_PREFIX "sout-mp4-"
set_capability("sout mux", 5)
add_shortcut("mp4", "mov", "3gp")
set_callbacks(Open, Close)
+
+add_submodule ()
+ set_description(N_("Fragmented and streamable MP4 muxer"))
+ set_category(CAT_SOUT)
+ set_subcategory(SUBCAT_SOUT_MUX)
+ set_shortname("MP4 Frag")
+ add_shortcut("mp4frag", "mp4stream")
+ set_capability("sout mux", 0)
+ set_callbacks(OpenFrag, CloseFrag)
+
vlc_module_end ()
/*****************************************************************************
static int Control(sout_mux_t *, int, va_list);
static int AddStream(sout_mux_t *, sout_input_t *);
-static int DelStream(sout_mux_t *, sout_input_t *);
+static void DelStream(sout_mux_t *, sout_input_t *);
static int Mux (sout_mux_t *);
+static int MuxFrag (sout_mux_t *);
/*****************************************************************************
* Local prototypes
mtime_t i_pts_dts;
mtime_t i_length;
unsigned int i_flags;
-
} mp4_entry_t;
+typedef struct mp4_fragentry_t mp4_fragentry_t;
+
+struct mp4_fragentry_t
+{
+ block_t *p_block;
+ uint32_t i_run;
+ mp4_fragentry_t *p_next;
+};
+
+typedef struct mp4_fragindex_t
+{
+ uint64_t i_moofoffset;
+ mtime_t i_time;
+ uint8_t i_traf;
+ uint8_t i_trun;
+ uint32_t i_sample;
+} mp4_fragindex_t;
+
+typedef struct mp4_fragqueue_t
+{
+ mp4_fragentry_t *p_first;
+ mp4_fragentry_t *p_last;
+} mp4_fragqueue_t;
+
typedef struct
{
es_format_t fmt;
- int i_track_id;
+ unsigned int i_track_id;
/* index */
unsigned int i_entry_count;
int64_t i_length_neg;
/* stats */
- int64_t i_dts_start;
- int64_t i_duration;
+ int64_t i_dts_start; /* applies to current segment only */
+ int64_t i_read_duration;
+ uint32_t i_timescale;
+ mtime_t i_starttime; /* the really first packet */
+ bool b_hasbframes;
+
+ /* XXX: needed for other codecs too, see lavf */
+ block_t *a52_frame;
/* for later stco fix-up (fast start files) */
uint64_t i_stco_pos;
bool b_stco64;
/* for spu */
- int64_t i_last_dts;
-
+ int64_t i_last_dts; /* applies to current segment only */
+ int64_t i_last_length;
+
+ /*** mp4frag ***/
+ bool b_hasiframes;
+ uint32_t i_trex_length;
+ uint32_t i_trex_size;
+ uint32_t i_tfhd_flags;
+
+ uint32_t i_current_run;
+ mp4_fragentry_t *p_held_entry;
+ mp4_fragqueue_t read;
+ mp4_fragqueue_t towrite;
+ mtime_t i_last_iframe_time;
+ mtime_t i_written_duration;
+ mp4_fragindex_t *p_indexentries;
+ uint32_t i_indexentriesmax;
+ uint32_t i_indexentries;
} mp4_stream_t;
struct sout_mux_sys_t
uint64_t i_mdat_pos;
uint64_t i_pos;
+ mtime_t i_read_duration;
- int64_t i_dts_start;
-
- int i_nb_streams;
+ unsigned int i_nb_streams;
mp4_stream_t **pp_streams;
-};
-typedef struct bo_t
-{
- block_t *b;
- size_t len;
-} bo_t;
-
-static void bo_init (bo_t *);
-static void bo_add_8 (bo_t *, uint8_t);
-static void bo_add_16be (bo_t *, uint16_t);
-static void bo_add_24be (bo_t *, uint32_t);
-static void bo_add_32be (bo_t *, uint32_t);
-static void bo_add_64be (bo_t *, uint64_t);
-static void bo_add_fourcc(bo_t *, const char *);
-static void bo_add_mem (bo_t *, int , uint8_t *);
-static void bo_add_descr(bo_t *, uint8_t , uint32_t);
-
-static void bo_fix_32be (bo_t *, int , uint32_t);
+ /* mp4frag */
+ bool b_fragmented;
+ bool b_header_sent;
+ mtime_t i_written_duration;
+ uint32_t i_mfhd_sequence;
+};
static bo_t *box_new (const char *fcc);
static bo_t *box_full_new(const char *fcc, uint8_t v, uint32_t f);
-static void box_fix (bo_t *box);
+static void box_fix (bo_t *box, uint32_t);
static void box_gather (bo_t *box, bo_t *box2);
+static inline void bo_add_mp4_tag_descr(bo_t *box, uint8_t tag, uint32_t size)
+{
+ bo_add_8(box, tag);
+ for (int i = 3; i>0; i--)
+ bo_add_8(box, (size>>(7*i)) | 0x80);
+ bo_add_8(box, size & 0x7F);
+}
+
static void box_send(sout_mux_t *p_mux, bo_t *box);
static bo_t *GetMoovBox(sout_mux_t *p_mux);
static block_t *ConvertSUBT(block_t *);
static block_t *ConvertFromAnnexB(block_t *);
+static const char avc1_short_start_code[3] = { 0, 0, 1 };
static const char avc1_start_code[4] = { 0, 0, 0, 1 };
/*****************************************************************************
p_sys->i_mdat_pos = 0;
p_sys->b_mov = p_mux->psz_mux && !strcmp(p_mux->psz_mux, "mov");
p_sys->b_3gp = p_mux->psz_mux && !strcmp(p_mux->psz_mux, "3gp");
- p_sys->i_dts_start = 0;
-
+ p_sys->i_read_duration = 0;
+ p_sys->b_fragmented = false;
if (!p_sys->b_mov) {
/* Now add ftyp header */
box = box_new("ftyp");
+ if(!box)
+ {
+ free(p_sys);
+ return VLC_ENOMEM;
+ }
if (p_sys->b_3gp)
bo_add_fourcc(box, "3gp6");
else
else
bo_add_fourcc(box, "mp41");
bo_add_fourcc(box, "avc1");
- bo_add_fourcc(box, "qt ");
- box_fix(box);
-
- p_sys->i_pos += box->len;
- p_sys->i_mdat_pos = p_sys->i_pos;
+ if(box->b)
+ {
+ box_fix(box, box->b->i_buffer);
+ p_sys->i_pos += box->b->i_buffer;
+ p_sys->i_mdat_pos = p_sys->i_pos;
- box_send(p_mux, box);
+ box_send(p_mux, box);
+ }
}
/* FIXME FIXME
/* Now add mdat header */
box = box_new("mdat");
+ if(!box)
+ {
+ free(p_sys);
+ return VLC_ENOMEM;
+ }
bo_add_64be (box, 0); // enough to store an extended size
- p_sys->i_pos += box->len;
+ if(box->b)
+ p_sys->i_pos += box->b->i_buffer;
box_send(p_mux, box);
/* Update mdat size */
bo_t bo;
- bo_init(&bo);
+ if (!bo_init(&bo, 16))
+ goto cleanup;
if (p_sys->i_pos - p_sys->i_mdat_pos >= (((uint64_t)1)<<32)) {
/* Extended size */
bo_add_32be (&bo, 1);
bo_add_fourcc(&bo, "mdat");
}
- bo.b->i_buffer = bo.len;
sout_AccessOutSeek(p_mux->p_access, p_sys->i_mdat_pos);
sout_AccessOutWrite(p_mux->p_access, bo.b);
/* Check we need to create "fast start" files */
p_sys->b_fast_start = var_GetBool(p_this, SOUT_CFG_PREFIX "faststart");
- while (p_sys->b_fast_start) {
+ while (p_sys->b_fast_start && moov && moov->b) {
/* Move data to the end of the file so we can fit the moov header
* at the start */
int64_t i_size = p_sys->i_pos - p_sys->i_mdat_pos;
- int i_moov_size = moov->len;
+ int i_moov_size = moov->b->i_buffer;
while (i_size > 0) {
int64_t i_chunk = __MIN(32768, i_size);
if (!p_sys->b_fast_start)
break;
+ /* Update pos pointers */
+ i_moov_pos = p_sys->i_mdat_pos;
+ p_sys->i_mdat_pos += moov->b->i_buffer;
+
/* Fix-up samples to chunks table in MOOV header */
- for (int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
+ for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
-
- moov->len = p_stream->i_stco_pos;
+ unsigned i_written = 0;
for (unsigned i = 0; i < p_stream->i_entry_count; ) {
mp4_entry_t *entry = p_stream->entry;
if (p_stream->b_stco64)
- bo_add_64be(moov, entry[i].i_pos + i_moov_size);
+ bo_set_64be(moov, p_stream->i_stco_pos + i_written++ * 8, entry[i].i_pos + p_sys->i_mdat_pos - i_moov_pos);
else
- bo_add_32be(moov, entry[i].i_pos + i_moov_size);
+ bo_set_32be(moov, p_stream->i_stco_pos + i_written++ * 4, entry[i].i_pos + p_sys->i_mdat_pos - i_moov_pos);
for (; i < p_stream->i_entry_count; i++)
if (i >= p_stream->i_entry_count - 1 ||
}
}
- moov->len = i_moov_size;
- i_moov_pos = p_sys->i_mdat_pos;
p_sys->b_fast_start = false;
}
sout_AccessOutSeek(p_mux->p_access, i_moov_pos);
box_send(p_mux, moov);
+cleanup:
/* Clean-up */
- for (int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
+ for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
es_format_Clean(&p_stream->fmt);
+ if (p_stream->a52_frame)
+ block_Release(p_stream->a52_frame);
free(p_stream->entry);
free(p_stream);
}
switch(p_input->p_fmt->i_codec)
{
+ case VLC_CODEC_A52:
+ case VLC_CODEC_EAC3:
case VLC_CODEC_MP4A:
case VLC_CODEC_MP4V:
case VLC_CODEC_MPGA:
p_stream->entry =
calloc(p_stream->i_entry_max, sizeof(mp4_entry_t));
p_stream->i_dts_start = 0;
- p_stream->i_duration = 0;
+ p_stream->i_read_duration = 0;
+ p_stream->a52_frame = NULL;
+ switch( p_stream->fmt.i_cat )
+ {
+ case AUDIO_ES:
+ if(!p_stream->fmt.audio.i_rate)
+ {
+ msg_Warn( p_mux, "no audio rate given for stream %d, assuming 48KHz",
+ p_sys->i_nb_streams );
+ p_stream->fmt.audio.i_rate = 48000;
+ }
+ p_stream->i_timescale = p_stream->fmt.audio.i_rate;
+ break;
+ case VIDEO_ES:
+ if( !p_stream->fmt.video.i_frame_rate ||
+ !p_stream->fmt.video.i_frame_rate_base )
+ {
+ msg_Warn( p_mux, "Missing frame rate for stream %d, assuming 25fps",
+ p_sys->i_nb_streams );
+ p_stream->fmt.video.i_frame_rate = 25;
+ p_stream->fmt.video.i_frame_rate_base = 1;
+ }
+ p_stream->i_timescale = p_stream->fmt.video.i_frame_rate * 1000 /
+ p_stream->fmt.video.i_frame_rate_base;
+ break;
+ default:
+ p_stream->i_timescale = CLOCK_FREQ;
+ break;
+ }
+
+ p_stream->i_starttime = p_sys->i_read_duration;
+ p_stream->b_hasbframes = false;
+
+ p_stream->i_last_dts = 0;
+ p_stream->i_last_length = 0;
+
+ p_stream->b_hasiframes = false;
+ p_stream->i_trex_length = 0;
+ p_stream->i_trex_size = 0;
+
+ p_stream->i_current_run = 0;
+ p_stream->read.p_first = NULL;
+ p_stream->read.p_last = NULL;
+ p_stream->towrite.p_first = NULL;
+ p_stream->towrite.p_last = NULL;
+ p_stream->p_held_entry = NULL;
+ p_stream->i_last_iframe_time = 0;
+ p_stream->i_written_duration = 0;
+ p_stream->p_indexentries = NULL;
+ p_stream->i_indexentriesmax = 0;
+ p_stream->i_indexentries = 0;
p_input->p_sys = p_stream;
/*****************************************************************************
* DelStream:
*****************************************************************************/
-static int DelStream(sout_mux_t *p_mux, sout_input_t *p_input)
+static void DelStream(sout_mux_t *p_mux, sout_input_t *p_input)
{
VLC_UNUSED(p_input);
msg_Dbg(p_mux, "removing input");
- return VLC_SUCCESS;
}
/*****************************************************************************
p_data = ConvertFromAnnexB(p_data);
else if (p_stream->fmt.i_codec == VLC_CODEC_SUBT)
p_data = ConvertSUBT(p_data);
+ else if (p_stream->fmt.i_codec == VLC_CODEC_A52 ||
+ p_stream->fmt.i_codec == VLC_CODEC_EAC3) {
+ if (p_stream->a52_frame == NULL && p_data->i_buffer >= 8)
+ p_stream->a52_frame = block_Duplicate(p_data);
+ }
} while (!p_data);
+ /* Reset reference dts in case of discontinuity (ex: gather sout) */
+ if ( p_stream->i_entry_count == 0 || p_data->i_flags & BLOCK_FLAG_DISCONTINUITY )
+ {
+ p_stream->i_dts_start = p_data->i_dts;
+ p_stream->i_last_dts = p_data->i_dts;
+ p_stream->i_length_neg = 0;
+ }
+
if (p_stream->fmt.i_cat != SPU_ES) {
/* Fix length of the sample */
if (block_FifoCount(p_input->p_fifo) > 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 < CLOCK_FREQ) /* protection */
- p_data->i_length = i_diff;
+ if ( p_next->i_flags & BLOCK_FLAG_DISCONTINUITY )
+ { /* we have no way to know real length except by decoding */
+ if ( p_stream->fmt.i_cat == VIDEO_ES )
+ {
+ p_data->i_length = CLOCK_FREQ *
+ p_stream->fmt.video.i_frame_rate_base /
+ p_stream->fmt.video.i_frame_rate;
+ msg_Dbg( p_mux, "video track %u fixup to %"PRId64" for sample %u",
+ p_stream->i_track_id, p_data->i_length, p_stream->i_entry_count );
+ }
+ else if ( p_stream->fmt.i_cat == AUDIO_ES &&
+ p_stream->fmt.audio.i_rate &&
+ p_data->i_nb_samples )
+ {
+ p_data->i_length = CLOCK_FREQ * p_data->i_nb_samples /
+ p_stream->fmt.audio.i_rate;
+ msg_Dbg( p_mux, "audio track %u fixup to %"PRId64" for sample %u",
+ p_stream->i_track_id, p_data->i_length, p_stream->i_entry_count );
+ }
+ else if ( p_data->i_length <= 0 )
+ {
+ msg_Warn( p_mux, "unknown length for track %u sample %u",
+ p_stream->i_track_id, p_stream->i_entry_count );
+ p_data->i_length = 1;
+ }
+ }
+ else
+ {
+ int64_t i_diff = p_next->i_dts - p_data->i_dts;
+ if (i_diff < CLOCK_FREQ) /* protection */
+ p_data->i_length = i_diff;
+ }
}
if (p_data->i_length <= 0) {
msg_Warn(p_mux, "i_length <= 0");
}
}
- /* 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;
mp4_entry_t *e = &p_stream->entry[p_stream->i_entry_count];
e->i_pos = p_sys->i_pos;
e->i_size = p_data->i_buffer;
- e->i_pts_dts = p_data->i_pts - p_data->i_dts;
- if (e->i_pts_dts < 0)
- e->i_pts_dts = 0;
+
+ if ( p_data->i_dts > VLC_TS_INVALID && p_data->i_pts > p_data->i_dts )
+ {
+ e->i_pts_dts = p_data->i_pts - p_data->i_dts;
+ if ( !p_stream->b_hasbframes )
+ p_stream->b_hasbframes = true;
+ }
+ else e->i_pts_dts = 0;
+
e->i_length = p_data->i_length;
e->i_flags = p_data->i_flags;
}
/* update */
- p_stream->i_duration = p_stream->i_last_dts - p_stream->i_dts_start + p_data->i_length;
+ p_stream->i_read_duration += __MAX( 0, p_data->i_length );
+ p_stream->i_last_length = p_data->i_length;
p_sys->i_pos += p_data->i_buffer;
- /* Save the DTS */
+ /* Save the DTS for SPU */
p_stream->i_last_dts = p_data->i_dts;
/* write data */
sout_AccessOutWrite(p_mux->p_access, p_data);
+ /* close subtitle with empty frame */
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) {
+ if ( i_length != 0 && (p_data = block_Alloc(3)) ) {
/* TODO */
msg_Dbg(p_mux, "writing an empty sub") ;
p_stream->i_last_dts += i_length;
/* Write a " " */
- p_data = block_Alloc(3);
+ p_data->i_dts = p_stream->i_last_dts;
+ p_data->i_dts = p_data->i_pts;
p_data->p_buffer[0] = 0;
p_data->p_buffer[1] = 1;
p_data->p_buffer[2] = ' ';
sout_AccessOutWrite(p_mux->p_access, p_data);
}
- /* Fix duration */
- p_stream->i_duration = p_stream->i_last_dts - p_stream->i_dts_start;
+ /* Fix duration = current segment starttime + duration within */
+ p_stream->i_read_duration = p_stream->i_starttime + ( p_stream->i_last_dts - p_stream->i_dts_start );
}
}
+ /* Update the global segment/media duration */
+ for ( unsigned int i=0; i<p_sys->i_nb_streams; i++ )
+ {
+ if ( p_sys->pp_streams[i]->i_read_duration > p_sys->i_read_duration )
+ p_sys->i_read_duration = p_sys->pp_streams[i]->i_read_duration;
+ }
+
return(VLC_SUCCESS);
}
static block_t *ConvertSUBT(block_t *p_block)
{
p_block = block_Realloc(p_block, 2, p_block->i_buffer);
-
+ if( !p_block )
+ return NULL;
/* No trailling '\0' */
if (p_block->i_buffer > 2 && p_block->p_buffer[p_block->i_buffer-1] == '\0')
p_block->i_buffer--;
static block_t *ConvertFromAnnexB(block_t *p_block)
{
- uint8_t *last = p_block->p_buffer; /* Assume it starts with 0x00000001 */
+ if(p_block->i_buffer < 4)
+ {
+ block_Release(p_block);
+ return NULL;
+ }
+
+ if(memcmp(p_block->p_buffer, avc1_start_code, 4))
+ {
+ if(!memcmp(p_block->p_buffer, avc1_short_start_code, 3))
+ {
+ p_block = block_Realloc(p_block, 1, p_block->i_buffer);
+ if( !p_block )
+ return NULL;
+ }
+ else /* No startcode on start */
+ {
+ block_Release(p_block);
+ return NULL;
+ }
+ }
+
+ uint8_t *last = p_block->p_buffer;
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 :(*/
+ /* Replace the 4 bytes start code with 4 bytes size */
while (dat < end) {
while (dat < end - 4) {
if (!memcmp(dat, avc1_start_code, 4))
+ {
break;
+ }
+ else if(!memcmp(dat, avc1_short_start_code, 3))
+ {
+ /* save offsets as we don't know if realloc will replace buffer */
+ size_t i_last = last - p_block->p_buffer;
+ size_t i_dat = dat - p_block->p_buffer;
+ size_t i_end = end - p_block->p_buffer;
+
+ p_block = block_Realloc(p_block, 0, p_block->i_buffer + 1);
+ if( !p_block )
+ return NULL;
+
+ /* restore offsets */
+ last = &p_block->p_buffer[i_last];
+ dat = &p_block->p_buffer[i_dat];
+ end = &p_block->p_buffer[i_end];
+
+ /* Shift data */
+ memmove(&dat[4], &dat[3], end - &dat[3]);
+ end++;
+ break;
+ }
dat++;
}
if (dat >= end - 4)
dat = end;
/* Fix size */
- int 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;
+ SetDWBE(last, dat - &last[4]);
/* Skip blocks with SPS/PPS */
//if ((last[4]&0x1f) == 7 || (last[4]&0x1f) == 8)
}
}
- if (p_stream->i_duration > 0)
- i_bitrate_avg = INT64_C(8000000) * i_bitrate_avg / p_stream->i_duration;
+ if (p_stream->i_read_duration > 0)
+ i_bitrate_avg = INT64_C(8000000) * i_bitrate_avg / p_stream->i_read_duration;
else
i_bitrate_avg = 0;
if (i_bitrate_max <= 1)
int i_decoder_specific_info_size = (p_stream->fmt.i_extra > 0) ? 5 + p_stream->fmt.i_extra : 0;
esds = box_full_new("esds", 0, 0);
+ if(!esds)
+ return NULL;
/* ES_Descr */
- bo_add_descr(esds, 0x03, 3 + 5 + 13 + i_decoder_specific_info_size + 5 + 1);
+ bo_add_mp4_tag_descr(esds, 0x03, 3 + 5 + 13 + i_decoder_specific_info_size + 5 + 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);
+ bo_add_mp4_tag_descr(esds, 0x04, 13 + i_decoder_specific_info_size);
int i_object_type_indication;
switch(p_stream->fmt.i_codec)
if (p_stream->fmt.i_extra > 0) {
/* DecoderSpecificInfo */
- bo_add_descr(esds, 0x05, p_stream->fmt.i_extra);
+ bo_add_mp4_tag_descr(esds, 0x05, p_stream->fmt.i_extra);
for (int 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_mp4_tag_descr(esds, 0x06, 1);
bo_add_8 (esds, 0x02); // sl_predefined
return esds;
bo_t *box;
wave = box_new("wave");
+ if(wave)
+ {
+ box = box_new("frma");
+ if(box)
+ {
+ bo_add_fourcc(box, "mp4a");
+ box_gather(wave, box);
+ }
+
+ box = box_new("mp4a");
+ if(box)
+ {
+ bo_add_32be(box, 0);
+ box_gather(wave, box);
+ }
+
+ box = GetESDS(p_stream);
+ box_gather(wave, box);
+
+ box = box_new("srcq");
+ if(box)
+ {
+ bo_add_32be(box, 0x40);
+ box_gather(wave, box);
+ }
- box = box_new("frma");
- bo_add_fourcc(box, "mp4a");
- box_gather(wave, box);
+ /* wazza ? */
+ bo_add_32be(wave, 8); /* new empty box */
+ bo_add_32be(wave, 0); /* box label */
+ }
+ return wave;
+}
+
+static bo_t *GetDec3Tag(mp4_stream_t *p_stream)
+{
+ if (!p_stream->a52_frame)
+ return NULL;
- box = box_new("mp4a");
- bo_add_32be(box, 0);
- box_gather(wave, box);
+ bs_t s;
+ bs_init(&s, p_stream->a52_frame->p_buffer, sizeof(p_stream->a52_frame->i_buffer));
+ bs_skip(&s, 16); // syncword
- box = GetESDS(p_stream);
- box_gather(wave, box);
+ uint8_t fscod, bsid, bsmod, acmod, lfeon, strmtyp;
- box = box_new("srcq");
- bo_add_32be(box, 0x40);
- box_gather(wave, box);
+ bsmod = 0;
- /* wazza ? */
- bo_add_32be(wave, 8); /* new empty box */
- bo_add_32be(wave, 0); /* box label */
+ strmtyp = bs_read(&s, 2);
- return wave;
+ if (strmtyp & 0x1) // dependant or reserved stream
+ return NULL;
+
+ if (bs_read(&s, 3) != 0x0) // substreamid: we don't support more than 1 stream
+ return NULL;
+
+ int numblkscod;
+ bs_skip(&s, 11); // frmsizecod
+ fscod = bs_read(&s, 2);
+ if (fscod == 0x03) {
+ bs_skip(&s, 2); // fscod2
+ numblkscod = 3;
+ } else {
+ numblkscod = bs_read(&s, 2);
+ }
+
+ acmod = bs_read(&s, 3);
+ lfeon = bs_read1(&s);
+
+ bsid = bs_read(&s, 5);
+
+ bs_skip(&s, 5); // dialnorm
+ if (bs_read1(&s)) // compre
+ bs_skip(&s, 5); // compr
+
+ if (acmod == 0) {
+ bs_skip(&s, 5); // dialnorm2
+ if (bs_read1(&s)) // compr2e
+ bs_skip(&s, 8); // compr2
+ }
+
+ if (strmtyp == 0x1) // dependant stream XXX: unsupported
+ if (bs_read1(&s)) // chanmape
+ bs_skip(&s, 16); // chanmap
+
+ /* we have to skip mixing info to read bsmod */
+ if (bs_read1(&s)) { // mixmdate
+ if (acmod > 0x2) // 2+ channels
+ bs_skip(&s, 2); // dmixmod
+ if ((acmod & 0x1) && (acmod > 0x2)) // 3 front channels
+ bs_skip(&s, 3 + 3); // ltrtcmixlev + lorocmixlev
+ if (acmod & 0x4) // surround channel
+ bs_skip(&s, 3 + 3); // ltrsurmixlev + lorosurmixlev
+ if (lfeon)
+ if (bs_read1(&s))
+ bs_skip(&s, 5); // lfemixlevcod
+ if (strmtyp == 0) { // independant stream
+ if (bs_read1(&s)) // pgmscle
+ bs_skip(&s, 6); // pgmscl
+ if (acmod == 0x0) // dual mono
+ if (bs_read1(&s)) // pgmscl2e
+ bs_skip(&s, 6); // pgmscl2
+ if (bs_read1(&s)) // extpgmscle
+ bs_skip(&s, 6); // extpgmscl
+ uint8_t mixdef = bs_read(&s, 2);
+ if (mixdef == 0x1)
+ bs_skip(&s, 5);
+ else if (mixdef == 0x2)
+ bs_skip(&s, 12);
+ else if (mixdef == 0x3) {
+ uint8_t mixdeflen = bs_read(&s, 5);
+ bs_skip(&s, 8 * (mixdeflen + 2));
+ }
+ if (acmod < 0x2) { // mono or dual mono
+ if (bs_read1(&s)) // paninfoe
+ bs_skip(&s, 14); // paninfo
+ if (acmod == 0) // dual mono
+ if (bs_read1(&s)) // paninfo2e
+ bs_skip(&s, 14); // paninfo2
+ }
+ if (bs_read1(&s)) { // frmmixcfginfoe
+ static const int blocks[4] = { 1, 2, 3, 6 };
+ int number_of_blocks = blocks[numblkscod];
+ if (number_of_blocks == 1)
+ bs_skip(&s, 5); // blkmixcfginfo[0]
+ else for (int i = 0; i < number_of_blocks; i++)
+ if (bs_read1(&s)) // blkmixcfginfoe
+ bs_skip(&s, 5); // blkmixcfginfo[i]
+ }
+ }
+ }
+
+ if (bs_read1(&s)) // infomdate
+ bsmod = bs_read(&s, 3);
+
+ uint8_t mp4_eac3_header[5];
+ bs_init(&s, mp4_eac3_header, sizeof(mp4_eac3_header));
+
+ int data_rate = p_stream->fmt.i_bitrate / 1000;
+ bs_write(&s, 13, data_rate);
+ bs_write(&s, 3, 0); // num_ind_sub - 1
+ bs_write(&s, 2, fscod);
+ bs_write(&s, 5, bsid);
+ bs_write(&s, 5, bsmod);
+ bs_write(&s, 3, acmod);
+ bs_write(&s, 1, lfeon);
+ bs_write(&s, 3, 0); // reserved
+ bs_write(&s, 4, 0); // num_dep_sub
+ bs_write(&s, 1, 0); // reserved
+
+ bo_t *dec3 = box_new("dec3");
+ if(dec3)
+ bo_add_mem(dec3, sizeof(mp4_eac3_header), mp4_eac3_header);
+
+ return dec3;
}
-static bo_t *GetDamrTag(mp4_stream_t *p_stream)
+static bo_t *GetDac3Tag(mp4_stream_t *p_stream)
{
- bo_t *damr;
+ if (!p_stream->a52_frame)
+ return NULL;
- damr = box_new("damr");
+ bo_t *dac3 = box_new("dac3");
+ if(!dac3)
+ return NULL;
+
+ bs_t s;
+ bs_init(&s, p_stream->a52_frame->p_buffer, sizeof(p_stream->a52_frame->i_buffer));
+
+ uint8_t fscod, bsid, bsmod, acmod, lfeon, frmsizecod;
+
+ bs_skip(&s, 16 + 16); // syncword + crc
+
+ fscod = bs_read(&s, 2);
+ frmsizecod = bs_read(&s, 6);
+ bsid = bs_read(&s, 5);
+ bsmod = bs_read(&s, 3);
+ acmod = bs_read(&s, 3);
+ if (acmod == 2)
+ bs_skip(&s, 2); // dsurmod
+ else {
+ if ((acmod & 1) && acmod != 1)
+ bs_skip(&s, 2); // cmixlev
+ if (acmod & 4)
+ bs_skip(&s, 2); // surmixlev
+ }
+
+ lfeon = bs_read1(&s);
+
+ uint8_t mp4_a52_header[3];
+ bs_init(&s, mp4_a52_header, sizeof(mp4_a52_header));
+
+ bs_write(&s, 2, fscod);
+ bs_write(&s, 5, bsid);
+ bs_write(&s, 3, bsmod);
+ bs_write(&s, 3, acmod);
+ bs_write(&s, 1, lfeon);
+ bs_write(&s, 5, frmsizecod >> 1); // bit_rate_code
+ bs_write(&s, 5, 0); // reserved
+
+ bo_add_mem(dac3, sizeof(mp4_a52_header), mp4_a52_header);
+
+ return dac3;
+}
+
+static bo_t *GetDamrTag(mp4_stream_t *p_stream)
+{
+ bo_t *damr = box_new("damr");
+ if(!damr)
+ return NULL;
bo_add_fourcc(damr, "REFC");
bo_add_8(damr, 0);
static bo_t *GetD263Tag(void)
{
- bo_t *d263;
-
- d263 = box_new("d263");
+ bo_t *d263 = box_new("d263");
+ if(!d263)
+ return NULL;
bo_add_fourcc(d263, "VLC ");
bo_add_16be(d263, 0xa);
hevc_skip_profile_tiers_level(&bs, sps_max_sublayer_minus1);
/* skip sps id */
- (void) read_ue( &bs );
+ (void) bs_read_ue( &bs );
- *chroma_idc = read_ue(&bs);
+ *chroma_idc = bs_read_ue(&bs);
if (*chroma_idc == 3)
bs_skip(&bs, 1);
/* skip width and heigh */
- (void) read_ue( &bs );
- (void) read_ue( &bs );
+ (void) bs_read_ue( &bs );
+ (void) bs_read_ue( &bs );
uint32_t conformance_window_flag = bs_read1(&bs);
if (conformance_window_flag) {
/* skip offsets*/
- (void) read_ue(&bs);
- (void) read_ue(&bs);
- (void) read_ue(&bs);
- (void) read_ue(&bs);
+ (void) bs_read_ue(&bs);
+ (void) bs_read_ue(&bs);
+ (void) bs_read_ue(&bs);
+ (void) bs_read_ue(&bs);
}
- *bit_depth_luma_minus8 = read_ue(&bs);
- *bit_depth_chroma_minus8 = read_ue(&bs);
+ *bit_depth_luma_minus8 = bs_read_ue(&bs);
+ *bit_depth_chroma_minus8 = bs_read_ue(&bs);
}
static bo_t *GetHvcCTag(mp4_stream_t *p_stream)
{
/* Generate hvcC box matching iso/iec 14496-15 3rd edition */
bo_t *hvcC = box_new("hvcC");
- if(!p_stream->fmt.i_extra)
+ if(!hvcC || !p_stream->fmt.i_extra)
return hvcC;
struct nal {
static bo_t *GetAvcCTag(mp4_stream_t *p_stream)
{
- bo_t *avcC = NULL;
+ bo_t *avcC = box_new("avcC");/* FIXME use better value */
+ if(!avcC)
+ return NULL;
uint8_t *p_sps = NULL;
uint8_t *p_pps = NULL;
int i_sps_size = 0;
}
const int i_nal_type = p_buffer[3]&0x1f;
int i_startcode = 0;
-
+
for (int i_offset = 1; i_offset+2 < i_buffer ; i_offset++)
if (!memcmp(&p_buffer[i_offset], &avc1_start_code[1], 3)) {
/* we found another startcode */
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);
static bo_t *GetSVQ3Tag(mp4_stream_t *p_stream)
{
bo_t *smi = box_new("SMI ");
+ if(!smi)
+ return NULL;
if (p_stream->fmt.i_extra > 0x4e) {
uint8_t *p_end = &((uint8_t*)p_stream->fmt.p_extra)[p_stream->fmt.i_extra];
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
bo_t *udta = box_new("udta");
+ if (!udta)
+ return NULL;
/* Requirements */
- for (int i_track = 0; i_track < p_sys->i_nb_streams; i_track++) {
+ for (unsigned int i_track = 0; i_track < p_sys->i_nb_streams; i_track++) {
mp4_stream_t *p_stream = p_sys->pp_streams[i_track];
vlc_fourcc_t codec = p_stream->fmt.i_codec;
if (codec == VLC_CODEC_MP4V || codec == VLC_CODEC_MP4A) {
bo_t *box = box_new("\251req");
+ if(!box)
+ break;
/* String length */
bo_add_16be(box, sizeof("QuickTime 6.0 or greater") - 1);
bo_add_16be(box, 0);
/* 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_gather(udta, box);
+ if(box)
+ {
+ /* 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_gather(udta, box);
+ }
}
#if 0
/* Misc atoms */
bool b_descr = true;
vlc_fourcc_t codec = p_stream->fmt.i_codec;
char fcc[4];
- vlc_fourcc_to_char(codec, fcc);
if (codec == VLC_CODEC_MPGA) {
if (p_sys->b_mov) {
memcpy(fcc, ".mp3", 4);
} else
memcpy(fcc, "mp4a", 4);
- }
+ } else if (codec == VLC_CODEC_A52) {
+ memcpy(fcc, "ac-3", 4);
+ } else if (codec == VLC_CODEC_EAC3) {
+ memcpy(fcc, "ec-3", 4);
+ } else
+ vlc_fourcc_to_char(codec, fcc);
bo_t *soun = box_new(fcc);
+ if(!soun)
+ return NULL;
for (int i = 0; i < 6; i++)
bo_add_8(soun, 0); // reserved;
bo_add_16be(soun, 1); // data-reference-index
box = GetWaveTag(p_stream);
else if (codec == VLC_CODEC_AMR_NB)
box = GetDamrTag(p_stream);
+ else if (codec == VLC_CODEC_A52)
+ box = GetDac3Tag(p_stream);
+ else if (codec == VLC_CODEC_EAC3)
+ box = GetDec3Tag(p_stream);
else
box = GetESDS(p_stream);
- box_gather(soun, box);
+
+ if (box)
+ box_gather(soun, box);
}
return soun;
}
bo_t *vide = box_new(fcc);
+ if(!vide)
+ return NULL;
for (int i = 0; i < 6; i++)
bo_add_8(vide, 0); // reserved;
bo_add_16be(vide, 1); // data-reference-index
static bo_t *GetTextBox(void)
{
bo_t *text = box_new("text");
+ if(!text)
+ return NULL;
for (int i = 0; i < 6; i++)
bo_add_8(text, 0); // reserved;
/* sample description */
bo_t *stsd = box_full_new("stsd", 0, 0);
+ if(!stsd)
+ return NULL;
bo_add_32be(stsd, 1);
if (p_stream->fmt.i_cat == AUDIO_ES)
box_gather(stsd, GetSounBox(p_mux, p_stream));
p_stream->b_stco64 = false;
stco = box_full_new("stco", 0, 0);
}
+ if(!stco)
+ {
+ bo_free(stsd);
+ return NULL;
+ }
bo_add_32be(stco, 0); // entry-count (fixed latter)
/* sample to chunk table */
}
/* Fix stco entry count */
- bo_fix_32be(stco, 12, i_chunk);
+ bo_swap_32be(stco, 12, i_chunk);
msg_Dbg(p_mux, "created %d chunks (stco)", i_chunk);
/* Fix stsc entry count */
- bo_fix_32be(stsc, 12, i_stsc_entries );
+ bo_swap_32be(stsc, 12, i_stsc_entries );
/* add stts */
bo_t *stts = box_full_new("stts", 0, 0);
+ if(!stts)
+ {
+ bo_free(stsd);
+ bo_free(stco);
+ return NULL;
+ }
bo_add_32be(stts, 0); // entry-count (fixed latter)
- uint32_t i_timescale;
- if (p_stream->fmt.i_cat == AUDIO_ES)
- i_timescale = p_stream->fmt.audio.i_rate;
- else
- i_timescale = CLOCK_FREQ;
-
unsigned i_index = 0;
for (unsigned i = 0; i < p_stream->i_entry_count; i_index++) {
- p_stream->entry[i].i_length = p_stream->entry[i].i_length
- * (int64_t)i_timescale / CLOCK_FREQ;
int i_first = i;
- int64_t i_delta = p_stream->entry[i].i_length;
+ mtime_t i_delta = p_stream->entry[i].i_length;
for (; i < p_stream->i_entry_count; ++i)
if (i == p_stream->i_entry_count || p_stream->entry[i].i_length != i_delta)
break;
bo_add_32be(stts, i - i_first); // sample-count
- bo_add_32be(stts, i_delta); // sample-delta
+ bo_add_32be(stts, (uint64_t)i_delta * p_stream->i_timescale / CLOCK_FREQ); // sample-delta
}
- bo_fix_32be(stts, 12, i_index);
+ bo_swap_32be(stts, 12, i_index);
- /* FIXME add ctts ?? FIXME */
+ /* composition time handling */
+ bo_t *ctts = NULL;
+ if ( p_stream->b_hasbframes && (ctts = box_full_new("ctts", 0, 0)) )
+ {
+ bo_add_32be(ctts, 0);
+ i_index = 0;
+ for (unsigned i = 0; i < p_stream->i_entry_count; i_index++)
+ {
+ int i_first = i;
+ mtime_t i_offset = p_stream->entry[i].i_pts_dts;
+
+ for (; i < p_stream->i_entry_count; ++i)
+ if (i == p_stream->i_entry_count || p_stream->entry[i].i_pts_dts != i_offset)
+ break;
+
+ bo_add_32be(ctts, i - i_first); // sample-count
+ bo_add_32be(ctts, i_offset * p_stream->i_timescale / CLOCK_FREQ ); // sample-offset
+ }
+ bo_swap_32be(ctts, 12, i_index);
+ }
bo_t *stsz = box_full_new("stsz", 0, 0);
- bo_add_32be(stsz, 0); // sample-size
- bo_add_32be(stsz, p_stream->i_entry_count); // sample-count
+ if(!stsz)
+ {
+ bo_free(stsd);
+ bo_free(stco);
+ bo_free(stts);
+ return NULL;
+ }
+ int i_size = 0;
for (unsigned i = 0; i < p_stream->i_entry_count; i++)
- bo_add_32be(stsz, p_stream->entry[i].i_size); // sample-size
+ {
+ if ( i == 0 )
+ i_size = p_stream->entry[i].i_size;
+ else if ( p_stream->entry[i].i_size != i_size )
+ {
+ i_size = 0;
+ break;
+ }
+ }
+ bo_add_32be(stsz, i_size); // sample-size
+ bo_add_32be(stsz, p_stream->i_entry_count); // sample-count
+ if ( i_size == 0 ) // all samples have different size
+ {
+ for (unsigned i = 0; i < p_stream->i_entry_count; i++)
+ bo_add_32be(stsz, p_stream->entry[i].i_size); // sample-size
+ }
/* create stss table */
bo_t *stss = NULL;
i_index = 0;
- for (unsigned i = 0; i < p_stream->i_entry_count; i++)
- if (p_stream->entry[i].i_flags & BLOCK_FLAG_TYPE_I) {
- if (stss == NULL) {
- stss = box_full_new("stss", 0, 0);
- bo_add_32be(stss, 0); /* fixed later */
+ if ( p_stream->fmt.i_cat == VIDEO_ES || p_stream->fmt.i_cat == AUDIO_ES )
+ {
+ mtime_t i_interval = -1;
+ for (unsigned i = 0; i < p_stream->i_entry_count; i++)
+ {
+ if ( i_interval != -1 )
+ {
+ i_interval += p_stream->entry[i].i_length + p_stream->entry[i].i_pts_dts;
+ if ( i_interval < CLOCK_FREQ * 2 )
+ continue;
+ }
+
+ if (p_stream->entry[i].i_flags & BLOCK_FLAG_TYPE_I) {
+ if (stss == NULL) {
+ stss = box_full_new("stss", 0, 0);
+ if(!stss)
+ break;
+ bo_add_32be(stss, 0); /* fixed later */
+ }
+ bo_add_32be(stss, 1 + i);
+ i_index++;
+ i_interval = 0;
}
- bo_add_32be(stss, 1 + i);
- i_index++;
}
+ }
if (stss)
- bo_fix_32be(stss, 12, i_index);
+ bo_swap_32be(stss, 12, i_index);
/* Now gather all boxes into stbl */
bo_t *stbl = box_new("stbl");
-
+ if(!stbl)
+ {
+ bo_free(stsd);
+ bo_free(stco);
+ bo_free(stts);
+ bo_free(stsz);
+ bo_free(stss);
+ return NULL;
+ }
box_gather(stbl, stsd);
box_gather(stbl, stts);
if (stss)
box_gather(stbl, stss);
+ if (ctts)
+ box_gather(stbl, ctts);
box_gather(stbl, stsc);
box_gather(stbl, stsz);
- p_stream->i_stco_pos = stbl->len + 16;
+ p_stream->i_stco_pos = stbl->b->i_buffer + 16;
box_gather(stbl, stco);
return stbl;
int64_t i_timestamp = get_timestamp();
moov = box_new("moov");
-
+ if(!moov)
+ return NULL;
/* Create general info */
- for (int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
- mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
- i_movie_duration = __MAX(i_movie_duration, p_stream->i_duration);
- }
- msg_Dbg(p_mux, "movie duration %"PRId64"s", i_movie_duration / CLOCK_FREQ);
+ if ( !p_sys->b_fragmented )
+ {
+ for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
+ i_movie_duration = __MAX(i_movie_duration, p_stream->i_read_duration);
+ }
+ msg_Dbg(p_mux, "movie duration %"PRId64"s", i_movie_duration / CLOCK_FREQ);
- i_movie_duration = i_movie_duration * i_movie_timescale / CLOCK_FREQ;
+ i_movie_duration = i_movie_duration * i_movie_timescale / CLOCK_FREQ;
+ }
+ else
+ i_movie_duration = 0;
/* *** add /moov/mvhd *** */
if (!p_sys->b_64_ext) {
mvhd = box_full_new("mvhd", 0, 0);
+ if(!mvhd)
+ {
+ bo_free(moov);
+ return NULL;
+ }
bo_add_32be(mvhd, i_timestamp); // creation time
bo_add_32be(mvhd, i_timestamp); // modification time
bo_add_32be(mvhd, i_movie_timescale); // timescale
bo_add_32be(mvhd, i_movie_duration); // duration
} else {
mvhd = box_full_new("mvhd", 1, 0);
+ if(!mvhd)
+ {
+ bo_free(moov);
+ return NULL;
+ }
bo_add_64be(mvhd, i_timestamp); // creation time
bo_add_64be(mvhd, i_timestamp); // modification time
bo_add_32be(mvhd, i_movie_timescale); // timescale
box_gather(moov, mvhd);
- for (int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
+ for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++) {
mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
- uint32_t i_timescale;
- if (p_stream->fmt.i_cat == AUDIO_ES)
- i_timescale = p_stream->fmt.audio.i_rate;
+ mtime_t i_stream_duration;
+ if ( !p_sys->b_fragmented )
+ i_stream_duration = p_stream->i_read_duration * i_movie_timescale / CLOCK_FREQ;
else
- i_timescale = CLOCK_FREQ;
+ i_stream_duration = 0;
/* *** add /moov/trak *** */
bo_t *trak = box_new("trak");
+ if(!trak)
+ continue;
/* *** add /moov/trak/tkhd *** */
bo_t *tkhd;
tkhd = box_full_new("tkhd", 0, 0x0f);
else
tkhd = box_full_new("tkhd", 0, 1);
-
+ if(!tkhd)
+ {
+ bo_free(trak);
+ continue;
+ }
bo_add_32be(tkhd, i_timestamp); // creation time
bo_add_32be(tkhd, i_timestamp); // modification time
bo_add_32be(tkhd, p_stream->i_track_id);
bo_add_32be(tkhd, 0); // reserved 0
- bo_add_32be(tkhd, p_stream->i_duration *
- (int64_t)i_movie_timescale / CLOCK_FREQ); // duration
+ bo_add_32be(tkhd, i_stream_duration); // duration
} else {
if (p_sys->b_mov)
tkhd = box_full_new("tkhd", 1, 0x0f);
else
tkhd = box_full_new("tkhd", 1, 1);
-
+ if(!tkhd)
+ {
+ bo_free(trak);
+ continue;
+ }
bo_add_64be(tkhd, i_timestamp); // creation time
bo_add_64be(tkhd, i_timestamp); // modification time
bo_add_32be(tkhd, p_stream->i_track_id);
bo_add_32be(tkhd, 0); // reserved 0
- bo_add_64be(tkhd, p_stream->i_duration *
- (int64_t)i_movie_timescale / CLOCK_FREQ); // duration
+ bo_add_64be(tkhd, i_stream_duration); // duration
}
for (int i = 0; i < 2; i++)
} else {
int i_width = 320 << 16;
int i_height = 200;
- for (int i = 0; i < p_sys->i_nb_streams; i++) {
+ for (unsigned int i = 0; i < p_sys->i_nb_streams; i++) {
mp4_stream_t *tk = p_sys->pp_streams[i];
if (tk->fmt.i_cat == VIDEO_ES) {
if (tk->fmt.video.i_sar_num > 0 &&
box_gather(trak, tkhd);
/* *** add /moov/trak/edts and elst */
- bo_t *edts = box_new("edts");
- bo_t *elst = box_full_new("elst", p_sys->b_64_ext ? 1 : 0, 0);
- if (p_stream->i_dts_start > p_sys->i_dts_start) {
- bo_add_32be(elst, 2);
-
- if (p_sys->b_64_ext) {
- bo_add_64be(elst, (p_stream->i_dts_start-p_sys->i_dts_start) *
- i_movie_timescale / CLOCK_FREQ);
- bo_add_64be(elst, -1);
- } else {
- bo_add_32be(elst, (p_stream->i_dts_start-p_sys->i_dts_start) *
- i_movie_timescale / CLOCK_FREQ);
- bo_add_32be(elst, -1);
+ if ( !p_sys->b_fragmented )
+ {
+ bo_t *elst = box_full_new("elst", p_sys->b_64_ext ? 1 : 0, 0);
+ if(elst)
+ {
+ if (p_stream->i_starttime > 0) {
+ bo_add_32be(elst, 2);
+
+ if (p_sys->b_64_ext) {
+ bo_add_64be(elst, p_stream->i_starttime *
+ i_movie_timescale / CLOCK_FREQ);
+ bo_add_64be(elst, -1);
+ } else {
+ bo_add_32be(elst, p_stream->i_starttime *
+ i_movie_timescale / CLOCK_FREQ);
+ bo_add_32be(elst, -1);
+ }
+ bo_add_16be(elst, 1);
+ bo_add_16be(elst, 0);
+ } else {
+ bo_add_32be(elst, 1);
+ }
+ if (p_sys->b_64_ext) {
+ bo_add_64be(elst, p_stream->i_read_duration *
+ i_movie_timescale / CLOCK_FREQ);
+ bo_add_64be(elst, 0);
+ } else {
+ bo_add_32be(elst, p_stream->i_read_duration *
+ i_movie_timescale / CLOCK_FREQ);
+ bo_add_32be(elst, 0);
+ }
+ bo_add_16be(elst, 1);
+ bo_add_16be(elst, 0);
+
+ bo_t *edts = box_new("edts");
+ if(edts)
+ {
+ box_gather(edts, elst);
+ box_gather(trak, edts);
+ }
+ else bo_free(elst);
}
- bo_add_16be(elst, 1);
- bo_add_16be(elst, 0);
- } else {
- bo_add_32be(elst, 1);
- }
- if (p_sys->b_64_ext) {
- bo_add_64be(elst, p_stream->i_duration *
- i_movie_timescale / CLOCK_FREQ);
- bo_add_64be(elst, 0);
- } else {
- bo_add_32be(elst, p_stream->i_duration *
- i_movie_timescale / CLOCK_FREQ);
- bo_add_32be(elst, 0);
}
- bo_add_16be(elst, 1);
- bo_add_16be(elst, 0);
-
- box_gather(edts, elst);
- box_gather(trak, edts);
/* *** add /moov/trak/mdia *** */
bo_t *mdia = box_new("mdia");
+ if(!mdia)
+ {
+ bo_free(trak);
+ continue;
+ }
/* media header */
bo_t *mdhd;
if (!p_sys->b_64_ext) {
mdhd = box_full_new("mdhd", 0, 0);
+ if(!mdhd)
+ {
+ bo_free(mdia);
+ bo_free(trak);
+ continue;
+ }
bo_add_32be(mdhd, i_timestamp); // creation time
bo_add_32be(mdhd, i_timestamp); // modification time
- bo_add_32be(mdhd, i_timescale); // timescale
- bo_add_32be(mdhd, p_stream->i_duration * (int64_t)i_timescale /
- CLOCK_FREQ); // duration
+ bo_add_32be(mdhd, p_stream->i_timescale); // timescale
+ bo_add_32be(mdhd, i_stream_duration); // duration
} else {
mdhd = box_full_new("mdhd", 1, 0);
+ if(!mdhd)
+ {
+ bo_free(mdia);
+ bo_free(trak);
+ continue;
+ }
bo_add_64be(mdhd, i_timestamp); // creation time
bo_add_64be(mdhd, i_timestamp); // modification time
- bo_add_32be(mdhd, i_timescale); // timescale
- bo_add_64be(mdhd, p_stream->i_duration * (int64_t)i_timescale /
- CLOCK_FREQ); // duration
+ bo_add_32be(mdhd, p_stream->i_timescale); // timescale
+ bo_add_64be(mdhd, i_stream_duration); // duration
}
if (p_stream->fmt.psz_language) {
/* handler reference */
bo_t *hdlr = box_full_new("hdlr", 0, 0);
+ if(!hdlr)
+ {
+ bo_free(mdia);
+ bo_free(trak);
+ continue;
+ }
if (p_sys->b_mov)
bo_add_fourcc(hdlr, "mhlr"); // media handler
/* minf*/
bo_t *minf = box_new("minf");
+ if(!minf)
+ {
+ bo_free(mdia);
+ bo_free(trak);
+ continue;
+ }
/* add smhd|vmhd */
if (p_stream->fmt.i_cat == AUDIO_ES) {
- bo_t *smhd;
-
- smhd = box_full_new("smhd", 0, 0);
- bo_add_16be(smhd, 0); // balance
- bo_add_16be(smhd, 0); // reserved
+ bo_t *smhd = box_full_new("smhd", 0, 0);
+ if(smhd)
+ {
+ bo_add_16be(smhd, 0); // balance
+ bo_add_16be(smhd, 0); // reserved
- box_gather(minf, smhd);
+ box_gather(minf, smhd);
+ }
} else if (p_stream->fmt.i_cat == VIDEO_ES) {
- bo_t *vmhd;
-
- vmhd = box_full_new("vmhd", 0, 1);
- bo_add_16be(vmhd, 0); // graphicsmode
- for (int i = 0; i < 3; i++)
- bo_add_16be(vmhd, 0); // opcolor
-
- box_gather(minf, vmhd);
+ bo_t *vmhd = box_full_new("vmhd", 0, 1);
+ if(vmhd)
+ {
+ bo_add_16be(vmhd, 0); // graphicsmode
+ for (int i = 0; i < 3; i++)
+ bo_add_16be(vmhd, 0); // opcolor
+ box_gather(minf, vmhd);
+ }
} else if (p_stream->fmt.i_cat == SPU_ES) {
- bo_t *gmhd = box_new("gmhd");
bo_t *gmin = box_full_new("gmin", 0, 1);
-
- bo_add_16be(gmin, 0); // graphicsmode
- for (int i = 0; i < 3; i++)
- bo_add_16be(gmin, 0); // opcolor
- bo_add_16be(gmin, 0); // balance
- bo_add_16be(gmin, 0); // reserved
-
- box_gather(gmhd, gmin);
-
- box_gather(minf, gmhd);
+ if(gmin)
+ {
+ bo_add_16be(gmin, 0); // graphicsmode
+ for (int i = 0; i < 3; i++)
+ bo_add_16be(gmin, 0); // opcolor
+ bo_add_16be(gmin, 0); // balance
+ bo_add_16be(gmin, 0); // reserved
+
+ bo_t *gmhd = box_new("gmhd");
+ if(gmhd)
+ {
+ box_gather(gmhd, gmin);
+ box_gather(minf, gmhd);
+ }
+ else bo_free(gmin);
+ }
}
/* dinf */
- bo_t *dinf = box_new("dinf");
bo_t *dref = box_full_new("dref", 0, 0);
- bo_add_32be(dref, 1);
- bo_t *url = box_full_new("url ", 0, 0x01);
- box_gather(dref, url);
- box_gather(dinf, dref);
+ if(dref)
+ {
+ bo_add_32be(dref, 1);
+
+ bo_t *url = box_full_new("url ", 0, 0x01);
+ if(url)
+ box_gather(dref, url);
+
+ bo_t *dinf = box_new("dinf");
+ if(dinf)
+ {
+ box_gather(dinf, dref);
- /* append dinf to mdia */
- box_gather(minf, dinf);
+ /* append dinf to mdia */
+ box_gather(minf, dinf);
+ }
+ else bo_free(dinf);
+ }
/* add stbl */
- bo_t *stbl = GetStblBox(p_mux, p_stream);
+ bo_t *stbl;
+ if ( p_sys->b_fragmented )
+ {
+ uint32_t i_backup = p_stream->i_entry_count;
+ p_stream->i_entry_count = 0;
+ stbl = GetStblBox(p_mux, p_stream);
+ p_stream->i_entry_count = i_backup;
+ }
+ else
+ stbl = GetStblBox(p_mux, p_stream);
/* append stbl to minf */
- p_stream->i_stco_pos += minf->len;
+ p_stream->i_stco_pos += minf->b->i_buffer;
box_gather(minf, stbl);
/* append minf to mdia */
- p_stream->i_stco_pos += mdia->len;
+ p_stream->i_stco_pos += mdia->b->i_buffer;
box_gather(mdia, minf);
/* append mdia to trak */
- p_stream->i_stco_pos += trak->len;
+ p_stream->i_stco_pos += trak->b->i_buffer;
box_gather(trak, mdia);
/* append trak to moov */
- p_stream->i_stco_pos += moov->len;
+ p_stream->i_stco_pos += moov->b->i_buffer;
box_gather(moov, trak);
}
/* Add user data tags */
box_gather(moov, GetUdtaTag(p_mux));
- box_fix(moov);
+ if ( p_sys->b_fragmented )
+ {
+ bo_t *mvex = box_new("mvex");
+ for (unsigned int i_trak = 0; mvex && i_trak < p_sys->i_nb_streams; i_trak++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
+
+ /* Try to find some defaults */
+ if ( p_stream->i_entry_count )
+ {
+ // FIXME: find highest occurence
+ p_stream->i_trex_length = p_stream->entry[0].i_length;
+ p_stream->i_trex_size = p_stream->entry[0].i_size;
+ }
+
+ /* *** add /mvex/trex *** */
+ bo_t *trex = box_full_new("trex", 0, 0);
+ bo_add_32be(trex, p_stream->i_track_id);
+ bo_add_32be(trex, 1); // sample desc index
+ bo_add_32be(trex, (uint64_t)p_stream->i_trex_length * p_stream->i_timescale / CLOCK_FREQ); // sample duration
+ bo_add_32be(trex, p_stream->i_trex_size); // sample size
+ bo_add_32be(trex, 0); // sample flags
+ box_gather(mvex, trex);
+ }
+ box_gather(moov, mvex);
+ }
+
+ if(moov->b)
+ box_fix(moov, moov->b->i_buffer);
return moov;
}
/****************************************************************************/
-static void bo_init(bo_t *p_bo)
+static bo_t *box_new(const char *fcc)
{
- p_bo->len = 0;
- p_bo->b = block_Alloc(1024);
+ bo_t *box = malloc(sizeof(*box));
+ if (!box)
+ return NULL;
+
+ bo_init(box, 1024);
+
+ bo_add_32be (box, 0);
+ bo_add_fourcc(box, fcc);
+
+ return box;
}
-static void bo_add_8(bo_t *p_bo, uint8_t i)
+static bo_t *box_full_new(const char *fcc, uint8_t v, uint32_t f)
{
- if (p_bo->len >= p_bo->b->i_buffer)
- p_bo->b = block_Realloc(p_bo->b, 0, p_bo->b->i_buffer + 1024);
+ bo_t *box = box_new(fcc);
+ if (!box)
+ return NULL;
+
+ bo_add_8 (box, v);
+ bo_add_24be (box, f);
- p_bo->b->p_buffer[p_bo->len++] = i;
+ return box;
}
-static void bo_add_16be(bo_t *p_bo, uint16_t i)
+static void box_fix(bo_t *box, uint32_t i_size)
{
- bo_add_8(p_bo, ((i >> 8) &0xff));
- bo_add_8(p_bo, i &0xff);
+ bo_set_32be(box, 0, i_size);
}
-static void bo_add_24be(bo_t *p_bo, uint32_t i)
+static void box_gather (bo_t *box, bo_t *box2)
{
- bo_add_8(p_bo, ((i >> 16) &0xff));
- bo_add_8(p_bo, ((i >> 8) &0xff));
- bo_add_8(p_bo, ( i &0xff));
+ if(box2 && box2->b && box && box->b)
+ {
+ box_fix(box2, box2->b->i_buffer);
+ size_t i_offset = box->b->i_buffer;
+ box->b = block_Realloc(box->b, 0, box->b->i_buffer + box2->b->i_buffer);
+ memcpy(&box->b->p_buffer[i_offset], box2->b->p_buffer, box2->b->i_buffer);
+ }
+ bo_free(box2);
}
-static void bo_add_32be(bo_t *p_bo, uint32_t i)
+
+static void box_send(sout_mux_t *p_mux, bo_t *box)
{
- bo_add_16be(p_bo, ((i >> 16) &0xffff));
- bo_add_16be(p_bo, i &0xffff);
+ if(box && box->b)
+ sout_AccessOutWrite(p_mux->p_access, box->b);
+ free(box);
}
-static void bo_fix_32be (bo_t *p_bo, int i_pos, uint32_t i)
+static int64_t get_timestamp(void)
{
- p_bo->b->p_buffer[i_pos ] = (i >> 24)&0xff;
- p_bo->b->p_buffer[i_pos + 1] = (i >> 16)&0xff;
- p_bo->b->p_buffer[i_pos + 2] = (i >> 8)&0xff;
- p_bo->b->p_buffer[i_pos + 3] = (i )&0xff;
+ int64_t i_timestamp = time(NULL);
+
+ i_timestamp += 2082844800; // MOV/MP4 start date is 1/1/1904
+ // 208284480 is (((1970 - 1904) * 365) + 17) * 24 * 60 * 60
+
+ return i_timestamp;
}
-static void bo_add_64be(bo_t *p_bo, uint64_t i)
+/***************************************************************************
+ MP4 Live submodule
+****************************************************************************/
+#define FRAGMENT_LENGTH (CLOCK_FREQ * 3/2)
+
+#define ENQUEUE_ENTRY(object, entry) \
+ do {\
+ if (object.p_last)\
+ object.p_last->p_next = entry;\
+ object.p_last = entry;\
+ if (!object.p_first)\
+ object.p_first = entry;\
+ } while(0)
+
+#define DEQUEUE_ENTRY(object, entry) \
+ do {\
+ entry = object.p_first;\
+ if (object.p_last == entry)\
+ object.p_last = NULL;\
+ object.p_first = object.p_first->p_next;\
+ entry->p_next = NULL;\
+ } while(0)
+
+/* Creates mfra/traf index entries */
+static void AddKeyframeEntry(mp4_stream_t *p_stream, const uint64_t i_moof_pos,
+ const uint8_t i_traf, const uint32_t i_sample,
+ const mtime_t i_time)
{
- bo_add_32be(p_bo, ((i >> 32) &0xffffffff));
- bo_add_32be(p_bo, i &0xffffffff);
+ /* alloc or realloc */
+ mp4_fragindex_t *p_entries = p_stream->p_indexentries;
+ if (p_stream->i_indexentries >= p_stream->i_indexentriesmax)
+ {
+ p_stream->i_indexentriesmax += 256;
+ p_entries = xrealloc(p_stream->p_indexentries,
+ p_stream->i_indexentriesmax * sizeof(mp4_fragindex_t));
+ if (p_entries) /* realloc can fail */
+ p_stream->p_indexentries = p_entries;
+ }
+
+ mtime_t i_last_entry_time;
+ if (p_stream->i_indexentries)
+ i_last_entry_time = p_stream->p_indexentries[p_stream->i_indexentries - 1].i_time;
+ else
+ i_last_entry_time = 0;
+
+ if (p_entries && i_time - i_last_entry_time >= CLOCK_FREQ * 2)
+ {
+ mp4_fragindex_t *p_indexentry = &p_stream->p_indexentries[p_stream->i_indexentries];
+ p_indexentry->i_time = i_time;
+ p_indexentry->i_moofoffset = i_moof_pos;
+ p_indexentry->i_sample = i_sample;
+ p_indexentry->i_traf = i_traf;
+ p_indexentry->i_trun = 1;
+ p_stream->i_indexentries++;
+ }
}
-static void bo_add_fourcc(bo_t *p_bo, const char *fcc)
+/* Creates moof box and traf/trun information.
+ * Single run per traf is absolutely not optimal as interleaving should be done
+ * using runs and not limiting moof size, but creating an relative offset only
+ * requires base_offset_is_moof and then comply to late iso brand spec which
+ * breaks clients. */
+static bo_t *GetMoofBox(sout_mux_t *p_mux, size_t *pi_mdat_total_size,
+ mtime_t i_barrier_time, const uint64_t i_write_pos)
{
- bo_add_8(p_bo, fcc[0]);
- bo_add_8(p_bo, fcc[1]);
- bo_add_8(p_bo, fcc[2]);
- bo_add_8(p_bo, fcc[3]);
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+
+ bo_t *moof, *mfhd;
+ size_t i_fixupoffset = 0;
+
+ *pi_mdat_total_size = 0;
+
+ moof = box_new("moof");
+ if(!moof)
+ return NULL;
+
+ /* *** add /moof/mfhd *** */
+
+ mfhd = box_full_new("mfhd", 0, 0);
+ if(!mfhd)
+ {
+ bo_free(moof);
+ return NULL;
+ }
+ bo_add_32be(mfhd, p_sys->i_mfhd_sequence++); // sequence number
+
+ box_gather(moof, mfhd);
+
+ for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
+
+ /* *** add /moof/traf *** */
+ bo_t *traf = box_new("traf");
+ if(!traf)
+ continue;
+ uint32_t i_sample = 0;
+ mtime_t i_time = p_stream->i_written_duration;
+ bool b_allsamesize = true;
+ bool b_allsamelength = true;
+ if ( p_stream->read.p_first )
+ {
+ mp4_fragentry_t *p_entry = p_stream->read.p_first->p_next;
+ while (p_entry && (b_allsamelength || b_allsamesize))
+ {
+ /* compare against queue head */
+ b_allsamelength &= ( p_entry->p_block->i_length == p_stream->read.p_first->p_block->i_length );
+ b_allsamesize &= ( p_entry->p_block->i_buffer == p_stream->read.p_first->p_block->i_buffer );
+ p_entry = p_entry->p_next;
+ }
+ }
+
+ uint32_t i_tfhd_flags = 0x0;
+ if (p_stream->read.p_first)
+ {
+ /* Current segment have all same duration value, different than trex's default */
+ if (b_allsamelength &&
+ p_stream->read.p_first->p_block->i_length != p_stream->i_trex_length &&
+ p_stream->read.p_first->p_block->i_length)
+ i_tfhd_flags |= MP4_TFHD_DFLT_SAMPLE_DURATION;
+
+ /* Current segment have all same size value, different than trex's default */
+ if (b_allsamesize &&
+ p_stream->read.p_first->p_block->i_buffer != p_stream->i_trex_size &&
+ p_stream->read.p_first->p_block->i_buffer)
+ i_tfhd_flags |= MP4_TFHD_DFLT_SAMPLE_SIZE;
+ }
+ else
+ {
+ /* We have no samples */
+ i_tfhd_flags |= MP4_TFHD_DURATION_IS_EMPTY;
+ }
+
+ /* *** add /moof/traf/tfhd *** */
+ bo_t *tfhd = box_full_new("tfhd", 0, i_tfhd_flags);
+ if(!tfhd)
+ {
+ bo_free(traf);
+ continue;
+ }
+ bo_add_32be(tfhd, p_stream->i_track_id);
+
+ /* set the local sample duration default */
+ if (i_tfhd_flags & MP4_TFHD_DFLT_SAMPLE_DURATION)
+ bo_add_32be(tfhd, p_stream->read.p_first->p_block->i_length * p_stream->i_timescale / CLOCK_FREQ);
+
+ /* set the local sample size default */
+ if (i_tfhd_flags & MP4_TFHD_DFLT_SAMPLE_SIZE)
+ bo_add_32be(tfhd, p_stream->read.p_first->p_block->i_buffer);
+
+ box_gather(traf, tfhd);
+
+ /* *** add /moof/traf/tfdt *** */
+ bo_t *tfdt = box_full_new("tfdt", 1, 0);
+ if(!tfdt)
+ {
+ bo_free(traf);
+ continue;
+ }
+ bo_add_64be(tfdt, p_stream->i_written_duration * p_stream->i_timescale / CLOCK_FREQ );
+ box_gather(traf, tfdt);
+
+ /* *** add /moof/traf/trun *** */
+ if (p_stream->read.p_first)
+ {
+ uint32_t i_trun_flags = 0x0;
+
+ if (p_stream->b_hasiframes && !(p_stream->read.p_first->p_block->i_flags & BLOCK_FLAG_TYPE_I))
+ i_trun_flags |= MP4_TRUN_FIRST_FLAGS;
+
+ if (!b_allsamelength ||
+ ( !(i_tfhd_flags & MP4_TFHD_DFLT_SAMPLE_DURATION) && p_stream->i_trex_length == 0 ))
+ i_trun_flags |= MP4_TRUN_SAMPLE_DURATION;
+
+ if (!b_allsamesize ||
+ ( !(i_tfhd_flags & MP4_TFHD_DFLT_SAMPLE_SIZE) && p_stream->i_trex_size == 0 ))
+ i_trun_flags |= MP4_TRUN_SAMPLE_SIZE;
+
+ if (p_stream->b_hasbframes)
+ i_trun_flags |= MP4_TRUN_SAMPLE_TIME_OFFSET;
+
+ if (i_fixupoffset == 0)
+ i_trun_flags |= MP4_TRUN_DATA_OFFSET;
+
+ bo_t *trun = box_full_new("trun", 0, i_trun_flags);
+ if(!trun)
+ {
+ bo_free(traf);
+ continue;
+ }
+
+ /* count entries */
+ uint32_t i_entry_count = 0;
+ mtime_t i_run_time = p_stream->i_written_duration;
+ mp4_fragentry_t *p_entry = p_stream->read.p_first;
+ while(p_entry)
+ {
+ if ( i_barrier_time && i_run_time + p_entry->p_block->i_length > i_barrier_time )
+ break;
+ i_entry_count++;
+ i_run_time += p_entry->p_block->i_length;
+ p_entry = p_entry->p_next;
+ }
+ bo_add_32be(trun, i_entry_count); // sample count
+
+ if (i_trun_flags & MP4_TRUN_DATA_OFFSET)
+ {
+ i_fixupoffset = moof->b->i_buffer + traf->b->i_buffer + trun->b->i_buffer;
+ bo_add_32be(trun, 0xdeadbeef); // data offset
+ }
+
+ if (i_trun_flags & MP4_TRUN_FIRST_FLAGS)
+ bo_add_32be(trun, 1<<16); // flag as non keyframe
+
+ while(p_stream->read.p_first && i_entry_count)
+ {
+ DEQUEUE_ENTRY(p_stream->read, p_entry);
+
+ if (i_trun_flags & MP4_TRUN_SAMPLE_DURATION)
+ bo_add_32be(trun, p_entry->p_block->i_length * p_stream->i_timescale / CLOCK_FREQ); // sample duration
+
+ if (i_trun_flags & MP4_TRUN_SAMPLE_SIZE)
+ bo_add_32be(trun, p_entry->p_block->i_buffer); // sample size
+
+ if (i_trun_flags & MP4_TRUN_SAMPLE_TIME_OFFSET)
+ {
+ uint32_t i_diff = 0;
+ if ( p_entry->p_block->i_dts > VLC_TS_INVALID &&
+ p_entry->p_block->i_pts > p_entry->p_block->i_dts )
+ {
+ i_diff = p_entry->p_block->i_pts - p_entry->p_block->i_dts;
+ }
+ bo_add_32be(trun, i_diff * p_stream->i_timescale / CLOCK_FREQ); // ctts
+ }
+
+ *pi_mdat_total_size += p_entry->p_block->i_buffer;
+
+ ENQUEUE_ENTRY(p_stream->towrite, p_entry);
+ i_entry_count--;
+ i_sample++;
+
+ /* Add keyframe entry if needed */
+ if (p_stream->b_hasiframes && (p_entry->p_block->i_flags & BLOCK_FLAG_TYPE_I) &&
+ (p_stream->fmt.i_cat == VIDEO_ES || p_stream->fmt.i_cat == AUDIO_ES))
+ {
+ AddKeyframeEntry(p_stream, i_write_pos, i_trak, i_sample, i_time);
+ }
+
+ i_time += p_entry->p_block->i_length;
+ }
+
+ box_gather(traf, trun);
+ }
+
+ box_gather(moof, traf);
+ }
+
+ if(!moof->b)
+ {
+ bo_free(moof);
+ return NULL;
+ }
+
+ box_fix(moof, moof->b->i_buffer);
+
+ /* do tfhd base data offset fixup */
+ if (i_fixupoffset)
+ {
+ /* mdat will follow moof */
+ bo_set_32be(moof, i_fixupoffset, moof->b->i_buffer + 8);
+ }
+
+ /* set iframe flag, so the streaming server always starts from moof */
+ moof->b->i_flags |= BLOCK_FLAG_TYPE_I;
+
+ return moof;
}
-static void bo_add_mem(bo_t *p_bo, int i_size, uint8_t *p_mem)
+static void WriteFragmentMDAT(sout_mux_t *p_mux, size_t i_total_size)
{
- for (int i = 0; i < i_size; i++)
- bo_add_8(p_bo, p_mem[i]);
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+
+ /* Now add mdat header */
+ bo_t *mdat = box_new("mdat");
+ if(!mdat)
+ return;
+ /* force update of real size */
+ assert(mdat->b->i_buffer==8);
+ box_fix(mdat, mdat->b->i_buffer + i_total_size);
+ p_sys->i_pos += mdat->b->i_buffer;
+ /* only write header */
+ sout_AccessOutWrite(p_mux->p_access, mdat->b);
+ free(mdat);
+ /* Header and its size are written and good, now write content */
+ for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
+
+ while(p_stream->towrite.p_first)
+ {
+ mp4_fragentry_t *p_entry = p_stream->towrite.p_first;
+ p_sys->i_pos += p_entry->p_block->i_buffer;
+ p_stream->i_written_duration += p_entry->p_block->i_length;
+
+ p_entry->p_block->i_flags &= ~BLOCK_FLAG_TYPE_I; // clear flag for http stream
+ sout_AccessOutWrite(p_mux->p_access, p_entry->p_block);
+
+ p_stream->towrite.p_first = p_entry->p_next;
+ free(p_entry);
+ if (!p_stream->towrite.p_first)
+ p_stream->towrite.p_last = NULL;
+ }
+ }
}
-static void bo_add_descr(bo_t *p_bo, uint8_t tag, uint32_t size)
+static bo_t *GetMfraBox(sout_mux_t *p_mux)
{
- bo_add_8(p_bo, tag);
- for (int i = 3; i>0; i--)
- bo_add_8(p_bo, (size>>(7*i)) | 0x80);
- bo_add_8(p_bo, size & 0x7F);
+ sout_mux_sys_t *p_sys = (sout_mux_sys_t*) p_mux->p_sys;
+ bo_t *mfra = NULL;
+ for (unsigned int i = 0; i < p_sys->i_nb_streams; i++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i];
+ if (p_stream->i_indexentries)
+ {
+ bo_t *tfra = box_full_new("tfra", 0, 0x0);
+ if (!tfra) continue;
+ bo_add_32be(tfra, p_stream->i_track_id);
+ bo_add_32be(tfra, 0x3); // reserved + lengths (1,1,4)=>(0,0,3)
+ bo_add_32be(tfra, p_stream->i_indexentries);
+ for(uint32_t i_index=0; i_index<p_stream->i_indexentries; i_index++)
+ {
+ const mp4_fragindex_t *p_indexentry = &p_stream->p_indexentries[i_index];
+ bo_add_32be(tfra, p_indexentry->i_time);
+ bo_add_32be(tfra, p_indexentry->i_moofoffset);
+ assert(sizeof(p_indexentry->i_traf)==1); /* guard against sys changes */
+ assert(sizeof(p_indexentry->i_trun)==1);
+ assert(sizeof(p_indexentry->i_sample)==4);
+ bo_add_8(tfra, p_indexentry->i_traf);
+ bo_add_8(tfra, p_indexentry->i_trun);
+ bo_add_32be(tfra, p_indexentry->i_sample);
+ }
+
+ if (!mfra && !(mfra = box_new("mfra")))
+ {
+ bo_free(tfra);
+ return NULL;
+ }
+
+ box_gather(mfra,tfra);
+ }
+ }
+ return mfra;
}
-static bo_t *box_new(const char *fcc)
+static void FlushHeader(sout_mux_t *p_mux)
{
- bo_t *box = malloc(sizeof(*box));
- if (!box)
- return NULL;
+ sout_mux_sys_t *p_sys = (sout_mux_sys_t*) p_mux->p_sys;
- bo_init(box);
+ /* Now add ftyp header */
+ bo_t *ftyp = box_new("ftyp");
+ if(!ftyp)
+ return;
+ bo_add_fourcc(ftyp, "isom");
+ bo_add_32be (ftyp, 0); // minor version
+ if(ftyp->b)
+ box_fix(ftyp, ftyp->b->i_buffer);
- bo_add_32be (box, 0);
- bo_add_fourcc(box, fcc);
+ bo_t *moov = GetMoovBox(p_mux);
- return box;
+ /* merge into a single block */
+ box_gather(ftyp, moov);
+
+ /* add header flag for streaming server */
+ ftyp->b->i_flags |= BLOCK_FLAG_HEADER;
+ p_sys->i_pos += ftyp->b->i_buffer;
+ box_send(p_mux, ftyp);
+ p_sys->b_header_sent = true;
}
-static bo_t *box_full_new(const char *fcc, uint8_t v, uint32_t f)
+static int OpenFrag(vlc_object_t *p_this)
{
- bo_t *box = box_new(fcc);
- if (!box)
- return NULL;
+ sout_mux_t *p_mux = (sout_mux_t*) p_this;
+ sout_mux_sys_t *p_sys = malloc(sizeof(sout_mux_sys_t));
+ if (!p_sys)
+ return VLC_ENOMEM;
- bo_add_8 (box, v);
- bo_add_24be (box, f);
+ p_mux->p_sys = (sout_mux_sys_t *) p_sys;
+ p_mux->pf_control = Control;
+ p_mux->pf_addstream = AddStream;
+ p_mux->pf_delstream = DelStream;
+ p_mux->pf_mux = MuxFrag;
- return box;
+ /* unused */
+ p_sys->b_mov = false;
+ p_sys->b_3gp = false;
+ p_sys->b_64_ext = false;
+ /* !unused */
+
+ p_sys->i_pos = 0;
+ p_sys->i_nb_streams = 0;
+ p_sys->pp_streams = NULL;
+ p_sys->i_mdat_pos = 0;
+ p_sys->i_read_duration = 0;
+ p_sys->i_written_duration= 0;
+
+ p_sys->b_header_sent = false;
+ p_sys->b_fragmented = true;
+ p_sys->i_mfhd_sequence = 1;
+
+ return VLC_SUCCESS;
}
-static void box_fix(bo_t *box)
+static void WriteFragments(sout_mux_t *p_mux, bool b_flush)
{
- box->b->p_buffer[0] = box->len >> 24;
- box->b->p_buffer[1] = box->len >> 16;
- box->b->p_buffer[2] = box->len >> 8;
- box->b->p_buffer[3] = box->len;
+ sout_mux_sys_t *p_sys = (sout_mux_sys_t*) p_mux->p_sys;
+ bo_t *moof = NULL;
+ mtime_t i_barrier_time = p_sys->i_written_duration + FRAGMENT_LENGTH;
+ size_t i_mdat_size = 0;
+ bool b_has_samples = false;
+
+ for (unsigned int i = 0; i < p_sys->i_nb_streams; i++)
+ {
+ const mp4_stream_t *p_stream = p_sys->pp_streams[i];
+ if (p_stream->read.p_first)
+ {
+ b_has_samples = true;
+
+ /* set a barrier so we try to align to keyframe */
+ if (p_stream->b_hasiframes &&
+ p_stream->i_last_iframe_time > p_stream->i_written_duration &&
+ (p_stream->fmt.i_cat == VIDEO_ES ||
+ p_stream->fmt.i_cat == AUDIO_ES) )
+ {
+ i_barrier_time = __MIN(i_barrier_time, p_stream->i_last_iframe_time);
+ }
+ }
+ }
+
+ if (!p_sys->b_header_sent)
+ FlushHeader(p_mux);
+
+ if (b_has_samples)
+ moof = GetMoofBox(p_mux, &i_mdat_size, (b_flush)?0:i_barrier_time, p_sys->i_pos);
+
+ if (moof && i_mdat_size == 0)
+ {
+ block_Release(moof->b);
+ FREENULL(moof);
+ }
+
+ if (moof)
+ {
+ msg_Dbg(p_mux, "writing moof @ %"PRId64, p_sys->i_pos);
+ p_sys->i_pos += moof->b->i_buffer;
+ assert(moof->b->i_flags & BLOCK_FLAG_TYPE_I); /* http sout */
+ box_send(p_mux, moof);
+ msg_Dbg(p_mux, "writing mdat @ %"PRId64, p_sys->i_pos);
+ WriteFragmentMDAT(p_mux, i_mdat_size);
+
+ /* update iframe point */
+ for (unsigned int i = 0; i < p_sys->i_nb_streams; i++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i];
+ p_stream->i_last_iframe_time = 0;
+ }
+ }
}
-static void box_gather (bo_t *box, bo_t *box2)
+/* Do an entry length fixup using only its own info.
+ * This is the end boundary case. */
+static void LengthLocalFixup(sout_mux_t *p_mux, const mp4_stream_t *p_stream, block_t *p_entrydata)
{
- box_fix(box2);
- box->b = block_Realloc(box->b, 0, box->len + box2->len);
- memcpy(&box->b->p_buffer[box->len], box2->b->p_buffer, box2->len);
- box->len += box2->len;
- block_Release(box2->b);
- free(box2);
+ if ( p_stream->fmt.i_cat == VIDEO_ES )
+ {
+ p_entrydata->i_length = CLOCK_FREQ *
+ p_stream->fmt.video.i_frame_rate_base /
+ p_stream->fmt.video.i_frame_rate;
+ msg_Dbg(p_mux, "video track %d fixup to %"PRId64" for sample %u",
+ p_stream->i_track_id, p_entrydata->i_length, p_stream->i_entry_count - 1);
+ }
+ else if (p_stream->fmt.i_cat == AUDIO_ES &&
+ p_stream->fmt.audio.i_rate &&
+ p_entrydata->i_nb_samples)
+ {
+ p_entrydata->i_length = CLOCK_FREQ * p_entrydata->i_nb_samples /
+ p_stream->fmt.audio.i_rate;
+ msg_Dbg(p_mux, "audio track %d fixup to %"PRId64" for sample %u",
+ p_stream->i_track_id, p_entrydata->i_length, p_stream->i_entry_count - 1);
+ }
+ else
+ {
+ msg_Warn(p_mux, "unknown length for track %d sample %u",
+ p_stream->i_track_id, p_stream->i_entry_count - 1);
+ p_entrydata->i_length = 1;
+ }
}
-static void box_send(sout_mux_t *p_mux, bo_t *box)
+static void CleanupFrag(sout_mux_sys_t *p_sys)
{
- box->b->i_buffer = box->len;
- sout_AccessOutWrite(p_mux->p_access, box->b);
- free(box);
+ for (unsigned int i = 0; i < p_sys->i_nb_streams; i++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i];
+ if (p_stream->p_held_entry)
+ {
+ block_Release(p_stream->p_held_entry->p_block);
+ free(p_stream->p_held_entry);
+ }
+ while(p_stream->read.p_first)
+ {
+ mp4_fragentry_t *p_next = p_stream->read.p_first->p_next;
+ block_Release(p_stream->read.p_first->p_block);
+ free(p_stream->read.p_first);
+ p_stream->read.p_first = p_next;
+ }
+ while(p_stream->towrite.p_first)
+ {
+ mp4_fragentry_t *p_next = p_stream->towrite.p_first->p_next;
+ block_Release(p_stream->towrite.p_first->p_block);
+ free(p_stream->towrite.p_first);
+ p_stream->towrite.p_first = p_next;
+ }
+ free(p_stream->p_indexentries);
+ }
+ free(p_sys);
}
-static int64_t get_timestamp(void)
+static void CloseFrag(vlc_object_t *p_this)
{
- int64_t i_timestamp = time(NULL);
+ sout_mux_t *p_mux = (sout_mux_t *) p_this;
+ sout_mux_sys_t *p_sys = (sout_mux_sys_t*) p_mux->p_sys;
- i_timestamp += 2082844800; // MOV/MP4 start date is 1/1/1904
- // 208284480 is (((1970 - 1904) * 365) + 17) * 24 * 60 * 60
+ /* Flush remaining entries */
+ for (unsigned int i = 0; i < p_sys->i_nb_streams; i++)
+ {
+ mp4_stream_t *p_stream = p_sys->pp_streams[i];
+ if (p_stream->p_held_entry)
+ {
+ if (p_stream->p_held_entry->p_block->i_length < 1)
+ LengthLocalFixup(p_mux, p_stream, p_stream->p_held_entry->p_block);
+ ENQUEUE_ENTRY(p_stream->read, p_stream->p_held_entry);
+ p_stream->p_held_entry = NULL;
+ }
+ }
- return i_timestamp;
+ /* and force creating a fragment from it */
+ WriteFragments(p_mux, true);
+
+ /* Write indexes, but only for non streamed content
+ as they refer to moof by absolute position */
+ if (!strcmp(p_mux->psz_mux, "mp4frag"))
+ {
+ bo_t *mfra = GetMfraBox(p_mux);
+ if (mfra)
+ {
+ bo_t *mfro = box_full_new("mfro", 0, 0x0);
+ if (mfro && mfra->b)
+ {
+ box_fix(mfra, mfra->b->i_buffer);
+ bo_add_32be(mfro, mfra->b->i_buffer + MP4_MFRO_BOXSIZE);
+ box_gather(mfra, mfro);
+ }
+ box_send(p_mux, mfra);
+ }
+ }
+
+ CleanupFrag(p_sys);
+}
+
+static int MuxFrag(sout_mux_t *p_mux)
+{
+ sout_mux_sys_t *p_sys = (sout_mux_sys_t*) p_mux->p_sys;
+
+ int i_stream = sout_MuxGetStream(p_mux, 1, NULL);
+ if (i_stream < 0)
+ return VLC_SUCCESS;
+ sout_input_t *p_input = p_mux->pp_inputs[i_stream];
+ mp4_stream_t *p_stream = (mp4_stream_t*) p_input->p_sys;
+ block_t *p_currentblock = block_FifoGet(p_input->p_fifo);
+
+ /* do block conversion */
+ switch(p_stream->fmt.i_codec)
+ {
+ case VLC_CODEC_H264:
+ case VLC_CODEC_HEVC:
+ p_currentblock = ConvertFromAnnexB(p_currentblock);
+ break;
+ case VLC_CODEC_SUBT:
+ p_currentblock = ConvertSUBT(p_currentblock);
+ break;
+ default:
+ break;
+ }
+
+ if( !p_currentblock )
+ return VLC_ENOMEM;
+
+ /* If we have a previous entry for outgoing queue */
+ if (p_stream->p_held_entry)
+ {
+ block_t *p_heldblock = p_stream->p_held_entry->p_block;
+
+ /* Fix previous block length from current */
+ if (p_heldblock->i_length < 1)
+ {
+
+ /* Fix using dts if not on a boundary */
+ if ((p_currentblock->i_flags & BLOCK_FLAG_DISCONTINUITY) == 0)
+ p_heldblock->i_length = p_currentblock->i_dts - p_heldblock->i_dts;
+
+ if (p_heldblock->i_length < 1)
+ LengthLocalFixup(p_mux, p_stream, p_heldblock);
+ }
+
+ /* enqueue */
+ ENQUEUE_ENTRY(p_stream->read, p_stream->p_held_entry);
+ p_stream->p_held_entry = NULL;
+
+ if (p_stream->b_hasiframes && (p_heldblock->i_flags & BLOCK_FLAG_TYPE_I) &&
+ p_stream->i_read_duration - p_sys->i_written_duration < FRAGMENT_LENGTH)
+ {
+ /* Flag the last iframe time, we'll use it as boundary so it will start
+ next fragment */
+ p_stream->i_last_iframe_time = p_stream->i_read_duration;
+ }
+
+ /* update buffered time */
+ p_stream->i_read_duration += __MAX(0, p_heldblock->i_length);
+ }
+
+
+ /* set temp entry */
+ p_stream->p_held_entry = malloc(sizeof(mp4_fragentry_t));
+ if (unlikely(!p_stream->p_held_entry))
+ return VLC_ENOMEM;
+
+ p_stream->p_held_entry->p_block = p_currentblock;
+ p_stream->p_held_entry->i_run = p_stream->i_current_run;
+ p_stream->p_held_entry->p_next = NULL;
+
+ if (p_stream->fmt.i_cat == VIDEO_ES )
+ {
+ if (!p_stream->b_hasiframes && (p_currentblock->i_flags & BLOCK_FLAG_TYPE_I))
+ p_stream->b_hasiframes = true;
+
+ if (!p_stream->b_hasbframes && p_currentblock->i_dts > VLC_TS_INVALID &&
+ p_currentblock->i_pts > p_currentblock->i_dts)
+ p_stream->b_hasbframes = true;
+ }
+
+ /* Update the global fragment/media duration */
+ mtime_t i_min_read_duration = p_stream->i_read_duration;
+ mtime_t i_min_written_duration = p_stream->i_written_duration;
+ for (unsigned int i=0; i<p_sys->i_nb_streams; i++)
+ {
+ const mp4_stream_t *p_s = p_sys->pp_streams[i];
+ if (p_s->fmt.i_cat != VIDEO_ES && p_s->fmt.i_cat != AUDIO_ES)
+ continue;
+ if (p_s->i_read_duration < i_min_read_duration)
+ i_min_read_duration = p_s->i_read_duration;
+
+ if (p_s->i_written_duration < i_min_written_duration)
+ i_min_written_duration = p_s->i_written_duration;
+ }
+ p_sys->i_read_duration = i_min_read_duration;
+ p_sys->i_written_duration = i_min_written_duration;
+
+ /* we have prerolled enough to know all streams, and have enough date to create a fragment */
+ if (p_stream->read.p_first && p_sys->i_read_duration - p_sys->i_written_duration >= FRAGMENT_LENGTH)
+ WriteFragments(p_mux, false);
+
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff