| Message ID | 20191228024033.18199-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6c735b96ee45bce24be6513bb9b292b5c7ecd8ee |
| Headers | show |
On 12/27/2019 11:40 PM, Andreas Rheinhardt wrote: > This test tests that demuxing ProRes that is muxed like it should be in > Matroska (i.e. with the first header ("icpf") atom stripped away) works; > it also tests bz2 decompression as well as the handling of > unknown-length clusters. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > The samples have already been sent to James for uploading. > > tests/fate/matroska.mak | 5 +++++ > .../fate/matroska-prores-header-insertion-bz2 | 16 ++++++++++++++++ > 2 files changed, 21 insertions(+) > create mode 100644 tests/ref/fate/matroska-prores-header-insertion-bz2 > > diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak > index 99145338ae..597be7346c 100644 > --- a/tests/fate/matroska.mak > +++ b/tests/fate/matroska.mak > @@ -1,6 +1,11 @@ > FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-prores-zlib > fate-matroska-prores-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_zlib.mkv -c:v copy > > +# This tests that the matroska demuxer correctly adds the icpf header atom > +# upon demuxing; it also tests bz2 decompression and unknown-length cluster. > +FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER BZLIB) += fate-matroska-prores-header-insertion-bz2 > +fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_bz2.mkv -map 0 -c copy > + > # This tests that the matroska demuxer supports modifying the colorspace > # properties in remuxing (-c:v copy) > # It also tests automatic insertion of the vp9_superframe bitstream filter > diff --git a/tests/ref/fate/matroska-prores-header-insertion-bz2 b/tests/ref/fate/matroska-prores-header-insertion-bz2 > new file mode 100644 > index 0000000000..63a59f9b8d > --- /dev/null > +++ b/tests/ref/fate/matroska-prores-header-insertion-bz2 > @@ -0,0 +1,16 @@ > +#extradata 0: 4, 0x0402019c > +#extradata 1: 4, 0x0402019c > +#tb 0: 1/1000 > +#media_type 0: video > +#codec_id 0: prores > +#dimensions 0: 720x480 > +#sar 0: 186/157 > +#tb 1: 1/1000 > +#media_type 1: video > +#codec_id 1: prores > +#dimensions 1: 720x480 > +#sar 1: 186/157 > +0, 0, 0, 0, 4304, 0x3625b1fc > +1, 0, 0, 0, 4304, 0x3625b1fc > +0, 42, 42, 0, 4304, 0x3625b1fc > +1, 42, 42, 0, 4304, 0x3625b1fc Pushed alongside the sample. Thanks.
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 99145338ae..597be7346c 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -1,6 +1,11 @@ FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-prores-zlib fate-matroska-prores-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_zlib.mkv -c:v copy +# This tests that the matroska demuxer correctly adds the icpf header atom +# upon demuxing; it also tests bz2 decompression and unknown-length cluster. +FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER BZLIB) += fate-matroska-prores-header-insertion-bz2 +fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_bz2.mkv -map 0 -c copy + # This tests that the matroska demuxer supports modifying the colorspace # properties in remuxing (-c:v copy) # It also tests automatic insertion of the vp9_superframe bitstream filter diff --git a/tests/ref/fate/matroska-prores-header-insertion-bz2 b/tests/ref/fate/matroska-prores-header-insertion-bz2 new file mode 100644 index 0000000000..63a59f9b8d --- /dev/null +++ b/tests/ref/fate/matroska-prores-header-insertion-bz2 @@ -0,0 +1,16 @@ +#extradata 0: 4, 0x0402019c +#extradata 1: 4, 0x0402019c +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: prores +#dimensions 0: 720x480 +#sar 0: 186/157 +#tb 1: 1/1000 +#media_type 1: video +#codec_id 1: prores +#dimensions 1: 720x480 +#sar 1: 186/157 +0, 0, 0, 0, 4304, 0x3625b1fc +1, 0, 0, 0, 4304, 0x3625b1fc +0, 42, 42, 0, 4304, 0x3625b1fc +1, 42, 42, 0, 4304, 0x3625b1fc
This test tests that demuxing ProRes that is muxed like it should be in Matroska (i.e. with the first header ("icpf") atom stripped away) works; it also tests bz2 decompression as well as the handling of unknown-length clusters. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- The samples have already been sent to James for uploading. tests/fate/matroska.mak | 5 +++++ .../fate/matroska-prores-header-insertion-bz2 | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/ref/fate/matroska-prores-header-insertion-bz2