diff --git a/extensions/flac/src/androidTest/assets/bear.flac.0.dump b/extensions/flac/src/androidTest/assets/bear.flac.0.dump
index 6908f5cc932085efe1b770256734fae83d03a40d..2a17cbdea67f2f092ae85328353055688bfd3529 100644
--- a/extensions/flac/src/androidTest/assets/bear.flac.0.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.0.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 526272
   sample count = 33
   sample 0:
     time = 0
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.1.dump b/extensions/flac/src/androidTest/assets/bear.flac.1.dump
index 1414443187a75a47f92b67a17471cbfd73feb6ed..412e4a1b8fdcc409543910532ba2c25f4df2ae88 100644
--- a/extensions/flac/src/androidTest/assets/bear.flac.1.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.1.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 362432
   sample count = 23
   sample 0:
     time = 853333
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.2.dump b/extensions/flac/src/androidTest/assets/bear.flac.2.dump
index e343241650a969103ba31faa227c6b2ba413d509..42ebb125d15800bf69ae61f0360ee027320b173c 100644
--- a/extensions/flac/src/androidTest/assets/bear.flac.2.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.2.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 182208
   sample count = 12
   sample 0:
     time = 1792000
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.3.dump b/extensions/flac/src/androidTest/assets/bear.flac.3.dump
index 95ab255bd0020507b02e2abbf3417a8c4acc4b3a..958cb0d418adc86523e4f10a8cfebc911ee4d3b9 100644
--- a/extensions/flac/src/androidTest/assets/bear.flac.3.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.3.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 18368
   sample count = 2
   sample 0:
     time = 2645333
diff --git a/library/core/src/androidTest/assets/flv/sample.flv.0.dump b/library/core/src/androidTest/assets/flv/sample.flv.0.dump
index 7a4a74770c165d21181fba69467bc549f557d557..f4502749f5614de4574756a1a9390c4417201963 100644
--- a/library/core/src/androidTest/assets/flv/sample.flv.0.dump
+++ b/library/core/src/androidTest/assets/flv/sample.flv.0.dump
@@ -26,6 +26,7 @@ track 8:
     drmInitData = -
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 9529
   sample count = 45
   sample 0:
     time = 112000
@@ -231,6 +232,7 @@ track 9:
     initializationData:
       data = length 30, hash F6F3D010
       data = length 10, hash 7A0D0F2B
+  total output bytes = 89502
   sample count = 30
   sample 0:
     time = 67000
diff --git a/library/core/src/androidTest/assets/mkv/sample.mkv.0.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.0.dump
index 0f005ee5a9ffb8c8ddd25bf8739d7d0ffcd8049e..009ff55c232143dffcb84dfe6593cabe3026bd5b 100644
--- a/library/core/src/androidTest/assets/mkv/sample.mkv.0.dump
+++ b/library/core/src/androidTest/assets/mkv/sample.mkv.0.dump
@@ -27,6 +27,7 @@ track 1:
     initializationData:
       data = length 30, hash F6F3D010
       data = length 10, hash 7A0D0F2B
+  total output bytes = 89502
   sample count = 30
   sample 0:
     time = 67000
@@ -170,6 +171,7 @@ track 2:
     language = und
     drmInitData = -
     initializationData:
+  total output bytes = 12120
   sample count = 29
   sample 0:
     time = 129000
diff --git a/library/core/src/androidTest/assets/mkv/sample.mkv.1.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.1.dump
index 378f5d7f2ad75f8b469ec310da17c8b471f5ff5f..91396e81b8dfb1ef443d4901244c94a47d789dec 100644
--- a/library/core/src/androidTest/assets/mkv/sample.mkv.1.dump
+++ b/library/core/src/androidTest/assets/mkv/sample.mkv.1.dump
@@ -27,6 +27,7 @@ track 1:
     initializationData:
       data = length 30, hash F6F3D010
       data = length 10, hash 7A0D0F2B
