aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-02 02:11:43 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-02 02:11:43 +0200
commitb7baebb754f548ccd106ebcacd09ffa289382fd4 (patch)
tree383fd216c3876bfc2969417ea37b7ff85d7f57a4
parenteac161451d248fdd375d403f9bb7d0bec68bc40b (diff)
downloadffmpeg-b7baebb754f548ccd106ebcacd09ffa289382fd4.tar.gz
avcodec/ffv1dec: Print CRCs at picture debug level
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/ffv1dec.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 133ad851d6..162e41bcbf 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -513,6 +513,7 @@ static int read_extra_header(FFV1Context *f)
uint8_t state[CONTEXT_SIZE];
int i, j, k, ret;
uint8_t state2[32][CONTEXT_SIZE];
+ unsigned crc = 0;
memset(state2, 128, sizeof(state2));
memset(state, 128, sizeof(state));
@@ -598,11 +599,12 @@ static int read_extra_header(FFV1Context *f)
av_log(f->avctx, AV_LOG_ERROR, "CRC mismatch %X!\n", v);
return AVERROR_INVALIDDATA;
}
+ crc = AV_RB32(f->avctx->extradata + f->avctx->extradata_size - 4);
}
if (f->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(f->avctx, AV_LOG_DEBUG,
- "global: ver:%d.%d, coder:%d, colorspace: %d bpr:%d chroma:%d(%d:%d), alpha:%d slices:%dx%d qtabs:%d ec:%d intra:%d\n",
+ "global: ver:%d.%d, coder:%d, colorspace: %d bpr:%d chroma:%d(%d:%d), alpha:%d slices:%dx%d qtabs:%d ec:%d intra:%d CRC:0x%08X\n",
f->version, f->micro_version,
f->ac,
f->colorspace,
@@ -612,7 +614,8 @@ static int read_extra_header(FFV1Context *f)
f->num_h_slices, f->num_v_slices,
f->quant_table_count,
f->ec,
- f->intra
+ f->intra,
+ crc
);
return 0;
}
@@ -947,6 +950,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
}
fs->slice_damaged = 1;
}
+ if (avctx->debug & FF_DEBUG_PICT_INFO) {
+ av_log(avctx, AV_LOG_DEBUG, "slice %d, CRC: 0x%08X\n", i, AV_RB32(buf_p + v - 4));
+ }
}
if (i) {