summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/xine.h.in36
-rw-r--r--src/demuxers/demux_mpeg_pes.c103
2 files changed, 109 insertions, 30 deletions
diff --git a/include/xine.h.in b/include/xine.h.in
index 5410e98b6..041bf3518 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -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: xine.h.in,v 1.125 2004/07/07 00:25:31 miguelfreitas Exp $
+ * $Id: xine.h.in,v 1.126 2004/07/19 19:53:40 miguelfreitas Exp $
*
* public xine-lib (libxine) interface and documentation
*
@@ -1414,6 +1414,40 @@ void xine_config_reset (xine_t *self);
#define XINE_EVENT_PVR_PAUSE 204
#define XINE_EVENT_SET_MPEG_DATA 205
+/* VDR specific event types */
+#define XINE_EVENT_VDR_RED 300
+#define XINE_EVENT_VDR_GREEN 301
+#define XINE_EVENT_VDR_YELLOW 302
+#define XINE_EVENT_VDR_BLUE 303
+#define XINE_EVENT_VDR_PLAY 304
+#define XINE_EVENT_VDR_PAUSE 305
+#define XINE_EVENT_VDR_STOP 306
+#define XINE_EVENT_VDR_RECORD 307
+#define XINE_EVENT_VDR_FASTFWD 308
+#define XINE_EVENT_VDR_FASTREW 309
+#define XINE_EVENT_VDR_POWER 310
+#define XINE_EVENT_VDR_CHANNELPLUS 311
+#define XINE_EVENT_VDR_CHANNELMINUS 312
+#define XINE_EVENT_VDR_SCHEDULE 313
+#define XINE_EVENT_VDR_CHANNELS 314
+#define XINE_EVENT_VDR_TIMERS 315
+#define XINE_EVENT_VDR_RECORDINGS 316
+#define XINE_EVENT_VDR_SETUP 317
+#define XINE_EVENT_VDR_COMMANDS 318
+#define XINE_EVENT_VDR_BACK 319
+#define XINE_EVENT_VDR_USER1 320
+#define XINE_EVENT_VDR_USER2 321
+#define XINE_EVENT_VDR_USER3 322
+#define XINE_EVENT_VDR_USER4 323
+#define XINE_EVENT_VDR_USER5 324
+#define XINE_EVENT_VDR_USER6 325
+#define XINE_EVENT_VDR_USER7 326
+#define XINE_EVENT_VDR_USER8 327
+#define XINE_EVENT_VDR_USER9 328
+#define XINE_EVENT_VDR_VOLPLUS 329
+#define XINE_EVENT_VDR_VOLMINUS 330
+#define XINE_EVENT_VDR_MUTE 331
+
/*
* xine event struct
*/
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 5c3e5e02e..1054112b5 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_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_mpeg_pes.c,v 1.25 2004/06/13 21:28:53 miguelfreitas Exp $
+ * $Id: demux_mpeg_pes.c,v 1.26 2004/07/19 19:53:41 miguelfreitas Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -169,47 +169,66 @@ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode)
int32_t result;
off_t i;
int32_t n;
+ uint8_t buf6[ 6 ];
+
this->scr = 0;
this->preview_mode = preview_mode;
- /* FIXME: buf must be allocated from somewhere before calling here. */
- if (this->video_fifo) {
- buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
- } else if (this->audio_fifo) {
- buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
- } else {
- return;
- }
-
- if (preview_mode)
- buf->decoder_flags = BUF_FLAG_PREVIEW;
- else
- buf->decoder_flags = 0;
-
- if( this->input->get_length (this->input) )
- buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
- 65535 / this->input->get_length (this->input) );
-
- i = this->input->read (this->input, buf->mem, (off_t) 6);
+ /* read first 6 bytes of PES packet into a local buffer. */
+ i = this->input->read (this->input, buf6, (off_t) 6);
if (i != 6) {
- buf->free_buffer (buf);
this->status = DEMUX_FINISHED;
return;
}
- p = buf->mem;
+ p = buf6;
- while (p[0] || p[1] || (p[2] != 1)) {
+ while ((p[2] != 1) || p[0] || p[1]) {
/* resync code */
for(n=0;n<5;n++) p[n]=p[n+1];
i = this->input->read (this->input, p+5, (off_t) 1);
if (i != 1) {
- buf->free_buffer (buf);
this->status = DEMUX_FINISHED;
return;
}
+ }
+
+ /* FIXME: buf must be allocated from somewhere before calling here. */
+
+ /* these streams should be allocated on the audio_fifo, if available. */
+ if ((0xC0 <= p[ 3 ] && p[ 3 ] <= 0xDF) /* audio_stream */
+ || 0xBD == p[ 3 ]) /* private_sream_1 */
+ {
+ if (this->audio_fifo)
+ buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+ }
+ if (!buf) /* still no buffer => try video fifo first. */
+ {
+ if (this->video_fifo) {
+ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
+ } else if (this->audio_fifo) {
+ buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+ } else {
+ return;
+ }
}
+
+ p = buf->mem;
+
+ /* copy local buffer to fifo element. */
+ for (n = 0; n < sizeof (buf6); n++)
+ p[ n ] = buf6[ n ];
+
+ if (preview_mode)
+ buf->decoder_flags = BUF_FLAG_PREVIEW;
+ else
+ buf->decoder_flags = 0;
+
+ if( this->input->get_length (this->input) )
+ buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
+ 65535 / this->input->get_length (this->input) );
+
this->stream_id = p[3];
if (this->stream_id == 0xBA) {
this->wait_for_program_stream_pack_header=0;
@@ -254,6 +273,7 @@ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode)
this->status = DEMUX_FINISHED;
return;
}
+ buf->size = buf->max_size;
}
if (this->stream_id == 0xBB) {
@@ -269,10 +289,10 @@ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode)
return;
result = parse_private_stream_2(this, p, buf);
} else if ((this->stream_id >= 0xC0)
- && (this->stream_id < 0xDF)) {
+ && (this->stream_id <= 0xDF)) {
result = parse_audio_stream(this, p, buf);
} else if ((this->stream_id >= 0xE0)
- && (this->stream_id < 0xEF)) {
+ && (this->stream_id <= 0xEF)) {
result = parse_video_stream(this, p, buf);
} else if (this->stream_id == 0xF0) {
result = parse_ecm_stream(this, p, buf);
@@ -321,9 +341,29 @@ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode)
static int32_t parse_padding_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* Just skip padding. */
- buf->free_buffer (buf);
- return this->packet_len;
+ int todo = 6 + this->packet_len;
+ int done = buf->size;
+
+ while (done < todo)
+ {
+ /* Handle Jumbo frames from VDR. */
+ int i;
+
+ int size = buf->max_size;
+ if ((todo - done) < size)
+ size = todo - done;
+
+ i = this->input->read (this->input, buf->mem, (off_t)size);
+ if (i != size)
+ break;
+
+ done += i;
+ }
+
+ buf->free_buffer(buf);
+ return this->packet_len + 6;
}
+
static int32_t parse_program_stream_map(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
@@ -844,7 +884,12 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el
* 111 => 8 channel
*/
num_channels = (p[5] & 0x7) + 1;
- sample_rate = p[5] & 0x10 ? 96000 : 48000;
+ switch ((p[5]>>4) & 3) {
+ case 0: sample_rate = 48000; break;
+ case 1: sample_rate = 96000; break;
+ case 2: sample_rate = 44100; break;
+ case 3: sample_rate = 32000; break;
+ }
switch ((p[5]>>6) & 3) {
case 3: /* illegal, use 16-bits? */
default:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 18:51:32 +0000