+  total output bytes = 30995
   sample count = 22
   sample 0:
     time = 334000
@@ -138,6 +139,7 @@ track 2:
     language = und
     drmInitData = -
     initializationData:
+  total output bytes = 8778
   sample count = 21
   sample 0:
     time = 408000
diff --git a/library/core/src/androidTest/assets/mkv/sample.mkv.2.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.2.dump
index 80caf24a93c1c4fa72309300fbd56931ac8c8a2c..5c56dcc8af905265ec21dd6741e3a816f8347884 100644
--- a/library/core/src/androidTest/assets/mkv/sample.mkv.2.dump
+++ b/library/core/src/androidTest/assets/mkv/sample.mkv.2.dump
@@ -27,6 +27,7 @@ track 1:
     initializationData:
       data = length 30, hash F6F3D010
       data = length 10, hash 7A0D0F2B
+  total output bytes = 10158
   sample count = 11
   sample 0:
     time = 700000
@@ -94,6 +95,7 @@ track 2:
     language = und
     drmInitData = -
     initializationData:
+  total output bytes = 4180
   sample count = 10
   sample 0:
     time = 791000
diff --git a/library/core/src/androidTest/assets/mkv/sample.mkv.3.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.3.dump
index c9672ba9c43a53cb8d4e76c9dc76429f5636c2ff..cf5a0199fc32154b5c63d9b306a12d92f67b21c1 100644
--- a/library/core/src/androidTest/assets/mkv/sample.mkv.3.dump
+++ b/library/core/src/androidTest/assets/mkv/sample.mkv.3.dump
@@ -27,6 +27,7 @@ track 1:
     initializationData:
       data = length 30, hash F6F3D010
       data = length 10, hash 7A0D0F2B
+  total output bytes = 0
   sample count = 0
 track 2:
   format:
@@ -50,6 +51,7 @@ track 2:
     language = und
     drmInitData = -
     initializationData:
+  total output bytes = 1254
   sample count = 3
   sample 0:
     time = 1035000
diff --git a/library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump b/library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump
index abc07dc5039dcaa220df281d34c0a3552f79499c..62a270eb9ec7c93c3421fc7c3ec1765fd735247c 100644
--- a/library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump
+++ b/library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump
@@ -25,6 +25,7 @@ track 1:
     language = null
     drmInitData = 1305012705
     initializationData:
+  total output bytes = 39
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump b/library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
index c43a43b5769ea0ac1231d2f2812571963cef5f0d..43e5eed5d148101e9f686bd3f7b6b9d044c0c1b1 100644
--- a/library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
+++ b/library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
@@ -25,6 +25,7 @@ track 1:
     language = null
     drmInitData = 1305012705
     initializationData:
+  total output bytes = 24
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp3/bear.mp3.0.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.0.dump
index eca3a6687d7c843cfcf1683080c6fd5a6ea92558..b12a68a60b91552b19c74ea1a6d3aa908d0004f9 100644
--- a/library/core/src/androidTest/assets/mp3/bear.mp3.0.dump
+++ b/library/core/src/androidTest/assets/mp3/bear.mp3.0.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 44544
   sample count = 116
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp3/bear.mp3.1.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.1.dump
index 12abf149c4dcb41fc24905d097d1120c00a94ee0..abf5b104156ea1cdd82c4a5020dc99fa37554a9e 100644
--- a/library/core/src/androidTest/assets/mp3/bear.mp3.1.dump
+++ b/library/core/src/androidTest/assets/mp3/bear.mp3.1.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 29568
   sample count = 77
   sample 0:
     time = 928568
diff --git a/library/core/src/androidTest/assets/mp3/bear.mp3.2.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.2.dump
index 3568616e76320a724537f2476218feb407dce7ad..813f61b7fc1e5ce5921aea030daa2342b327c2ae 100644
--- a/library/core/src/androidTest/assets/mp3/bear.mp3.2.dump
+++ b/library/core/src/androidTest/assets/mp3/bear.mp3.2.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 14592
   sample count = 38
   sample 0:
     time = 1871586
