diff --git a/library/src/androidTest/assets/mkv/sample.mkv b/library/src/androidTest/assets/mkv/sample.mkv index 27843561c9..2a795cb566 100644 Binary files a/library/src/androidTest/assets/mkv/sample.mkv and b/library/src/androidTest/assets/mkv/sample.mkv differ diff --git a/library/src/androidTest/assets/mkv/sample.mkv.0.dump b/library/src/androidTest/assets/mkv/sample.mkv.0.dump index 9e471465cb..999cb3627f 100644 --- a/library/src/androidTest/assets/mkv/sample.mkv.0.dump +++ b/library/src/androidTest/assets/mkv/sample.mkv.0.dump @@ -1,7 +1,7 @@ seekMap: isSeekable = true - duration = 1145000 - getPosition(0) = 1034 + duration = 1072000 + getPosition(0) = 5576 numberOfTracks = 2 track 1: format: @@ -182,15 +182,15 @@ track 2: flags = 1 data = length 418, hash 77425A86 sample 2: - time = 199000 + time = 198829 flags = 1 data = length 418, hash A0FE5CA1 sample 3: - time = 234000 + time = 233000 flags = 1 data = length 418, hash 2309B066 sample 4: - time = 269000 + time = 268000 flags = 1 data = length 418, hash 928A653B sample 5: @@ -198,7 +198,7 @@ track 2: flags = 1 data = length 418, hash 3422F0CB sample 6: - time = 338000 + time = 337829 flags = 1 data = length 418, hash EFF43D5B sample 7: @@ -214,7 +214,7 @@ track 2: flags = 1 data = length 418, hash 2A6EE863 sample 10: - time = 478000 + time = 477829 flags = 1 data = length 418, hash D69A9251 sample 11: @@ -226,7 +226,7 @@ track 2: flags = 1 data = length 418, hash 11B66799 sample 13: - time = 582000 + time = 581829 flags = 1 data = length 418, hash C824D392 sample 14: @@ -242,11 +242,11 @@ track 2: flags = 1 data = length 418, hash 4D4FF934 sample 17: - time = 721000 + time = 721829 flags = 1 data = length 418, hash 984AA025 sample 18: - time = 756000 + time = 757000 flags = 1 data = length 418, hash BB788B46 sample 19: @@ -258,7 +258,7 @@ track 2: flags = 1 data = length 418, hash DF1A460C sample 21: - time = 861000 + time = 860829 flags = 1 data = length 418, hash 2BDB56A sample 22: @@ -266,7 +266,7 @@ track 2: flags = 1 data = length 418, hash CA230060 sample 23: - time = 930000 + time = 931000 flags = 1 data = length 418, hash D2F19F41 sample 24: @@ -274,7 +274,7 @@ track 2: flags = 1 data = length 418, hash AF392D79 sample 25: - time = 1000000 + time = 999829 flags = 1 data = length 418, hash C5D7F2A3 sample 26: @@ -282,7 +282,7 @@ track 2: flags = 1 data = length 418, hash 733A35AE sample 27: - time = 1070000 + time = 1069829 flags = 1 data = length 418, hash DE46E5D3 sample 28: diff --git a/library/src/androidTest/assets/mkv/sample.mkv.1.dump b/library/src/androidTest/assets/mkv/sample.mkv.1.dump index 9e471465cb..5bf296a4ad 100644 --- a/library/src/androidTest/assets/mkv/sample.mkv.1.dump +++ b/library/src/androidTest/assets/mkv/sample.mkv.1.dump @@ -1,7 +1,7 @@ seekMap: isSeekable = true - duration = 1145000 - getPosition(0) = 1034 + duration = 1072000 + getPosition(0) = 5576 numberOfTracks = 2 track 1: format: @@ -28,124 +28,92 @@ track 1: initializationData: data = length 30, hash F6F3D010 data = length 10, hash 7A0D0F2B - sample count = 30 + sample count = 22 sample 0: - time = 67000 - flags = 1 - data = length 36477, hash F0F36CFE - sample 1: - time = 134000 - flags = 0 - data = length 5341, hash 40B85E2 - sample 2: - time = 100000 - flags = 0 - data = length 596, hash 357B4D92 - sample 3: - time = 267000 - flags = 0 - data = length 7704, hash A39EDA06 - sample 4: - time = 200000 - flags = 0 - data = length 989, hash 2813C72D - sample 5: - time = 167000 - flags = 0 - data = length 721, hash C50D1C73 - sample 6: - time = 234000 - flags = 0 - data = length 519, hash 65FE1911 - sample 7: - time = 400000 - flags = 0 - data = length 6160, hash E1CAC0EC - sample 8: time = 334000 flags = 0 data = length 953, hash 7160C661 - sample 9: + sample 1: time = 300000 flags = 0 data = length 620, hash 7A7AE07C - sample 10: + sample 2: time = 367000 flags = 0 data = length 405, hash 5CC7F4E7 - sample 11: + sample 3: time = 500000 flags = 0 data = length 4852, hash 9DB6979D - sample 12: + sample 4: time = 467000 flags = 0 data = length 547, hash E31A6979 - sample 13: + sample 5: time = 434000 flags = 0 data = length 570, hash FEC40D00 - sample 14: + sample 6: time = 634000 flags = 0 data = length 5525, hash 7C478F7E - sample 15: + sample 7: time = 567000 flags = 0 data = length 1082, hash DA07059A - sample 16: + sample 8: time = 534000 flags = 0 data = length 807, hash 93478E6B - sample 17: + sample 9: time = 600000 flags = 0 data = length 744, hash 9A8E6026 - sample 18: + sample 10: time = 767000 flags = 0 data = length 4732, hash C73B23C0 - sample 19: + sample 11: time = 700000 flags = 0 data = length 1004, hash 8A19A228 - sample 20: + sample 12: time = 667000 flags = 0 data = length 794, hash 8126022C - sample 21: + sample 13: time = 734000 flags = 0 data = length 645, hash F08300E5 - sample 22: + sample 14: time = 900000 flags = 0 data = length 2684, hash 727FE378 - sample 23: + sample 15: time = 834000 flags = 0 data = length 787, hash 419A7821 - sample 24: + sample 16: time = 800000 flags = 0 data = length 649, hash 5C159346 - sample 25: + sample 17: time = 867000 flags = 0 data = length 509, hash F912D655 - sample 26: + sample 18: time = 1034000 flags = 0 data = length 1226, hash 29815C21 - sample 27: + sample 19: time = 967000 flags = 0 data = length 898, hash D997AD0A - sample 28: + sample 20: time = 934000 flags = 0 data = length 476, hash A0423645 - sample 29: + sample 21: time = 1000000 flags = 0 data = length 486, hash DDF32CBB @@ -172,120 +140,88 @@ track 2: language = und drmInitData = - initializationData: - sample count = 29 + sample count = 21 sample 0: - time = 129000 - flags = 1 - data = length 416, hash 211F2286 - sample 1: - time = 164000 - flags = 1 - data = length 418, hash 77425A86 - sample 2: - time = 199000 - flags = 1 - data = length 418, hash A0FE5CA1 - sample 3: - time = 234000 - flags = 1 - data = length 418, hash 2309B066 - sample 4: - time = 269000 - flags = 1 - data = length 418, hash 928A653B - sample 5: - time = 303000 - flags = 1 - data = length 418, hash 3422F0CB - sample 6: - time = 338000 - flags = 1 - data = length 418, hash EFF43D5B - sample 7: - time = 373000 - flags = 1 - data = length 418, hash FC8093C7 - sample 8: time = 408000 flags = 1 data = length 418, hash CCC08A16 - sample 9: + sample 1: time = 443000 flags = 1 data = length 418, hash 2A6EE863 - sample 10: - time = 478000 + sample 2: + time = 477829 flags = 1 data = length 418, hash D69A9251 - sample 11: + sample 3: time = 512000 flags = 1 data = length 418, hash BCFB758D - sample 12: + sample 4: time = 547000 flags = 1 data = length 418, hash 11B66799 - sample 13: - time = 582000 + sample 5: + time = 581829 flags = 1 data = length 418, hash C824D392 - sample 14: + sample 6: time = 617000 flags = 1 data = length 418, hash C167D872 - sample 15: + sample 7: time = 652000 flags = 1 data = length 418, hash 4221C855 - sample 16: + sample 8: time = 687000 flags = 1 data = length 418, hash 4D4FF934 - sample 17: - time = 721000 + sample 9: + time = 721829 flags = 1 data = length 418, hash 984AA025 - sample 18: - time = 756000 + sample 10: + time = 757000 flags = 1 data = length 418, hash BB788B46 - sample 19: + sample 11: time = 791000 flags = 1 data = length 418, hash 9EFBFD97 - sample 20: + sample 12: time = 826000 flags = 1 data = length 418, hash DF1A460C - sample 21: - time = 861000 + sample 13: + time = 860829 flags = 1 data = length 418, hash 2BDB56A - sample 22: + sample 14: time = 896000 flags = 1 data = length 418, hash CA230060 - sample 23: - time = 930000 + sample 15: + time = 931000 flags = 1 data = length 418, hash D2F19F41 - sample 24: + sample 16: time = 965000 flags = 1 data = length 418, hash AF392D79 - sample 25: - time = 1000000 + sample 17: + time = 999829 flags = 1 data = length 418, hash C5D7F2A3 - sample 26: + sample 18: time = 1035000 flags = 1 data = length 418, hash 733A35AE - sample 27: - time = 1070000 + sample 19: + time = 1069829 flags = 1 data = length 418, hash DE46E5D3 - sample 28: + sample 20: time = 1104000 flags = 1 data = length 418, hash 56AB8D37 diff --git a/library/src/androidTest/assets/mkv/sample.mkv.2.dump b/library/src/androidTest/assets/mkv/sample.mkv.2.dump index 9e471465cb..bad03620d7 100644 --- a/library/src/androidTest/assets/mkv/sample.mkv.2.dump +++ b/library/src/androidTest/assets/mkv/sample.mkv.2.dump @@ -1,7 +1,7 @@ seekMap: isSeekable = true - duration = 1145000 - getPosition(0) = 1034 + duration = 1072000 + getPosition(0) = 5576 numberOfTracks = 2 track 1: format: @@ -28,124 +28,48 @@ track 1: initializationData: data = length 30, hash F6F3D010 data = length 10, hash 7A0D0F2B - sample count = 30 + sample count = 11 sample 0: - time = 67000 - flags = 1 - data = length 36477, hash F0F36CFE - sample 1: - time = 134000 - flags = 0 - data = length 5341, hash 40B85E2 - sample 2: - time = 100000 - flags = 0 - data = length 596, hash 357B4D92 - sample 3: - time = 267000 - flags = 0 - data = length 7704, hash A39EDA06 - sample 4: - time = 200000 - flags = 0 - data = length 989, hash 2813C72D - sample 5: - time = 167000 - flags = 0 - data = length 721, hash C50D1C73 - sample 6: - time = 234000 - flags = 0 - data = length 519, hash 65FE1911 - sample 7: - time = 400000 - flags = 0 - data = length 6160, hash E1CAC0EC - sample 8: - time = 334000 - flags = 0 - data = length 953, hash 7160C661 - sample 9: - time = 300000 - flags = 0 - data = length 620, hash 7A7AE07C - sample 10: - time = 367000 - flags = 0 - data = length 405, hash 5CC7F4E7 - sample 11: - time = 500000 - flags = 0 - data = length 4852, hash 9DB6979D - sample 12: - time = 467000 - flags = 0 - data = length 547, hash E31A6979 - sample 13: - time = 434000 - flags = 0 - data = length 570, hash FEC40D00 - sample 14: - time = 634000 - flags = 0 - data = length 5525, hash 7C478F7E - sample 15: - time = 567000 - flags = 0 - data = length 1082, hash DA07059A - sample 16: - time = 534000 - flags = 0 - data = length 807, hash 93478E6B - sample 17: - time = 600000 - flags = 0 - data = length 744, hash 9A8E6026 - sample 18: - time = 767000 - flags = 0 - data = length 4732, hash C73B23C0 - sample 19: time = 700000 flags = 0 data = length 1004, hash 8A19A228 - sample 20: + sample 1: time = 667000 flags = 0 data = length 794, hash 8126022C - sample 21: + sample 2: time = 734000 flags = 0 data = length 645, hash F08300E5 - sample 22: + sample 3: time = 900000 flags = 0 data = length 2684, hash 727FE378 - sample 23: + sample 4: time = 834000 flags = 0 data = length 787, hash 419A7821 - sample 24: + sample 5: time = 800000 flags = 0 data = length 649, hash 5C159346 - sample 25: + sample 6: time = 867000 flags = 0 data = length 509, hash F912D655 - sample 26: + sample 7: time = 1034000 flags = 0 data = length 1226, hash 29815C21 - sample 27: + sample 8: time = 967000 flags = 0 data = length 898, hash D997AD0A - sample 28: + sample 9: time = 934000 flags = 0 data = length 476, hash A0423645 - sample 29: + sample 10: time = 1000000 flags = 0 data = length 486, hash DDF32CBB @@ -172,120 +96,44 @@ track 2: language = und drmInitData = - initializationData: - sample count = 29 + sample count = 10 sample 0: - time = 129000 - flags = 1 - data = length 416, hash 211F2286 - sample 1: - time = 164000 - flags = 1 - data = length 418, hash 77425A86 - sample 2: - time = 199000 - flags = 1 - data = length 418, hash A0FE5CA1 - sample 3: - time = 234000 - flags = 1 - data = length 418, hash 2309B066 - sample 4: - time = 269000 - flags = 1 - data = length 418, hash 928A653B - sample 5: - time = 303000 - flags = 1 - data = length 418, hash 3422F0CB - sample 6: - time = 338000 - flags = 1 - data = length 418, hash EFF43D5B - sample 7: - time = 373000 - flags = 1 - data = length 418, hash FC8093C7 - sample 8: - time = 408000 - flags = 1 - data = length 418, hash CCC08A16 - sample 9: - time = 443000 - flags = 1 - data = length 418, hash 2A6EE863 - sample 10: - time = 478000 - flags = 1 - data = length 418, hash D69A9251 - sample 11: - time = 512000 - flags = 1 - data = length 418, hash BCFB758D - sample 12: - time = 547000 - flags = 1 - data = length 418, hash 11B66799 - sample 13: - time = 582000 - flags = 1 - data = length 418, hash C824D392 - sample 14: - time = 617000 - flags = 1 - data = length 418, hash C167D872 - sample 15: - time = 652000 - flags = 1 - data = length 418, hash 4221C855 - sample 16: - time = 687000 - flags = 1 - data = length 418, hash 4D4FF934 - sample 17: - time = 721000 - flags = 1 - data = length 418, hash 984AA025 - sample 18: - time = 756000 - flags = 1 - data = length 418, hash BB788B46 - sample 19: time = 791000 flags = 1 data = length 418, hash 9EFBFD97 - sample 20: + sample 1: time = 826000 flags = 1 data = length 418, hash DF1A460C - sample 21: - time = 861000 + sample 2: + time = 860829 flags = 1 data = length 418, hash 2BDB56A - sample 22: + sample 3: time = 896000 flags = 1 data = length 418, hash CA230060 - sample 23: - time = 930000 + sample 4: + time = 931000 flags = 1 data = length 418, hash D2F19F41 - sample 24: + sample 5: time = 965000 flags = 1 data = length 418, hash AF392D79 - sample 25: - time = 1000000 + sample 6: + time = 999829 flags = 1 data = length 418, hash C5D7F2A3 - sample 26: + sample 7: time = 1035000 flags = 1 data = length 418, hash 733A35AE - sample 27: - time = 1070000 + sample 8: + time = 1069829 flags = 1 data = length 418, hash DE46E5D3 - sample 28: + sample 9: time = 1104000 flags = 1 data = length 418, hash 56AB8D37 diff --git a/library/src/androidTest/assets/mkv/sample.mkv.3.dump b/library/src/androidTest/assets/mkv/sample.mkv.3.dump index 9e471465cb..d1f3d71efb 100644 --- a/library/src/androidTest/assets/mkv/sample.mkv.3.dump +++ b/library/src/androidTest/assets/mkv/sample.mkv.3.dump @@ -1,7 +1,7 @@ seekMap: isSeekable = true - duration = 1145000 - getPosition(0) = 1034 + duration = 1072000 + getPosition(0) = 5576 numberOfTracks = 2 track 1: format: @@ -28,127 +28,7 @@ track 1: initializationData: data = length 30, hash F6F3D010 data = length 10, hash 7A0D0F2B - sample count = 30 - sample 0: - time = 67000 - flags = 1 - data = length 36477, hash F0F36CFE - sample 1: - time = 134000 - flags = 0 - data = length 5341, hash 40B85E2 - sample 2: - time = 100000 - flags = 0 - data = length 596, hash 357B4D92 - sample 3: - time = 267000 - flags = 0 - data = length 7704, hash A39EDA06 - sample 4: - time = 200000 - flags = 0 - data = length 989, hash 2813C72D - sample 5: - time = 167000 - flags = 0 - data = length 721, hash C50D1C73 - sample 6: - time = 234000 - flags = 0 - data = length 519, hash 65FE1911 - sample 7: - time = 400000 - flags = 0 - data = length 6160, hash E1CAC0EC - sample 8: - time = 334000 - flags = 0 - data = length 953, hash 7160C661 - sample 9: - time = 300000 - flags = 0 - data = length 620, hash 7A7AE07C - sample 10: - time = 367000 - flags = 0 - data = length 405, hash 5CC7F4E7 - sample 11: - time = 500000 - flags = 0 - data = length 4852, hash 9DB6979D - sample 12: - time = 467000 - flags = 0 - data = length 547, hash E31A6979 - sample 13: - time = 434000 - flags = 0 - data = length 570, hash FEC40D00 - sample 14: - time = 634000 - flags = 0 - data = length 5525, hash 7C478F7E - sample 15: - time = 567000 - flags = 0 - data = length 1082, hash DA07059A - sample 16: - time = 534000 - flags = 0 - data = length 807, hash 93478E6B - sample 17: - time = 600000 - flags = 0 - data = length 744, hash 9A8E6026 - sample 18: - time = 767000 - flags = 0 - data = length 4732, hash C73B23C0 - sample 19: - time = 700000 - flags = 0 - data = length 1004, hash 8A19A228 - sample 20: - time = 667000 - flags = 0 - data = length 794, hash 8126022C - sample 21: - time = 734000 - flags = 0 - data = length 645, hash F08300E5 - sample 22: - time = 900000 - flags = 0 - data = length 2684, hash 727FE378 - sample 23: - time = 834000 - flags = 0 - data = length 787, hash 419A7821 - sample 24: - time = 800000 - flags = 0 - data = length 649, hash 5C159346 - sample 25: - time = 867000 - flags = 0 - data = length 509, hash F912D655 - sample 26: - time = 1034000 - flags = 0 - data = length 1226, hash 29815C21 - sample 27: - time = 967000 - flags = 0 - data = length 898, hash D997AD0A - sample 28: - time = 934000 - flags = 0 - data = length 476, hash A0423645 - sample 29: - time = 1000000 - flags = 0 - data = length 486, hash DDF32CBB + sample count = 0 track 2: format: bitrate = -1 @@ -172,120 +52,16 @@ track 2: language = und drmInitData = - initializationData: - sample count = 29 + sample count = 3 sample 0: - time = 129000 - flags = 1 - data = length 416, hash 211F2286 - sample 1: - time = 164000 - flags = 1 - data = length 418, hash 77425A86 - sample 2: - time = 199000 - flags = 1 - data = length 418, hash A0FE5CA1 - sample 3: - time = 234000 - flags = 1 - data = length 418, hash 2309B066 - sample 4: - time = 269000 - flags = 1 - data = length 418, hash 928A653B - sample 5: - time = 303000 - flags = 1 - data = length 418, hash 3422F0CB - sample 6: - time = 338000 - flags = 1 - data = length 418, hash EFF43D5B - sample 7: - time = 373000 - flags = 1 - data = length 418, hash FC8093C7 - sample 8: - time = 408000 - flags = 1 - data = length 418, hash CCC08A16 - sample 9: - time = 443000 - flags = 1 - data = length 418, hash 2A6EE863 - sample 10: - time = 478000 - flags = 1 - data = length 418, hash D69A9251 - sample 11: - time = 512000 - flags = 1 - data = length 418, hash BCFB758D - sample 12: - time = 547000 - flags = 1 - data = length 418, hash 11B66799 - sample 13: - time = 582000 - flags = 1 - data = length 418, hash C824D392 - sample 14: - time = 617000 - flags = 1 - data = length 418, hash C167D872 - sample 15: - time = 652000 - flags = 1 - data = length 418, hash 4221C855 - sample 16: - time = 687000 - flags = 1 - data = length 418, hash 4D4FF934 - sample 17: - time = 721000 - flags = 1 - data = length 418, hash 984AA025 - sample 18: - time = 756000 - flags = 1 - data = length 418, hash BB788B46 - sample 19: - time = 791000 - flags = 1 - data = length 418, hash 9EFBFD97 - sample 20: - time = 826000 - flags = 1 - data = length 418, hash DF1A460C - sample 21: - time = 861000 - flags = 1 - data = length 418, hash 2BDB56A - sample 22: - time = 896000 - flags = 1 - data = length 418, hash CA230060 - sample 23: - time = 930000 - flags = 1 - data = length 418, hash D2F19F41 - sample 24: - time = 965000 - flags = 1 - data = length 418, hash AF392D79 - sample 25: - time = 1000000 - flags = 1 - data = length 418, hash C5D7F2A3 - sample 26: time = 1035000 flags = 1 data = length 418, hash 733A35AE - sample 27: - time = 1070000 + sample 1: + time = 1069829 flags = 1 data = length 418, hash DE46E5D3 - sample 28: + sample 2: time = 1104000 flags = 1 data = length 418, hash 56AB8D37