virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Add "AVFormatContext *ctx" (that being the RTSP demuxer's) as first argument

Browse Source 
to the parse_packet() function pointer in RTPDynamicProtocolHandlers. This
allows these functions to peek back and retrieve values from the demuxer's
context (or RTSPState). The ASF/RTP payload parser will use this to be able
to parse SDP values (which occur even before the payload ID is given), store
them in the RTSPState and then retrieve them while parsing payload data. See
"[PATCH] RTSP-MS 13/15: add RTSP demuxer AVFormatContext to parse_packet()
function pointer (was: transport context)" mailinglist thread.

Originally committed as revision 17015 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-02-06 01:37:19 +00:00
parent 4606a05979
commit 1a45a9f4c0
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rdt.c
View File

@ -295,7 +295,7 @@ ff_rdt_parse_header(const uint8_t *buf, int len,
/**< return 0 on packet, no more left, 1 on packet, 1 on partial packet... */ /**< return 0 on packet, no more left, 1 on packet, 1 on partial packet... */
static int static int
rdt_parse_packet (PayloadContext *rdt, AVStream *st, rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
AVPacket *pkt, uint32_t *timestamp, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, int flags) const uint8_t *buf, int len, int flags)
{ {
@ -347,7 +347,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt,
if (!buf && s->prev_stream_id != -1) { if (!buf && s->prev_stream_id != -1) {
/* return the next packets, if any */ /* return the next packets, if any */
timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned....
rv= s->parse_packet(s->dynamic_protocol_context, rv= s->parse_packet(s->ic, s->dynamic_protocol_context,
s->streams[s->prev_stream_id], s->streams[s->prev_stream_id],
pkt, &timestamp, NULL, 0, flags); pkt, &timestamp, NULL, 0, flags);
return rv; return rv;
@ -374,7 +374,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt,
return -1; return -1;
} }
rv = s->parse_packet(s->dynamic_protocol_context, rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
s->streams[s->prev_stream_id], s->streams[s->prev_stream_id],
pkt, &timestamp, buf, len, flags); pkt, &timestamp, buf, len, flags);

4
libavformat/rtp.h
View File

@ -107,6 +107,7 @@ typedef struct {
/** /**
* Packet parsing for "private" payloads in the RTP specs. * Packet parsing for "private" payloads in the RTP specs.
* *
* @param ctx RTSP demuxer context
* @param s stream context * @param s stream context
* @param st stream that this packet belongs to * @param st stream that this packet belongs to
* @param pkt packet in which to write the parsed data * @param pkt packet in which to write the parsed data
@ -115,7 +116,8 @@ typedef struct {
* @param len length of buf * @param len length of buf
* @param flags flags from the RTP packet header (PKT_FLAG_*) * @param flags flags from the RTP packet header (PKT_FLAG_*)
*/ */
typedef int (*DynamicPayloadPacketHandlerProc) (PayloadContext *s, typedef int (*DynamicPayloadPacketHandlerProc) (AVFormatContext *ctx,
PayloadContext *s,
AVStream *st, AVStream *st,
AVPacket * pkt, AVPacket * pkt,
uint32_t *timestamp, uint32_t *timestamp,

3
libavformat/rtp_h264.c
View File

@ -159,7 +159,8 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream,
} }
// return 0 on packet, no more left, 1 on packet, 1 on partial packet... // return 0 on packet, no more left, 1 on packet, 1 on partial packet...
static int h264_handle_packet(PayloadContext *data, static int h264_handle_packet(AVFormatContext *ctx,
PayloadContext *data,
AVStream *st, AVStream *st,
AVPacket * pkt, AVPacket * pkt,
uint32_t * timestamp, uint32_t * timestamp,

4
libavformat/rtpdec.c
View File

@ -407,7 +407,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
/* return the next packets, if any */ /* return the next packets, if any */
if(s->st && s->parse_packet) { if(s->st && s->parse_packet) {
timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned....
rv= s->parse_packet(s->dynamic_protocol_context, rv= s->parse_packet(s->ic, s->dynamic_protocol_context,
s->st, pkt, &timestamp, NULL, 0, flags); s->st, pkt, &timestamp, NULL, 0, flags);
finalize_packet(s, pkt, timestamp); finalize_packet(s, pkt, timestamp);
return rv; return rv;
@ -472,7 +472,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
return 1; return 1;
} }
} else if (s->parse_packet) { } else if (s->parse_packet) {
rv = s->parse_packet(s->dynamic_protocol_context, rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
s->st, pkt, &timestamp, buf, len, flags); s->st, pkt, &timestamp, buf, len, flags);
} else { } else {
// at this point, the RTP header has been stripped; This is ASSUMING that there is only 1 CSRC, which in't wise. // at this point, the RTP header has been stripped; This is ASSUMING that there is only 1 CSRC, which in't wise.