summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_mpeg_pes.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_mpeg_pes.c')
-rw-r--r--src/demuxers/demux_mpeg_pes.c67
1 files changed, 43 insertions, 24 deletions
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index d1753d907..ecaeedc38 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.18 2003/11/26 19:43:30 f1rmb Exp $
+ * $Id: demux_mpeg_pes.c,v 1.19 2003/12/05 15:54:57 f1rmb Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -302,8 +302,11 @@ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode)
} else if (this->stream_id == 0xFF) {
result = parse_program_stream_directory(this, p, buf);
} else {
- printf("xine-lib:demux_mpeg_pes: Unrecognised stream_id 0x%02x. Please report this to xine developers.\n", this->stream_id);
- printf("xine-lib:demux_mpeg_pes: packet_len=%d\n", this->packet_len);
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+ _("xine-lib:demux_mpeg_pes: Unrecognised stream_id 0x%02x. "
+ "Please report this to xine developers.\n"), this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: packet_len=%d\n", this->packet_len);
buf->free_buffer (buf);
return;
}
@@ -323,85 +326,99 @@ static int32_t parse_padding_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_elem
}
static int32_t parse_program_stream_map(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x.\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x.\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_ecm_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_emm_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_dsmcc_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_iec_13522_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_h222_typeA_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_h222_typeB_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_h222_typeC_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_h222_typeD_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_h222_typeE_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_IEC14496_SL_packetized_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_IEC14496_FlexMux_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_program_stream_directory(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
static int32_t parse_ancillary_stream(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf) {
/* FIXME: Implement */
- printf("xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "xine-lib:demux_mpeg_pes: Unhandled stream_id 0x%02x\n", this->stream_id);
buf->free_buffer (buf);
return -1;
}
@@ -663,9 +680,9 @@ static int32_t parse_pes_for_pts(demux_mpeg_pes_t *this, uint8_t *p, buf_element
/* check PES scrambling_control */
if ((p[6] & 0x30) != 0) {
- printf("demux_mpeg_pes: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n", (p[6] & 0x30) >> 4);
- xine_log (this->stream->xine, XINE_LOG_MSG,
- _("demux_mpeg_pes: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4);
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+ _("demux_mpeg_pes: warning: PES header indicates that "
+ "this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4);
_x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
"Media stream scrambled/encrypted", NULL);
this->status = DEMUX_FINISHED;
@@ -831,7 +848,8 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el
switch ((p[5]>>6) & 3) {
case 3: /* illegal, use 16-bits? */
default:
- printf ("illegal lpcm sample format (%d), assume 16-bit samples\n",
+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "illegal lpcm sample format (%d), assume 16-bit samples\n",
(p[5]>>6) & 3 );
case 0: bits_per_sample = 16; break;
case 1: bits_per_sample = 20; break;
@@ -897,7 +915,8 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el
/* Some new streams have been encountered.
1) DVD+RW disc recorded with a Philips DVD recorder: - new unknown sub-stream id of 0xff
*/
- printf("demux_mpeg_pes:Unrecognised private stream 1 0x%02x. Please report this to xine developers.\n", p[0]);
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+ _("demux_mpeg_pes:Unrecognised private stream 1 0x%02x. Please report this to xine developers.\n"), p[0]);
buf->free_buffer(buf);
return this->packet_len + result;
}
@@ -1063,8 +1082,8 @@ static int demux_mpeg_pes_estimate_rate (demux_mpeg_pes_t *this) {
/* we should now have a PES packet here */
if (p[0] || p[1] || (p[2] != 1)) {
- printf ("demux_mpeg_pes: error %02x %02x %02x (should be 0x000001) \n",
- p[0], p[1], p[2]);
+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "demux_mpeg_pes: error %02x %02x %02x (should be 0x000001) \n", p[0], p[1], p[2]);
buf->free_buffer (buf);
return rate;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 17:17:22 +0000