#include <vlc_sout.h>
#include <vlc_block.h>
+#include <vlc_bits.h>
+
#include <time.h>
#include <vlc_iso_lang.h>
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 *);
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;
uint32_t i_mfhd_sequence;
};
-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);
-
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 };
/*****************************************************************************
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");
- 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 (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 (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:
calloc(p_stream->i_entry_max, sizeof(mp4_entry_t));
p_stream->i_dts_start = 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;
/*****************************************************************************
* 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) */
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)
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("frma");
- 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 = box_new("mp4a");
- bo_add_32be(box, 0);
- box_gather(wave, box);
+ box = GetESDS(p_stream);
+ 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("srcq");
- bo_add_32be(box, 0x40);
- box_gather(wave, box);
+ /* wazza ? */
+ bo_add_32be(wave, 8); /* new empty box */
+ bo_add_32be(wave, 0); /* box label */
+ }
+ return wave;
+}
- /* wazza ? */
- bo_add_32be(wave, 8); /* new empty box */
- bo_add_32be(wave, 0); /* box label */
+static bo_t *GetDec3Tag(mp4_stream_t *p_stream)
+{
+ if (!p_stream->a52_frame)
+ return NULL;
- return wave;
+ bs_t s;
+ bs_init(&s, p_stream->a52_frame->p_buffer, sizeof(p_stream->a52_frame->i_buffer));
+ bs_skip(&s, 16); // syncword
+
+ uint8_t fscod, bsid, bsmod, acmod, lfeon, strmtyp;
+
+ bsmod = 0;
+
+ strmtyp = bs_read(&s, 2);
+
+ 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);
{
/* 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 (unsigned int i_track = 0; i_track < p_sys->i_nb_streams; i_track++) {
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)
unsigned i_index = 0;
bo_add_32be(stts, i - i_first); // sample-count
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);
/* composition time handling */
bo_t *ctts = NULL;
bo_add_32be(ctts, i - i_first); // sample-count
bo_add_32be(ctts, i_offset * p_stream->i_timescale / CLOCK_FREQ ); // sample-offset
}
- bo_fix_32be(ctts, 12, i_index);
+ bo_swap_32be(ctts, 12, i_index);
}
bo_t *stsz = box_full_new("stsz", 0, 0);
+ 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++)
{
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);
}
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, 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 */
if ( !p_sys->b_fragmented )
{
/* *** 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
/* *** 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);
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);
/* *** add /moov/trak/edts and elst */
if ( !p_sys->b_fragmented )
{
- 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_starttime > 0) {
- bo_add_32be(elst, 2);
-
+ 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_starttime *
+ bo_add_64be(elst, p_stream->i_read_duration *
i_movie_timescale / CLOCK_FREQ);
- bo_add_64be(elst, -1);
+ bo_add_64be(elst, 0);
} else {
- bo_add_32be(elst, p_stream->i_starttime *
+ bo_add_32be(elst, p_stream->i_read_duration *
i_movie_timescale / CLOCK_FREQ);
- bo_add_32be(elst, -1);
+ bo_add_32be(elst, 0);
}
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);
- box_gather(edts, elst);
- box_gather(trak, edts);
+ bo_t *edts = box_new("edts");
+ if(edts)
+ {
+ box_gather(edts, elst);
+ box_gather(trak, edts);
+ }
+ else bo_free(elst);
+ }
}
/* *** 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, 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, p_stream->i_timescale); // timescale
/* 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;
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);
}
if ( p_sys->b_fragmented )
{
bo_t *mvex = box_new("mvex");
- for (unsigned int i_trak = 0; i_trak < p_sys->i_nb_streams; i_trak++)
+ 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];
box_gather(moov, mvex);
}
- box_fix(moov);
+ if(moov->b)
+ box_fix(moov, moov->b->i_buffer);
return moov;
}
/****************************************************************************/
-static void bo_init(bo_t *p_bo)
-{
- p_bo->len = 0;
- p_bo->b = block_Alloc(1024);
-}
-
-static void bo_add_8(bo_t *p_bo, uint8_t i)
-{
- if (p_bo->len >= p_bo->b->i_buffer)
- p_bo->b = block_Realloc(p_bo->b, 0, p_bo->b->i_buffer + 1024);
-
- p_bo->b->p_buffer[p_bo->len++] = i;
-}
-
-static void bo_add_16be(bo_t *p_bo, uint16_t i)
-{
- bo_add_8(p_bo, ((i >> 8) &0xff));
- bo_add_8(p_bo, i &0xff);
-}
-
-static void bo_add_24be(bo_t *p_bo, uint32_t i)
-{
- bo_add_8(p_bo, ((i >> 16) &0xff));
- bo_add_8(p_bo, ((i >> 8) &0xff));
- bo_add_8(p_bo, ( i &0xff));
-}
-static void bo_add_32be(bo_t *p_bo, uint32_t i)
-{
- bo_add_16be(p_bo, ((i >> 16) &0xffff));
- bo_add_16be(p_bo, i &0xffff);
-}
-
-static void bo_fix_32be (bo_t *p_bo, int i_pos, uint32_t i)
-{
- 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;
-}
-
-static void bo_add_64be(bo_t *p_bo, uint64_t i)
-{
- bo_add_32be(p_bo, ((i >> 32) &0xffffffff));
- bo_add_32be(p_bo, i &0xffffffff);
-}
-
-static void bo_add_fourcc(bo_t *p_bo, const char *fcc)
-{
- 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]);
-}
-
-static void bo_add_mem(bo_t *p_bo, int i_size, uint8_t *p_mem)
-{
- for (int i = 0; i < i_size; i++)
- bo_add_8(p_bo, p_mem[i]);
-}
-
-static void bo_add_descr(bo_t *p_bo, uint8_t tag, uint32_t size)
-{
- 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);
-}
-
static bo_t *box_new(const char *fcc)
{
bo_t *box = malloc(sizeof(*box));
if (!box)
return NULL;
- bo_init(box);
+ bo_init(box, 1024);
bo_add_32be (box, 0);
bo_add_fourcc(box, fcc);
return box;
}
-static void box_free(bo_t *box)
-{
- block_Release(box->b);
- free(box);
-}
-
-static void box_fix(bo_t *box)
+static void box_fix(bo_t *box, uint32_t i_size)
{
- 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;
+ bo_set_32be(box, 0, i_size);
}
static void box_gather (bo_t *box, bo_t *box2)
{
- 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;
- box_free(box2);
+ 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 box_send(sout_mux_t *p_mux, bo_t *box)
{
- box->b->i_buffer = box->len;
- sout_AccessOutWrite(p_mux->p_access, box->b);
+ if(box && box->b)
+ sout_AccessOutWrite(p_mux->p_access, box->b);
free(box);
}
*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);
/* *** 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;
}
}
- uint16_t i_tfhd_flags = 0x0;
+ uint32_t i_tfhd_flags = 0x0;
if (p_stream->read.p_first)
{
/* Current segment have all same duration value, different than trex's default */
/* *** 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 */
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)
{
- uint16_t i_trun_flags = 0x0;
+ 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;
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;
if (i_trun_flags & MP4_TRUN_DATA_OFFSET)
{
- i_fixupoffset = moof->len + traf->len + trun->len;
+ i_fixupoffset = moof->b->i_buffer + traf->b->i_buffer + trun->b->i_buffer;
bo_add_32be(trun, 0xdeadbeef); // data offset
}
box_gather(moof, traf);
}
- box_fix(moof);
+ 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 */
- SetDWBE(moof->b->p_buffer + i_fixupoffset, moof->len + 8);
+ bo_set_32be(moof, i_fixupoffset, moof->b->i_buffer + 8);
}
/* set iframe flag, so the streaming server always starts from moof */
/* Now add mdat header */
bo_t *mdat = box_new("mdat");
+ if(!mdat)
+ return;
/* force update of real size */
- mdat->b->i_buffer = mdat->len;
- assert(mdat->len==8);
- mdat->len += i_total_size;
- box_fix(mdat);
+ 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);
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));
+ 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")))
{
- box_free(tfra);
+ bo_free(tfra);
return NULL;
}
/* 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
- box_fix(ftyp);
+ if(ftyp->b)
+ box_fix(ftyp, ftyp->b->i_buffer);
bo_t *moov = GetMoovBox(p_mux);
/* add header flag for streaming server */
ftyp->b->i_flags |= BLOCK_FLAG_HEADER;
- p_sys->i_pos += ftyp->len;
+ p_sys->i_pos += ftyp->b->i_buffer;
box_send(p_mux, ftyp);
p_sys->b_header_sent = true;
}
if (moof)
{
msg_Dbg(p_mux, "writing moof @ %"PRId64, p_sys->i_pos);
- p_sys->i_pos += moof->len;
+ 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);
if (mfra)
{
bo_t *mfro = box_full_new("mfro", 0, 0x0);
- if (mfro)
+ if (mfro && mfra->b)
{
- box_fix(mfra);
- bo_add_32be(mfro, mfra->len + MP4_MFRO_BOXSIZE);
+ 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);
break;
}
+ if( !p_currentblock )
+ return VLC_ENOMEM;
+
/* If we have a previous entry for outgoing queue */
if (p_stream->p_held_entry)
{