RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  rtpdec_vp8: Don't trim too much data from broken frames
  rtpdec_vp8: Simplify code by using an existing helper function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-10 13:07:19 +01:00
parent b563afe6fa 76c40fbef0
commit 91da6b97c7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/rtpdec_vp8.c
View File

@ -200,7 +200,6 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
int ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index);
if (ret < 0)
return ret;
pkt->size = vp8->first_part_size;
pkt->flags |= AV_PKT_FLAG_CORRUPT;
returned_old_frame = 1;
old_timestamp = vp8->timestamp;
@ -225,11 +224,8 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
if (vp8->timestamp != *timestamp) {
// Missed the start of the new frame, sequence broken
vp8->sequence_ok = 0;
av_log(ctx, AV_LOG_WARNING,
"Received no start marker; dropping frame\n");
vp8_free_buffer(vp8);
return AVERROR(EAGAIN);
return vp8_broken_sequence(ctx, vp8,
"Received no start marker; dropping frame\n");
}
if (seq != expected_seq) {
@ -250,7 +246,8 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
return vp8_broken_sequence(ctx, vp8, "Received no start marker\n");
vp8->prev_seq = seq;
avio_write(vp8->data, buf, len);
if (!vp8->broken_frame)
avio_write(vp8->data, buf, len);
if (returned_old_frame) {
*timestamp = old_timestamp;
@ -262,8 +259,6 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index);
if (ret < 0)
return ret;
if (vp8->broken_frame)
pkt->size = vp8->first_part_size;
if (vp8->sequence_dirty)
pkt->flags |= AV_PKT_FLAG_CORRUPT;
return 0;