RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8d918a98aa24134a043d578ef45bae363dbed9db'

Browse Source 
* commit '8d918a98aa24134a043d578ef45bae363dbed9db':
  rtpdec: Use the right logging context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-24 18:24:34 +00:00
commit 79b1a24b7d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/rtpdec.c
View File

@ -150,8 +150,7 @@ static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf,
switch (buf[1]) {
case RTCP_SR:
if (payload_len < 20) {
av_log(NULL, AV_LOG_ERROR,
"Invalid length for RTCP SR packet\n");
av_log(s->ic, AV_LOG_ERROR, "Invalid RTCP SR packet length\n");
return AVERROR_INVALIDDATA;
}
@ -521,8 +520,8 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
s->st = st;
s->queue_size = queue_size;
av_log(s->st ? s->st->codec : NULL, AV_LOG_VERBOSE,
"setting jitter buffer size to %d\n", s->queue_size);
av_log(s->ic, AV_LOG_VERBOSE, "setting jitter buffer size to %d\n",
s->queue_size);
rtp_init_statistics(&s->statistics, 0);
if (st) {
@ -623,7 +622,7 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
st = s->st;
// only do something with this if all the rtp checks pass...
if (!rtp_valid_packet_in_sequence(&s->statistics, seq)) {
av_log(st ? st->codec : NULL, AV_LOG_ERROR,
av_log(s->ic, AV_LOG_ERROR,
"RTP: PT=%02x: bad cseq %04x expected=%04x\n",
payload_type, seq, ((s->seq + 1) & 0xffff));
return -1;
@ -737,7 +736,7 @@ static int rtp_parse_queued_packet(RTPDemuxContext *s, AVPacket *pkt)
return -1;
if (!has_next_packet(s))
av_log(s->st ? s->st->codec : NULL, AV_LOG_WARNING,
av_log(s->ic, AV_LOG_WARNING,
"RTP: missed %d packets\n", s->queue->seq - s->seq - 1);
/* Parse the first packet in the queue, and dequeue it */
@ -804,7 +803,7 @@ static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt,
int16_t diff = seq - s->seq;
if (diff < 0) {
/* Packet older than the previously emitted one, drop */
av_log(s->st ? s->st->codec : NULL, AV_LOG_WARNING,
av_log(s->ic, AV_LOG_WARNING,
"RTP: dropping old packet received too late\n");
return -1;
} else if (diff <= 1) {
@ -820,8 +819,7 @@ static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt,
/* Return the first enqueued packet if the queue is full,
* even if we're missing something */
if (s->queue_len >= s->queue_size) {
av_log(s->st ? s->st->codec : NULL, AV_LOG_WARNING,
"jitter buffer full\n");
av_log(s->ic, AV_LOG_WARNING, "jitter buffer full\n");
return rtp_parse_queued_packet(s, pkt);
}
return -1;
@ -871,7 +869,7 @@ int ff_parse_fmtp(AVFormatContext *s,
int value_size = strlen(p) + 1;
if (!(value = av_malloc(value_size))) {
av_log(NULL, AV_LOG_ERROR, "Failed to allocate data for FMTP.\n");
av_log(s, AV_LOG_ERROR, "Failed to allocate data for FMTP.\n");
return AVERROR(ENOMEM);
}