summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2020-12-12 15:09:10 +0100
committerAnton Khirnov <anton@khirnov.net>2021-02-25 11:46:28 +0100
commit9e4225cf7f26b57e0054470127bcc032b6d29742 (patch)
treec13c00b8ca9669abd8a8d1d194e546c72184c990 /tests
parentae4f6379d6b52e480e4ad335e0a71292effdf839 (diff)
downloadffmpeg-9e4225cf7f26b57e0054470127bcc032b6d29742.tar.gz
Handle AVID MJPEG streams directly in the MJPEG decoder.
AVID streams - currently handled by the AVRN decoder - can be (depending on extradata contents) either MJPEG or raw video. To decode the MJPEG variant, the AVRN decoder currently instantiates a MJPEG decoder internally and forwards decoded frames to the caller (possibly after cropping them). This is suboptimal, because the AVRN decoder does not forward all the features of the internal MJPEG decoder, such as direct rendering. Handling such forwarding in a full and generic manner would be quite hard, so it is simpler to just handle those streams in the MJPEG decoder directly. The AVRN decoder, which now handles only the raw streams, can now be marked as supporting direct rendering. This also removes the last remaining internal use of the obsolete decoding API.
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/video.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 4b2c4ab665..d6b5770aba 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -46,7 +46,7 @@ fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-i
FATE_VIDEO-$(call DEMDEC, AVI, AVRN) += fate-avid-interlaced
fate-avid-interlaced: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avid_ntsc_interlaced.avi
-FATE_VIDEO-$(call DEMDEC, MOV, AVRN) += fate-avid-meridian
+FATE_VIDEO-$(call DEMDEC, MOV, MJPEG) += fate-avid-meridian
fate-avid-meridian: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov
FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid