Message ID | 0101018d74af2a10-78b9d97b-fda6-43f1-a3b1-eaebd863b97d-000000@us-west-2.amazonses.com |
---|---|
State | New |
Headers | show |
Series | avformat/mov: add support for 'amve' ambient viewing environment | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | fail | Make fate failed |
On 2/4/2024 12:14 PM, Cosmin Stejerean via ffmpeg-devel wrote: > From: Cosmin Stejerean <cosmin@cosmin.at> > > --- > tests/fate/mov.mak | 5 +++++ > tests/ref/fate/mov-read-amve | 8 ++++++++ > tests/ref/fate/mov-write-amve | 33 +++++++++++++++++++++++++++++++++ > 3 files changed, 46 insertions(+) > create mode 100644 tests/ref/fate/mov-read-amve > create mode 100644 tests/ref/fate/mov-write-amve > > diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak > index f202f36d96..65854d1628 100644 > --- a/tests/fate/mov.mak > +++ b/tests/fate/mov.mak > @@ -9,6 +9,7 @@ FATE_MOV = fate-mov-3elist \ > fate-mov-frag-encrypted \ > fate-mov-tenc-only-encrypted \ > fate-mov-invalid-elst-entry-count \ > + fate-mov-write-amve \ > fate-mov-gpmf-remux \ > fate-mov-440hz-10ms \ > fate-mov-ibi-elst-starts-b \ > @@ -25,6 +26,7 @@ FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \ > fate-mov-zombie \ > fate-mov-init-nonkeyframe \ > fate-mov-displaymatrix \ > + fate-mov-read-amve \ > fate-mov-spherical-mono \ > fate-mov-guess-delay-1 \ > fate-mov-guess-delay-2 \ > @@ -109,6 +111,9 @@ fate-mov-init-nonkeyframe: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets - > > fate-mov-displaymatrix: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=display_aspect_ratio,sample_aspect_ratio:stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/displaymatrix.mov > > +fate-mov-read-amve: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/amve.mov > +fate-mov-write-amve: CMD = transcode mov $(TARGET_SAMPLES)/mov/amve.mov mp4 "-c copy" "-c:v copy -t 0.5" "-show_entries stream_side_data_list" The sample hasn't been uploaded to the fate suite. Where is it available? > + > fate-mov-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/spherical.mov > > fate-mov-gpmf-remux: CMD = md5 -i $(TARGET_SAMPLES)/mov/fake-gp-media-with-real-gpmf.mp4 -map 0 -c copy -fflags +bitexact -f mp4 > diff --git a/tests/ref/fate/mov-read-amve b/tests/ref/fate/mov-read-amve > new file mode 100644 > index 0000000000..91d34d94dd > --- /dev/null > +++ b/tests/ref/fate/mov-read-amve > @@ -0,0 +1,8 @@ > +[STREAM] > +[SIDE_DATA] > +side_data_type=Ambient viewing environment > +ambient_illuminance=3140000/10000 > +ambient_light_x=15635/50000 > +ambient_light_y=16450/50000 > +[/SIDE_DATA] > +[/STREAM] > diff --git a/tests/ref/fate/mov-write-amve b/tests/ref/fate/mov-write-amve > new file mode 100644 > index 0000000000..115cdbd9f0 > --- /dev/null > +++ b/tests/ref/fate/mov-write-amve > @@ -0,0 +1,33 @@ > +850c56be1114aa21a2e41bd4ea3da144 *tests/data/fate/mov-write-amve.mp4 > +23677 tests/data/fate/mov-write-amve.mp4 > +#extradata 0: 49, 0x7f8d1145 > +#tb 0: 1/15360 > +#media_type 0: video > +#codec_id 0: h264 > +#dimensions 0: 640x360 > +#sar 0: 0/1 > +0, -1024, 0, 512, 11849, 0xf21aa1d0 > +0, -512, 2048, 512, 1572, 0xf0c41b68, F=0x0 > +0, 0, 1024, 512, 347, 0x9b8daabf, F=0x0 > +0, 512, 512, 512, 195, 0x557e58db, F=0x0 > +0, 1024, 1536, 512, 134, 0x423541b4, F=0x0 > +0, 1536, 3072, 512, 1454, 0xe5a2cdad, F=0x0 > +0, 2048, 2560, 512, 168, 0xd0ef5402, F=0x0 > +0, 2560, 5120, 512, 1395, 0x603eb602, F=0x0 > +0, 3072, 4096, 512, 304, 0x69cc92a6, F=0x0 > +0, 3584, 3584, 512, 145, 0x3f1a4462, F=0x0 > +0, 4096, 4608, 512, 154, 0x953851d1, F=0x0 > +0, 4608, 5632, 512, 876, 0xad65ace7, F=0x0 > +0, 5120, 7680, 512, 742, 0x6b6d689f, F=0x0 > +0, 5632, 6656, 512, 177, 0xa4f2573b, F=0x0 > +0, 6144, 6144, 512, 101, 0xb0722d2b, F=0x0 > +0, 6656, 7168, 512, 105, 0x1f6033ed, F=0x0 > +0, 7168, 9728, 512, 589, 0xcd912063, F=0x0 > +[STREAM] > +[SIDE_DATA] > +side_data_type=Ambient viewing environment > +ambient_illuminance=3140000/10000 > +ambient_light_x=15635/50000 > +ambient_light_y=16450/50000 > +[/SIDE_DATA] > +[/STREAM]
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index f202f36d96..65854d1628 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -9,6 +9,7 @@ FATE_MOV = fate-mov-3elist \ fate-mov-frag-encrypted \ fate-mov-tenc-only-encrypted \ fate-mov-invalid-elst-entry-count \ + fate-mov-write-amve \ fate-mov-gpmf-remux \ fate-mov-440hz-10ms \ fate-mov-ibi-elst-starts-b \ @@ -25,6 +26,7 @@ FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \ fate-mov-zombie \ fate-mov-init-nonkeyframe \ fate-mov-displaymatrix \ + fate-mov-read-amve \ fate-mov-spherical-mono \ fate-mov-guess-delay-1 \ fate-mov-guess-delay-2 \ @@ -109,6 +111,9 @@ fate-mov-init-nonkeyframe: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets - fate-mov-displaymatrix: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=display_aspect_ratio,sample_aspect_ratio:stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/displaymatrix.mov +fate-mov-read-amve: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/amve.mov +fate-mov-write-amve: CMD = transcode mov $(TARGET_SAMPLES)/mov/amve.mov mp4 "-c copy" "-c:v copy -t 0.5" "-show_entries stream_side_data_list" + fate-mov-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/spherical.mov fate-mov-gpmf-remux: CMD = md5 -i $(TARGET_SAMPLES)/mov/fake-gp-media-with-real-gpmf.mp4 -map 0 -c copy -fflags +bitexact -f mp4 diff --git a/tests/ref/fate/mov-read-amve b/tests/ref/fate/mov-read-amve new file mode 100644 index 0000000000..91d34d94dd --- /dev/null +++ b/tests/ref/fate/mov-read-amve @@ -0,0 +1,8 @@ +[STREAM] +[SIDE_DATA] +side_data_type=Ambient viewing environment +ambient_illuminance=3140000/10000 +ambient_light_x=15635/50000 +ambient_light_y=16450/50000 +[/SIDE_DATA] +[/STREAM] diff --git a/tests/ref/fate/mov-write-amve b/tests/ref/fate/mov-write-amve new file mode 100644 index 0000000000..115cdbd9f0 --- /dev/null +++ b/tests/ref/fate/mov-write-amve @@ -0,0 +1,33 @@ +850c56be1114aa21a2e41bd4ea3da144 *tests/data/fate/mov-write-amve.mp4 +23677 tests/data/fate/mov-write-amve.mp4 +#extradata 0: 49, 0x7f8d1145 +#tb 0: 1/15360 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 640x360 +#sar 0: 0/1 +0, -1024, 0, 512, 11849, 0xf21aa1d0 +0, -512, 2048, 512, 1572, 0xf0c41b68, F=0x0 +0, 0, 1024, 512, 347, 0x9b8daabf, F=0x0 +0, 512, 512, 512, 195, 0x557e58db, F=0x0 +0, 1024, 1536, 512, 134, 0x423541b4, F=0x0 +0, 1536, 3072, 512, 1454, 0xe5a2cdad, F=0x0 +0, 2048, 2560, 512, 168, 0xd0ef5402, F=0x0 +0, 2560, 5120, 512, 1395, 0x603eb602, F=0x0 +0, 3072, 4096, 512, 304, 0x69cc92a6, F=0x0 +0, 3584, 3584, 512, 145, 0x3f1a4462, F=0x0 +0, 4096, 4608, 512, 154, 0x953851d1, F=0x0 +0, 4608, 5632, 512, 876, 0xad65ace7, F=0x0 +0, 5120, 7680, 512, 742, 0x6b6d689f, F=0x0 +0, 5632, 6656, 512, 177, 0xa4f2573b, F=0x0 +0, 6144, 6144, 512, 101, 0xb0722d2b, F=0x0 +0, 6656, 7168, 512, 105, 0x1f6033ed, F=0x0 +0, 7168, 9728, 512, 589, 0xcd912063, F=0x0 +[STREAM] +[SIDE_DATA] +side_data_type=Ambient viewing environment +ambient_illuminance=3140000/10000 +ambient_light_x=15635/50000 +ambient_light_y=16450/50000 +[/SIDE_DATA] +[/STREAM]
From: Cosmin Stejerean <cosmin@cosmin.at> --- tests/fate/mov.mak | 5 +++++ tests/ref/fate/mov-read-amve | 8 ++++++++ tests/ref/fate/mov-write-amve | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 tests/ref/fate/mov-read-amve create mode 100644 tests/ref/fate/mov-write-amve