mux: mp4: split moov creation from mux

should be reusable

modules/demux/mp4/libmp4.h

@@ -39,6 +39,8 @@ typedef int64_t stime_t;
 #define MAJOR_isom VLC_FOURCC( 'i', 's', 'o', 'm' )
 #define MAJOR_qt__ VLC_FOURCC( 'q', 't', ' ', ' ' )
 #define MAJOR_dash VLC_FOURCC( 'd', 'a', 's', 'h' )
+#define MAJOR_mp41 VLC_FOURCC( 'm', 'p', '4', '1' )
+#define MAJOR_avc1 VLC_FOURCC( 'a', 'v', 'c', '1' )
 
 #define ATOM_root VLC_FOURCC( 'r', 'o', 'o', 't' )
 #define ATOM_uuid VLC_FOURCC( 'u', 'u', 'i', 'd' )

modules/mux/Makefile.am

@@ -4,7 +4,8 @@ libmux_dummy_plugin_la_SOURCES = mux/dummy.c
 
 libmux_asf_plugin_la_SOURCES = mux/asf.c demux/asf/libasf_guid.h
 libmux_avi_plugin_la_SOURCES = mux/avi.c
-libmux_mp4_plugin_la_SOURCES = mux/mp4.c \
+libmux_mp4_plugin_la_SOURCES = mux/mp4/mp4.c \
+	mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h \
 	demux/mpeg/mpeg_parser_helpers.h demux/mp4/libmp4.h
 libmux_mpjpeg_plugin_la_SOURCES = mux/mpjpeg.c
 libmux_ps_plugin_la_SOURCES = \

modules/mux/mp4/libmp4mux.h

+/*****************************************************************************
+ * libmp4mux.h: mp4/mov muxer
+ *****************************************************************************
+ * Copyright (C) 2001, 2002, 2003, 2006, 20115 VLC authors and VideoLAN
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Gildas Bazin <gbazin at videolan dot org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_es.h>
+#include <vlc_bits.h>
+
+typedef struct
+{
+    uint64_t i_pos;
+    int      i_size;
+
+    mtime_t  i_pts_dts;
+    mtime_t  i_length;
+    unsigned int i_flags;
+} mp4mux_entry_t;
+
+typedef struct
+{
+    unsigned i_track_id;
+    es_format_t   fmt;
+
+    /* index */
+    unsigned int i_entry_count;
+    unsigned int i_entry_max;
+    mp4mux_entry_t *entry;
+
+    /* XXX: needed for other codecs too, see lavf */
+    block_t      *a52_frame;
+
+    /* stats */
+    int64_t      i_read_duration;
+    uint32_t     i_timescale;
+    mtime_t      i_starttime; /* the really first packet */
+    bool         b_hasbframes;
+
+    /* temp stuff */
+    /* for later stco fix-up (fast start files) */
+    uint64_t     i_stco_pos;
+
+    /* frags */
+    uint32_t     i_trex_default_length;
+    uint32_t     i_trex_default_size;
+
+} mp4mux_trackinfo_t;
+
+bool mp4mux_trackinfo_Init( mp4mux_trackinfo_t * );
+void mp4mux_trackinfo_Clear( mp4mux_trackinfo_t * );
+
+bo_t *box_new     (const char *fcc);
+bo_t *box_full_new(const char *fcc, uint8_t v, uint32_t f);
+void  box_fix     (bo_t *box, uint32_t);
+void  box_gather  (bo_t *box, bo_t *box2);
+
+bo_t *GetFtyp(vlc_fourcc_t, uint32_t, vlc_fourcc_t[], size_t i_fourcc);
+bo_t *GetMoovBox(vlc_object_t *, mp4mux_trackinfo_t **pp_tracks, unsigned int i_tracks,
+                 bool b_fragmented, bool b_mov, bool b_64ext, bool b_stco64);