diff --git a/library/core/src/androidTest/assets/mp3/bear.mp3.3.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.3.dump
index 8a31fe5e7d2fc582d0a445ec8b28b192985ad366..9a0207bd534e07379c6bba1e6a070ddfe1e3fc75 100644
--- a/library/core/src/androidTest/assets/mp3/bear.mp3.3.dump
+++ b/library/core/src/androidTest/assets/mp3/bear.mp3.3.dump
@@ -25,5 +25,6 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 0
   sample count = 0
 tracksEnded = true
diff --git a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump
index 88601665b04eeef1d2912db4d02ce5bcd941eae7..435360dfed84fbc8822eddd163817bcc76deee3b 100644
--- a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump
+++ b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 418
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump
index 88601665b04eeef1d2912db4d02ce5bcd941eae7..435360dfed84fbc8822eddd163817bcc76deee3b 100644
--- a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump
+++ b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 418
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump
index 88601665b04eeef1d2912db4d02ce5bcd941eae7..435360dfed84fbc8822eddd163817bcc76deee3b 100644
--- a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump
+++ b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 418
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump
index 88601665b04eeef1d2912db4d02ce5bcd941eae7..435360dfed84fbc8822eddd163817bcc76deee3b 100644
--- a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump
+++ b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 418
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump
index 2c0ac67561ceb585553fdf70a2a9a1bda3fa7fe9..6b49619b502f18271ae03110fca3d6db6582bcba 100644
--- a/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump
+++ b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 418
   sample count = 1
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp4/sample.mp4.0.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.0.dump
index 7cd348650538078fff3fcde65781a7296aa15626..77708b16df451303f59c28063b22645a0096689b 100644
--- a/library/core/src/androidTest/assets/mp4/sample.mp4.0.dump
+++ b/library/core/src/androidTest/assets/mp4/sample.mp4.0.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B
+  total output bytes = 89876
   sample count = 30
   sample 0:
     time = 0
@@ -171,6 +172,7 @@ track 1:
     drmInitData = -
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 9529
   sample count = 45
   sample 0:
     time = 44000
diff --git a/library/core/src/androidTest/assets/mp4/sample.mp4.1.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.1.dump
index fcf9402cba7923ad13a88bb05f8f655342c35241..30ed21ef98fb5f05fcf6d8731e24e1935e7caf89 100644
--- a/library/core/src/androidTest/assets/mp4/sample.mp4.1.dump
+++ b/library/core/src/androidTest/assets/mp4/sample.mp4.1.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B
+  total output bytes = 89876
   sample count = 30
   sample 0:
     time = 0
@@ -171,6 +172,7 @@ track 1:
     drmInitData = -
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 7464
   sample count = 33
   sample 0:
     time = 322639
diff --git a/library/core/src/androidTest/assets/mp4/sample.mp4.2.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.2.dump
index 5dbb6e1561456d887ac63082deb52a9187e57113..640d92722c00cb496696f16ca6f258cba08b5998 100644
--- a/library/core/src/androidTest/assets/mp4/sample.mp4.2.dump
+++ b/library/core/src/androidTest/assets/mp4/sample.mp4.2.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B
+  total output bytes = 89876
   sample count = 30
   sample 0:
     time = 0
@@ -171,6 +172,7 @@ track 1:
     drmInitData = -
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 4019
   sample count = 18
   sample 0:
     time = 670938
diff --git a/library/core/src/androidTest/assets/mp4/sample.mp4.3.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.3.dump
index bac707446d5e91ca92776b38d61fb87636b2a27d..b4fd4a0b02ee6f55b048bf38a00bc1a2963e7938 100644
--- a/library/core/src/androidTest/assets/mp4/sample.mp4.3.dump
+++ b/library/core/src/androidTest/assets/mp4/sample.mp4.3.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B
+  total output bytes = 89876
   sample count = 30
   sample 0:
     time = 0
