On 12/08/13 06:25, Kostya Shishkov wrote: > On Mon, Aug 12, 2013 at 12:17:11AM +0200, Luca Barbato wrote: >> Update the fate reference since the last broken frame is not decoded >> anymore. >> >> Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind >> CC: [email protected] >> --- >> libavcodec/nuv.c | 4 +++- >> tests/ref/fate/nuv-rtjpeg | 1 - >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c >> index b3331a6..37bca3b 100644 >> --- a/libavcodec/nuv.c >> +++ b/libavcodec/nuv.c >> @@ -200,8 +200,10 @@ static int decode_frame(AVCodecContext *avctx, void >> *data, int *got_frame, >> buf_size -= 12; >> if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { >> int outlen = c->decomp_size, inlen = buf_size; >> - if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) >> + if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) { >> av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); >> + return AVERROR_INVALIDDATA; >> + } >> buf = c->decomp_buf; >> buf_size = c->decomp_size; >> } >> diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg >> index e9286d6..a5c9c4a 100644 >> --- a/tests/ref/fate/nuv-rtjpeg >> +++ b/tests/ref/fate/nuv-rtjpeg >> @@ -7,4 +7,3 @@ >> 0, 269, 269, 0, 460800, 0x4e091ee2 >> 0, 302, 302, 0, 460800, 0x2ea88828 >> 0, 335, 335, 0, 460800, 0x4b7f4df0 >> -0, 369, 369, 0, 460800, 0xb30eb322 >> -- > > probably OK though our idea was to decode any random data thrown at decoder
The sample file with the lzo-failure rejected looks better though... I'd first get all the stuff right and then relax the rejection while adding concealment. lu _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
