virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

Browse Source 
* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-09 13:02:16 +01:00
commit 8947f47fdf
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libavcodec/mxpegdec.c
View File

@ -31,7 +31,7 @@
typedef struct MXpegDecodeContext { typedef struct MXpegDecodeContext {
MJpegDecodeContext jpg; MJpegDecodeContext jpg;
AVFrame picture[2]; /* pictures array */ AVFrame *picture[2]; /* pictures array */
int picture_index; /* index of current picture */ int picture_index; /* index of current picture */
int got_sof_data; /* true if SOF data successfully parsed */ int got_sof_data; /* true if SOF data successfully parsed */
int got_mxm_bitmask; /* true if MXM bitmask available */ int got_mxm_bitmask; /* true if MXM bitmask available */
@ -42,11 +42,36 @@ typedef struct MXpegDecodeContext {
unsigned mb_width, mb_height; /* size of picture in MB's from MXM header */ unsigned mb_width, mb_height; /* size of picture in MB's from MXM header */
} MXpegDecodeContext; } MXpegDecodeContext;
static av_cold int mxpeg_decode_end(AVCodecContext *avctx)
{
MXpegDecodeContext *s = avctx->priv_data;
MJpegDecodeContext *jpg = &s->jpg;
int i;
jpg->picture_ptr = NULL;
ff_mjpeg_decode_end(avctx);
for (i = 0; i < 2; ++i)
av_frame_free(&s->picture[i]);
av_freep(&s->mxm_bitmask);
av_freep(&s->completion_bitmask);
return 0;
}
static av_cold int mxpeg_decode_init(AVCodecContext *avctx) static av_cold int mxpeg_decode_init(AVCodecContext *avctx)
{ {
MXpegDecodeContext *s = avctx->priv_data; MXpegDecodeContext *s = avctx->priv_data;
s->jpg.picture_ptr = &s->picture[0]; s->picture[0] = av_frame_alloc();
s->picture[1] = av_frame_alloc();
if (!s->picture[0] || !s->picture[1]) {
mxpeg_decode_end(avctx);
return AVERROR(ENOMEM);
}
s->jpg.picture_ptr = s->picture[0];
return ff_mjpeg_decode_init(avctx); return ff_mjpeg_decode_init(avctx);
} }
@ -260,7 +285,7 @@ static int mxpeg_decode_frame(AVCodecContext *avctx,
} }
if (s->got_mxm_bitmask) { if (s->got_mxm_bitmask) {
AVFrame *reference_ptr = &s->picture[s->picture_index ^ 1]; AVFrame *reference_ptr = s->picture[s->picture_index ^ 1];
if (mxpeg_check_dimensions(s, jpg, reference_ptr) < 0) if (mxpeg_check_dimensions(s, jpg, reference_ptr) < 0)
break; break;
@ -295,7 +320,7 @@ the_end:
*got_frame = 1; *got_frame = 1;
s->picture_index ^= 1; s->picture_index ^= 1;
jpg->picture_ptr = &s->picture[s->picture_index]; jpg->picture_ptr = s->picture[s->picture_index];
if (!s->has_complete_frame) { if (!s->has_complete_frame) {
if (!s->got_mxm_bitmask) if (!s->got_mxm_bitmask)
@ -308,24 +333,6 @@ the_end:
return buf_ptr - buf; return buf_ptr - buf;
} }
static av_cold int mxpeg_decode_end(AVCodecContext *avctx)
{
MXpegDecodeContext *s = avctx->priv_data;
MJpegDecodeContext *jpg = &s->jpg;
int i;
jpg->picture_ptr = NULL;
ff_mjpeg_decode_end(avctx);
for (i = 0; i < 2; ++i)
av_frame_unref(&s->picture[i]);
av_freep(&s->mxm_bitmask);
av_freep(&s->completion_bitmask);
return 0;
}
AVCodec ff_mxpeg_decoder = { AVCodec ff_mxpeg_decoder = {
.name = "mxpeg", .name = "mxpeg",
.long_name = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"), .long_name = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"),