@@ -171,6 +172,7 @@ track 1:
     drmInitData = -
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 470
   sample count = 3
   sample 0:
     time = 1019238
diff --git a/library/core/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump b/library/core/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump
index 736e57693ccd8531398db58ed9b4a8d7c9952be9..ec2cb7b8cea2d559602895095c443c8dfc660537 100644
--- a/library/core/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump
+++ b/library/core/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B
+  total output bytes = 85933
   sample count = 30
   sample 0:
     time = 66000
@@ -171,6 +172,7 @@ track 1:
     drmInitData = -
     initializationData:
       data = length 5, hash 2B7623A
+  total output bytes = 18257
   sample count = 46
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump b/library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump
index 8186a2b9ce12cfc561445c1c7645eab32fddaaf5..ae012055fed6e0e74b6bc8d1605b19b51a0033f4 100644
--- a/library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump
+++ b/library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B
+  total output bytes = 85933
   sample count = 30
   sample 0:
     time = 66000
@@ -171,6 +172,7 @@ track 1:
     drmInitData = -
     initializationData:
       data = length 5, hash 2B7623A
+  total output bytes = 18257
   sample count = 46
   sample 0:
     time = 0
@@ -378,5 +380,6 @@ track 3:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 0
   sample count = 0
 tracksEnded = true
diff --git a/library/core/src/androidTest/assets/ogg/bear.opus.0.dump b/library/core/src/androidTest/assets/ogg/bear.opus.0.dump
index 4d09067f3b98a363f4bd569b0d7e79f450318725..643972b8364d5a1b924061eb815bce06e491b8f9 100644
--- a/library/core/src/androidTest/assets/ogg/bear.opus.0.dump
+++ b/library/core/src/androidTest/assets/ogg/bear.opus.0.dump
@@ -28,6 +28,7 @@ track 0:
       data = length 19, hash BFE794DB
       data = length 8, hash CA22068C
       data = length 8, hash 79C07075
+  total output bytes = 25541
   sample count = 275
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear.opus.1.dump b/library/core/src/androidTest/assets/ogg/bear.opus.1.dump
index 821351e989c84a5baa200b9b5739a70adafd68cb..8df1563d903657fa498ed5fd687179ac8b304ef5 100644
--- a/library/core/src/androidTest/assets/ogg/bear.opus.1.dump
+++ b/library/core/src/androidTest/assets/ogg/bear.opus.1.dump
@@ -28,6 +28,7 @@ track 0:
       data = length 19, hash BFE794DB
       data = length 8, hash CA22068C
       data = length 8, hash 79C07075
+  total output bytes = 17031
   sample count = 184
   sample 0:
     time = 910000
diff --git a/library/core/src/androidTest/assets/ogg/bear.opus.2.dump b/library/core/src/androidTest/assets/ogg/bear.opus.2.dump
index 3aea1e8d749745fac3073babe5aff40efe17295b..bed4c46d9ca5cc6807f82df7b7993d7686ae0cf6 100644
--- a/library/core/src/androidTest/assets/ogg/bear.opus.2.dump
+++ b/library/core/src/androidTest/assets/ogg/bear.opus.2.dump
@@ -28,6 +28,7 @@ track 0:
       data = length 19, hash BFE794DB
       data = length 8, hash CA22068C
       data = length 8, hash 79C07075
+  total output bytes = 8698
   sample count = 92
   sample 0:
     time = 1830000
