diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-12-18 13:18:52 +0000 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-12-18 13:18:52 +0000 |
commit | bf09a0198121467b5a79ba03363b0d1e4dbc3e58 (patch) | |
tree | bc91852d949f66872b9e868531d4294a22ef710f /libavformat/asfdec.c | |
parent | d09b5a869fea0de5c2f43c547f8ccba8f4740293 (diff) | |
download | ffmpeg-bf09a0198121467b5a79ba03363b0d1e4dbc3e58.tar.gz |
Change ASF demuxer to return incomplete last packets.
Whether the behaviour for streams using scrambling makes sense
is unclear.
Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asfdec.c')
-rw-r--r-- | libavformat/asfdec.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 843b109511..36876fa1fd 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -953,12 +953,24 @@ static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket * ret = get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, asf->packet_frag_size); - if (ret != asf->packet_frag_size) - return ret >= 0 ? AVERROR_EOF : ret; + if (ret != asf->packet_frag_size) { + if (ret < 0 || asf->packet_frag_offset + ret == 0) + return ret < 0 ? ret : AVERROR_EOF; + if (asf_st->ds_span > 1) { + // scrambling, we can either drop it completely or fill the remainder + // TODO: should we fill the whole packet instead of just the current + // fragment? + memset(asf_st->pkt.data + asf->packet_frag_offset + ret, 0, + asf->packet_frag_size - ret); + ret = asf->packet_frag_size; + } else + // no scrambling, so we can return partial packets + av_shrink_packet(&asf_st->pkt, asf->packet_frag_offset + ret); + } if (s->key && s->keylen == 20) ff_asfcrypt_dec(s->key, asf_st->pkt.data + asf->packet_frag_offset, - asf->packet_frag_size); - asf_st->frag_offset += asf->packet_frag_size; + ret); + asf_st->frag_offset += ret; /* test if whole packet is read */ if (asf_st->frag_offset == asf_st->pkt.size) { //workaround for macroshit radio DVR-MS files |