summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_asf.c10
-rw-r--r--src/demuxers/demux_avi.c14
-rw-r--r--src/demuxers/demux_cda.c8
-rw-r--r--src/demuxers/demux_elem.c6
-rw-r--r--src/demuxers/demux_mpeg.c30
-rw-r--r--src/demuxers/demux_mpeg_block.c26
-rw-r--r--src/demuxers/demux_mpgaudio.c6
-rw-r--r--src/demuxers/demux_ogg.c6
-rw-r--r--src/demuxers/demux_pes.c14
-rw-r--r--src/demuxers/demux_qt.c10
-rw-r--r--src/demuxers/demux_ts.c10
11 files changed, 70 insertions, 70 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 034f03126..4fef54fb8 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_asf.c,v 1.21 2002/02/03 23:26:08 guenter Exp $
+ * $Id: demux_asf.c,v 1.22 2002/02/09 07:13:22 guenter Exp $
*
* demultiplexer for asf streams
*
@@ -701,8 +701,8 @@ static void asf_send_buffer_nodefrag (demux_asf_t *this, asf_stream_t *stream,
buf->input_pos = 0 ;
buf->input_time = 0 ;
}
- buf->PTS = timestamp * 90;
- buf->SCR = timestamp * 90;
+ buf->pts = timestamp * 90;
+ buf->scr = timestamp * 90;
buf->type = stream->buf_type;
buf->size = bufsize;
timestamp = 0;
@@ -774,9 +774,9 @@ static void asf_send_buffer_defrag (demux_asf_t *this, asf_stream_t *stream,
buf->input_time = 0 ;
}
- buf->PTS = stream->timestamp * 90 + stream->ts_per_kbyte *
+ buf->pts = stream->timestamp * 90 + stream->ts_per_kbyte *
(p-stream->buffer) / 1024;
- buf->SCR = buf->PTS;
+ buf->scr = buf->pts;
buf->type = stream->buf_type;
buf->size = bufsize;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 257dcc88a..6bb2b1ae3 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_avi.c,v 1.62 2002/01/24 22:55:51 guenter Exp $
+ * $Id: demux_avi.c,v 1.63 2002/02/09 07:13:22 guenter Exp $
*
* demultiplexer for avi streams
*
@@ -751,8 +751,8 @@ static int demux_avi_next (demux_avi_t *this) {
/* read audio */
- buf->PTS = audio_pts;
- buf->SCR = audio_pts;
+ buf->pts = audio_pts;
+ buf->scr = audio_pts;
buf->size = AVI_read_audio (this, this->avi, buf->mem, 2048, &buf->decoder_info[0]);
if (buf->size<0) {
@@ -778,8 +778,8 @@ static int demux_avi_next (demux_avi_t *this) {
/* read video */
- buf->PTS = video_pts;
- buf->SCR = video_pts;
+ buf->pts = video_pts;
+ buf->scr = video_pts;
buf->size = AVI_read_video (this, this->avi, buf->mem, 2048, &buf->decoder_info[0]);
buf->type = this->avi->video_type;
@@ -807,7 +807,7 @@ static int demux_avi_next (demux_avi_t *this) {
buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
buf->type = BUF_SPU_TEXT;
- buf->PTS = video_pts;
+ buf->pts = video_pts;
buf->decoder_info[0] = 1;
buf->decoder_info[1] = this->avi->video_posf;
@@ -923,7 +923,7 @@ static void demux_avi_start (demux_plugin_t *this_gen,
LOG_MSG(this->xine, _("demux_avi: video format = %s, audio format = 0x%lx\n"),
this->avi->compressor, this->avi->a_fmt);
- LOG_MSG(this->xine, _("demux_avi: video frame size %d x %d\n"),
+ LOG_MSG(this->xine, _("demux_avi: video frame size %ld x %ld\n"),
this->avi->width, this->avi->height);
this->no_audio = 0;
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index a585a988b..d5fd46b0f 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_cda.c,v 1.6 2002/01/14 21:42:59 f1rmb Exp $
+ * $Id: demux_cda.c,v 1.7 2002/02/09 07:13:22 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -93,11 +93,11 @@ static int demux_cda_next (demux_cda_t *this) {
pos = this->input->get_current_pos(this->input);
len = this->input->get_length(this->input);
- buf->PTS = 0;
- buf->SCR = 0;
+ buf->pts = 0;
+ buf->scr = 0;
buf->input_pos = pos;
buf->input_time = buf->input_pos / this->blocksize;
- buf->type = BUF_VIDEO_FILL; /* Fake */
+ buf->type = BUF_CONTROL_NOP; /* Fake */
this->video_fifo->put(this->video_fifo, buf);
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 44f000590..608c74fa0 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_elem.c,v 1.32 2002/01/02 18:16:07 jkeil Exp $
+ * $Id: demux_elem.c,v 1.33 2002/02/09 07:13:22 guenter Exp $
*
* demultiplexer for elementary mpeg streams
*
@@ -108,8 +108,8 @@ static int demux_mpeg_elem_next (demux_mpeg_elem_t *this, int preview_mode) {
else
buf->decoder_info[0] = 1;
- buf->PTS = 0;
- buf->SCR = 0;
+ buf->pts = 0;
+ buf->scr = 0;
buf->input_pos = this->input->get_current_pos(this->input);
buf->type = BUF_VIDEO_MPEG;
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 8df1d4fe1..ddfc39cfc 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg.c,v 1.48 2002/01/02 18:16:07 jkeil Exp $
+ * $Id: demux_mpeg.c,v 1.49 2002/02/09 07:13:22 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
* reads streams of variable blocksizes
@@ -185,8 +185,8 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, uint32_t scr)
return ;
}
buf->type = BUF_AUDIO_A52 + track;
- buf->PTS = pts;
- buf->SCR = scr;
+ buf->pts = pts;
+ buf->scr = scr;
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -235,8 +235,8 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, uint32_t scr)
return ;
}
buf->type = BUF_AUDIO_MPEG + track;
- buf->PTS = pts;
- buf->SCR = scr;
+ buf->pts = pts;
+ buf->scr = scr;
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -280,8 +280,8 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, uint32_t scr)
return ;
}
buf->type = BUF_VIDEO_MPEG;
- buf->PTS = pts;
- buf->SCR = scr;
+ buf->pts = pts;
+ buf->scr = scr;
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -392,8 +392,8 @@ static void parse_mpeg1_packet (demux_mpeg_t *this, int stream_id, uint32_t scr)
return ;
}
buf->type = BUF_AUDIO_MPEG + track ;
- buf->PTS = pts;
- buf->SCR = scr;
+ buf->pts = pts;
+ buf->scr = scr;
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -415,8 +415,8 @@ static void parse_mpeg1_packet (demux_mpeg_t *this, int stream_id, uint32_t scr)
return ;
}
buf->type = BUF_VIDEO_MPEG;
- buf->PTS = pts;
- buf->SCR = scr;
+ buf->pts = pts;
+ buf->scr = scr;
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -516,14 +516,14 @@ static uint32_t parse_pack(demux_mpeg_t *this) {
buf_element_t *buf;
buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
- buf->type = BUF_CONTROL_AVSYNC_RESET;
- buf->SCR = scr;
+ buf->type = BUF_CONTROL_DISCONTINUITY;
+ buf->scr = scr;
this->video_fifo->put (this->video_fifo, buf);
if (this->audio_fifo) {
buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
- buf->type = BUF_CONTROL_AVSYNC_RESET;
- buf->SCR = scr;
+ buf->type = BUF_CONTROL_DISCONTINUITY;
+ buf->scr = scr;
this->audio_fifo->put (this->audio_fifo, buf);
}
}
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 0eb35d522..53f1a0b86 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_block.c,v 1.75 2002/02/01 13:01:57 f1rmb Exp $
+ * $Id: demux_mpeg_block.c,v 1.76 2002/02/09 07:13:23 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -202,7 +202,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
scr |= (p[6] & 0xFF) << 7;
scr |= (p[7] & 0xFE) >> 1;
- buf->SCR = scr;
+ buf->scr = scr;
/* mux_rate */
@@ -234,7 +234,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
scr += ( (p[8] & 0x03 << 7) | (p[9] & 0xFE >> 1) );
*/
- buf->SCR = scr;
+ buf->scr = scr;
/* mux_rate */
@@ -294,14 +294,14 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
#endif
buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
- buf->type = BUF_CONTROL_AVSYNC_RESET;
- buf->SCR = scr;
+ buf->type = BUF_CONTROL_DISCONTINUITY;
+ buf->scr = scr;
this->video_fifo->put (this->video_fifo, buf);
if (this->audio_fifo) {
buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
- buf->type = BUF_CONTROL_AVSYNC_RESET;
- buf->SCR = scr;
+ buf->type = BUF_CONTROL_DISCONTINUITY;
+ buf->scr = scr;
this->audio_fifo->put (this->audio_fifo, buf);
}
}
@@ -315,7 +315,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
buf->content = p;
buf->size = packet_len;
buf->type = BUF_SPU_NAV;
- buf->PTS = 0; /* NAV packets do not have PES values */
+ buf->pts = 0; /* NAV packets do not have PES values */
buf->input_pos = this->input->get_current_pos(this->input);
this->video_fifo->put (this->video_fifo, buf);
return ;
@@ -424,7 +424,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
buf->content = p+1;
buf->size = packet_len-1;
buf->type = BUF_SPU_PACKAGE + spu_id;
- buf->PTS = PTS;
+ buf->pts = PTS;
buf->input_pos = this->input->get_current_pos(this->input);
this->video_fifo->put (this->video_fifo, buf);
@@ -445,7 +445,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
} else {
buf->type = BUF_AUDIO_A52 + track;
}
- buf->PTS = PTS;
+ buf->pts = PTS;
buf->input_pos = this->input->get_current_pos(this->input);
@@ -505,7 +505,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
buf->content = p+pcm_offset;
buf->size = packet_len-pcm_offset;
buf->type = BUF_AUDIO_LPCM_BE + track;
- buf->PTS = PTS;
+ buf->pts = PTS;
buf->input_pos = this->input->get_current_pos(this->input);
@@ -522,7 +522,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
buf->content = p;
buf->size = packet_len;
buf->type = BUF_VIDEO_MPEG;
- buf->PTS = PTS;
+ buf->pts = PTS;
buf->input_pos = this->input->get_current_pos(this->input);
@@ -538,7 +538,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
buf->content = p;
buf->size = packet_len;
buf->type = BUF_AUDIO_MPEG + track;
- buf->PTS = PTS;
+ buf->pts = PTS;
buf->input_pos = this->input->get_current_pos(this->input);
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 17e10c138..df01ac14d 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpgaudio.c,v 1.33 2002/01/13 21:15:48 jcdutton Exp $
+ * $Id: demux_mpgaudio.c,v 1.34 2002/02/09 07:13:23 guenter Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -207,8 +207,8 @@ static int demux_mpgaudio_next (demux_mpgaudio_t *this) {
}
}
- buf->PTS = 0;
- buf->SCR = 0;
+ buf->pts = 0;
+ buf->scr = 0;
buf->input_pos = this->input->get_current_pos(this->input);
buf->input_time = buf->input_pos * this->stream_length /
this->input->get_length(this->input);
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index b78f9cd63..c1382cbdb 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_ogg.c,v 1.13 2002/01/02 18:16:07 jkeil Exp $
+ * $Id: demux_ogg.c,v 1.14 2002/02/09 07:13:23 guenter Exp $
*
* demultiplexer for ogg streams
*
@@ -184,8 +184,8 @@ static void demux_ogg_send_package (demux_ogg_t *this, int is_content) {
}
- buf->PTS = 0; /* FIXME */
- buf->SCR = 0; /* FIXME */
+ buf->pts = 0; /* FIXME */
+ buf->scr = 0; /* FIXME */
buf->size = op.bytes;
buf->decoder_info[0] = is_content;
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 26d36ecad..2a5305aee 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_pes.c,v 1.17 2002/01/02 18:16:07 jkeil Exp $
+ * $Id: demux_pes.c,v 1.18 2002/02/09 07:13:23 guenter Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -183,8 +183,8 @@ static void parse_mpeg2_packet (demux_pes_t *this, int nID) {
return ;
}
buf->type = BUF_AUDIO_A52 + track;
- buf->PTS = pts;
- buf->SCR = pts; /* FIMXE! */
+ buf->pts = pts;
+ buf->scr = pts; /* FIMXE! */
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -229,8 +229,8 @@ static void parse_mpeg2_packet (demux_pes_t *this, int nID) {
return ;
}
buf->type = BUF_AUDIO_MPEG + track;
- buf->PTS = pts;
- buf->SCR = pts; /* FIXME ! */
+ buf->pts = pts;
+ buf->scr = pts; /* FIXME ! */
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
@@ -275,8 +275,8 @@ static void parse_mpeg2_packet (demux_pes_t *this, int nID) {
return ;
}
buf->type = BUF_VIDEO_MPEG;
- buf->PTS = pts;
- buf->SCR = pts; /* FIXME! */
+ buf->pts = pts;
+ buf->scr = pts; /* FIXME! */
if (this->preview_mode)
buf->decoder_info[0] = 0;
else
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index bfbda7a61..a739bfa59 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_qt.c,v 1.19 2002/01/15 21:10:31 miguelfreitas Exp $
+ * $Id: demux_qt.c,v 1.20 2002/02/09 07:13:23 guenter Exp $
*
* demultiplexer for quicktime streams, based on:
*
@@ -4026,8 +4026,8 @@ static void *demux_qt_loop (void *this_gen) {
/* int count; */
- buf->PTS = audio_pts;
- buf->SCR = audio_pts;
+ buf->pts = audio_pts;
+ buf->scr = audio_pts;
buf->type = this->audio_type;
buf->decoder_info[0] = 1;
buf->input_time = 0;
@@ -4073,8 +4073,8 @@ static void *demux_qt_loop (void *this_gen) {
buf->content = buf->mem;
buf->size = copy_bytes;
- buf->PTS = video_pts;
- buf->SCR = video_pts;
+ buf->pts = video_pts;
+ buf->scr = video_pts;
buf->type = this->video_type;
buf->input_time = video_pts / 90000;
buf->input_pos = this->input->get_current_pos(this->input);
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 54bcd6c8e..44e05147c 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_ts.c,v 1.35 2002/01/13 21:15:48 jcdutton Exp $
+ * $Id: demux_ts.c,v 1.36 2002/02/09 07:13:23 guenter Exp $
*
* Demultiplexer for MPEG2 Transport Streams.
*
@@ -544,8 +544,8 @@ static void demux_ts_buffer_pes(demux_ts *this, unsigned char *ts,
buf->content = buf->mem;
buf->size = m->size;
buf->type = m->type;
- buf->PTS = m->PTS;
- buf->SCR = this->PCR;
+ buf->pts = m->PTS;
+ buf->scr = this->PCR;
buf->decoder_info[0] = 1;
m->fifo->put (m->fifo, buf);
}
@@ -556,8 +556,8 @@ static void demux_ts_buffer_pes(demux_ts *this, unsigned char *ts,
buf->content = buf->mem;
buf->size = len;
buf->type = m->type;
- buf->PTS = 0;
- buf->SCR = 0;
+ buf->pts = 0;
+ buf->scr = 0;
buf->input_pos = this->input->get_current_pos(this->input);
buf->decoder_info[0] = 1;
m->fifo->put (m->fifo, buf);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 01:20:53 +0000