diff --git a/trunk/doc/ts-audio-video-dts-pts.txt b/trunk/doc/ts-audio-video-dts-pts.txt
index 16a3ce96d..0e7e480de 100644
--- a/trunk/doc/ts-audio-video-dts-pts.txt
+++ b/trunk/doc/ts-audio-video-dts-pts.txt
@@ -1,205 +1,330 @@
-ts+aac+h264+data audio pts:168696991 dts(calc):168696991 dts:0 size: 584
-ts+aac+h264+data video pts:168704280 dts(calc):168700500 dts:168700500 size: 35795
-ts+aac+h264+data video pts:168702836 dts(calc):168704280 dts:168704280 size: 4108
-ts+aac+h264+data video pts:168691586 dts(calc):168691586 dts:0 size: 425
-ts+aac+h264+data video pts:168695366 dts(calc):168695366 dts:0 size: 466
-ts+aac+h264+data video pts:168699146 dts(calc):168699146 dts:0 size: 353
-ts+aac+h264+data video pts:168734250 dts(calc):168702836 dts:168702836 size: 4225
-ts+aac+h264+data audio pts:168705351 dts(calc):168705351 dts:0 size: 1611
-ts+aac+h264+data video pts:168723000 dts(calc):168723000 dts:0 size: 416
-ts+aac+h264+data video pts:168726780 dts(calc):168726780 dts:0 size: 486
-ts+aac+h264+data video pts:168730470 dts(calc):168730470 dts:0 size: 408
-ts+aac+h264+data video pts:168732896 dts(calc):168734250 dts:168734250 size: 5018
-ts+aac+h264+data video pts:168738030 dts(calc):168738030 dts:0 size: 450
-ts+aac+h264+data video pts:168725336 dts(calc):168725336 dts:0 size: 466
-ts+aac+h264+data audio pts:168726248 dts(calc):168726248 dts:0 size: 1497
-ts+aac+h264+data video pts:168729116 dts(calc):168729116 dts:0 size: 384
-ts+aac+h264+data video pts:168764220 dts(calc):168732896 dts:168732896 size: 6680
-ts+aac+h264+data video pts:168736586 dts(calc):168736586 dts:0 size: 844
-ts+aac+h264+data video pts:168756750 dts(calc):168756750 dts:0 size: 773
-ts+aac+h264+data video pts:168760530 dts(calc):168760530 dts:0 size: 509
-ts+aac+h264+data audio pts:168730762 dts(calc):168730762 dts:0 size: 1383
-ts+aac+h264+data video pts:168762866 dts(calc):168764220 dts:168764220 size: 7197
-ts+aac+h264+data video pts:168768000 dts(calc):168768000 dts:0 size: 546
-ts+aac+h264+data video pts:168755396 dts(calc):168755396 dts:0 size: 574
-ts+aac+h264+data video pts:168759086 dts(calc):168759086 dts:0 size: 415
-ts+aac+h264+data video pts:168794280 dts(calc):168762866 dts:168762866 size: 3442
-ts+aac+h264+data video pts:168766646 dts(calc):168766646 dts:0 size: 334
-ts+aac+h264+data audio pts:168768044 dts(calc):168768044 dts:0 size: 1454
-ts+aac+h264+data video pts:168770336 dts(calc):168770336 dts:0 size: 353
-ts+aac+h264+data video pts:168790500 dts(calc):168790500 dts:0 size: 298
-ts+aac+h264+data video pts:168792836 dts(calc):168794280 dts:168794280 size: 954
-ts+aac+h264+data video pts:168797970 dts(calc):168797970 dts:0 size: 303
-ts+aac+h264+data video pts:168801750 dts(calc):168801750 dts:0 size: 329
-ts+aac+h264+data video pts:168789146 dts(calc):168789146 dts:0 size: 302
-ts+aac+h264+data audio pts:168788942 dts(calc):168788942 dts:0 size: 1513
-ts+aac+h264+data video pts:168800396 dts(calc):168792836 dts:168792836 size: 746
-ts+aac+h264+data video pts:168796616 dts(calc):168796616 dts:0 size: 473
-ts+aac+h264+data video pts:168804086 dts(calc):168800396 dts:168800396 size: 3674
-ts+aac+h264+data video pts:168824250 dts(calc):168804086 dts:168804086 size: 3116
-ts+aac+h264+data video pts:168828030 dts(calc):168824250 dts:168824250 size: 3064
-ts+aac+h264+data audio pts:168793456 dts(calc):168793456 dts:0 size: 1504
-ts+aac+h264+data video pts:168831720 dts(calc):168828030 dts:168828030 size: 2899
-ts+aac+h264+data video pts:168835500 dts(calc):168831720 dts:168831720 size: 3231
-ts+aac+h264+data video pts:168822896 dts(calc):168835500 dts:168835500 size: 3877
-ts+aac+h264+data video pts:168826586 dts(calc):168822896 dts:168822896 size: 2984
-ts+aac+h264+data video pts:168830366 dts(calc):168826586 dts:168826586 size: 6415
-ts+aac+h264+data video pts:168834146 dts(calc):168830366 dts:168830366 size: 29200
-ts+aac+h264+data audio pts:168830738 dts(calc):168830738 dts:0 size: 1540
-ts+aac+h264+data video pts:168854220 dts(calc):168834146 dts:168834146 size: 4102
-ts+aac+h264+data video pts:168858000 dts(calc):168854220 dts:168854220 size: 6944
-ts+aac+h264+data video pts:168861780 dts(calc):168858000 dts:168858000 size: 9061
-ts+aac+h264+data video pts:168865470 dts(calc):168861780 dts:168861780 size: 9760
-ts+aac+h264+data video pts:168869250 dts(calc):168865470 dts:168865470 size: 14741
-ts+aac+h264+data audio pts:168835252 dts(calc):168835252 dts:0 size: 1607
-ts+aac+h264+data video pts:168860336 dts(calc):168869250 dts:168869250 size: 15711
-ts+aac+h264+data video pts:168856646 dts(calc):168856646 dts:0 size: 2181
-ts+aac+h264+data video pts:168891750 dts(calc):168860336 dts:168860336 size: 19063
-ts+aac+h264+data video pts:168864116 dts(calc):168864116 dts:0 size: 2345
-ts+aac+h264+data video pts:168867896 dts(calc):168867896 dts:0 size: 2597
-ts+aac+h264+data video pts:168887970 dts(calc):168887970 dts:0 size: 2003
-ts+aac+h264+data audio pts:168856150 dts(calc):168856150 dts:0 size: 1575
-ts+aac+h264+data video pts:168890396 dts(calc):168891750 dts:168891750 size: 16911
-ts+aac+h264+data video pts:168895530 dts(calc):168895530 dts:0 size: 1196
-ts+aac+h264+data video pts:168899220 dts(calc):168899220 dts:0 size: 1181
-ts+aac+h264+data video pts:168886616 dts(calc):168886616 dts:0 size: 891
-ts+aac+h264+data video pts:168921720 dts(calc):168890396 dts:168890396 size: 15388
-ts+aac+h264+data audio pts:168893432 dts(calc):168893432 dts:0 size: 1401
-ts+aac+h264+data video pts:168894086 dts(calc):168894086 dts:0 size: 982
-ts+aac+h264+data video pts:168897866 dts(calc):168897866 dts:0 size: 928
-ts+aac+h264+data video pts:168901646 dts(calc):168901646 dts:0 size: 737
-ts+aac+h264+data video pts:168920366 dts(calc):168921720 dts:168921720 size: 14519
-ts+aac+h264+data video pts:168925500 dts(calc):168925500 dts:0 size: 900
-ts+aac+h264+data video pts:168929280 dts(calc):168929280 dts:0 size: 878
-ts+aac+h264+data audio pts:168897946 dts(calc):168897946 dts:0 size: 1546
-ts+aac+h264+data video pts:168932970 dts(calc):168932970 dts:0 size: 698
-ts+aac+h264+data video pts:168935396 dts(calc):168920366 dts:168920366 size: 11824
-ts+aac+h264+data video pts:168924146 dts(calc):168924146 dts:0 size: 837
-ts+aac+h264+data video pts:168927836 dts(calc):168927836 dts:0 size: 896
-ts+aac+h264+data video pts:168931616 dts(calc):168931616 dts:0 size: 671
-ts+aac+h264+data video pts:168966720 dts(calc):168935396 dts:168935396 size: 8523
-ts+aac+h264+data audio pts:168935228 dts(calc):168935228 dts:0 size: 1398
-ts+aac+h264+data video pts:168955470 dts(calc):168955470 dts:0 size: 773
-ts+aac+h264+data video pts:168959250 dts(calc):168959250 dts:0 size: 755
-ts+aac+h264+data video pts:168963030 dts(calc):168963030 dts:0 size: 643
-ts+aac+h264+data video pts:168961586 dts(calc):168966720 dts:168966720 size: 4648
-ts+aac+h264+data video pts:168954116 dts(calc):168954116 dts:0 size: 626
-ts+aac+h264+data audio pts:168956126 dts(calc):168956126 dts:0 size: 1426
-ts+aac+h264+data video pts:168957896 dts(calc):168957896 dts:0 size: 536
-ts+aac+h264+data video pts:168965366 dts(calc):168961586 dts:168961586 size: 3771
-ts+aac+h264+data video pts:168985530 dts(calc):168965366 dts:168965366 size: 4494
-ts+aac+h264+data video pts:168989220 dts(calc):168985530 dts:168985530 size: 5560
-ts+aac+h264+data video pts:168993000 dts(calc):168989220 dts:168989220 size: 6541
-ts+aac+h264+data video pts:168996780 dts(calc):168993000 dts:168993000 size: 7636
-ts+aac+h264+data audio pts:168960640 dts(calc):168960640 dts:0 size: 1470
-ts+aac+h264+data video pts:169000470 dts(calc):168996780 dts:168996780 size: 6685
-ts+aac+h264+data video pts:168987866 dts(calc):169000470 dts:169000470 size: 6791
-ts+aac+h264+data video pts:168991646 dts(calc):168987866 dts:168987866 size: 11730
-ts+aac+h264+data video pts:168995336 dts(calc):168991646 dts:168991646 size: 14252
-ts+aac+h264+data video pts:169022970 dts(calc):168995336 dts:168995336 size: 9386
-ts+aac+h264+data audio pts:168997922 dts(calc):168997922 dts:0 size: 1641
-ts+aac+h264+data video pts:168999116 dts(calc):168999116 dts:0 size: 809
-ts+aac+h264+data video pts:169019280 dts(calc):169019280 dts:0 size: 631
-ts+aac+h264+data video pts:169030530 dts(calc):169022970 dts:169022970 size: 7316
-ts+aac+h264+data video pts:169026750 dts(calc):169026750 dts:0 size: 594
-ts+aac+h264+data video pts:169021616 dts(calc):169030530 dts:169030530 size: 6070
-ts+aac+h264+data video pts:169017836 dts(calc):169017836 dts:0 size: 674
-ts+aac+h264+data audio pts:169018820 dts(calc):169018820 dts:0 size: 1468
-ts+aac+h264+data video pts:169029086 dts(calc):169021616 dts:169021616 size: 5808
-ts+aac+h264+data video pts:169025396 dts(calc):169025396 dts:0 size: 958
-ts+aac+h264+data video pts:169032866 dts(calc):169029086 dts:169029086 size: 5959
-ts+aac+h264+data video pts:169053030 dts(calc):169032866 dts:169032866 size: 5991
-ts+aac+h264+data video pts:169056720 dts(calc):169053030 dts:169053030 size: 10941
-ts+aac+h264+data audio pts:169023334 dts(calc):169023334 dts:0 size: 1471
-ts+aac+h264+data video pts:169064280 dts(calc):169056720 dts:169056720 size: 7867
-ts+aac+h264+data video pts:169060500 dts(calc):169060500 dts:0 size: 4550
-ts+aac+h264+data video pts:169051586 dts(calc):169064280 dts:169064280 size: 10501
-ts+aac+h264+data video pts:169055366 dts(calc):169051586 dts:169051586 size: 10772
-ts+aac+h264+data video pts:169059146 dts(calc):169055366 dts:169055366 size: 12594
-ts+aac+h264+data video pts:169083000 dts(calc):169059146 dts:169059146 size: 12274
-ts+aac+h264+data audio pts:169060616 dts(calc):169060616 dts:0 size: 1551
-ts+aac+h264+data video pts:169062836 dts(calc):169062836 dts:0 size: 2145
-ts+aac+h264+data video pts:169098030 dts(calc):169083000 dts:169083000 size: 10764
-ts+aac+h264+data video pts:169086780 dts(calc):169086780 dts:0 size: 952
-ts+aac+h264+data video pts:169090470 dts(calc):169090470 dts:0 size: 977
-ts+aac+h264+data video pts:169094250 dts(calc):169094250 dts:0 size: 830
-ts+aac+h264+data video pts:169096586 dts(calc):169098030 dts:169098030 size: 2899
-ts+aac+h264+data audio pts:169065130 dts(calc):169065130 dts:0 size: 1457
-ts+aac+h264+data video pts:169085336 dts(calc):169085336 dts:0 size: 388
-ts+aac+h264+data video pts:169089116 dts(calc):169089116 dts:0 size: 291
-ts+aac+h264+data video pts:169092896 dts(calc):169092896 dts:0 size: 275
-ts+aac+h264+data video pts:169124220 dts(calc):169096586 dts:169096586 size: 676
-ts+aac+h264+data video pts:169116750 dts(calc):169116750 dts:0 size: 249
-ts+aac+h264+data audio pts:169086028 dts(calc):169086028 dts:0 size: 1400
-ts+aac+h264+data video pts:169120530 dts(calc):169120530 dts:0 size: 217
-ts+aac+h264+data video pts:169128000 dts(calc):169124220 dts:169124220 size: 75644
-ts+aac+h264+data video pts:169126646 dts(calc):169128000 dts:169128000 size: 2805
-ts+aac+h264+data video pts:169131780 dts(calc):169131780 dts:0 size: 229
-ts+aac+h264+data video pts:169119086 dts(calc):169119086 dts:0 size: 199
-ts+aac+h264+data video pts:169122866 dts(calc):169122866 dts:0 size: 197
-ts+aac+h264+data audio pts:169123310 dts(calc):169123310 dts:0 size: 1683
-ts+aac+h264+data video pts:169157970 dts(calc):169126646 dts:169126646 size: 4670
-ts+aac+h264+data video pts:169130336 dts(calc):169130336 dts:0 size: 501
-ts+aac+h264+data video pts:169150500 dts(calc):169150500 dts:0 size: 672
-ts+aac+h264+data video pts:169154280 dts(calc):169154280 dts:0 size: 422
-ts+aac+h264+data video pts:169156616 dts(calc):169157970 dts:169157970 size: 6008
-ts+aac+h264+data audio pts:169127824 dts(calc):169127824 dts:0 size: 1470
-ts+aac+h264+data video pts:169161750 dts(calc):169161750 dts:0 size: 682
-ts+aac+h264+data video pts:169149146 dts(calc):169149146 dts:0 size: 712
-ts+aac+h264+data video pts:169152836 dts(calc):169152836 dts:0 size: 638
-ts+aac+h264+data video pts:169188030 dts(calc):169156616 dts:169156616 size: 11908
-ts+aac+h264+data video pts:169160396 dts(calc):169160396 dts:0 size: 1508
-ts+aac+h264+data video pts:169164086 dts(calc):169164086 dts:0 size: 1455
-ts+aac+h264+data audio pts:169148722 dts(calc):169148722 dts:0 size: 1383
-ts+aac+h264+data video pts:169184250 dts(calc):169184250 dts:0 size: 1169
-ts+aac+h264+data video pts:169186586 dts(calc):169188030 dts:169188030 size: 11158
-ts+aac+h264+data video pts:169191720 dts(calc):169191720 dts:0 size: 685
-ts+aac+h264+data video pts:169195500 dts(calc):169195500 dts:0 size: 652
-ts+aac+h264+data video pts:169182896 dts(calc):169182896 dts:0 size: 558
-ts+aac+h264+data audio pts:169186004 dts(calc):169186004 dts:0 size: 1535
-ts+aac+h264+data video pts:169218000 dts(calc):169186586 dts:169186586 size: 2086
-ts+aac+h264+data video pts:169190366 dts(calc):169190366 dts:0 size: 420
-ts+aac+h264+data video pts:169194146 dts(calc):169194146 dts:0 size: 465
-ts+aac+h264+data video pts:169214220 dts(calc):169214220 dts:0 size: 407
-ts+aac+h264+data video pts:169229250 dts(calc):169218000 dts:169218000 size: 284
-ts+aac+h264+data video pts:169221780 dts(calc):169221780 dts:0 size: 288
-ts+aac+h264+data audio pts:169190518 dts(calc):169190518 dts:0 size: 1403
-ts+aac+h264+data video pts:169225470 dts(calc):169225470 dts:0 size: 234
-ts+aac+h264+data video pts:169216646 dts(calc):169229250 dts:169229250 size: 59016
-ts+aac+h264+data video pts:169224116 dts(calc):169216646 dts:169216646 size: 4100
-ts+aac+h264+data video pts:169220336 dts(calc):169220336 dts:0 size: 1047
-ts+aac+h264+data video pts:169247970 dts(calc):169224116 dts:169224116 size: 10317
-ts+aac+h264+data video pts:169227896 dts(calc):169227896 dts:0 size: 2748
-ts+aac+h264+data audio pts:169227800 dts(calc):169227800 dts:0 size: 1617
-ts+aac+h264+data video pts:169251750 dts(calc):169247970 dts:169247970 size: 11029
-ts+aac+h264+data video pts:169250396 dts(calc):169251750 dts:169251750 size: 4083
-ts+aac+h264+data video pts:169255530 dts(calc):169255530 dts:0 size: 1481
-ts+aac+h264+data video pts:169259220 dts(calc):169259220 dts:0 size: 642
-ts+aac+h264+data video pts:169263000 dts(calc):169263000 dts:0 size: 499
-ts+aac+h264+data audio pts:169248697 dts(calc):169248697 dts:0 size: 1478
-ts+aac+h264+data video pts:169281720 dts(calc):169250396 dts:169250396 size: 1760
-ts+aac+h264+data video pts:169254086 dts(calc):169254086 dts:0 size: 499
-ts+aac+h264+data video pts:169257866 dts(calc):169257866 dts:0 size: 510
-ts+aac+h264+data video pts:169261646 dts(calc):169261646 dts:0 size: 425
-ts+aac+h264+data video pts:169285500 dts(calc):169281720 dts:169281720 size: 2071
-ts+aac+h264+data video pts:169292970 dts(calc):169285500 dts:169285500 size: 4220
-ts+aac+h264+data audio pts:169253211 dts(calc):169253211 dts:0 size: 1373
-ts+aac+h264+data video pts:169289280 dts(calc):169289280 dts:0 size: 2596
-ts+aac+h264+data video pts:169280366 dts(calc):169292970 dts:169292970 size: 13800
-ts+aac+h264+data video pts:169284146 dts(calc):169280366 dts:169280366 size: 8452
-ts+aac+h264+data video pts:169291616 dts(calc):169284146 dts:169284146 size: 11802
-ts+aac+h264+data video pts:169287836 dts(calc):169287836 dts:0 size: 3014
-ts+aac+h264+data audio pts:169290493 dts(calc):169290493 dts:0 size: 1497
-ts+aac+h264+data video pts:169295396 dts(calc):169291616 dts:169291616 size: 10497
-ts+aac+h264+data video pts:169323030 dts(calc):169295396 dts:169295396 size: 10094
-ts+aac+h264+data video pts:169315470 dts(calc):169315470 dts:0 size: 1955
-ts+aac+h264+data video pts:169319250 dts(calc):169319250 dts:0 size: 931
-ts+aac+h264+data video pts:169321586 dts(calc):169323030 dts:169323030 size: 2733
-ts+aac+h264+data video pts:169326720 dts(calc):169326720 dts:0 size: 570
-ts+aac+h264+data audio pts:169295007 dts(calc):169295007 dts:0 size: 1501
-ts+aac+h264+data video pts:169314116 dts(calc):169314116 dts:0 size: 590
-ts+aac+h264+data video pts:169317896 dts(calc):169317896 dts:0 size: 418
-ts+aac+h264+data video pts:169349220 dts(calc):169321586 dts:169321586 size: 838
-ts+aac+h264+data video pts:169325366 dts(calc):169325366 dts:0 size: 341
-ts+aac+h264+data video pts:169345530 dts(calc):169345530 dts:0 size: 402
-ts+aac+h264+data audio pts:169315905 dts(calc):169315905 dts:0 size: 1380
+ts+aac+h264+data audio pts:168696991 dts:168696991 size: 286
+ts+aac+h264+data audio pts:168701170 dts:168701170 size: 298
+ts+aac+h264+data video pts:168704280 dts:168700500 size: 35795
+ts+aac+h264+data video pts:168702836 dts:168704280 size: 4108
+ts+aac+h264+data video pts:168691586 dts:168691586 size: 425
+ts+aac+h264+data video pts:168695366 dts:168695366 size: 466
+ts+aac+h264+data video pts:168699146 dts:168699146 size: 353
+ts+aac+h264+data video pts:168734250 dts:168702836 size: 4225
+ts+aac+h264+data audio pts:168705351 dts:168705351 size: 297
+ts+aac+h264+data audio pts:168709530 dts:168709530 size: 297
+ts+aac+h264+data audio pts:168713709 dts:168713709 size: 297
+ts+aac+h264+data audio pts:168717888 dts:168717888 size: 354
+ts+aac+h264+data audio pts:168722067 dts:168722067 size: 366
+ts+aac+h264+data video pts:168723000 dts:168723000 size: 416
+ts+aac+h264+data video pts:168726780 dts:168726780 size: 486
+ts+aac+h264+data video pts:168730470 dts:168730470 size: 408
+ts+aac+h264+data video pts:168732896 dts:168734250 size: 5018
+ts+aac+h264+data video pts:168738030 dts:168738030 size: 450
+ts+aac+h264+data video pts:168725336 dts:168725336 size: 466
+ts+aac+h264+data audio pts:168726248 dts:168726248 size: 304
+ts+aac+h264+data audio pts:168730427 dts:168730427 size: 282
+ts+aac+h264+data audio pts:168734606 dts:168734606 size: 298
+ts+aac+h264+data audio pts:168738785 dts:168738785 size: 320
+ts+aac+h264+data audio pts:168742964 dts:168742964 size: 293
+ts+aac+h264+data video pts:168729116 dts:168729116 size: 384
+ts+aac+h264+data video pts:168764220 dts:168732896 size: 6680
+ts+aac+h264+data video pts:168736586 dts:168736586 size: 844
+ts+aac+h264+data video pts:168756750 dts:168756750 size: 773
+ts+aac+h264+data video pts:168760530 dts:168760530 size: 509
+ts+aac+h264+data audio pts:168730762 dts:168730762 size: 278
+ts+aac+h264+data audio pts:168734941 dts:168734941 size: 277
+ts+aac+h264+data audio pts:168739120 dts:168739120 size: 266
+ts+aac+h264+data audio pts:168743299 dts:168743299 size: 286
+ts+aac+h264+data audio pts:168747478 dts:168747478 size: 276
+ts+aac+h264+data video pts:168762866 dts:168764220 size: 7197
+ts+aac+h264+data video pts:168768000 dts:168768000 size: 546
+ts+aac+h264+data video pts:168755396 dts:168755396 size: 574
+ts+aac+h264+data video pts:168759086 dts:168759086 size: 415
+ts+aac+h264+data video pts:168794280 dts:168762866 size: 3442
+ts+aac+h264+data video pts:168766646 dts:168766646 size: 334
+ts+aac+h264+data audio pts:168768044 dts:168768044 size: 284
+ts+aac+h264+data audio pts:168772223 dts:168772223 size: 301
+ts+aac+h264+data audio pts:168776402 dts:168776402 size: 284
+ts+aac+h264+data audio pts:168780581 dts:168780581 size: 287
+ts+aac+h264+data audio pts:168784760 dts:168784760 size: 298
+ts+aac+h264+data video pts:168770336 dts:168770336 size: 353
+ts+aac+h264+data video pts:168790500 dts:168790500 size: 298
+ts+aac+h264+data video pts:168792836 dts:168794280 size: 954
+ts+aac+h264+data video pts:168797970 dts:168797970 size: 303
+ts+aac+h264+data video pts:168801750 dts:168801750 size: 329
+ts+aac+h264+data video pts:168789146 dts:168789146 size: 302
+ts+aac+h264+data audio pts:168788942 dts:168788942 size: 361
+ts+aac+h264+data audio pts:168793121 dts:168793121 size: 309
+ts+aac+h264+data audio pts:168797300 dts:168797300 size: 277
+ts+aac+h264+data audio pts:168801479 dts:168801479 size: 282
+ts+aac+h264+data audio pts:168805658 dts:168805658 size: 284
+ts+aac+h264+data video pts:168800396 dts:168792836 size: 746
+ts+aac+h264+data video pts:168796616 dts:168796616 size: 473
+ts+aac+h264+data video pts:168804086 dts:168800396 size: 3674
+ts+aac+h264+data video pts:168824250 dts:168804086 size: 3116
+ts+aac+h264+data video pts:168828030 dts:168824250 size: 3064
+ts+aac+h264+data audio pts:168793456 dts:168793456 size: 286
+ts+aac+h264+data audio pts:168797635 dts:168797635 size: 286
+ts+aac+h264+data audio pts:168801814 dts:168801814 size: 303
+ts+aac+h264+data audio pts:168805993 dts:168805993 size: 301
+ts+aac+h264+data audio pts:168810172 dts:168810172 size: 328
+ts+aac+h264+data video pts:168831720 dts:168828030 size: 2899
+ts+aac+h264+data video pts:168835500 dts:168831720 size: 3231
+ts+aac+h264+data video pts:168822896 dts:168835500 size: 3877
+ts+aac+h264+data video pts:168826586 dts:168822896 size: 2984
+ts+aac+h264+data video pts:168830366 dts:168826586 size: 6415
+ts+aac+h264+data video pts:168834146 dts:168830366 size: 29200
+ts+aac+h264+data audio pts:168830738 dts:168830738 size: 290
+ts+aac+h264+data audio pts:168834917 dts:168834917 size: 291
+ts+aac+h264+data audio pts:168839096 dts:168839096 size: 356
+ts+aac+h264+data audio pts:168843275 dts:168843275 size: 317
+ts+aac+h264+data audio pts:168847454 dts:168847454 size: 286
+ts+aac+h264+data video pts:168854220 dts:168834146 size: 4102
+ts+aac+h264+data video pts:168858000 dts:168854220 size: 6944
+ts+aac+h264+data video pts:168861780 dts:168858000 size: 9061
+ts+aac+h264+data video pts:168865470 dts:168861780 size: 9760
+ts+aac+h264+data video pts:168869250 dts:168865470 size: 14741
+ts+aac+h264+data audio pts:168835252 dts:168835252 size: 274
+ts+aac+h264+data audio pts:168839431 dts:168839431 size: 364
+ts+aac+h264+data audio pts:168843610 dts:168843610 size: 317
+ts+aac+h264+data audio pts:168847789 dts:168847789 size: 284
+ts+aac+h264+data audio pts:168851968 dts:168851968 size: 368
+ts+aac+h264+data video pts:168860336 dts:168869250 size: 15711
+ts+aac+h264+data video pts:168856646 dts:168856646 size: 2181
+ts+aac+h264+data video pts:168891750 dts:168860336 size: 19063
+ts+aac+h264+data video pts:168864116 dts:168864116 size: 2345
+ts+aac+h264+data video pts:168867896 dts:168867896 size: 2597
+ts+aac+h264+data video pts:168887970 dts:168887970 size: 2003
+ts+aac+h264+data audio pts:168856150 dts:168856150 size: 357
+ts+aac+h264+data audio pts:168860329 dts:168860329 size: 334
+ts+aac+h264+data audio pts:168864508 dts:168864508 size: 306
+ts+aac+h264+data audio pts:168868687 dts:168868687 size: 290
+ts+aac+h264+data audio pts:168872866 dts:168872866 size: 288
+ts+aac+h264+data video pts:168890396 dts:168891750 size: 16911
+ts+aac+h264+data video pts:168895530 dts:168895530 size: 1196
+ts+aac+h264+data video pts:168899220 dts:168899220 size: 1181
+ts+aac+h264+data video pts:168886616 dts:168886616 size: 891
+ts+aac+h264+data video pts:168921720 dts:168890396 size: 15388
+ts+aac+h264+data audio pts:168893432 dts:168893432 size: 285
+ts+aac+h264+data audio pts:168897611 dts:168897611 size: 278
+ts+aac+h264+data audio pts:168901790 dts:168901790 size: 280
+ts+aac+h264+data audio pts:168905969 dts:168905969 size: 276
+ts+aac+h264+data audio pts:168910148 dts:168910148 size: 282
+ts+aac+h264+data video pts:168894086 dts:168894086 size: 982
+ts+aac+h264+data video pts:168897866 dts:168897866 size: 928
+ts+aac+h264+data video pts:168901646 dts:168901646 size: 737
+ts+aac+h264+data video pts:168920366 dts:168921720 size: 14519
+ts+aac+h264+data video pts:168925500 dts:168925500 size: 900
+ts+aac+h264+data video pts:168929280 dts:168929280 size: 878
+ts+aac+h264+data audio pts:168897946 dts:168897946 size: 282
+ts+aac+h264+data audio pts:168902125 dts:168902125 size: 274
+ts+aac+h264+data audio pts:168906304 dts:168906304 size: 347
+ts+aac+h264+data audio pts:168910483 dts:168910483 size: 341
+ts+aac+h264+data audio pts:168914662 dts:168914662 size: 302
+ts+aac+h264+data video pts:168932970 dts:168932970 size: 698
+ts+aac+h264+data video pts:168935396 dts:168920366 size: 11824
+ts+aac+h264+data video pts:168924146 dts:168924146 size: 837
+ts+aac+h264+data video pts:168927836 dts:168927836 size: 896
+ts+aac+h264+data video pts:168931616 dts:168931616 size: 671
+ts+aac+h264+data video pts:168966720 dts:168935396 size: 8523
+ts+aac+h264+data audio pts:168935228 dts:168935228 size: 285
+ts+aac+h264+data audio pts:168939407 dts:168939407 size: 290
+ts+aac+h264+data audio pts:168943586 dts:168943586 size: 301
+ts+aac+h264+data audio pts:168947765 dts:168947765 size: 257
+ts+aac+h264+data audio pts:168951944 dts:168951944 size: 265
+ts+aac+h264+data video pts:168955470 dts:168955470 size: 773
+ts+aac+h264+data video pts:168959250 dts:168959250 size: 755
+ts+aac+h264+data video pts:168963030 dts:168963030 size: 643
+ts+aac+h264+data video pts:168961586 dts:168966720 size: 4648
+ts+aac+h264+data video pts:168954116 dts:168954116 size: 626
+ts+aac+h264+data audio pts:168956126 dts:168956126 size: 279
+ts+aac+h264+data audio pts:168960305 dts:168960305 size: 279
+ts+aac+h264+data audio pts:168964484 dts:168964484 size: 280
+ts+aac+h264+data audio pts:168968663 dts:168968663 size: 269
+ts+aac+h264+data audio pts:168972842 dts:168972842 size: 319
+ts+aac+h264+data video pts:168957896 dts:168957896 size: 536
+ts+aac+h264+data video pts:168965366 dts:168961586 size: 3771
+ts+aac+h264+data video pts:168985530 dts:168965366 size: 4494
+ts+aac+h264+data video pts:168989220 dts:168985530 size: 5560
+ts+aac+h264+data video pts:168993000 dts:168989220 size: 6541
+ts+aac+h264+data video pts:168996780 dts:168993000 size: 7636
+ts+aac+h264+data audio pts:168960640 dts:168960640 size: 287
+ts+aac+h264+data audio pts:168964819 dts:168964819 size: 279
+ts+aac+h264+data audio pts:168968998 dts:168968998 size: 272
+ts+aac+h264+data audio pts:168973177 dts:168973177 size: 314
+ts+aac+h264+data audio pts:168977356 dts:168977356 size: 318
+ts+aac+h264+data video pts:169000470 dts:168996780 size: 6685
+ts+aac+h264+data video pts:168987866 dts:169000470 size: 6791
+ts+aac+h264+data video pts:168991646 dts:168987866 size: 11730
+ts+aac+h264+data video pts:168995336 dts:168991646 size: 14252
+ts+aac+h264+data video pts:169022970 dts:168995336 size: 9386
+ts+aac+h264+data audio pts:168997922 dts:168997922 size: 269
+ts+aac+h264+data audio pts:169002101 dts:169002101 size: 365
+ts+aac+h264+data audio pts:169006280 dts:169006280 size: 360
+ts+aac+h264+data audio pts:169010459 dts:169010459 size: 339
+ts+aac+h264+data audio pts:169014638 dts:169014638 size: 308
+ts+aac+h264+data video pts:168999116 dts:168999116 size: 809
+ts+aac+h264+data video pts:169019280 dts:169019280 size: 631
+ts+aac+h264+data video pts:169030530 dts:169022970 size: 7316
+ts+aac+h264+data video pts:169026750 dts:169026750 size: 594
+ts+aac+h264+data video pts:169021616 dts:169030530 size: 6070
+ts+aac+h264+data video pts:169017836 dts:169017836 size: 674
+ts+aac+h264+data audio pts:169018820 dts:169018820 size: 295
+ts+aac+h264+data audio pts:169022999 dts:169022999 size: 330
+ts+aac+h264+data audio pts:169027178 dts:169027178 size: 291
+ts+aac+h264+data audio pts:169031357 dts:169031357 size: 271
+ts+aac+h264+data audio pts:169035536 dts:169035536 size: 281
+ts+aac+h264+data video pts:169029086 dts:169021616 size: 5808
+ts+aac+h264+data video pts:169025396 dts:169025396 size: 958
+ts+aac+h264+data video pts:169032866 dts:169029086 size: 5959
+ts+aac+h264+data video pts:169053030 dts:169032866 size: 5991
+ts+aac+h264+data video pts:169056720 dts:169053030 size: 10941
+ts+aac+h264+data audio pts:169023334 dts:169023334 size: 270
+ts+aac+h264+data audio pts:169027513 dts:169027513 size: 277
+ts+aac+h264+data audio pts:169031692 dts:169031692 size: 264
+ts+aac+h264+data audio pts:169035871 dts:169035871 size: 279
+ts+aac+h264+data audio pts:169040050 dts:169040050 size: 381
+ts+aac+h264+data video pts:169064280 dts:169056720 size: 7867
+ts+aac+h264+data video pts:169060500 dts:169060500 size: 4550
+ts+aac+h264+data video pts:169051586 dts:169064280 size: 10501
+ts+aac+h264+data video pts:169055366 dts:169051586 size: 10772
+ts+aac+h264+data video pts:169059146 dts:169055366 size: 12594
+ts+aac+h264+data video pts:169083000 dts:169059146 size: 12274
+ts+aac+h264+data audio pts:169060616 dts:169060616 size: 362
+ts+aac+h264+data audio pts:169064795 dts:169064795 size: 305
+ts+aac+h264+data audio pts:169068974 dts:169068974 size: 283
+ts+aac+h264+data audio pts:169073153 dts:169073153 size: 285
+ts+aac+h264+data audio pts:169077332 dts:169077332 size: 316
+ts+aac+h264+data video pts:169062836 dts:169062836 size: 2145
+ts+aac+h264+data video pts:169098030 dts:169083000 size: 10764
+ts+aac+h264+data video pts:169086780 dts:169086780 size: 952
+ts+aac+h264+data video pts:169090470 dts:169090470 size: 977
+ts+aac+h264+data video pts:169094250 dts:169094250 size: 830
+ts+aac+h264+data video pts:169096586 dts:169098030 size: 2899
+ts+aac+h264+data audio pts:169065130 dts:169065130 size: 288
+ts+aac+h264+data audio pts:169069309 dts:169069309 size: 313
+ts+aac+h264+data audio pts:169073488 dts:169073488 size: 299
+ts+aac+h264+data audio pts:169077667 dts:169077667 size: 272
+ts+aac+h264+data audio pts:169081846 dts:169081846 size: 285
+ts+aac+h264+data video pts:169085336 dts:169085336 size: 388
+ts+aac+h264+data video pts:169089116 dts:169089116 size: 291
+ts+aac+h264+data video pts:169092896 dts:169092896 size: 275
+ts+aac+h264+data video pts:169124220 dts:169096586 size: 676
+ts+aac+h264+data video pts:169116750 dts:169116750 size: 249
+ts+aac+h264+data audio pts:169086028 dts:169086028 size: 287
+ts+aac+h264+data audio pts:169090207 dts:169090207 size: 276
+ts+aac+h264+data audio pts:169094386 dts:169094386 size: 272
+ts+aac+h264+data audio pts:169098565 dts:169098565 size: 285
+ts+aac+h264+data audio pts:169102744 dts:169102744 size: 280
+ts+aac+h264+data video pts:169120530 dts:169120530 size: 217
+ts+aac+h264+data video pts:169128000 dts:169124220 size: 75644
+ts+aac+h264+data video pts:169126646 dts:169128000 size: 2805
+ts+aac+h264+data video pts:169131780 dts:169131780 size: 229
+ts+aac+h264+data video pts:169119086 dts:169119086 size: 199
+ts+aac+h264+data video pts:169122866 dts:169122866 size: 197
+ts+aac+h264+data audio pts:169123310 dts:169123310 size: 322
+ts+aac+h264+data audio pts:169127489 dts:169127489 size: 384
+ts+aac+h264+data audio pts:169131668 dts:169131668 size: 368
+ts+aac+h264+data audio pts:169135847 dts:169135847 size: 301
+ts+aac+h264+data audio pts:169140026 dts:169140026 size: 308
+ts+aac+h264+data video pts:169157970 dts:169126646 size: 4670
+ts+aac+h264+data video pts:169130336 dts:169130336 size: 501
+ts+aac+h264+data video pts:169150500 dts:169150500 size: 672
+ts+aac+h264+data video pts:169154280 dts:169154280 size: 422
+ts+aac+h264+data video pts:169156616 dts:169157970 size: 6008
+ts+aac+h264+data audio pts:169127824 dts:169127824 size: 309
+ts+aac+h264+data audio pts:169132003 dts:169132003 size: 325
+ts+aac+h264+data audio pts:169136182 dts:169136182 size: 300
+ts+aac+h264+data audio pts:169140361 dts:169140361 size: 266
+ts+aac+h264+data audio pts:169144540 dts:169144540 size: 270
+ts+aac+h264+data video pts:169161750 dts:169161750 size: 682
+ts+aac+h264+data video pts:169149146 dts:169149146 size: 712
+ts+aac+h264+data video pts:169152836 dts:169152836 size: 638
+ts+aac+h264+data video pts:169188030 dts:169156616 size: 11908
+ts+aac+h264+data video pts:169160396 dts:169160396 size: 1508
+ts+aac+h264+data video pts:169164086 dts:169164086 size: 1455
+ts+aac+h264+data audio pts:169148722 dts:169148722 size: 270
+ts+aac+h264+data audio pts:169152901 dts:169152901 size: 268
+ts+aac+h264+data audio pts:169157080 dts:169157080 size: 282
+ts+aac+h264+data audio pts:169161259 dts:169161259 size: 296
+ts+aac+h264+data audio pts:169165438 dts:169165438 size: 267
+ts+aac+h264+data video pts:169184250 dts:169184250 size: 1169
+ts+aac+h264+data video pts:169186586 dts:169188030 size: 11158
+ts+aac+h264+data video pts:169191720 dts:169191720 size: 685
+ts+aac+h264+data video pts:169195500 dts:169195500 size: 652
+ts+aac+h264+data video pts:169182896 dts:169182896 size: 558
+ts+aac+h264+data audio pts:169186004 dts:169186004 size: 278
+ts+aac+h264+data audio pts:169190183 dts:169190183 size: 282
+ts+aac+h264+data audio pts:169194362 dts:169194362 size: 353
+ts+aac+h264+data audio pts:169198541 dts:169198541 size: 346
+ts+aac+h264+data audio pts:169202720 dts:169202720 size: 276
+ts+aac+h264+data video pts:169218000 dts:169186586 size: 2086
+ts+aac+h264+data video pts:169190366 dts:169190366 size: 420
+ts+aac+h264+data video pts:169194146 dts:169194146 size: 465
+ts+aac+h264+data video pts:169214220 dts:169214220 size: 407
+ts+aac+h264+data video pts:169229250 dts:169218000 size: 284
+ts+aac+h264+data video pts:169221780 dts:169221780 size: 288
+ts+aac+h264+data audio pts:169190518 dts:169190518 size: 275
+ts+aac+h264+data audio pts:169194697 dts:169194697 size: 293
+ts+aac+h264+data audio pts:169198876 dts:169198876 size: 261
+ts+aac+h264+data audio pts:169203055 dts:169203055 size: 295
+ts+aac+h264+data audio pts:169207234 dts:169207234 size: 279
+ts+aac+h264+data video pts:169225470 dts:169225470 size: 234
+ts+aac+h264+data video pts:169216646 dts:169229250 size: 59016
+ts+aac+h264+data video pts:169224116 dts:169216646 size: 4100
+ts+aac+h264+data video pts:169220336 dts:169220336 size: 1047
+ts+aac+h264+data video pts:169247970 dts:169224116 size: 10317
+ts+aac+h264+data video pts:169227896 dts:169227896 size: 2748
+ts+aac+h264+data audio pts:169227800 dts:169227800 size: 280
+ts+aac+h264+data audio pts:169231979 dts:169231979 size: 278
+ts+aac+h264+data audio pts:169236158 dts:169236158 size: 361
+ts+aac+h264+data audio pts:169240337 dts:169240337 size: 354
+ts+aac+h264+data audio pts:169244516 dts:169244516 size: 344
+ts+aac+h264+data video pts:169251750 dts:169247970 size: 11029
+ts+aac+h264+data video pts:169250396 dts:169251750 size: 4083
+ts+aac+h264+data video pts:169255530 dts:169255530 size: 1481
+ts+aac+h264+data video pts:169259220 dts:169259220 size: 642
+ts+aac+h264+data video pts:169263000 dts:169263000 size: 499
+ts+aac+h264+data audio pts:169248697 dts:169248697 size: 321
+ts+aac+h264+data audio pts:169252876 dts:169252876 size: 301
+ts+aac+h264+data audio pts:169257055 dts:169257055 size: 277
+ts+aac+h264+data audio pts:169261234 dts:169261234 size: 318
+ts+aac+h264+data audio pts:169265413 dts:169265413 size: 261
+ts+aac+h264+data video pts:169281720 dts:169250396 size: 1760
+ts+aac+h264+data video pts:169254086 dts:169254086 size: 499
+ts+aac+h264+data video pts:169257866 dts:169257866 size: 510
+ts+aac+h264+data video pts:169261646 dts:169261646 size: 425
+ts+aac+h264+data video pts:169285500 dts:169281720 size: 2071
+ts+aac+h264+data video pts:169292970 dts:169285500 size: 4220
+ts+aac+h264+data audio pts:169253211 dts:169253211 size: 268
+ts+aac+h264+data audio pts:169257390 dts:169257390 size: 289
+ts+aac+h264+data audio pts:169261569 dts:169261569 size: 267
+ts+aac+h264+data audio pts:169265748 dts:169265748 size: 269
+ts+aac+h264+data audio pts:169269927 dts:169269927 size: 280
+ts+aac+h264+data video pts:169289280 dts:169289280 size: 2596
+ts+aac+h264+data video pts:169280366 dts:169292970 size: 13800
+ts+aac+h264+data video pts:169284146 dts:169280366 size: 8452
+ts+aac+h264+data video pts:169291616 dts:169284146 size: 11802
+ts+aac+h264+data video pts:169287836 dts:169287836 size: 3014
+ts+aac+h264+data audio pts:169290493 dts:169290493 size: 263
+ts+aac+h264+data audio pts:169294672 dts:169294672 size: 310
+ts+aac+h264+data audio pts:169298851 dts:169298851 size: 313
+ts+aac+h264+data audio pts:169303030 dts:169303030 size: 331
+ts+aac+h264+data audio pts:169307209 dts:169307209 size: 280
+ts+aac+h264+data video pts:169295396 dts:169291616 size: 10497
+ts+aac+h264+data video pts:169323030 dts:169295396 size: 10094
+ts+aac+h264+data video pts:169315470 dts:169315470 size: 1955
+ts+aac+h264+data video pts:169319250 dts:169319250 size: 931
+ts+aac+h264+data video pts:169321586 dts:169323030 size: 2733
+ts+aac+h264+data video pts:169326720 dts:169326720 size: 570
+ts+aac+h264+data audio pts:169295007 dts:169295007 size: 330
+ts+aac+h264+data audio pts:169299186 dts:169299186 size: 299
+ts+aac+h264+data audio pts:169303365 dts:169303365 size: 289
+ts+aac+h264+data audio pts:169307544 dts:169307544 size: 296
+ts+aac+h264+data audio pts:169311723 dts:169311723 size: 287
+ts+aac+h264+data video pts:169314116 dts:169314116 size: 590
+ts+aac+h264+data video pts:169317896 dts:169317896 size: 418
+ts+aac+h264+data video pts:169349220 dts:169321586 size: 838
+ts+aac+h264+data video pts:169325366 dts:169325366 size: 341
+ts+aac+h264+data video pts:169345530 dts:169345530 size: 402
+ts+aac+h264+data audio pts:169315905 dts:169315905 size: 286
+ts+aac+h264+data audio pts:169320084 dts:169320084 size: 278
+ts+aac+h264+data audio pts:169324263 dts:169324263 size: 269
+ts+aac+h264+data audio pts:169328442 dts:169328442 size: 271
+ts+aac+h264+data audio pts:169332621 dts:169332621 size: 276
diff --git a/trunk/research/ts_info.cpp b/trunk/research/ts_info.cpp
index 107a4d74f..16ed15677 100755
--- a/trunk/research/ts_info.cpp
+++ b/trunk/research/ts_info.cpp
@@ -2013,9 +2013,6 @@ int consume(TSMessage* msg, AacMuxer* aac_muxer)
 		trace("ts+aac+h264 ignore empty message.");
 		return ret;
 	}
