Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mjpegdec: convert to receive_frame()

Browse Source 
This will be useful in the following commit.
pull/358/head
Anton Khirnov 4 years ago
parent 36237ac4ee
commit e9a2a87773
4 changed files with 80 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavcodec/jpeglsdec.c
  2. 77
      libavcodec/mjpegdec.c
  3. 8
      libavcodec/mjpegdec.h
  4. 34
      libavcodec/sp5xdec.c

5
libavcodec/jpeglsdec.c
Unescape View File

@ -551,7 +551,8 @@ AVCodec ff_jpegls_decoder = {
.priv_data_size = sizeof(MJpegDecodeContext), .priv_data_size = sizeof(MJpegDecodeContext),
.init = ff_mjpeg_decode_init, .init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end, .close = ff_mjpeg_decode_end,
.decode = ff_mjpeg_decode_frame, .receive_frame = ff_mjpeg_receive_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SETS_PKT_DTS,
}; };

77
libavcodec/mjpegdec.c
Unescape View File

@ -36,6 +36,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "blockdsp.h" #include "blockdsp.h"
#include "copy_block.h" #include "copy_block.h"
#include "decode.h"
#include "hwconfig.h" #include "hwconfig.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "internal.h" #include "internal.h"
@ -158,6 +159,10 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
s->picture_ptr = s->picture; s->picture_ptr = s->picture;
} }
s->pkt = av_packet_alloc();
if (!s->pkt)
return AVERROR(ENOMEM);
s->avctx = avctx; s->avctx = avctx;
ff_blockdsp_init(&s->bdsp, avctx); ff_blockdsp_init(&s->bdsp, avctx);
ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_hpeldsp_init(&s->hdsp, avctx->flags);
@ -2331,12 +2336,32 @@ static void reset_icc_profile(MJpegDecodeContext *s)
s->iccnum = 0; s->iccnum = 0;
} }
int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int mjpeg_get_packet(AVCodecContext *avctx)
AVPacket *avpkt) {
MJpegDecodeContext *s = avctx->priv_data;
int ret;
av_packet_unref(s->pkt);
ret = ff_decode_get_packet(avctx, s->pkt);
if (ret < 0)
return ret;
#if CONFIG_SP5X_DECODER || CONFIG_AMV_DECODER
if (avctx->codec_id == AV_CODEC_ID_SP5X ||
avctx->codec_id == AV_CODEC_ID_AMV) {
ret = ff_sp5x_process_packet(avctx, s->pkt);
if (ret < 0)
return ret;
}
#endif
s->buf_size = s->pkt->size;
return 0;
}
int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{ {
AVFrame *frame = data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MJpegDecodeContext *s = avctx->priv_data; MJpegDecodeContext *s = avctx->priv_data;
const uint8_t *buf_end, *buf_ptr; const uint8_t *buf_end, *buf_ptr;
const uint8_t *unescaped_buf_ptr; const uint8_t *unescaped_buf_ptr;
@ -2347,8 +2372,6 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
int ret = 0; int ret = 0;
int is16bit; int is16bit;
s->buf_size = buf_size;
av_dict_free(&s->exif_metadata); av_dict_free(&s->exif_metadata);
av_freep(&s->stereo3d); av_freep(&s->stereo3d);
s->adobe_transform = -1; s->adobe_transform = -1;
@ -2356,8 +2379,12 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (s->iccnum != 0) if (s->iccnum != 0)
reset_icc_profile(s); reset_icc_profile(s);
buf_ptr = buf; ret = mjpeg_get_packet(avctx);
buf_end = buf + buf_size; if (ret < 0)
return ret;
buf_ptr = s->pkt->data;
buf_end = s->pkt->data + s->pkt->size;
while (buf_ptr < buf_end) { while (buf_ptr < buf_end) {
/* find start next marker */ /* find start next marker */
start_code = ff_mjpeg_find_marker(s, &buf_ptr, buf_end, start_code = ff_mjpeg_find_marker(s, &buf_ptr, buf_end,
@ -2369,7 +2396,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} else if (unescaped_buf_size > INT_MAX / 8) { } else if (unescaped_buf_size > INT_MAX / 8) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"MJPEG packet 0x%x too big (%d/%d), corrupt data?\n", "MJPEG packet 0x%x too big (%d/%d), corrupt data?\n",
start_code, unescaped_buf_size, buf_size); start_code, unescaped_buf_size, s->pkt->size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%"PTRDIFF_SPECIFIER"\n", av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%"PTRDIFF_SPECIFIER"\n",
@ -2506,6 +2533,7 @@ eoi_parser:
} }
if (avctx->skip_frame == AVDISCARD_ALL) { if (avctx->skip_frame == AVDISCARD_ALL) {
s->got_picture = 0; s->got_picture = 0;
ret = AVERROR(EAGAIN);
goto the_end_no_picture; goto the_end_no_picture;
} }
if (s->avctx->hwaccel) { if (s->avctx->hwaccel) {
@ -2517,9 +2545,11 @@ eoi_parser:
} }
if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0) if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0)
return ret; return ret;
*got_frame = 1;
s->got_picture = 0; s->got_picture = 0;
frame->pkt_dts = s->pkt->dts;
frame->best_effort_timestamp = s->pkt->pts;
if (!s->lossless) { if (!s->lossless) {
int qp = FFMAX3(s->qscale[0], int qp = FFMAX3(s->qscale[0],
s->qscale[1], s->qscale[1],
@ -2528,7 +2558,7 @@ eoi_parser:
AVBufferRef *qp_table_buf = av_buffer_alloc(qpw); AVBufferRef *qp_table_buf = av_buffer_alloc(qpw);
if (qp_table_buf) { if (qp_table_buf) {
memset(qp_table_buf->data, qp, qpw); memset(qp_table_buf->data, qp, qpw);
av_frame_set_qp_table(data, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1); av_frame_set_qp_table(frame, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1);
} }
if(avctx->debug & FF_DEBUG_QP) if(avctx->debug & FF_DEBUG_QP)
@ -2769,7 +2799,7 @@ the_end:
} }
if (s->stereo3d) { if (s->stereo3d) {
AVStereo3D *stereo = av_stereo3d_create_side_data(data); AVStereo3D *stereo = av_stereo3d_create_side_data(frame);
if (stereo) { if (stereo) {
stereo->type = s->stereo3d->type; stereo->type = s->stereo3d->type;
stereo->flags = s->stereo3d->flags; stereo->flags = s->stereo3d->flags;
@ -2787,7 +2817,7 @@ the_end:
for (i = 0; i < s->iccnum; i++) for (i = 0; i < s->iccnum; i++)
total_size += s->iccdatalens[i]; total_size += s->iccdatalens[i];
sd = av_frame_new_side_data(data, AV_FRAME_DATA_ICC_PROFILE, total_size); sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size);
if (!sd) { if (!sd) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); av_log(s->avctx, AV_LOG_ERROR, "Could not allocate frame side data\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -2800,14 +2830,16 @@ the_end:
} }
} }
av_dict_copy(&((AVFrame *) data)->metadata, s->exif_metadata, 0); av_dict_copy(&frame->metadata, s->exif_metadata, 0);
av_dict_free(&s->exif_metadata); av_dict_free(&s->exif_metadata);
ret = 0;
the_end_no_picture: the_end_no_picture:
av_log(avctx, AV_LOG_DEBUG, "decode frame unused %"PTRDIFF_SPECIFIER" bytes\n", av_log(avctx, AV_LOG_DEBUG, "decode frame unused %"PTRDIFF_SPECIFIER" bytes\n",
buf_end - buf_ptr); buf_end - buf_ptr);
// return buf_end - buf_ptr;
return buf_ptr - buf; return ret;
} }
/* mxpeg may call the following function (with a blank MJpegDecodeContext) /* mxpeg may call the following function (with a blank MJpegDecodeContext)
@ -2827,6 +2859,8 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
} else if (s->picture_ptr) } else if (s->picture_ptr)
av_frame_unref(s->picture_ptr); av_frame_unref(s->picture_ptr);
av_packet_free(&s->pkt);
av_freep(&s->buffer); av_freep(&s->buffer);
av_freep(&s->stereo3d); av_freep(&s->stereo3d);
av_freep(&s->ljpeg_buffer); av_freep(&s->ljpeg_buffer);
@ -2879,14 +2913,14 @@ AVCodec ff_mjpeg_decoder = {
.priv_data_size = sizeof(MJpegDecodeContext), .priv_data_size = sizeof(MJpegDecodeContext),
.init = ff_mjpeg_decode_init, .init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end, .close = ff_mjpeg_decode_end,
.decode = ff_mjpeg_decode_frame, .receive_frame = ff_mjpeg_receive_frame,
.flush = decode_flush, .flush = decode_flush,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.max_lowres = 3, .max_lowres = 3,
.priv_class = &mjpegdec_class, .priv_class = &mjpegdec_class,
.profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles),
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_SETS_PKT_DTS,
.hw_configs = (const AVCodecHWConfigInternal*[]) { .hw_configs = (const AVCodecHWConfigInternal*[]) {
#if CONFIG_MJPEG_NVDEC_HWACCEL #if CONFIG_MJPEG_NVDEC_HWACCEL
HWACCEL_NVDEC(mjpeg), HWACCEL_NVDEC(mjpeg),
@ -2907,10 +2941,11 @@ AVCodec ff_thp_decoder = {
.priv_data_size = sizeof(MJpegDecodeContext), .priv_data_size = sizeof(MJpegDecodeContext),
.init = ff_mjpeg_decode_init, .init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end, .close = ff_mjpeg_decode_end,
.decode = ff_mjpeg_decode_frame, .receive_frame = ff_mjpeg_receive_frame,
.flush = decode_flush, .flush = decode_flush,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.max_lowres = 3, .max_lowres = 3,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SETS_PKT_DTS,
}; };
#endif #endif

8
libavcodec/mjpegdec.h
Unescape View File

@ -49,6 +49,8 @@ typedef struct MJpegDecodeContext {
GetBitContext gb; GetBitContext gb;
int buf_size; int buf_size;
AVPacket *pkt;
int start_code; /* current start code */ int start_code; /* current start code */
int buffer_size; int buffer_size;
uint8_t *buffer; uint8_t *buffer;
@ -156,9 +158,7 @@ typedef struct MJpegDecodeContext {
int ff_mjpeg_decode_init(AVCodecContext *avctx); int ff_mjpeg_decode_init(AVCodecContext *avctx);
int ff_mjpeg_decode_end(AVCodecContext *avctx); int ff_mjpeg_decode_end(AVCodecContext *avctx);
int ff_mjpeg_decode_frame(AVCodecContext *avctx, int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame);
void *data, int *got_frame,
AVPacket *avpkt);
int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
int ff_mjpeg_decode_dht(MJpegDecodeContext *s); int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
int ff_mjpeg_decode_sof(MJpegDecodeContext *s); int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
@ -169,4 +169,6 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
const uint8_t **buf_ptr, const uint8_t *buf_end, const uint8_t **buf_ptr, const uint8_t *buf_end,
const uint8_t **unescaped_buf_ptr, int *unescaped_buf_size); const uint8_t **unescaped_buf_ptr, int *unescaped_buf_size);
int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt);
#endif /* AVCODEC_MJPEGDEC_H */ #endif /* AVCODEC_MJPEGDEC_H */

