diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-04 11:00:20 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-04 11:00:20 +0000 |
commit | 63985abe1a9b5818370054327904b265c3ac8cfa (patch) | |
tree | 596ce6b57304c3f56ed12fec9d8251a1e8d987ff | |
parent | a6401e400b1fd78d6ff8714fe81bb724376613fc (diff) | |
download | mpv-63985abe1a9b5818370054327904b265c3ac8cfa.tar.bz2 mpv-63985abe1a9b5818370054327904b265c3ac8cfa.tar.xz |
print ts_probe; 0x88 .. 0x8F in pes_private streams are not AC3 but DTS tracks (unsupported); save the size of the payload of the current PES packet in any case (used for ac3 detection)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17725 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/demux_ts.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index be3adfcafb..4292a16614 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -963,7 +963,7 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer) } - mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...POS=%"PRIu64"\n", params.atype, demuxer->audio->id, params.vtype, demuxer->video->id, (uint64_t) start_pos); + mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...POS=%"PRIu64", PROBE=%"PRIu64"\n", params.atype, demuxer->audio->id, params.vtype, demuxer->video->id, (uint64_t) start_pos, ts_probe); start_pos = (start_pos <= priv->ts.packet_size ? 0 : start_pos - priv->ts.packet_size); @@ -1315,7 +1315,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es, return 1; } - else if ((p[0] & 0xF0) == 0x80) + else if ((p[0] & 0xF8) == 0x80) { mp_msg(MSGT_DEMUX, MSGL_DBG2, "A52 WITH HEADER\n"); es->start = p+4; @@ -2867,6 +2867,8 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, { if(es->type == UNKNOWN) return 0; + + tss->payload_size = es->payload_size; if(len == 0) { if(tss->type != UNKNOWN) |