diff --git a/library/core/src/androidTest/assets/ogg/bear.opus.3.dump b/library/core/src/androidTest/assets/ogg/bear.opus.3.dump
index b49af29f2ca2bda8419330644fcd0c15f0e8a170..8a9c99250e247f08faef491af8d12eb7f454c828 100644
--- a/library/core/src/androidTest/assets/ogg/bear.opus.3.dump
+++ b/library/core/src/androidTest/assets/ogg/bear.opus.3.dump
@@ -28,6 +28,7 @@ track 0:
       data = length 19, hash BFE794DB
       data = length 8, hash CA22068C
       data = length 8, hash 79C07075
+  total output bytes = 126
   sample count = 1
   sample 0:
     time = 2741000
diff --git a/library/core/src/androidTest/assets/ogg/bear.opus.unklen.dump b/library/core/src/androidTest/assets/ogg/bear.opus.unklen.dump
index b2d5a9f3d2d399e7e796732798eaaf90e1e3d7d5..5d2c84b0479d7be7e2aff264e458e0c881e126ae 100644
--- a/library/core/src/androidTest/assets/ogg/bear.opus.unklen.dump
+++ b/library/core/src/androidTest/assets/ogg/bear.opus.unklen.dump
@@ -28,6 +28,7 @@ track 0:
       data = length 19, hash BFE794DB
       data = length 8, hash CA22068C
       data = length 8, hash 79C07075
+  total output bytes = 25541
   sample count = 275
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.0.dump
index 572d1da891dfe3f8dbb68b856101c31e6a7830ad..ff22bb2d3e2ed645679bc195694d3e4a708c334b 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.0.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.0.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 164431
   sample count = 33
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.1.dump
index d53f257fd2f02ceabbfba9b249c80556eae4b4b2..50110149fd4ceee64acb6898083717949dca2b43 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.1.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.1.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 113666
   sample count = 23
   sample 0:
     time = 853333
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.2.dump
index cdfd6efab807975c6c1773484d85defa06e5f4b5..483ae36721eebc478cf1ef7c0ee5749fc6ead6d1 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.2.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.2.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 55652
   sample count = 12
   sample 0:
     time = 1792000
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.3.dump
index 9b029d3301b1bbfa46758999b511574ea32eef05..a47407e63dc6ab05f939d38f19f40adab280fcd2 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.3.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.3.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 445
   sample count = 1
   sample 0:
     time = 2730666
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump
index 572d1da891dfe3f8dbb68b856101c31e6a7830ad..ff22bb2d3e2ed645679bc195694d3e4a708c334b 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 164431
   sample count = 33
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump
index 1c02c1bbefbc1dc9424665b4f679389efeb08bb8..32f350efcb45e4371f7c491e907844da621afc7d 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 164431
   sample count = 33
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump
index 81d79b867462eadf7f7fb701a43ee170ac869d02..3082e8faca962c899a71dd4f642811cb99405976 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 113666
   sample count = 23
   sample 0:
     time = 853333
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump
index f8b00bcb3afd73f7188ca442c28902e2d95e0528..b574409f708560096fd8bccb609c214f8ce137e9 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 55652
   sample count = 12
   sample 0:
     time = 1792000
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump
index b02061848837fdd8511ac9051a953e104b7c2c04..f411596b44cd2ddd7009baeb7a49ada178c2c799 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 445
   sample count = 1
   sample 0:
     time = 2730666
diff --git a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
index bf135434f499150b4f71382f444da03572fe00f9..bdfe90277daa77f97abedd5fcd2b9fa5068ea9de 100644
--- a/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 42, hash 83F6895
+  total output bytes = 164431
   sample count = 33
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump
index 860e8a3b5bcffc75c35ed9f89952ea5f8ef9fa92..dd129ce9dc6f852a01f094a284b19bf8dddb4778 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 30, hash 9A8FF207
       data = length 3832, hash 8A406249
+  total output bytes = 26873
   sample count = 180
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump
index 11afeb9665e7bfb813aaa67864b240bd6c5562f3..4fb8a74d923253eeeb7ebab52adfa8ef7fad7305 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 30, hash 9A8FF207
       data = length 3832, hash 8A406249