-	trace("ts+aac+h264+data %s pts:%"PRId64" dts(calc):%"PRId64" dts:%"PRId64" size: %d",
-		(msg->type == TSPidTypeVideo)? "video":"audio", msg->pts, 
-		(msg->dts == 0)? msg->pts : msg->dts, msg->dts, msg->packet_data_size);
 	
 	char* last = msg->packet_data + msg->packet_data_size;
         
@@ -2026,6 +2023,7 @@ int consume(TSMessage* msg, AacMuxer* aac_muxer)
 	    }
 	    
 	    // parse AAC audio.
+	    int64_t dts = -1;
 		while (p < last) {
 		    TSAacAdts aac;
 		    if ((ret = aac.parse(msg, p)) != 0) {
@@ -2033,9 +2031,34 @@ int consume(TSMessage* msg, AacMuxer* aac_muxer)
 		    }
 		    trace("ts+aac audio raw data parsed, size: %d, 0x%02x 0x%02x 0x%02x 0x%02x",
 		    	aac.size, aac.at(0), aac.at(1), aac.at(2), aac.at(3));
+			
+			if (dts == -1) {
+				dts = (msg->dts == 0)? msg->pts : msg->dts;
+			} else {
+				// see ffmpeg: avpriv_aac_parse_header
+				// rdb = get_bits(gbc, 2);  /* number_of_raw_data_blocks_in_frame */
+				// hdr->samples  = (rdb + 1) * 1024;
+				int samples = (aac.number_of_raw_data_blocks_in_frame + 1) * 1024;
+				static int sample_rates[] = {
+					96000, 88200, 64000, 48000, 44100, 32000,
+					24000, 22050, 16000, 12000, 11025, 8000, 
+					1, 1, 1, 1
+				};
+				int sample_rate = sample_rates[aac.sampling_frequency_index];
+				
+				dts += samples * 90000 / sample_rate;
+			}
+			
+			trace("ts+aac+h264+data %s pts:%"PRId64" dts:%"PRId64" size: %d",
+				(msg->type == TSPidTypeVideo)? "video":"audio", dts, dts, aac.frame_length);
+				
 		    // TODO: process audio.
 		}
-    } else {
+    } else { 	
+		trace("ts+aac+h264+data %s pts:%"PRId64" dts:%"PRId64" size: %d",
+			(msg->type == TSPidTypeVideo)? "video":"audio", msg->pts, 
+			(msg->dts == 0)? msg->pts : msg->dts, msg->packet_data_size);
+		   
         // parse H264 video.
 		while (p < last) {
 			TSH264Codec h264;
@@ -2044,6 +2067,7 @@ int consume(TSMessage* msg, AacMuxer* aac_muxer)
 		    }
 		    trace("ts+h264 video raw data parsed, size: %d, 0x%02x 0x%02x 0x%02x 0x%02x",
 		    	h264.size, h264.at(0), h264.at(1), h264.at(2), h264.at(3));
+			
 		    // TODO: process video.
 		}
     }