#include "bytestream.h"
-static void build_huffman_codes(uint8_t *huff_size, const uint8_t *bits_table)
-{
- for (int i = 1, k = 0; i <= 16; i++) {
- int nb = bits_table[i];
- for (int j = 0; j < nb;j++) {
- huff_size[k] = i;
- k++;
- }
- }
-}
-
-static int build_vlc(VLC *vlc, const uint8_t *bits_table,
- const uint8_t *val_table, int nb_codes,
- int is_ac, void *logctx)
-{
- uint8_t huff_size[256];
- uint16_t huff_sym[256];
- int i;
-
- av_assert0(nb_codes <= 256);
-
- build_huffman_codes(huff_size, bits_table);
-
- for (i = 0; i < nb_codes; i++) {
- huff_sym[i] = val_table[i] + 16 * is_ac;
-
- if (is_ac && !val_table[i])
- huff_sym[i] = 16 * 256;
- }
-
- return ff_init_vlc_from_lengths(vlc, 9, nb_codes, huff_size, 1,
- huff_sym, 2, 2, 0, 0, logctx);
-}
-
static int init_default_huffman_tables(MJpegDecodeContext *s)
{
static const struct {
int i, ret;
for (i = 0; i < FF_ARRAY_ELEMS(ht); i++) {
- ret = build_vlc(&s->vlcs[ht[i].class][ht[i].index],
- ht[i].bits, ht[i].values, ht[i].length,
- ht[i].class == 1, s->avctx);
+ ff_free_vlc(&s->vlcs[ht[i].class][ht[i].index]);
+ ret = ff_mjpeg_build_vlc(&s->vlcs[ht[i].class][ht[i].index],
+ ht[i].bits, ht[i].values,
+ ht[i].class == 1, s->avctx);
if (ret < 0)
return ret;
s->buffer = NULL;
s->start_code = -1;
s->first_picture = 1;
+ s->seen_sof = 0;
s->got_picture = 0;
s->orig_height = avctx->coded_height;
avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
if (ff_mjpeg_decode_dht(s)) {
av_log(avctx, AV_LOG_ERROR,
"error using external huffman table, switching back to internal\n");
- init_default_huffman_tables(s);
+ if ((ret = init_default_huffman_tables(s)) < 0)
+ return ret;
}
}
if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */
ff_free_vlc(&s->vlcs[class][index]);
av_log(s->avctx, AV_LOG_DEBUG, "class=%d index=%d nb_codes=%d\n",
class, index, n);
- if ((ret = build_vlc(&s->vlcs[class][index], bits_table, val_table,
- n, class > 0, s->avctx)) < 0)
+ if ((ret = ff_mjpeg_build_vlc(&s->vlcs[class][index], bits_table,
+ val_table, class > 0, s->avctx)) < 0)
return ret;
if (class > 0) {
ff_free_vlc(&s->vlcs[2][index]);
- if ((ret = build_vlc(&s->vlcs[2][index], bits_table, val_table,
- n, 0, s->avctx)) < 0)
+ if ((ret = ff_mjpeg_build_vlc(&s->vlcs[2][index], bits_table,
+ val_table, 0, s->avctx)) < 0)
return ret;
}
memcpy(s->h_count, h_count, sizeof(h_count));
memcpy(s->v_count, v_count, sizeof(v_count));
s->interlaced = 0;
+ s->seen_sof = 0;
s->got_picture = 0;
/* test interlaced mode */
if (ret < 0)
return ret;
+ if ((s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') ||
+ s->avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) &&
+ s->orig_height < height)
+ s->avctx->height = AV_CEIL_RSHIFT(s->orig_height, s->avctx->lowres);
+
s->first_picture = 0;
} else {
size_change = 0;
case 0x12121100:
case 0x22122100:
case 0x21211100:
+ case 0x21112100:
case 0x22211200:
case 0x22221100:
case 0x22112200:
} else if (s->nb_components != 1) {
av_log(s->avctx, AV_LOG_ERROR, "Unsupported number of components %d\n", s->nb_components);
return AVERROR_PATCHWELCOME;
- } else if (s->palette_index && s->bits <= 8)
- s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
- else if (s->bits <= 8)
- s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
- else
+ } else if (s->bits <= 8) {
+ avpriv_set_systematic_pal2(s->palette, s->avctx->pix_fmt);
+ if (s->palette_index)
+ s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ else
+ s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
+ } else
s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
}
if (s->avctx->skip_frame == AVDISCARD_ALL) {
s->picture_ptr->pict_type = AV_PICTURE_TYPE_I;
s->picture_ptr->key_frame = 1;
- s->got_picture = 1;
+ s->seen_sof = 1;
return 0;
}
-
- av_frame_unref(s->picture_ptr);
- if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0)
- return -1;
- s->picture_ptr->pict_type = AV_PICTURE_TYPE_I;
- s->picture_ptr->key_frame = 1;
- s->got_picture = 1;
-
- for (i = 0; i < 4; i++)
- s->linesize[i] = s->picture_ptr->linesize[i] << s->interlaced;
-
- ff_dlog(s->avctx, "%d %d %d %d %d %d\n",
- s->width, s->height, s->linesize[0], s->linesize[1],
- s->interlaced, s->avctx->height);
-
}
+ s->seen_sof = 1;
+
if ((s->rgb && !s->lossless && !s->ls) ||
(!s->rgb && s->ls && s->nb_components > 1) ||
(s->avctx->pix_fmt == AV_PIX_FMT_PAL8 && !s->ls)
memset(s->coefs_finished, 0, sizeof(s->coefs_finished));
}
- if (s->avctx->hwaccel) {
- s->hwaccel_picture_private =
- av_mallocz(s->avctx->hwaccel->frame_priv_data_size);
- if (!s->hwaccel_picture_private)
- return AVERROR(ENOMEM);
-
- ret = s->avctx->hwaccel->start_frame(s->avctx, s->raw_image_buffer,
- s->raw_image_buffer_size);
- if (ret < 0)
- return ret;
- }
-
return 0;
}
const int block_size = s->lossless ? 1 : 8;
int ilv, prev_shift;
- if (!s->got_picture) {
+ if (!s->seen_sof) {
av_log(s->avctx, AV_LOG_WARNING,
"Can not process SOS before SOF, skipping\n");
return -1;
}
+ if (!s->got_picture || !s->interlaced || !(s->bottom_field == !s->interlace_polarity)) {
+ av_frame_unref(s->picture_ptr);
+ if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0)
+ return -1;
+ s->picture_ptr->pict_type = AV_PICTURE_TYPE_I;
+ s->picture_ptr->key_frame = 1;
+
+ for (i = 0; i < 4; i++)
+ s->linesize[i] = s->picture_ptr->linesize[i] << s->interlaced;
+
+ if (s->picture_ptr->format == AV_PIX_FMT_PAL8)
+ memcpy(s->picture_ptr->data[1], s->palette, sizeof(s->palette));
+
+ s->got_picture = 1;
+
+ ff_dlog(s->avctx, "%d %d %d %d %d %d\n",
+ s->width, s->height, s->linesize[0], s->linesize[1],
+ s->interlaced, s->avctx->height);
+
+ if (s->avctx->hwaccel && !s->hwaccel_picture_private) {
+ s->hwaccel_picture_private =
+ av_mallocz(s->avctx->hwaccel->frame_priv_data_size);
+ if (!s->hwaccel_picture_private)
+ return AVERROR(ENOMEM);
+
+ ret = s->avctx->hwaccel->start_frame(s->avctx, s->raw_image_buffer,
+ s->raw_image_buffer_size);
+ if (ret < 0)
+ return ret;
+ }
+ }
+
if (reference) {
if (reference->width != s->picture_ptr->width ||
reference->height != s->picture_ptr->height ||
/* Allocate if this is the first APP2 we've seen. */
if (s->iccnum == 0) {
- s->iccdata = av_mallocz(nummarkers * sizeof(*(s->iccdata)));
- s->iccdatalens = av_mallocz(nummarkers * sizeof(*(s->iccdatalens)));
- if (!s->iccdata || !s->iccdatalens) {
+ if (!FF_ALLOCZ_TYPED_ARRAY(s->iccentries, nummarkers)) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate ICC data arrays\n");
return AVERROR(ENOMEM);
}
s->iccnum = nummarkers;
}
- if (s->iccdata[seqno - 1]) {
+ if (s->iccentries[seqno - 1].data) {
av_log(s->avctx, AV_LOG_WARNING, "Duplicate ICC sequence number\n");
goto out;
}
- s->iccdatalens[seqno - 1] = len;
- s->iccdata[seqno - 1] = av_malloc(len);
- if (!s->iccdata[seqno - 1]) {
+ s->iccentries[seqno - 1].length = len;
+ s->iccentries[seqno - 1].data = av_malloc(len);
+ if (!s->iccentries[seqno - 1].data) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate ICC data buffer\n");
return AVERROR(ENOMEM);
}
- memcpy(s->iccdata[seqno - 1], align_get_bits(&s->gb), len);
+ memcpy(s->iccentries[seqno - 1].data, align_get_bits(&s->gb), len);
skip_bits(&s->gb, len << 3);
len = 0;
s->iccread++;
{
int i;
- if (s->iccdata)
+ if (s->iccentries) {
for (i = 0; i < s->iccnum; i++)
- av_freep(&s->iccdata[i]);
- av_freep(&s->iccdata);
- av_freep(&s->iccdatalens);
+ av_freep(&s->iccentries[i].data);
+ av_freep(&s->iccentries);
+ }
s->iccread = 0;
s->iccnum = 0;
break;
}
if (avctx->skip_frame == AVDISCARD_ALL) {
+ s->seen_sof = 0;
s->got_picture = 0;
ret = AVERROR(EAGAIN);
goto the_end_no_picture;
}
if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0)
return ret;
+ s->seen_sof = 0;
s->got_picture = 0;
frame->pkt_dts = s->pkt->dts;
- if (!s->lossless) {
+ if (!s->lossless && avctx->debug & FF_DEBUG_QP) {
int qp = FFMAX3(s->qscale[0],
s->qscale[1],
s->qscale[2]);
- int qpw = (s->width + 15) / 16;
- AVBufferRef *qp_table_buf = av_buffer_alloc(qpw);
- if (qp_table_buf) {
- memset(qp_table_buf->data, qp, qpw);
- av_frame_set_qp_table(frame, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1);
- }
- if(avctx->debug & FF_DEBUG_QP)
- av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp);
+ av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp);
}
goto the_end;
av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n");
return AVERROR_INVALIDDATA;
fail:
+ s->seen_sof = 0;
s->got_picture = 0;
return ret;
the_end:
/* Sum size of all parts. */
for (i = 0; i < s->iccnum; i++)
- total_size += s->iccdatalens[i];
+ total_size += s->iccentries[i].length;
sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size);
if (!sd) {
/* Reassemble the parts, which are now in-order. */
for (i = 0; i < s->iccnum; i++) {
- memcpy(sd->data + offset, s->iccdata[i], s->iccdatalens[i]);
- offset += s->iccdatalens[i];
+ memcpy(sd->data + offset, s->iccentries[i].data, s->iccentries[i].length);
+ offset += s->iccentries[i].length;
}
}
return ret;
}
}
+ if ((avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') ||
+ avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) &&
+ avctx->coded_height > s->orig_height) {
+ frame->height = AV_CEIL_RSHIFT(avctx->coded_height, avctx->lowres);
+ frame->crop_top = frame->height - avctx->height;
+ }
ret = 0;
reset_icc_profile(s);
av_freep(&s->hwaccel_picture_private);
+ av_freep(&s->jls_state);
return 0;
}
static void decode_flush(AVCodecContext *avctx)
{
MJpegDecodeContext *s = avctx->priv_data;
+ s->seen_sof = 0;
s->got_picture = 0;
s->smv_next_frame = 0;
.flush = decode_flush,
.capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING |
- FF_CODEC_CAP_SETS_PKT_DTS,
+ FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP,
};
#endif
projects / ffmpeg / blobdiff