From d2afbd9a56e4e863bad01923006dd9b77f747035 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 2 Feb 2012 14:20:43 +0100 Subject: frame{crc/md5}: set the stream timebase from codec timebase. Right now those muxers use the default timebase in all cases(1/90000). This patch avoid unnecessary rescaling and makes the printed timestamps more readable. Also, extend the printed information to include the timebases and packet pts/duration and align the columns. Obviously changes the results of all fate tests which use those two muxers. --- tests/ref/fate/h264-conformance-frext-freh2_b | 201 +++++++++++++------------- 1 file changed, 101 insertions(+), 100 deletions(-) (limited to 'tests/ref/fate/h264-conformance-frext-freh2_b') diff --git a/tests/ref/fate/h264-conformance-frext-freh2_b b/tests/ref/fate/h264-conformance-frext-freh2_b index ac9a48c..ff12025 100644 --- a/tests/ref/fate/h264-conformance-frext-freh2_b +++ b/tests/ref/fate/h264-conformance-frext-freh2_b @@ -1,100 +1,101 @@ -0, 0, 152064, 0x1668b41a -0, 3600, 152064, 0x953ca7fb -0, 7200, 152064, 0x3e38bc6e -0, 10800, 152064, 0x18dff6cc -0, 14400, 152064, 0x03105f7a -0, 18000, 152064, 0x6fe79efb -0, 21600, 152064, 0xbd4ccb6f -0, 25200, 152064, 0xaf398a10 -0, 28800, 152064, 0x4f281075 -0, 32400, 152064, 0x88f63791 -0, 36000, 152064, 0x7500b606 -0, 39600, 152064, 0xebebd6e6 -0, 43200, 152064, 0x3ed7c35e -0, 46800, 152064, 0xc95826d6 -0, 50400, 152064, 0x0989ab63 -0, 54000, 152064, 0xddd5d22b -0, 57600, 152064, 0x11683b8a -0, 61200, 152064, 0x5ce36d50 -0, 64800, 152064, 0xa5185ccf -0, 68400, 152064, 0xf47583b5 -0, 72000, 152064, 0xac6e82b6 -0, 75600, 152064, 0xf8dc25c0 -0, 79200, 152064, 0x5a6aba8e -0, 82800, 152064, 0x43790f6d -0, 86400, 152064, 0x787c4377 -0, 90000, 152064, 0xe6833159 -0, 93600, 152064, 0xe5c21131 -0, 97200, 152064, 0x16ae69bb -0, 100800, 152064, 0x754fcc9e -0, 104400, 152064, 0x71aaf1e1 -0, 108000, 152064, 0xce9de9ee -0, 111600, 152064, 0x05e6d832 -0, 115200, 152064, 0x5773b413 -0, 118800, 152064, 0xe518881c -0, 122400, 152064, 0xe248bce9 -0, 126000, 152064, 0x421e8c0d -0, 129600, 152064, 0x30135143 -0, 133200, 152064, 0xf02347f4 -0, 136800, 152064, 0x3fa71a0e -0, 140400, 152064, 0x2c14d955 -0, 144000, 152064, 0x18b2d558 -0, 147600, 152064, 0x54cb7fa2 -0, 151200, 152064, 0x90ae2332 -0, 154800, 152064, 0x7957129a -0, 158400, 152064, 0x6c9b463e -0, 162000, 152064, 0x8c44e126 -0, 165600, 152064, 0xde3ba475 -0, 169200, 152064, 0x9823e3ed -0, 172800, 152064, 0x3ce03b21 -0, 176400, 152064, 0x930007a2 -0, 180000, 152064, 0x6f94bf67 -0, 183600, 152064, 0x3e113ce9 -0, 187200, 152064, 0xa31c8828 -0, 190800, 152064, 0xe65260e0 -0, 194400, 152064, 0x4c612620 -0, 198000, 152064, 0xdc41f17f -0, 201600, 152064, 0x6d3f6a84 -0, 205200, 152064, 0xfb55e9e9 -0, 208800, 152064, 0x21e2c8b5 -0, 212400, 152064, 0x2d0939a9 -0, 216000, 152064, 0xe1f422d2 -0, 219600, 152064, 0xab0ad4a3 -0, 223200, 152064, 0x948f46df -0, 226800, 152064, 0x61f50c16 -0, 230400, 152064, 0x7f5edb05 -0, 234000, 152064, 0x8d8c4782 -0, 237600, 152064, 0xe8644529 -0, 241200, 152064, 0x1e7ce779 -0, 244800, 152064, 0x22f355a9 -0, 248400, 152064, 0x4dd736d4 -0, 252000, 152064, 0x3d968c63 -0, 255600, 152064, 0xa629c711 -0, 259200, 152064, 0xae87c4c6 -0, 262800, 152064, 0xcd482dd2 -0, 266400, 152064, 0x6bbbbd25 -0, 270000, 152064, 0x4f0ad3d2 -0, 273600, 152064, 0x66052e88 -0, 277200, 152064, 0xa09dff03 -0, 280800, 152064, 0xb3837263 -0, 284400, 152064, 0x3c91fdde -0, 288000, 152064, 0x4d9309a9 -0, 291600, 152064, 0x6b624164 -0, 295200, 152064, 0xaa425ecb -0, 298800, 152064, 0x37aec7c9 -0, 302400, 152064, 0xf4b3d359 -0, 306000, 152064, 0x85d3af2b -0, 309600, 152064, 0xe5c1f190 -0, 313200, 152064, 0x8cb00e09 -0, 316800, 152064, 0x59406ebc -0, 320400, 152064, 0xd7ac351f -0, 324000, 152064, 0x998238b6 -0, 327600, 152064, 0x8e89d064 -0, 331200, 152064, 0x644223c5 -0, 334800, 152064, 0x90ad366f -0, 338400, 152064, 0x40a12122 -0, 342000, 152064, 0x3045024c -0, 345600, 152064, 0x58673cfb -0, 349200, 152064, 0x567cf1fe -0, 352800, 152064, 0x2d236e41 -0, 356400, 152064, 0xc493577d +#tb 0: 1/25 +0, 0, 0, 1, 152064, 0x1668b41a +0, 1, 1, 1, 152064, 0x953ca7fb +0, 2, 2, 1, 152064, 0x3e38bc6e +0, 3, 3, 1, 152064, 0x18dff6cc +0, 4, 4, 1, 152064, 0x03105f7a +0, 5, 5, 1, 152064, 0x6fe79efb +0, 6, 6, 1, 152064, 0xbd4ccb6f +0, 7, 7, 1, 152064, 0xaf398a10 +0, 8, 8, 1, 152064, 0x4f281075 +0, 9, 9, 1, 152064, 0x88f63791 +0, 10, 10, 1, 152064, 0x7500b606 +0, 11, 11, 1, 152064, 0xebebd6e6 +0, 12, 12, 1, 152064, 0x3ed7c35e +0, 13, 13, 1, 152064, 0xc95826d6 +0, 14, 14, 1, 152064, 0x0989ab63 +0, 15, 15, 1, 152064, 0xddd5d22b +0, 16, 16, 1, 152064, 0x11683b8a +0, 17, 17, 1, 152064, 0x5ce36d50 +0, 18, 18, 1, 152064, 0xa5185ccf +0, 19, 19, 1, 152064, 0xf47583b5 +0, 20, 20, 1, 152064, 0xac6e82b6 +0, 21, 21, 1, 152064, 0xf8dc25c0 +0, 22, 22, 1, 152064, 0x5a6aba8e +0, 23, 23, 1, 152064, 0x43790f6d +0, 24, 24, 1, 152064, 0x787c4377 +0, 25, 25, 1, 152064, 0xe6833159 +0, 26, 26, 1, 152064, 0xe5c21131 +0, 27, 27, 1, 152064, 0x16ae69bb +0, 28, 28, 1, 152064, 0x754fcc9e +0, 29, 29, 1, 152064, 0x71aaf1e1 +0, 30, 30, 1, 152064, 0xce9de9ee +0, 31, 31, 1, 152064, 0x05e6d832 +0, 32, 32, 1, 152064, 0x5773b413 +0, 33, 33, 1, 152064, 0xe518881c +0, 34, 34, 1, 152064, 0xe248bce9 +0, 35, 35, 1, 152064, 0x421e8c0d +0, 36, 36, 1, 152064, 0x30135143 +0, 37, 37, 1, 152064, 0xf02347f4 +0, 38, 38, 1, 152064, 0x3fa71a0e +0, 39, 39, 1, 152064, 0x2c14d955 +0, 40, 40, 1, 152064, 0x18b2d558 +0, 41, 41, 1, 152064, 0x54cb7fa2 +0, 42, 42, 1, 152064, 0x90ae2332 +0, 43, 43, 1, 152064, 0x7957129a +0, 44, 44, 1, 152064, 0x6c9b463e +0, 45, 45, 1, 152064, 0x8c44e126 +0, 46, 46, 1, 152064, 0xde3ba475 +0, 47, 47, 1, 152064, 0x9823e3ed +0, 48, 48, 1, 152064, 0x3ce03b21 +0, 49, 49, 1, 152064, 0x930007a2 +0, 50, 50, 1, 152064, 0x6f94bf67 +0, 51, 51, 1, 152064, 0x3e113ce9 +0, 52, 52, 1, 152064, 0xa31c8828 +0, 53, 53, 1, 152064, 0xe65260e0 +0, 54, 54, 1, 152064, 0x4c612620 +0, 55, 55, 1, 152064, 0xdc41f17f +0, 56, 56, 1, 152064, 0x6d3f6a84 +0, 57, 57, 1, 152064, 0xfb55e9e9 +0, 58, 58, 1, 152064, 0x21e2c8b5 +0, 59, 59, 1, 152064, 0x2d0939a9 +0, 60, 60, 1, 152064, 0xe1f422d2 +0, 61, 61, 1, 152064, 0xab0ad4a3 +0, 62, 62, 1, 152064, 0x948f46df +0, 63, 63, 1, 152064, 0x61f50c16 +0, 64, 64, 1, 152064, 0x7f5edb05 +0, 65, 65, 1, 152064, 0x8d8c4782 +0, 66, 66, 1, 152064, 0xe8644529 +0, 67, 67, 1, 152064, 0x1e7ce779 +0, 68, 68, 1, 152064, 0x22f355a9 +0, 69, 69, 1, 152064, 0x4dd736d4 +0, 70, 70, 1, 152064, 0x3d968c63 +0, 71, 71, 1, 152064, 0xa629c711 +0, 72, 72, 1, 152064, 0xae87c4c6 +0, 73, 73, 1, 152064, 0xcd482dd2 +0, 74, 74, 1, 152064, 0x6bbbbd25 +0, 75, 75, 1, 152064, 0x4f0ad3d2 +0, 76, 76, 1, 152064, 0x66052e88 +0, 77, 77, 1, 152064, 0xa09dff03 +0, 78, 78, 1, 152064, 0xb3837263 +0, 79, 79, 1, 152064, 0x3c91fdde +0, 80, 80, 1, 152064, 0x4d9309a9 +0, 81, 81, 1, 152064, 0x6b624164 +0, 82, 82, 1, 152064, 0xaa425ecb +0, 83, 83, 1, 152064, 0x37aec7c9 +0, 84, 84, 1, 152064, 0xf4b3d359 +0, 85, 85, 1, 152064, 0x85d3af2b +0, 86, 86, 1, 152064, 0xe5c1f190 +0, 87, 87, 1, 152064, 0x8cb00e09 +0, 88, 88, 1, 152064, 0x59406ebc +0, 89, 89, 1, 152064, 0xd7ac351f +0, 90, 90, 1, 152064, 0x998238b6 +0, 91, 91, 1, 152064, 0x8e89d064 +0, 92, 92, 1, 152064, 0x644223c5 +0, 93, 93, 1, 152064, 0x90ad366f +0, 94, 94, 1, 152064, 0x40a12122 +0, 95, 95, 1, 152064, 0x3045024c +0, 96, 96, 1, 152064, 0x58673cfb +0, 97, 97, 1, 152064, 0x567cf1fe +0, 98, 98, 1, 152064, 0x2d236e41 +0, 99, 99, 1, 152064, 0xc493577d -- cgit v1.1