[FFmpeg-devel] [PATCH]Implement max_lowres
Carl Eugen Hoyos
cehoyos
Wed Jul 7 14:19:59 CEST 2010
Hi!
On Tuesday 06 July 2010 06:47:03 am Jai Menon wrote:
> > New version attached. libopenjpeg always crashes for me with lowres>0.
>
> Works here till 5 reslevels (beyond which swscale complains)
Confirmed, I don't know what I originally tested.
Fixed and updated patch attached.
Please comment, Carl Eugen
-------------- next part --------------
Index: libavcodec/rv10.c
===================================================================
--- libavcodec/rv10.c (revision 24076)
+++ libavcodec/rv10.c (working copy)
@@ -716,6 +716,7 @@
rv10_decode_end,
rv10_decode_frame,
CODEC_CAP_DR1,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
.pix_fmts= ff_pixfmt_list_420,
};
@@ -731,6 +732,7 @@
rv10_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_DELAY,
.flush= ff_mpeg_flush,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
.pix_fmts= ff_pixfmt_list_420,
};
Index: libavcodec/msmpeg4.c
===================================================================
--- libavcodec/msmpeg4.c (revision 24076)
+++ libavcodec/msmpeg4.c (working copy)
@@ -1929,6 +1929,7 @@
ff_h263_decode_end,
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
.pix_fmts= ff_pixfmt_list_420,
};
@@ -1943,6 +1944,7 @@
ff_h263_decode_end,
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
.pix_fmts= ff_pixfmt_list_420,
};
@@ -1957,6 +1959,7 @@
ff_h263_decode_end,
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
.pix_fmts= ff_pixfmt_list_420,
};
@@ -1971,6 +1974,7 @@
ff_h263_decode_end,
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
.pix_fmts= ff_pixfmt_list_420,
};
Index: libavcodec/mjpegdec.c
===================================================================
--- libavcodec/mjpegdec.c (revision 24076)
+++ libavcodec/mjpegdec.c (working copy)
@@ -1542,6 +1542,7 @@
ff_mjpeg_decode_frame,
CODEC_CAP_DR1,
NULL,
+ .max_lowres = 8,
.long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
};
@@ -1556,5 +1557,6 @@
ff_mjpeg_decode_frame,
CODEC_CAP_DR1,
NULL,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
};
Index: libavcodec/mjpegbdec.c
===================================================================
--- libavcodec/mjpegbdec.c (revision 24076)
+++ libavcodec/mjpegbdec.c (working copy)
@@ -156,5 +156,6 @@
mjpegb_decode_frame,
CODEC_CAP_DR1,
NULL,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
};
Index: libavcodec/mpeg12.c
===================================================================
--- libavcodec/mpeg12.c (revision 24076)
+++ libavcodec/mpeg12.c (working copy)
@@ -2511,6 +2511,7 @@
mpeg_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
.flush= flush,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"),
};
@@ -2525,6 +2526,7 @@
mpeg_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
.flush= flush,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"),
};
@@ -2540,6 +2542,7 @@
mpeg_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
.flush= flush,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"),
};
Index: libavcodec/h263dec.c
===================================================================
--- libavcodec/h263dec.c (revision 24076)
+++ libavcodec/h263dec.c (working copy)
@@ -738,6 +738,7 @@
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
.flush= ff_mpeg_flush,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
.pix_fmts= ff_hwaccel_pixfmt_list_420,
};
Index: libavcodec/mpeg4videodec.c
===================================================================
--- libavcodec/mpeg4videodec.c (revision 24076)
+++ libavcodec/mpeg4videodec.c (working copy)
@@ -2245,6 +2245,7 @@
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
.flush= ff_mpeg_flush,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
.pix_fmts= ff_hwaccel_pixfmt_list_420,
};
Index: libavcodec/libopenjpeg.c
===================================================================
--- libavcodec/libopenjpeg.c (revision 24076)
+++ libavcodec/libopenjpeg.c (working copy)
@@ -193,5 +193,6 @@
libopenjpeg_decode_close,
libopenjpeg_decode_frame,
CODEC_CAP_DR1,
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),
} ;
Index: libavcodec/flvdec.c
===================================================================
--- libavcodec/flvdec.c (revision 24076)
+++ libavcodec/flvdec.c (working copy)
@@ -127,6 +127,7 @@
ff_h263_decode_end,
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .max_lowres= 3,
.long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),
.pix_fmts= ff_pixfmt_list_420,
};
Index: libavcodec/sp5xdec.c
===================================================================
--- libavcodec/sp5xdec.c (revision 24076)
+++ libavcodec/sp5xdec.c (working copy)
@@ -204,6 +204,7 @@
sp5x_decode_frame,
CODEC_CAP_DR1,
NULL,
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"),
};
Index: libavcodec/bmp.c
===================================================================
--- libavcodec/bmp.c (revision 24076)
+++ libavcodec/bmp.c (working copy)
@@ -345,5 +345,6 @@
bmp_decode_end,
bmp_decode_frame,
CODEC_CAP_DR1,
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("BMP image"),
};
Index: libavcodec/cdgraphics.c
===================================================================
--- libavcodec/cdgraphics.c (revision 24076)
+++ libavcodec/cdgraphics.c (working copy)
@@ -377,5 +377,6 @@
cdg_decode_end,
cdg_decode_frame,
CODEC_CAP_DR1,
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"),
};
Index: libavcodec/avcodec.h
===================================================================
--- libavcodec/avcodec.h (revision 24076)
+++ libavcodec/avcodec.h (working copy)
@@ -30,8 +30,8 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 79
-#define LIBAVCODEC_VERSION_MICRO 1
+#define LIBAVCODEC_VERSION_MINOR 80
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -2713,6 +2713,7 @@
const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
const enum SampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
} AVCodec;
/**
Index: libavcodec/kgv1dec.c
===================================================================
--- libavcodec/kgv1dec.c (revision 24076)
+++ libavcodec/kgv1dec.c (working copy)
@@ -172,5 +172,6 @@
NULL,
decode_end,
decode_frame,
+ .max_lowres = 1,
.long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"),
};
Index: libavcodec/pnmdec.c
===================================================================
--- libavcodec/pnmdec.c (revision 24076)
+++ libavcodec/pnmdec.c (working copy)
@@ -199,6 +199,7 @@
pnm_decode_frame,
CODEC_CAP_DR1,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
};
#endif
@@ -215,6 +216,7 @@
pnm_decode_frame,
CODEC_CAP_DR1,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
};
#endif
@@ -231,6 +233,7 @@
pnm_decode_frame,
CODEC_CAP_DR1,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE},
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
};
#endif
@@ -247,6 +250,7 @@
pnm_decode_frame,
CODEC_CAP_DR1,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
};
#endif
@@ -263,6 +267,7 @@
pnm_decode_frame,
CODEC_CAP_DR1,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
};
#endif
Index: libavcodec/dv.c
===================================================================
--- libavcodec/dv.c (revision 24076)
+++ libavcodec/dv.c (working copy)
@@ -1304,6 +1304,7 @@
dvvideo_decode_frame,
CODEC_CAP_DR1,
NULL,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
};
#endif
Index: libavcodec/pngdec.c
===================================================================
--- libavcodec/pngdec.c (revision 24076)
+++ libavcodec/pngdec.c (working copy)
@@ -667,5 +667,6 @@
decode_frame,
CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
NULL,
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("PNG image"),
};
Index: libavcodec/utils.c
===================================================================
--- libavcodec/utils.c (revision 24076)
+++ libavcodec/utils.c (working copy)
@@ -506,6 +506,13 @@
}
avctx->frame_number = 0;
if(avctx->codec->init){
+ if(avctx->codec_type == AVMEDIA_TYPE_VIDEO &&
+ avctx->codec->max_lowres < avctx->lowres){
+ av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n",
+ avctx->codec->max_lowres);
+ goto free_and_end;
+ }
+
ret = avctx->codec->init(avctx);
if (ret < 0) {
goto free_and_end;
Index: libavcodec/wmv2dec.c
===================================================================
--- libavcodec/wmv2dec.c (revision 24076)
+++ libavcodec/wmv2dec.c (working copy)
@@ -494,6 +494,7 @@
wmv2_decode_end,
ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
.pix_fmts= ff_pixfmt_list_420,
};
Index: libavcodec/h261dec.c
===================================================================
--- libavcodec/h261dec.c (revision 24076)
+++ libavcodec/h261dec.c (working copy)
@@ -651,5 +651,6 @@
h261_decode_end,
h261_decode_frame,
CODEC_CAP_DR1,
+ .max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("H.261"),
};
More information about the ffmpeg-devel
mailing list