[FFmpeg-devel] [PATCH]Mark experimental j2k decoder as experimental if libopenjpeg is available

[Carl Eugen Hoyos]

On Thursday 19 June 2014 01:32:58 am Michael Niedermayer wrote:
> On Wed, Jun 18, 2014 at 07:02:59PM -0400, Dave Rice wrote:
> > Hi all,
> >
> > On May 7, 2014, at 6:41 AM, Carl Eugen Hoyos wrote:
> > > Nicolas George <george <at> nsup.org> writes:
> > >>> I thought this would anger both users and downstream
> > >>> (who paid for the removal of EXPERIMENTAL iirc) and I
> > >>> intended to keep the profile low for this controversy.
> > >>
> > >> Well, this ticket obviously shows that the removal of
> > >> EXPERIMENTAL was premature.
> > >
> > > Sorry, I assumed this was well known for all developers.
> > > (See also the large number of tickets opened
> > > immediately after the removal.)
> >
> > ping
>
> the patch breaks fate

New patch attached that compiles (!) and passes fate.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index d6204bb..83a3339 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1734,5 +1734,8 @@ AVCodec ff_jpeg2000_decoder = {
     .decode           = jpeg2000_decode_frame,
     .priv_class       = &jpeg2000_class,
     .max_lowres       = 5,
-    .profiles         = NULL_IF_CONFIG_SMALL(profiles)
+    .profiles         = NULL_IF_CONFIG_SMALL(profiles),
+#if CONFIG_LIBOPENJPEG_DECODER
+    .capabilities   = CODEC_CAP_EXPERIMENTAL,
+#endif
 };
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index cefd4d3..a8df34b 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -103,9 +103,9 @@ fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
 
 FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
 fate-vsynth%-jpeg2000:                ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
-fate-vsynth%-jpeg2000:                DECINOPTS = -vcodec jpeg2000
+fate-vsynth%-jpeg2000:                DECINOPTS = -vcodec jpeg2000 -strict -2
 fate-vsynth%-jpeg2000-97:             ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
-fate-vsynth%-jpeg2000-97:             DECINOPTS = -vcodec jpeg2000
+fate-vsynth%-jpeg2000-97:             DECINOPTS = -vcodec jpeg2000 -strict -2
 
 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
 fate-vsynth%-ljpeg:              ENCOPTS = -strict -1
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 7e5416c..1953216 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -163,7 +163,7 @@ FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
 fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
 
 FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
-fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
+fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -vcodec jpeg2000 -strict -2 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
 
 FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv
 fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24