Mercurial > mplayer.hg
annotate libmpdemux/demux_rtp_internal.h @ 25509:1cfa39a320cc
Fix update_subtitles() checking subtitle type for the wrong track.
update_subtitles() uses 'type' field from d_dvdsub even when some other track
is active. For this reason, external vobsub is not displayed when there is at
least one text track from demuxer (type is always 't' or 'a' in this case).
The solution is to check vobsub_id and dvdsub_id instead.
author | eugeni |
---|---|
date | Fri, 28 Dec 2007 20:57:38 +0000 |
parents | 3f0d00abc073 |
children | 3baf6a2283da |
rev | line source |
---|---|
23689
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
22852
diff
changeset
|
1 #ifndef DEMUX_RTP_INTERNAL_H |
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
22852
diff
changeset
|
2 #define DEMUX_RTP_INTERNAL_H |
9250 | 3 |
4 #include <stdlib.h> | |
5 | |
6 extern "C" { | |
23689
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
22852
diff
changeset
|
7 #ifndef STREAM_H |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22454
diff
changeset
|
8 #include "stream/stream.h" |
9250 | 9 #endif |
23689
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
22852
diff
changeset
|
10 #ifndef DEMUXER_H |
9250 | 11 #include "demuxer.h" |
12 #endif | |
22852 | 13 #ifdef USE_LIBAVCODEC_SO |
14 #include <ffmpeg/avcodec.h> | |
15 #elif defined(USE_LIBAVCODEC) | |
16 #include "libavcodec/avcodec.h" | |
17 #endif | |
9250 | 18 } |
19 | |
20 #ifndef _LIVEMEDIA_HH | |
12530
773ad7374436
MinGW compilation fix, idea and approval by Sascha Sommer
diego
parents:
11754
diff
changeset
|
21 #undef STREAM_SEEK |
9250 | 22 #include <liveMedia.hh> |
23 #endif | |
24 | |
25 // Codec-specific initialization routines: | |
26 void rtpCodecInitialize_video(demuxer_t* demuxer, | |
27 MediaSubsession* subsession, unsigned& flags); | |
28 void rtpCodecInitialize_audio(demuxer_t* demuxer, | |
29 MediaSubsession* subsession, unsigned& flags); | |
30 | |
31 // Flags that may be set by the above routines: | |
9565
e74916774667
Improved RTP packet buffering, by relying on the underlying OS's UDP
rsf
parents:
9250
diff
changeset
|
32 #define RTPSTATE_IS_MPEG12_VIDEO 0x1 // is a MPEG-1 or 2 video stream |
10476
1bc3ac054b08
Added support for checking whether a RTP demuxer had combined audio+video data.
rsf
parents:
9565
diff
changeset
|
33 #define RTPSTATE_IS_MULTIPLEXED 0x2 // is a combined audio+video stream |
9250 | 34 |
35 // A routine to wait for the first packet of a RTP stream to arrive. | |
36 // (For some RTP payload formats, codecs cannot be fully initialized until | |
37 // we've started receiving data.) | |
9565
e74916774667
Improved RTP packet buffering, by relying on the underlying OS's UDP
rsf
parents:
9250
diff
changeset
|
38 Boolean awaitRTPPacket(demuxer_t* demuxer, demux_stream_t* ds, |
e74916774667
Improved RTP packet buffering, by relying on the underlying OS's UDP
rsf
parents:
9250
diff
changeset
|
39 unsigned char*& packetData, unsigned& packetDataLen, |
e74916774667
Improved RTP packet buffering, by relying on the underlying OS's UDP
rsf
parents:
9250
diff
changeset
|
40 float& pts); |
9250 | 41 // "streamType": 0 => video; 1 => audio |
42 // This routine returns False if the input stream has closed | |
43 | |
44 #endif |