summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorrtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-19 16:51:28 +0000
committerrtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-19 16:51:28 +0000
commita8717a3eee973bd7aa0a1600afbc617af37b7de0 (patch)
tree2cb5ccafcbd884079c664d7c968d8d5ff5ecacae /libmpdemux/demuxer.c
parent530df550e4af63fce126001c5509d931d9ee65f9 (diff)
downloadmpv-a8717a3eee973bd7aa0a1600afbc617af37b7de0.tar.bz2
mpv-a8717a3eee973bd7aa0a1600afbc617af37b7de0.tar.xz
Revert r26411: policy violation
Reindent of the file is not allowed Controversial cosmetics changes with no previous discussion Mix cosmetics and non-cosmetic changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26469 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c1775
1 files changed, 812 insertions, 963 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 71fa7332c0..28d91eeaf8 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -78,110 +78,108 @@ extern const demuxer_desc_t demuxer_desc_nut;
* demuxer, add it to libavformat, except for wrappers around external
* libraries and demuxers requiring binary support. */
-const demuxer_desc_t *const demuxer_list[] = {
- &demuxer_desc_rawaudio,
- &demuxer_desc_rawvideo,
+const demuxer_desc_t* const demuxer_list[] = {
+ &demuxer_desc_rawaudio,
+ &demuxer_desc_rawvideo,
#ifdef USE_TV
- &demuxer_desc_tv,
+ &demuxer_desc_tv,
#endif
- &demuxer_desc_mf,
+ &demuxer_desc_mf,
#ifdef USE_LIBAVFORMAT
- &demuxer_desc_lavf_preferred,
+ &demuxer_desc_lavf_preferred,
#endif
- &demuxer_desc_avi,
- &demuxer_desc_y4m,
- &demuxer_desc_asf,
- &demuxer_desc_nsv,
- &demuxer_desc_nuv,
- &demuxer_desc_real,
- &demuxer_desc_smjpeg,
- &demuxer_desc_matroska,
- &demuxer_desc_realaudio,
- &demuxer_desc_vqf,
- &demuxer_desc_mov,
- &demuxer_desc_vivo,
- &demuxer_desc_fli,
- &demuxer_desc_film,
- &demuxer_desc_roq,
+ &demuxer_desc_avi,
+ &demuxer_desc_y4m,
+ &demuxer_desc_asf,
+ &demuxer_desc_nsv,
+ &demuxer_desc_nuv,
+ &demuxer_desc_real,
+ &demuxer_desc_smjpeg,
+ &demuxer_desc_matroska,
+ &demuxer_desc_realaudio,
+ &demuxer_desc_vqf,
+ &demuxer_desc_mov,
+ &demuxer_desc_vivo,
+ &demuxer_desc_fli,
+ &demuxer_desc_film,
+ &demuxer_desc_roq,
#ifdef HAVE_GIF
- &demuxer_desc_gif,
+ &demuxer_desc_gif,
#endif
#ifdef HAVE_OGGVORBIS
- &demuxer_desc_ogg,
+ &demuxer_desc_ogg,
#endif
#ifdef USE_WIN32DLL
- &demuxer_desc_avs,
+ &demuxer_desc_avs,
#endif
- &demuxer_desc_pva,
- &demuxer_desc_mpeg_ts,
- &demuxer_desc_lmlm4,
- &demuxer_desc_mpeg_ps,
- &demuxer_desc_mpeg_pes,
- &demuxer_desc_mpeg_es,
- &demuxer_desc_mpeg_gxf,
- &demuxer_desc_mpeg4_es,
- &demuxer_desc_h264_es,
+ &demuxer_desc_pva,
+ &demuxer_desc_mpeg_ts,
+ &demuxer_desc_lmlm4,
+ &demuxer_desc_mpeg_ps,
+ &demuxer_desc_mpeg_pes,
+ &demuxer_desc_mpeg_es,
+ &demuxer_desc_mpeg_gxf,
+ &demuxer_desc_mpeg4_es,
+ &demuxer_desc_h264_es,
#ifdef MUSEPACK
- &demuxer_desc_mpc,
+ &demuxer_desc_mpc,
#endif
- &demuxer_desc_audio,
- &demuxer_desc_mpeg_ty,
+ &demuxer_desc_audio,
+ &demuxer_desc_mpeg_ty,
#ifdef STREAMING_LIVE555
- &demuxer_desc_rtp,
+ &demuxer_desc_rtp,
#endif
#ifdef LIBNEMESI
- &demuxer_desc_rtp_nemesi,
+ &demuxer_desc_rtp_nemesi,
#endif
#ifdef USE_LIBAVFORMAT
- &demuxer_desc_lavf,
+ &demuxer_desc_lavf,
#endif
#ifdef HAVE_LIBDV095
- &demuxer_desc_rawdv,
+ &demuxer_desc_rawdv,
#endif
- &demuxer_desc_aac,
+ &demuxer_desc_aac,
#ifdef HAVE_LIBNUT
- &demuxer_desc_nut,
+ &demuxer_desc_nut,
#endif
#ifdef HAVE_XMMS
- &demuxer_desc_xmms,
+ &demuxer_desc_xmms,
#endif
- /* Please do not add any new demuxers here. If you want to implement a new
- * demuxer, add it to libavformat, except for wrappers around external
- * libraries and demuxers requiring binary support. */
- NULL
+ /* Please do not add any new demuxers here. If you want to implement a new
+ * demuxer, add it to libavformat, except for wrappers around external
+ * libraries and demuxers requiring binary support. */
+ NULL
};
-void free_demuxer_stream(demux_stream_t *ds)
-{
+void free_demuxer_stream(demux_stream_t *ds){
ds_free_packs(ds);
free(ds);
}
-demux_stream_t *new_demuxer_stream(struct demuxer_st *demuxer, int id)
-{
- demux_stream_t *ds = malloc(sizeof(demux_stream_t));
- ds->buffer_pos = ds->buffer_size = 0;
- ds->buffer = NULL;
- ds->pts = 0;
- ds->pts_bytes = 0;
- ds->eof = 0;
- ds->pos = 0;
- ds->dpos = 0;
- ds->pack_no = 0;
-
- ds->packs = 0;
- ds->bytes = 0;
- ds->first = ds->last = ds->current = NULL;
- ds->id = id;
- ds->demuxer = demuxer;
-
- ds->asf_seq = -1;
- ds->asf_packet = NULL;
-
- ds->ss_mul = ds->ss_div = 0;
-
- ds->sh = NULL;
- return ds;
+demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){
+ demux_stream_t* ds=malloc(sizeof(demux_stream_t));
+ ds->buffer_pos=ds->buffer_size=0;
+ ds->buffer=NULL;
+ ds->pts=0;
+ ds->pts_bytes=0;
+ ds->eof=0;
+ ds->pos=0;
+ ds->dpos=0;
+ ds->pack_no=0;
+//---------------
+ ds->packs=0;
+ ds->bytes=0;
+ ds->first=ds->last=ds->current=NULL;
+ ds->id=id;
+ ds->demuxer=demuxer;
+//----------------
+ ds->asf_seq=-1;
+ ds->asf_packet=NULL;
+//----------------
+ ds->ss_mul=ds->ss_div=0;
+//----------------
+ ds->sh=NULL;
+ return ds;
}
@@ -191,343 +189,300 @@ demux_stream_t *new_demuxer_stream(struct demuxer_st *demuxer, int id)
* @param file_format type of the demuxer
* @return structure for the demuxer, NULL if not found
*/
-static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format)
+static const demuxer_desc_t* get_demuxer_desc_from_type(int file_format)
{
- int i;
+ int i;
- for (i = 0; demuxer_list[i]; i++)
- if (file_format == demuxer_list[i]->type)
- return demuxer_list[i];
+ for (i = 0; demuxer_list[i]; i++)
+ if (file_format == demuxer_list[i]->type)
+ return demuxer_list[i];
- return NULL;
+ return NULL;
}
-demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id,
- int s_id, char *filename)
-{
- demuxer_t *d = malloc(sizeof(demuxer_t));
- memset(d, 0, sizeof(demuxer_t));
- d->stream = stream;
- d->stream_pts = MP_NOPTS_VALUE;
- d->reference_clock = MP_NOPTS_VALUE;
- d->movi_start = stream->start_pos;
- d->movi_end = stream->end_pos;
- d->seekable = 1;
- d->synced = 0;
- d->filepos = 0;
- d->audio = new_demuxer_stream(d, a_id);
- d->video = new_demuxer_stream(d, v_id);
- d->sub = new_demuxer_stream(d, s_id);
- d->type = type;
- if (type)
- if (!(d->desc = get_demuxer_desc_from_type(type)))
- mp_msg(MSGT_DEMUXER, MSGL_ERR,
- "BUG! Invalid demuxer type in new_demuxer(), "
- "big troubles ahead.");
- if (filename) // Filename hack for avs_check_file
- d->filename = strdup(filename);
- stream_reset(stream);
- stream_seek(stream, stream->start_pos);
- return d;
+demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename){
+ demuxer_t *d=malloc(sizeof(demuxer_t));
+ memset(d,0,sizeof(demuxer_t));
+ d->stream=stream;
+ d->stream_pts = MP_NOPTS_VALUE;
+ d->reference_clock = MP_NOPTS_VALUE;
+ d->movi_start=stream->start_pos;
+ d->movi_end=stream->end_pos;
+ d->seekable=1;
+ d->synced=0;
+ d->filepos=0;
+ d->audio=new_demuxer_stream(d,a_id);
+ d->video=new_demuxer_stream(d,v_id);
+ d->sub=new_demuxer_stream(d,s_id);
+ d->type=type;
+ if(type)
+ if (!(d->desc = get_demuxer_desc_from_type(type)))
+ mp_msg(MSGT_DEMUXER,MSGL_ERR,"BUG! Invalid demuxer type in new_demuxer(), big troubles ahead.");
+ if(filename) // Filename hack for avs_check_file
+ d->filename=strdup(filename);
+ stream_reset(stream);
+ stream_seek(stream,stream->start_pos);
+ return d;
}
extern int dvdsub_id;
-sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid)
-{
- if (id > MAX_S_STREAMS - 1 || id < 0) {
- mp_msg(MSGT_DEMUXER, MSGL_WARN,
- "Requested sub stream id overflow (%d > %d)\n", id,
- MAX_S_STREAMS);
- return NULL;
- }
- if (demuxer->s_streams[id])
- mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id);
- else {
- sh_sub_t *sh = calloc(1, sizeof(sh_sub_t));
- demuxer->s_streams[id] = sh;
- sh->sid = sid;
- mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
- }
- return demuxer->s_streams[id];
+sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) {
+ if (id > MAX_S_STREAMS - 1 || id < 0) {
+ mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested sub stream id overflow (%d > %d)\n",
+ id, MAX_S_STREAMS);
+ return NULL;
+ }
+ if (demuxer->s_streams[id])
+ mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id);
+ else {
+ sh_sub_t *sh = calloc(1, sizeof(sh_sub_t));
+ demuxer->s_streams[id] = sh;
+ sh->sid = sid;
+ mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
+ }
+ return demuxer->s_streams[id];
}
-void free_sh_sub(sh_sub_t *sh)
-{
+void free_sh_sub(sh_sub_t *sh) {
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
free(sh->extradata);
#ifdef USE_ASS
- if (sh->ass_track)
- ass_free_track(sh->ass_track);
+ if (sh->ass_track) ass_free_track(sh->ass_track);
#endif
free(sh->lang);
free(sh);
}
-sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid)
-{
- if (id > MAX_A_STREAMS - 1 || id < 0) {
- mp_msg(MSGT_DEMUXER, MSGL_WARN,
- "Requested audio stream id overflow (%d > %d)\n", id,
- MAX_A_STREAMS);
- return NULL;
+sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid){
+ if(id > MAX_A_STREAMS-1 || id < 0)
+ {
+ mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested audio stream id overflow (%d > %d)\n",
+ id, MAX_A_STREAMS);
+ return NULL;
}
- if (demuxer->a_streams[id]) {
- mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_AudioStreamRedefined, id);
+ if(demuxer->a_streams[id]){
+ mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_AudioStreamRedefined,id);
} else {
sh_audio_t *sh;
- mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundAudioStream, id);
- demuxer->a_streams[id] = calloc(1, sizeof(sh_audio_t));
+ mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id);
+ demuxer->a_streams[id]=calloc(1, sizeof(sh_audio_t));
sh = demuxer->a_streams[id];
// set some defaults
- sh->samplesize = 2;
- sh->sample_format = AF_FORMAT_S16_NE;
- sh->audio_out_minsize = 8192; /* default size, maybe not enough for Win32/ACM */
- sh->pts = MP_NOPTS_VALUE;
- mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
+ sh->samplesize=2;
+ sh->sample_format=AF_FORMAT_S16_NE;
+ sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
+ sh->pts=MP_NOPTS_VALUE;
+ mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
}
- ((sh_audio_t *) demuxer->a_streams[id])->aid = aid;
+ ((sh_audio_t *)demuxer->a_streams[id])->aid = aid;
return demuxer->a_streams[id];
}
-void free_sh_audio(demuxer_t *demuxer, int id)
-{
+void free_sh_audio(demuxer_t *demuxer, int id) {
sh_audio_t *sh = demuxer->a_streams[id];
demuxer->a_streams[id] = NULL;
- mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh);
+ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_audio at %p\n",sh);
free(sh->wf);
free(sh->codecdata);
free(sh->lang);
free(sh);
}
-sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid)
-{
- if (id > MAX_V_STREAMS - 1 || id < 0) {
- mp_msg(MSGT_DEMUXER, MSGL_WARN,
- "Requested video stream id overflow (%d > %d)\n", id,
- MAX_V_STREAMS);
- return NULL;
+sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid){
+ if(id > MAX_V_STREAMS-1 || id < 0)
+ {
+ mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested video stream id overflow (%d > %d)\n",
+ id, MAX_V_STREAMS);
+ return NULL;
}
- if (demuxer->v_streams[id])
- mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id);
- else {
- mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundVideoStream, id);
- demuxer->v_streams[id] = calloc(1, sizeof(sh_video_t));
- mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
+ if(demuxer->v_streams[id]){
+ mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_VideoStreamRedefined,id);
+ } else {
+ mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundVideoStream,id);
+ demuxer->v_streams[id]=calloc(1, sizeof(sh_video_t));
+ mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
}
- ((sh_video_t *) demuxer->v_streams[id])->vid = vid;
+ ((sh_video_t *)demuxer->v_streams[id])->vid = vid;
return demuxer->v_streams[id];
}
-void free_sh_video(sh_video_t *sh)
-{
- mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh);
+void free_sh_video(sh_video_t* sh){
+ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_video at %p\n",sh);
free(sh->bih);
free(sh);
}
-void free_demuxer(demuxer_t *demuxer)
-{
+void free_demuxer(demuxer_t *demuxer){
int i;
- mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing demuxer at %p\n",
- demuxer);
- if (demuxer->desc->close)
- demuxer->desc->close(demuxer);
+ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing demuxer at %p\n",demuxer);
+ if(demuxer->desc->close)
+ demuxer->desc->close(demuxer);
// Very ugly hack to make it behave like old implementation
if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS)
- goto skip_streamfree;
+ goto skip_streamfree;
// free streams:
- for (i = 0; i < MAX_A_STREAMS; i++)
- if (demuxer->a_streams[i])
- free_sh_audio(demuxer, i);
- for (i = 0; i < MAX_V_STREAMS; i++)
- if (demuxer->v_streams[i])
- free_sh_video(demuxer->v_streams[i]);
- for (i = 0; i < MAX_S_STREAMS; i++)
- if (demuxer->s_streams[i])
- free_sh_sub(demuxer->s_streams[i]);
+ for(i = 0; i < MAX_A_STREAMS; i++)
+ if(demuxer->a_streams[i]) free_sh_audio(demuxer, i);
+ for(i = 0; i < MAX_V_STREAMS; i++)
+ if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]);
+ for(i = 0; i < MAX_S_STREAMS; i++)
+ if(demuxer->s_streams[i]) free_sh_sub(demuxer->s_streams[i]);
// free demuxers:
free_demuxer_stream(demuxer->audio);
free_demuxer_stream(demuxer->video);
free_demuxer_stream(demuxer->sub);
- skip_streamfree:
- if (demuxer->info) {
- for (i = 0; demuxer->info[i] != NULL; i++)
- free(demuxer->info[i]);
- free(demuxer->info);
+skip_streamfree:
+ if(demuxer->info) {
+ for(i=0;demuxer->info[i] != NULL; i++)
+ free(demuxer->info[i]);
+ free(demuxer->info);
}
free(demuxer->filename);
if (demuxer->chapters) {
- for (i = 0; i < demuxer->num_chapters; i++)
- free(demuxer->chapters[i].name);
- free(demuxer->chapters);
+ for (i=0; i<demuxer->num_chapters; i++)
+ free(demuxer->chapters[i].name);
+ free(demuxer->chapters);
}
if (demuxer->attachments) {
- for (i = 0; i < demuxer->num_attachments; i++) {
- free(demuxer->attachments[i].name);
- free(demuxer->attachments[i].type);
- free(demuxer->attachments[i].data);
- }
- free(demuxer->attachments);
+ for (i=0; i<demuxer->num_attachments; i++) {
+ free(demuxer->attachments[i].name);
+ free(demuxer->attachments[i].type);
+ free(demuxer->attachments[i].data);
+ }
+ free(demuxer->attachments);
}
free(demuxer);
}
-void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp)
-{
+void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){
+// demux_packet_t* dp=new_demux_packet(len);
+// stream_read(stream,dp->buffer,len);
+// dp->pts=pts; //(float)pts/90000.0f;
+// dp->pos=pos;
// append packet to DS stream:
++ds->packs;
- ds->bytes += dp->len;
- if (ds->last) {
- // next packet in stream
- ds->last->next = dp;
- ds->last = dp;
+ ds->bytes+=dp->len;
+ if(ds->last){
+ // next packet in stream
+ ds->last->next=dp;
+ ds->last=dp;
} else {
- // first packet in stream
- ds->first = ds->last = dp;
+ // first packet in stream
+ ds->first=ds->last=dp;
}
- mp_dbg(MSGT_DEMUXER, MSGL_DBG2,
- "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n",
- (ds == ds->demuxer->audio) ? "d_audio" : "d_video", dp->len,
- dp->pts, (unsigned int) dp->pos, ds->demuxer->audio->packs,
- ds->demuxer->video->packs);
+ mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n",
+ (ds==ds->demuxer->audio)?"d_audio":"d_video",
+ dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs);
}
-void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len,
- double pts, off_t pos, int flags)
-{
- demux_packet_t *dp = new_demux_packet(len);
- len = stream_read(stream, dp->buffer, len);
+void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len, double pts, off_t pos, int flags) {
+ demux_packet_t* dp=new_demux_packet(len);
+ len = stream_read(stream,dp->buffer,len);
resize_demux_packet(dp, len);
- dp->pts = pts;
- dp->pos = pos;
- dp->flags = flags;
+ dp->pts=pts; //(float)pts/90000.0f;
+ dp->pos=pos;
+ dp->flags=flags;
// append packet to DS stream:
- ds_add_packet(ds, dp);
+ ds_add_packet(ds,dp);
}
// return value:
// 0 = EOF or no stream found or invalid type
// 1 = successfully read a packet
-int demux_fill_buffer(demuxer_t *demux, demux_stream_t *ds)
-{
- // Note: parameter 'ds' can be NULL!
- return demux->desc->fill_buffer(demux, ds);
+int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
+ // Note: parameter 'ds' can be NULL!
+// printf("demux->type=%d\n",demux->type);
+ return demux->desc->fill_buffer(demux, ds);
}
// return value:
// 0 = EOF
// 1 = successful
#define MAX_ACUMULATED_PACKETS 64
-int ds_fill_buffer(demux_stream_t *ds)
-{
- demuxer_t *demux = ds->demuxer;
- if (ds->current)
- free_demux_packet(ds->current);
- ds->current = NULL;
- if (mp_msg_test(MSGT_DEMUXER, MSGL_DBG3)) {
- if (ds == demux->audio)
- mp_dbg(MSGT_DEMUXER, MSGL_DBG3,
- "ds_fill_buffer(d_audio) called\n");
- else if (ds == demux->video)
- mp_dbg(MSGT_DEMUXER, MSGL_DBG3,
- "ds_fill_buffer(d_video) called\n");
- else if (ds == demux->sub)
- mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_fill_buffer(d_sub) called\n");
- else
- mp_dbg(MSGT_DEMUXER, MSGL_DBG3,
- "ds_fill_buffer(unknown 0x%X) called\n", (unsigned int) ds);
- }
- while (1) {
- if (ds->packs) {
- demux_packet_t *p = ds->first;
+int ds_fill_buffer(demux_stream_t *ds){
+ demuxer_t *demux=ds->demuxer;
+ if(ds->current) free_demux_packet(ds->current);
+ ds->current=NULL;
+ if( mp_msg_test(MSGT_DEMUXER,MSGL_DBG3) ){
+ if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else
+ if(ds==demux->video) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_video) called\n");else
+ if(ds==demux->sub) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_sub) called\n");else
+ mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(unknown 0x%X) called\n",(unsigned int)ds);
+ }
+ while(1){
+ if(ds->packs){
+ demux_packet_t *p=ds->first;
#if 0
- if (demux->reference_clock != MP_NOPTS_VALUE) {
- if ((p->pts != MP_NOPTS_VALUE)
- && (p->pts > demux->reference_clock)
- && (ds->packs < MAX_ACUMULATED_PACKETS)) {
- if (demux_fill_buffer(demux, ds))
- continue;
- }
- }
-#endif
- // copy useful data:
- ds->buffer = p->buffer;
- ds->buffer_pos = 0;
- ds->buffer_size = p->len;
- ds->pos = p->pos;
- ds->dpos += p->len; // !!!
- ++ds->pack_no;
- if (p->pts != MP_NOPTS_VALUE) {
- ds->pts = p->pts;
- ds->pts_bytes = 0;
- }
- ds->pts_bytes += p->len; // !!!
- if (p->stream_pts != MP_NOPTS_VALUE)
- demux->stream_pts = p->stream_pts;
- ds->flags = p->flags;
- // unlink packet:
- ds->bytes -= p->len;
- ds->current = p;
- ds->first = p->next;
- if (!ds->first)
- ds->last = NULL;
- --ds->packs;
- return 1;
- }
- if (demux->audio->packs >= MAX_PACKS
- || demux->audio->bytes >= MAX_PACK_BYTES) {
- mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer,
- demux->audio->packs, demux->audio->bytes);
- mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
- break;
- }
- if (demux->video->packs >= MAX_PACKS
- || demux->video->bytes >= MAX_PACK_BYTES) {
- mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer,
- demux->video->packs, demux->video->bytes);
- mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
- break;
- }
- if (!demux_fill_buffer(demux, ds)) {
- mp_dbg(MSGT_DEMUXER, MSGL_DBG2,
- "ds_fill_buffer()->demux_fill_buffer() failed\n");
- break; // EOF
+ if(demux->reference_clock != MP_NOPTS_VALUE) {
+ if((p->pts != MP_NOPTS_VALUE) && (p->pts > demux->reference_clock)
+ && (ds->packs < MAX_ACUMULATED_PACKETS)) {
+ if(demux_fill_buffer(demux,ds))
+ continue;
}
+ }
+#endif
+ // copy useful data:
+ ds->buffer=p->buffer;
+ ds->buffer_pos=0;
+ ds->buffer_size=p->len;
+ ds->pos=p->pos;
+ ds->dpos+=p->len; // !!!
+ ++ds->pack_no;
+ if (p->pts != MP_NOPTS_VALUE) {
+ ds->pts=p->pts;
+ ds->pts_bytes=0;
+ }
+ ds->pts_bytes+=p->len; // !!!
+ if(p->stream_pts != MP_NOPTS_VALUE) demux->stream_pts=p->stream_pts;
+ ds->flags=p->flags;
+ // unlink packet:
+ ds->bytes-=p->len;
+ ds->current=p;
+ ds->first=p->next;
+ if(!ds->first) ds->last=NULL;
+ --ds->packs;
+ return 1; //ds->buffer_size;
}
- ds->buffer_pos = ds->buffer_size = 0;
- ds->buffer = NULL;
- mp_msg(MSGT_DEMUXER, MSGL_V,
- "ds_fill_buffer: EOF reached (stream: %s) \n",
- ds == demux->audio ? "audio" : "video");
- ds->eof = 1;
- return 0;
+ if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){
+ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes);
+ mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
+ break;
+ }
+ if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){
+ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes);
+ mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
+ break;
+ }
+ if(!demux_fill_buffer(demux,ds)){
+ mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"ds_fill_buffer()->demux_fill_buffer() failed\n");
+ break; // EOF
+ }
+ }
+ ds->buffer_pos=ds->buffer_size=0;
+ ds->buffer=NULL;
+ mp_msg(MSGT_DEMUXER,MSGL_V,"ds_fill_buffer: EOF reached (stream: %s) \n",ds==demux->audio?"audio":"video");
+ ds->eof=1;
+ return 0;
}
-int demux_read_data(demux_stream_t *ds, unsigned char *mem, int len)
-{
- int x;
- int bytes = 0;
- while (len > 0) {
- x = ds->buffer_size - ds->buffer_pos;
- if (x == 0) {
- if (!ds_fill_buffer(ds))
- return bytes;
- } else {
- if (x > len)
- x = len;
- if (mem)
- fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x);
- bytes += x;
- len -= x;
- ds->buffer_pos += x;
- }
- }
- return bytes;
+int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){
+int x;
+int bytes=0;
+while(len>0){
+ x=ds->buffer_size-ds->buffer_pos;
+ if(x==0){
+ if(!ds_fill_buffer(ds)) return bytes;
+ } else {
+ if(x>len) x=len;
+ if(mem) fast_memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x);
+ bytes+=x;len-=x;ds->buffer_pos+=x;
+ }
+}
+return bytes;
}
/**
@@ -539,157 +494,143 @@ int demux_read_data(demux_stream_t *ds, unsigned char *mem, int len)
* \return whether pattern was found
*/
int demux_pattern_3(demux_stream_t *ds, unsigned char *mem, int maxlen,
- int *read, uint32_t pattern)
-{
- register uint32_t head = 0xffffff00;
- register uint32_t pat = pattern & 0xffffff00;
- int total_len = 0;
+ int *read, uint32_t pattern) {
+ register uint32_t head = 0xffffff00;
+ register uint32_t pat = pattern & 0xffffff00;
+ int total_len = 0;
+ do {
+ register unsigned char *ds_buf = &ds->buffer[ds->buffer_size];
+ int len = ds->buffer_size - ds->buffer_pos;
+ register long pos = -len;
+ if (unlikely(pos >= 0)) { // buffer is empty
+ ds_fill_buffer(ds);
+ continue;
+ }
do {
- register unsigned char *ds_buf = &ds->buffer[ds->buffer_size];
- int len = ds->buffer_size - ds->buffer_pos;
- register long pos = -len;
- if (unlikely(pos >= 0)) { // buffer is empty
- ds_fill_buffer(ds);
- continue;
- }
- do {
- head |= ds_buf[pos];
- head <<= 8;
- } while (++pos && head != pat);
- len += pos;
- if (total_len + len > maxlen)
- len = maxlen - total_len;
- len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len);
- total_len += len;
- } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof);
- if (read)
- *read = total_len;
- return total_len >= 3 && head == pat;
+ head |= ds_buf[pos];
+ head <<= 8;
+ } while (++pos && head != pat);
+ len += pos;
+ if (total_len + len > maxlen)
+ len = maxlen - total_len;
+ len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len);
+ total_len += len;
+ } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof);
+ if (read)
+ *read = total_len;
+ return total_len >= 3 && head == pat;
}
-void ds_free_packs(demux_stream_t *ds)
-{
- demux_packet_t *dp = ds->first;
- while (dp) {
- demux_packet_t *dn = dp->next;
- free_demux_packet(dp);
- dp = dn;
- }
- if (ds->asf_packet) {
- // free unfinished .asf fragments:
- free(ds->asf_packet->buffer);
- free(ds->asf_packet);
- ds->asf_packet = NULL;
- }
- ds->first = ds->last = NULL;
- ds->packs = 0; // !!!!!
- ds->bytes = 0;
- if (ds->current)
- free_demux_packet(ds->current);
- ds->current = NULL;
- ds->buffer = NULL;
- ds->buffer_pos = ds->buffer_size;
- ds->pts = 0;
- ds->pts_bytes = 0;
+void ds_free_packs(demux_stream_t *ds){
+ demux_packet_t *dp=ds->first;
+ while(dp){
+ demux_packet_t *dn=dp->next;
+ free_demux_packet(dp);
+ dp=dn;
+ }
+ if(ds->asf_packet){
+ // free unfinished .asf fragments:
+ free(ds->asf_packet->buffer);
+ free(ds->asf_packet);
+ ds->asf_packet=NULL;
+ }
+ ds->first=ds->last=NULL;
+ ds->packs=0; // !!!!!
+ ds->bytes=0;
+ if(ds->current) free_demux_packet(ds->current);
+ ds->current=NULL;
+ ds->buffer=NULL;
+ ds->buffer_pos=ds->buffer_size;
+ ds->pts=0; ds->pts_bytes=0;
}
-int ds_get_packet(demux_stream_t *ds, unsigned char **start)
-{
+int ds_get_packet(demux_stream_t *ds,unsigned char **start){
int len;
- if (ds->buffer_pos >= ds->buffer_size) {
- if (!ds_fill_buffer(ds)) {
+ if(ds->buffer_pos>=ds->buffer_size){
+ if(!ds_fill_buffer(ds)){
// EOF
*start = NULL;
return -1;
- }
+ }
}
- len = ds->buffer_size - ds->buffer_pos;
+ len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
- ds->buffer_pos += len;
+ ds->buffer_pos+=len;
return len;
}
-int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts)
+int ds_get_packet_pts(demux_stream_t *ds,unsigned char **start, double *pts)
{
int len;
*pts = MP_NOPTS_VALUE;
- if (ds->buffer_pos >= ds->buffer_size) {
- if (!ds_fill_buffer(ds)) {
+ if(ds->buffer_pos>=ds->buffer_size){
+ if (!ds_fill_buffer(ds)) {
// EOF
*start = NULL;
return -1;
- }
+ }
}
// Return pts unless this read starts from the middle of a packet
if (!ds->buffer_pos)
- *pts = ds->current->pts;
- len = ds->buffer_size - ds->buffer_pos;
+ *pts = ds->current->pts;
+ len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
- ds->buffer_pos += len;
+ ds->buffer_pos+=len;
return len;
}
-int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start)
-{
+int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){
int len;
- if (ds->buffer_pos >= ds->buffer_size) {
- *start = NULL;
- if (!ds->packs)
- return -1; // no sub
- if (!ds_fill_buffer(ds))
- return -1; // EOF
+ if(ds->buffer_pos>=ds->buffer_size){
+ *start = NULL;
+ if(!ds->packs) return -1; // no sub
+ if(!ds_fill_buffer(ds)) return -1; // EOF
}
- len = ds->buffer_size - ds->buffer_pos;
+ len=ds->buffer_size-ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
- ds->buffer_pos += len;
+ ds->buffer_pos+=len;
return len;
}
double ds_get_next_pts(demux_stream_t *ds)
{
- demuxer_t *demux = ds->demuxer;
- while (!ds->first) {
- if (demux->audio->packs >= MAX_PACKS
- || demux->audio->bytes >= MAX_PACK_BYTES) {
- mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer,
- demux->audio->packs, demux->audio->bytes);
- mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
- return MP_NOPTS_VALUE;
- }
- if (demux->video->packs >= MAX_PACKS
- || demux->video->bytes >= MAX_PACK_BYTES) {
- mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer,
- demux->video->packs, demux->video->bytes);
- mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
- return MP_NOPTS_VALUE;
- }
- if (!demux_fill_buffer(demux, ds))
- return MP_NOPTS_VALUE;
+ demuxer_t* demux = ds->demuxer;
+ while(!ds->first) {
+ if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){
+ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes);
+ mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
+ return MP_NOPTS_VALUE;
+ }
+ if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){
+ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes);
+ mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
+ return MP_NOPTS_VALUE;
}
- return ds->first->pts;
+ if(!demux_fill_buffer(demux,ds))
+ return MP_NOPTS_VALUE;
+ }
+ return ds->first->pts;
}
// ====================================================================
void demuxer_help(void)
{
- int i;
-
- mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
- mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n");
- mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n");
- for (i = 0; demuxer_list[i]; i++) {
- if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers
- continue;
- if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment))
- mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n",
- demuxer_list[i]->name, demuxer_list[i]->type,
- demuxer_list[i]->info, demuxer_list[i]->comment);
- else
- mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n",
- demuxer_list[i]->name, demuxer_list[i]->type,
- demuxer_list[i]->info);
- }
+ int i;
+
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n");
+ mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n");
+ for (i = 0; demuxer_list[i]; i++) {
+ if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers
+ continue;
+ if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment))
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n",
+ demuxer_list[i]->name, demuxer_list[i]->type, demuxer_list[i]->info, demuxer_list[i]->comment);
+ else
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s