34
libavcodec/sp5xdec.c
Unescape View File

@ -30,14 +30,11 @@
#include "mjpegdec.h" #include "mjpegdec.h"
#include "sp5x.h" #include "sp5x.h"
int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt)
static int sp5x_decode_frame(AVCodecContext *avctx,
void *data, int *got_frame,
AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AVPacket avpkt_recoded; AVBufferRef *buf_recoded;
const int qscale = 5; const int qscale = 5;
uint8_t *recoded; uint8_t *recoded;
int i = 0, j = 0; int i = 0, j = 0;
@ -45,9 +42,10 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
if (!avctx->width || !avctx->height) if (!avctx->width || !avctx->height)
return -1; return -1;
recoded = av_mallocz(buf_size + 1024); buf_recoded = av_buffer_allocz(buf_size + 1024);
if (!recoded) if (!buf_recoded)
return -1; return -1;
recoded = buf_recoded->data;
/* SOI */ /* SOI */
recoded[j++] = 0xFF; recoded[j++] = 0xFF;
@ -84,14 +82,12 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
recoded[j++] = 0xFF; recoded[j++] = 0xFF;
recoded[j++] = 0xD9; recoded[j++] = 0xD9;
av_init_packet(&avpkt_recoded); av_buffer_unref(&avpkt->buf);
avpkt_recoded.data = recoded; avpkt->buf = buf_recoded;
avpkt_recoded.size = j; avpkt->data = recoded;
i = ff_mjpeg_decode_frame(avctx, data, got_frame, &avpkt_recoded); avpkt->size = j;
av_free(recoded);
return i < 0 ? i : avpkt->size; return 0;
} }
#if CONFIG_SP5X_DECODER #if CONFIG_SP5X_DECODER
@ -103,10 +99,11 @@ AVCodec ff_sp5x_decoder = {
.priv_data_size = sizeof(MJpegDecodeContext), .priv_data_size = sizeof(MJpegDecodeContext),
.init = ff_mjpeg_decode_init, .init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end, .close = ff_mjpeg_decode_end,
.decode = sp5x_decode_frame, .receive_frame = ff_mjpeg_receive_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.max_lowres = 3, .max_lowres = 3,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SETS_PKT_DTS,
}; };
#endif #endif
#if CONFIG_AMV_DECODER #if CONFIG_AMV_DECODER
@ -118,9 +115,10 @@ AVCodec ff_amv_decoder = {
.priv_data_size = sizeof(MJpegDecodeContext), .priv_data_size = sizeof(MJpegDecodeContext),
.init = ff_mjpeg_decode_init, .init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end, .close = ff_mjpeg_decode_end,
.decode = sp5x_decode_frame, .receive_frame = ff_mjpeg_receive_frame,
.max_lowres = 3, .max_lowres = 3,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SETS_PKT_DTS,
}; };
#endif #endif

Write Preview
Loading…
Cancel
Save