+  total output bytes = 17598
   sample count = 109
   sample 0:
     time = 896000
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump
index f2f97ebcfa5bf5b244b30a5ebd598924438840b6..fad8f33d779fc408b88b9d35a5988ee0917be0d5 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 30, hash 9A8FF207
       data = length 3832, hash 8A406249
+  total output bytes = 8658
   sample count = 49
   sample 0:
     time = 1821333
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump
index 5d5f284cf24a31a9ac742d7054e041430cbac395..49dca02220d5176d00bbfe8ec999feac10ecdd57 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump
@@ -27,5 +27,6 @@ track 0:
     initializationData:
       data = length 30, hash 9A8FF207
       data = length 3832, hash 8A406249
+  total output bytes = 0
   sample count = 0
 tracksEnded = true
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump
index ee1176773e3357042929d00517895c20be668b8b..756be4285420b8a7ca97a2880226898e990ec40b 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump
@@ -27,6 +27,7 @@ track 0:
     initializationData:
       data = length 30, hash 9A8FF207
       data = length 3832, hash 8A406249
+  total output bytes = 26873
   sample count = 180
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/rawcc/sample.rawcc.0.dump b/library/core/src/androidTest/assets/rawcc/sample.rawcc.0.dump
index d430d1d8d44e403c04c2154acfcfaa7e01477b34..130be06cebd799f8676827aae650c8374be62b45 100644
--- a/library/core/src/androidTest/assets/rawcc/sample.rawcc.0.dump
+++ b/library/core/src/androidTest/assets/rawcc/sample.rawcc.0.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 978
   sample count = 150
   sample 0:
     time = 37657512133
diff --git a/library/core/src/androidTest/assets/ts/sample.ac3.0.dump b/library/core/src/androidTest/assets/ts/sample.ac3.0.dump
index bedffcf19892d322daaa7af32b14d58c1c2bfd4c..46028638fe61704bcd003e272fd233ac5efe688c 100644
--- a/library/core/src/androidTest/assets/ts/sample.ac3.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.ac3.0.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 13281
   sample count = 8
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/ts/sample.adts.0.dump b/library/core/src/androidTest/assets/ts/sample.adts.0.dump
index a97cf860d10ac42b511f5e1ad262783d4c4ed18e..132859a00e147fa92c1f0ca6ff31a9dd89c93a38 100644
--- a/library/core/src/androidTest/assets/ts/sample.adts.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.adts.0.dump
@@ -26,6 +26,7 @@ track 0:
     drmInitData = -
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 30797
   sample count = 144
   sample 0:
     time = 0
@@ -625,5 +626,6 @@ track 1:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 0
   sample count = 0
 tracksEnded = true
diff --git a/library/core/src/androidTest/assets/ts/sample.ps.0.dump b/library/core/src/androidTest/assets/ts/sample.ps.0.dump
index 41db704d5681079ae303c7605dbc401e4ce51d5d..e833201692cbab8c488f56848982d212384e5c02 100644
--- a/library/core/src/androidTest/assets/ts/sample.ps.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.ps.0.dump
@@ -25,6 +25,7 @@ track 192:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 1671
   sample count = 4
   sample 0:
     time = 29088
@@ -65,6 +66,7 @@ track 224:
     drmInitData = -
     initializationData:
       data = length 22, hash 743CC6F8
+  total output bytes = 44056
   sample count = 2
   sample 0:
     time = 40000
diff --git a/library/core/src/androidTest/assets/ts/sample.ts.0.dump b/library/core/src/androidTest/assets/ts/sample.ts.0.dump
index e900b94673294004c89ccdca1312d0cb43deac72..39b15652894ffecfa1ac9d01b2995535d9598827 100644
--- a/library/core/src/androidTest/assets/ts/sample.ts.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.ts.0.dump
@@ -26,6 +26,7 @@ track 256:
     drmInitData = -
     initializationData:
       data = length 22, hash CE183139
