int i, j;
for (i = 0; i < FF_ARRAY_ELEMS(s->plane); i++) {
+ Plane *p = &s->plane[i];
av_freep(&s->plane[i].idwt_buf);
av_freep(&s->plane[i].idwt_tmp);
s->plane[i].idwt_size = 0;
for (j = 0; j < 10; j++)
s->plane[i].l_h[j] = NULL;
+
+ for (j = 0; j < DWT_LEVELS_3D; j++)
+ p->band[j][0].read_ok =
+ p->band[j][1].read_ok =
+ p->band[j][2].read_ok =
+ p->band[j][3].read_ok = 0;
}
s->a_height = 0;
s->a_width = 0;
coeff_data = s->plane[s->channel_num].subband[s->subband_num_actual];
/* Lowpass coefficients */
- if (tag == BitstreamMarker && data == 0xf0f && s->a_width && s->a_height) {
- int lowpass_height = s->plane[s->channel_num].band[0][0].height;
- int lowpass_width = s->plane[s->channel_num].band[0][0].width;
- int lowpass_a_height = s->plane[s->channel_num].band[0][0].a_height;
- int lowpass_a_width = s->plane[s->channel_num].band[0][0].a_width;
+ if (tag == BitstreamMarker && data == 0xf0f) {
+ int lowpass_height, lowpass_width, lowpass_a_height, lowpass_a_width;
+
+ if (!s->a_width || !s->a_height) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+
+ lowpass_height = s->plane[s->channel_num].band[0][0].height;
+ lowpass_width = s->plane[s->channel_num].band[0][0].width;
+ lowpass_a_height = s->plane[s->channel_num].band[0][0].a_height;
+ lowpass_a_width = s->plane[s->channel_num].band[0][0].a_width;
if (lowpass_width < 3 ||
lowpass_width > lowpass_a_width) {
lowpass_width * sizeof(*coeff_data));
}
+ s->plane[s->channel_num].band[0][0].read_ok = 1;
+
av_log(avctx, AV_LOG_DEBUG, "Lowpass coefficients %d\n", lowpass_width * lowpass_height);
}
- if ((tag == BandHeader || tag == BandSecondPass) && s->subband_num_actual != 255 && s->a_width && s->a_height) {
- int highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height;
- int highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width;
- int highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width;
- int highpass_a_height = s->plane[s->channel_num].band[s->level][s->subband_num].a_height;
- int highpass_stride = s->plane[s->channel_num].band[s->level][s->subband_num].stride;
+ av_assert0(s->subband_num_actual != 255);
+ if (tag == BandHeader || tag == BandSecondPass) {
+ int highpass_height, highpass_width, highpass_a_width, highpass_a_height, highpass_stride, a_expected;
int expected;
- int a_expected = highpass_a_height * highpass_a_width;
int level, run, coeff;
int count = 0, bytes;
+ if (!s->a_width || !s->a_height) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+
+ highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height;
+ highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width;
+ highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width;
+ highpass_a_height = s->plane[s->channel_num].band[s->level][s->subband_num].a_height;
+ highpass_stride = s->plane[s->channel_num].band[s->level][s->subband_num].stride;
+ a_expected = highpass_a_height * highpass_a_width;
+
if (!got_buffer) {
av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n");
ret = AVERROR(EINVAL);
bytestream2_seek(&gb, bytes, SEEK_CUR);
av_log(avctx, AV_LOG_DEBUG, "End subband coeffs %i extra %i\n", count, count - expected);
+ s->plane[s->channel_num].band[s->level][s->subband_num].read_ok = 1;
finish:
if (s->subband_num_actual != 255)
s->codebook = 0;
goto end;
}
+ for (plane = 0; plane < s->planes; plane++) {
+ int o, level;
+
+ for (level = 0; level < (s->transform_type == 0 ? DWT_LEVELS : DWT_LEVELS_3D) ; level++) {
+ if (s->transform_type == 2)
+ if (level == 2 || level == 5)
+ continue;
+ for (o = !!level; o < 4 ; o++) {
+ if (!s->plane[plane].band[level][o].read_ok) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+ }
+ }
+ }
+
if (s->transform_type == 0 && s->sample_type != 1) {
for (plane = 0; plane < s->planes && !ret; plane++) {
/* level 1 */
}
#endif
-AVCodec ff_cfhd_decoder = {
+const AVCodec ff_cfhd_decoder = {
.name = "cfhd",
.long_name = NULL_IF_CONFIG_SMALL("GoPro CineForm HD"),
.type = AVMEDIA_TYPE_VIDEO,