[FFmpeg-cvslog] Merge commit 'b90c8a3d08e3f9ad4de1253376d2d1d93abb8b8c'

James Almer git at videolan.org
Tue Mar 28 00:22:16 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Mar 27 18:19:02 2017 -0300| [ba4d0a37b98a6642d7a1aca0b6c7f744fc8cf8ef] | committer: James Almer

Merge commit 'b90c8a3d08e3f9ad4de1253376d2d1d93abb8b8c'

* commit 'b90c8a3d08e3f9ad4de1253376d2d1d93abb8b8c':
  fate: Add tests for mov display matrix

Adapted to use ffprobe -show_entries

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba4d0a37b98a6642d7a1aca0b6c7f744fc8cf8ef
---

 tests/fate/mov.mak               | 2 +-
 tests/ref/fate/mov-displaymatrix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 74f0357..eac2f37 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -44,6 +44,6 @@ fate-mov-zombie: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packe
 
 fate-mov-init-nonkeyframe: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/mp4-init-nonkeyframe.mp4
 
-fate-mov-displaymatrix: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/displaymatrix.mov
+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-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/spherical.mov
diff --git a/tests/ref/fate/mov-displaymatrix b/tests/ref/fate/mov-displaymatrix
index ac09e2a..a40fcf6 100644
--- a/tests/ref/fate/mov-displaymatrix
+++ b/tests/ref/fate/mov-displaymatrix
@@ -1,4 +1,6 @@
 [STREAM]
+sample_aspect_ratio=1:2
+display_aspect_ratio=1:3
 [SIDE_DATA]
 side_data_type=Display Matrix
 displaymatrix=


======================================================================

diff --cc tests/fate/mov.mak
index 74f0357,909e438..eac2f37
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@@ -1,49 -1,15 +1,49 @@@
 -FATE_MOV += fate-mov-dar
 -fate-mov-dar: CMD = probestream display_aspect_ratio $(TARGET_SAMPLES)/mov/displaymatrix.mov
 +FATE_MOV = fate-mov-3elist \
 +           fate-mov-3elist-1ctts \
 +           fate-mov-1elist-1ctts \
 +           fate-mov-1elist-noctts \
 +           fate-mov-elist-starts-ctts-2ndsample \
 +           fate-mov-1elist-ends-last-bframe \
 +           fate-mov-2elist-elist1-ends-bframe \
 +           fate-mov-3elist-encrypted \
  
 -FATE_MOV += fate-mov-display-matrix
 -fate-mov-display-matrix: CMD = probestream matrix $(TARGET_SAMPLES)/mov/displaymatrix.mov
 +FATE_MOV_FFPROBE = fate-mov-aac-2048-priming \
 +                   fate-mov-zombie \
 +                   fate-mov-init-nonkeyframe \
 +                   fate-mov-displaymatrix \
 +                   fate-mov-spherical-mono \
  
 -FATE_MOV += fate-mov-rotation
 -fate-mov-rotation: CMD = probestream rotation $(TARGET_SAMPLES)/mov/displaymatrix.mov
 +FATE_SAMPLES_AVCONV += $(FATE_MOV)
 +FATE_SAMPLES_FFPROBE += $(FATE_MOV_FFPROBE)
  
 -FATE_MOV += fate-mov-sar
 -fate-mov-sar: CMD = probestream sample_aspect_ratio $(TARGET_SAMPLES)/mov/displaymatrix.mov
 +fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE)
  
 -$(FATE_MOV): avprobe$(EXESUF)
 -FATE_SAMPLES-$(call ALLYES, AVPROBE MOV_DEMUXER) += $(FATE_MOV)
 -fate-mov: $(FATE_MOV)
 +# Make sure we handle edit lists correctly in normal cases.
 +fate-mov-1elist-noctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-noctts.mov
 +fate-mov-1elist-1ctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-1ctts.mov
 +fate-mov-3elist: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-3elist.mov
 +fate-mov-3elist-1ctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-3elist-1ctts.mov
 +
 +# Edit list with encryption
 +fate-mov-3elist-encrypted: CMD = framemd5 -decryption_key 12345678901234567890123456789012 -i $(TARGET_SAMPLES)/mov/mov-3elist-encrypted.mov
 +
 +# Makes sure that the CTTS is also modified when we fix avindex in mov.c while parsing edit lists.
 +fate-mov-elist-starts-ctts-2ndsample: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-elist-starts-ctts-2ndsample.mov
 +
 +# Makes sure that we handle edit lists ending on a B-frame correctly.
 +# The last frame in decoding order which is B-frame should be output, but the last but-one P-frame shouldn't be
 +# output.
 +fate-mov-1elist-ends-last-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-ends-last-bframe.mov
 +
 +# Makes sure that we handle timestamps of packets in case of multiple edit lists with one of them ending on a B-frame correctly.
 +fate-mov-2elist-elist1-ends-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-2elist-elist1-ends-bframe.mov
 +
 +fate-mov-aac-2048-priming: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact $(TARGET_SAMPLES)/mov/aac-2048-priming.mov
 +
 +fate-mov-zombie: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_frames -bitexact -print_format compact $(TARGET_SAMPLES)/mov/white_zombie_scrunch-part.mov
 +
 +fate-mov-init-nonkeyframe: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/mp4-init-nonkeyframe.mp4
 +
- fate-mov-displaymatrix: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/displaymatrix.mov
++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-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/spherical.mov
diff --cc tests/ref/fate/mov-displaymatrix
index ac09e2a,0000000..a40fcf6
mode 100644,000000..100644
--- a/tests/ref/fate/mov-displaymatrix
+++ b/tests/ref/fate/mov-displaymatrix
@@@ -1,11 -1,0 +1,13 @@@
 +[STREAM]
++sample_aspect_ratio=1:2
++display_aspect_ratio=1:3
 +[SIDE_DATA]
 +side_data_type=Display Matrix
 +displaymatrix=
 +00000000:            0      131072           0
 +00000001:       -65536           0           0
 +00000002:     47185920           0  1073741824
 +
 +rotation=-90
 +[/SIDE_DATA]
 +[/STREAM]



More information about the ffmpeg-cvslog mailing list