diff options
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r-- | libmpdemux/demuxer.h | 60 |
1 files changed, 40 insertions, 20 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index ad3981573c..1f16ea4eda 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -23,11 +23,11 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include "stream/stream.h" -#ifdef CONFIG_ASS -#include "libass/ass_mp.h" -#endif + +struct MPOpts; #ifdef HAVE_BUILTIN_EXPECT #define likely(x) __builtin_expect ((x) != 0, 1) @@ -38,7 +38,7 @@ #endif #define MAX_PACKS 4096 -#define MAX_PACK_BYTES 0x2000000 +#define MAX_PACK_BYTES 0x8000000 // 128 MiB #define DEMUXER_TYPE_UNKNOWN 0 #define DEMUXER_TYPE_MPEG_ES 1 @@ -114,6 +114,8 @@ #define SEEK_ABSOLUTE (1 << 0) #define SEEK_FACTOR (1 << 1) +#define SEEK_FORWARD (1 << 2) +#define SEEK_BACKWARD (1 << 3) #define MP_INPUT_BUFFER_PADDING_SIZE 64 @@ -127,11 +129,11 @@ typedef struct demux_packet { unsigned char* buffer; int flags; // keyframe, etc int refcount; //refcounter for the master packet, if 0, buffer can be free()d - struct demux_packet* master; //pointer to the master packet if this one is a cloned one - struct demux_packet* next; + struct demux_packet *master; //pointer to the master packet if this one is a cloned one + struct demux_packet *next; } demux_packet_t; -typedef struct { +typedef struct demux_stream { int buffer_pos; // current buffer position int buffer_size; // current buffer size unsigned char* buffer; // current buffer, never free() it, always use free_demux_packet(buffer_ref); @@ -175,9 +177,6 @@ typedef struct demuxer_info { struct demuxer; -extern int correct_pts; -extern int user_correct_pts; - /** * Demuxer description structure */ @@ -211,6 +210,19 @@ typedef struct demux_chapter char* name; } demux_chapter_t; +struct matroska_data { + unsigned char segment_uid[16]; + // Ordered chapter information if any + struct matroska_chapter { + uint64_t start; + uint64_t end; + bool has_segment_uid; + unsigned char segment_uid[16]; + char *name; + } *ordered_chapters; + int num_ordered_chapters; +}; + typedef struct demux_attachment { char* name; @@ -232,15 +244,18 @@ typedef struct demuxer { int type; // demuxer type: mpeg PS, mpeg ES, avi, avi-ni, avi-nini, asf int file_format; // file format: mpeg/avi/asf int seekable; // flag + /* Set if using absolute seeks for small movements is OK (no pts resets + * that would make pts ambigious, preferably supports back/forward flags */ + bool accurate_seek; // demux_stream_t *audio; // audio buffer/demuxer demux_stream_t *video; // video buffer/demuxer demux_stream_t *sub; // dvd subtitle buffer/demuxer // stream headers: - void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t) - void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t) - void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag) + struct sh_audio *a_streams[MAX_A_STREAMS]; + struct sh_video *v_streams[MAX_V_STREAMS]; + struct sh_sub *s_streams[MAX_S_STREAMS]; // pointer to teletext decoder private data, if demuxer stream contains teletext void *teletext; @@ -251,8 +266,11 @@ typedef struct demuxer { demux_attachment_t* attachments; int num_attachments; + struct matroska_data matroska_data; + void* priv; // fileformat-dependent data char** info; + struct MPOpts *opts; } demuxer_t; typedef struct { @@ -335,7 +353,7 @@ static inline void *realloc_struct(void *ptr, size_t nmemb, size_t size) { } demux_stream_t* new_demuxer_stream(struct demuxer *demuxer,int id); -demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename); +demuxer_t* new_demuxer(struct MPOpts *opts, stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename); void free_demuxer_stream(demux_stream_t *ds); void free_demuxer(demuxer_t *demuxer); @@ -396,7 +414,7 @@ static inline int avi_stream_id(unsigned int id){ return a*10+b; } -demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid,char* filename); +demuxer_t* demux_open(struct MPOpts *opts, stream_t *stream,int file_format,int aid,int vid,int sid,char* filename); void demux_flush(demuxer_t *demuxer); int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags); demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); @@ -425,11 +443,13 @@ int demuxer_type_by_filename(char* filename); void demuxer_help(void); int get_demuxer_type_from_name(char *demuxer_name, int *force); -int demuxer_add_attachment(demuxer_t* demuxer, const char* name, - const char* type, const void* data, size_t size); - -int demuxer_add_chapter(demuxer_t* demuxer, const char* name, uint64_t start, uint64_t end); -int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, float *seek_pts, int *num_chapters, char **chapter_name); +int demuxer_add_attachment(demuxer_t *demuxer, const char *name, + int name_maxlen, const char *type, int type_maxlen, + const void *data, size_t size); +int demuxer_add_chapter(demuxer_t *demuxer, const char *name, int name_maxlen, + uint64_t start, uint64_t end); +int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, double *seek_pts, + char **chapter_name); /// Get current chapter index if available. int demuxer_get_current_chapter(demuxer_t *demuxer); |