+  total output bytes = 45026
   sample count = 2
   sample 0:
     time = 33366
@@ -57,6 +58,7 @@ track 257:
     language = und
     drmInitData = -
     initializationData:
+  total output bytes = 5015
   sample count = 4
   sample 0:
     time = 22455
diff --git a/library/core/src/androidTest/assets/wav/sample.wav.0.dump b/library/core/src/androidTest/assets/wav/sample.wav.0.dump
index 5d0f4d77f05cd129aee9ff9229272c2c2e793670..32f9d495d237cf4cdf09e01f55c05f734af18a70 100644
--- a/library/core/src/androidTest/assets/wav/sample.wav.0.dump
+++ b/library/core/src/androidTest/assets/wav/sample.wav.0.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 88200
   sample count = 3
   sample 0:
     time = 0
diff --git a/library/core/src/androidTest/assets/wav/sample.wav.1.dump b/library/core/src/androidTest/assets/wav/sample.wav.1.dump
index e59239bff81ca7deb95ac4c8e019e6b636a697d3..d4758e65b5fa55a8b3d73a465d9e49e0ebd75a3c 100644
--- a/library/core/src/androidTest/assets/wav/sample.wav.1.dump
+++ b/library/core/src/androidTest/assets/wav/sample.wav.1.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 58802
   sample count = 2
   sample 0:
     time = 333310
diff --git a/library/core/src/androidTest/assets/wav/sample.wav.2.dump b/library/core/src/androidTest/assets/wav/sample.wav.2.dump
index c80a260385c456ebe0f9d80acf44e828d1942653..ea33c62423edacb6c11b240928919b82430fc05e 100644
--- a/library/core/src/androidTest/assets/wav/sample.wav.2.dump
+++ b/library/core/src/androidTest/assets/wav/sample.wav.2.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 29402
   sample count = 1
   sample 0:
     time = 666643
diff --git a/library/core/src/androidTest/assets/wav/sample.wav.3.dump b/library/core/src/androidTest/assets/wav/sample.wav.3.dump
index 9f25028923dd754071821f408597848983f2df95..de0d8f22d02c7f5967b2fd027edebc34d7f964fc 100644
--- a/library/core/src/androidTest/assets/wav/sample.wav.3.dump
+++ b/library/core/src/androidTest/assets/wav/sample.wav.3.dump
@@ -25,6 +25,7 @@ track 0:
     language = null
     drmInitData = -
     initializationData:
