diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-03-19 17:07:37 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-03-22 16:03:52 -0400 |
| commit | 6202e2fede75df92cbc374a3f7d6893d0c5ac721 (patch) | |
| tree | eb7c278ea7504620db09b5b6d0cd9737f261e65f /libavcodec/indeo4.c | |
| parent | 4426540f0c3ee516662f79d0a6ab5b95503b6611 (diff) | |
indeo4: Rework stream analysis report
* Change log level from error to debug
* Print report after the first decoded frame, not at the end of decoding
* Drop macro guard and use a context variable instead
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 64ed8cd581..4ec09dcc3a 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -119,17 +119,13 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) return AVERROR_INVALIDDATA; } -#if IVI4_STREAM_ANALYSER if (ctx->frame_type == IVI4_FRAMETYPE_BIDIR) ctx->has_b_frames = 1; -#endif ctx->transp_status = get_bits1(&ctx->gb); -#if IVI4_STREAM_ANALYSER if (ctx->transp_status) { ctx->has_transp = 1; } -#endif /* unknown bit: Mac decoder ignores this bit, XANIM returns error */ if (get_bits1(&ctx->gb)) { @@ -166,9 +162,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) if (get_bits1(&ctx->gb)) { pic_conf.tile_height = scale_tile_size(pic_conf.pic_height, get_bits(&ctx->gb, 4)); pic_conf.tile_width = scale_tile_size(pic_conf.pic_width, get_bits(&ctx->gb, 4)); -#if IVI4_STREAM_ANALYSER ctx->uses_tiling = 1; -#endif } else { pic_conf.tile_height = pic_conf.pic_height; pic_conf.tile_width = pic_conf.pic_width; @@ -293,10 +287,8 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, band->is_halfpel); return AVERROR_INVALIDDATA; } -#if IVI4_STREAM_ANALYSER if (!band->is_halfpel) ctx->uses_fullpel = 1; -#endif band->checksum_present = get_bits1(&ctx->gb); if (band->checksum_present) @@ -328,10 +320,8 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, return AVERROR_PATCHWELCOME; } -#if IVI4_STREAM_ANALYSER if ((transform_id >= 0 && transform_id <= 2) || transform_id == 10) ctx->uses_haar = 1; -#endif band->inv_transform = transforms[transform_id].inv_trans; band->dc_transform = transforms[transform_id].dc_trans; @@ -640,6 +630,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->is_nonnull_frame = is_nonnull_frame; ctx->is_indeo4 = 1; + ctx->show_indeo4_info = 1; ctx->dst_buf = 0; ctx->ref_buf = 1; |