+  total output bytes = 2
   sample count = 1
   sample 0:
     time = 999977
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java
index 5cb11fdd81af2bb7ded424b79f2b3a58028e7f3a..7f6398dd5a67fb8c58efc1076a8906a5b79bc0ab 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java
@@ -91,23 +91,16 @@ public final class FakeExtractorInput implements ExtractorInput {
 
   @Override
   public int read(byte[] target, int offset, int length) throws IOException {
+    checkIOException(readPosition, failedReadPositions);
     length = getReadLength(length);
-    if (readFully(target, offset, length, true)) {
-      return length;
-    }
-    return C.RESULT_END_OF_INPUT;
+    return readFullyInternal(target, offset, length, true) ? length : C.RESULT_END_OF_INPUT;
   }
 
   @Override
   public boolean readFully(byte[] target, int offset, int length, boolean allowEndOfInput)
       throws IOException {
-    if (!checkXFully(allowEndOfInput, readPosition, length, failedReadPositions)) {
-      return false;
-    }
-    System.arraycopy(data, readPosition, target, offset, length);
-    readPosition += length;
-    peekPosition = readPosition;
-    return true;
+    checkIOException(readPosition, failedReadPositions);
+    return readFullyInternal(target, offset, length, allowEndOfInput);
   }
 
   @Override
@@ -117,21 +110,15 @@ public final class FakeExtractorInput implements ExtractorInput {
 
   @Override
   public int skip(int length) throws IOException {
+    checkIOException(readPosition, failedReadPositions);
     length = getReadLength(length);
-    if (skipFully(length, true)) {
-      return length;
-    }
-    return C.RESULT_END_OF_INPUT;
+    return skipFullyInternal(length, true) ? length : C.RESULT_END_OF_INPUT;
   }
 
   @Override
   public boolean skipFully(int length, boolean allowEndOfInput) throws IOException {
-    if (!checkXFully(allowEndOfInput, readPosition, length, failedReadPositions)) {
-      return false;
-    }
-    readPosition += length;
-    peekPosition = readPosition;
-    return true;
+    checkIOException(readPosition, failedReadPositions);
+    return skipFullyInternal(length, allowEndOfInput);
   }
 
   @Override
@@ -142,7 +129,8 @@ public final class FakeExtractorInput implements ExtractorInput {
   @Override
   public boolean peekFully(byte[] target, int offset, int length, boolean allowEndOfInput)
       throws IOException {
-    if (!checkXFully(allowEndOfInput, peekPosition, length, failedPeekPositions)) {
+    checkIOException(peekPosition, failedPeekPositions);
+    if (!checkXFully(allowEndOfInput, peekPosition, length)) {
       return false;
     }
     System.arraycopy(data, peekPosition, target, offset, length);
@@ -157,7 +145,8 @@ public final class FakeExtractorInput implements ExtractorInput {
 
   @Override
   public boolean advancePeekPosition(int length, boolean allowEndOfInput) throws IOException {
-    if (!checkXFully(allowEndOfInput, peekPosition, length, failedPeekPositions)) {
+    checkIOException(peekPosition, failedPeekPositions);
+    if (!checkXFully(allowEndOfInput, peekPosition, length)) {
       return false;
     }
     peekPosition += length;
@@ -196,13 +185,17 @@ public final class FakeExtractorInput implements ExtractorInput {
     throw e;
   }
 
-  private boolean checkXFully(boolean allowEndOfInput, int position, int length,
-      SparseBooleanArray failedPositions) throws IOException {
+  private void checkIOException(int position, SparseBooleanArray failedPositions)
+      throws SimulatedIOException {
     if (simulateIOErrors && !failedPositions.get(position)) {
       failedPositions.put(position, true);
       peekPosition = readPosition;
       throw new SimulatedIOException("Simulated IO error at position: " + position);
     }
+  }
+
+  private boolean checkXFully(boolean allowEndOfInput, int position, int length)
+      throws EOFException {
     if (length > 0 && position == data.length) {
       if (allowEndOfInput) {
         return false;
@@ -230,6 +223,26 @@ public final class FakeExtractorInput implements ExtractorInput {
     return Math.min(requestedLength, data.length - readPosition);
   }
 
+  private boolean readFullyInternal(byte[] target, int offset, int length, boolean allowEndOfInput)
+      throws EOFException {
+    if (!checkXFully(allowEndOfInput, readPosition, length)) {
+      return false;
+    }
+    System.arraycopy(data, readPosition, target, offset, length);
+    readPosition += length;
+    peekPosition = readPosition;
+    return true;
+  }
+
+  private boolean skipFullyInternal(int length, boolean allowEndOfInput) throws EOFException {
+    if (!checkXFully(allowEndOfInput, readPosition, length)) {
+      return false;
+    }
+    readPosition += length;
+    peekPosition = readPosition;
+    return true;
+  }
+
   /**
    * Builder of {@link FakeExtractorInput} instances.
    */
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
index b14e6f60efa4c37ccedba6e8405022c423ce0de5..f8e54074219cb9bb7894bb5e1466beda8de31b11 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
@@ -160,6 +160,7 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
     }
     dumper.endBlock().endBlock();
 
+    dumper.add("total output bytes", sampleData.length);
     dumper.add("sample count", sampleTimesUs.size());
 
     for (int i = 0; i < sampleTimesUs.size(); i++) {