[FFmpeg-cvslog] adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
Justin Ruggles
git at videolan.org
Sun Oct 16 04:20:36 CEST 2011
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Oct 2 15:58:54 2011 -0400| [ff5790c76102ef2574e94c77edf2d7e81eb40752] | committer: Justin Ruggles
adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
There are still 2 nibbles to decode once the last byte in the packet has been
read. Updated FATE reference.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff5790c76102ef2574e94c77edf2d7e81eb40752
---
libavcodec/adpcm.c | 6 +-
tests/ref/fate/duck-dk3 | 2 +-
tests/ref/fate/truemotion1-15 | 226 ++++++++++++++++++++--------------------
tests/ref/fate/truemotion1-24 | 56 +++++-----
4 files changed, 147 insertions(+), 143 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 8ab3bd8..200957b 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -325,8 +325,11 @@ static void xa_decode(short *out, const unsigned char *in,
} \
else \
{ \
+ if (end_of_packet) \
+ break; \
last_byte = *src++; \
- if (src >= buf + buf_size) break; \
+ if (src >= buf + buf_size) \
+ end_of_packet = 1; \
nibble = last_byte & 0x0F; \
decode_top_nibble_next = 1; \
}
@@ -534,6 +537,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
unsigned char last_byte = 0;
unsigned char nibble;
int decode_top_nibble_next = 0;
+ int end_of_packet = 0;
int diff_channel;
if (avctx->block_align != 0 && buf_size > avctx->block_align)
diff --git a/tests/ref/fate/duck-dk3 b/tests/ref/fate/duck-dk3
index 08c0fd1..9aad92b 100644
--- a/tests/ref/fate/duck-dk3
+++ b/tests/ref/fate/duck-dk3
@@ -1 +1 @@
-62fbe4db4a49cb044f57f92cce9993c5
+bb952ae86c72d461aef7583685ec0a4d
diff --git a/tests/ref/fate/truemotion1-15 b/tests/ref/fate/truemotion1-15
index d103f01..d9925c7 100644
--- a/tests/ref/fate/truemotion1-15
+++ b/tests/ref/fate/truemotion1-15
@@ -1,218 +1,218 @@
0, 0, 161280, 0x7041748d
-1, 0, 10832, 0xe1a811fa
-1, 5527, 10832, 0xb47841f9
+1, 0, 10836, 0x2a531236
+1, 5529, 10836, 0xc58f45af
0, 6000, 161280, 0x3cc4dfb5
-1, 11053, 10832, 0x839eedf1
+1, 11057, 10836, 0x436cf135
0, 12000, 161280, 0xca3af22d
-1, 16580, 10832, 0xb48b1f60
+1, 16586, 10836, 0x3a6022cc
0, 18000, 161280, 0x23ad1d85
-1, 22106, 10832, 0x743936c0
+1, 22114, 10836, 0x57e83a4a
0, 24000, 161280, 0x9c9cf364
-1, 27633, 10832, 0xe1f039fb
+1, 27643, 10836, 0xca4b3a1b
0, 30000, 161280, 0x1551d6a8
-1, 33159, 10832, 0xef00751a
+1, 33171, 10836, 0xc3da7536
0, 36000, 161280, 0xc39f6b95
-1, 38686, 10832, 0x401ed099
+1, 38700, 10836, 0x8c57d47b
0, 42000, 161280, 0x3b036dcc
-1, 44212, 10832, 0x432a53bd
+1, 44229, 10836, 0x9a79572b
0, 48000, 161280, 0xa6fac1db
-1, 49739, 10832, 0xc4276bfd
+1, 49757, 10836, 0x7dbd6fd3
0, 54000, 161280, 0x67656b62
-1, 55265, 10832, 0x51f0fa8c
+1, 55286, 10836, 0x4454fdde
0, 60000, 161280, 0xb41f47d1
-1, 60792, 10832, 0xcebae622
+1, 60814, 10836, 0x68aae686
0, 66000, 161280, 0xc207249e
-1, 66318, 10832, 0xe9f6dc1f
-1, 71845, 10832, 0xda087fee
+1, 66343, 10836, 0x61f2df35
+1, 71871, 10836, 0xe36883c6
0, 72000, 161280, 0xbee8f843
-1, 77371, 10832, 0x67a621bb
+1, 77400, 10836, 0xefa62217
0, 78000, 161280, 0x092acf46
-1, 82898, 10832, 0xd7be207f
+1, 82929, 10836, 0x63b92479
0, 84000, 161280, 0x8d9e2680
-1, 88424, 10832, 0x19d32507
+1, 88457, 10836, 0xaf452579
0, 90000, 161280, 0x8becc20c
-1, 93951, 10832, 0xe1a3fbfa
+1, 93986, 10836, 0xdbb10001
0, 96000, 161280, 0x655e444e
-1, 99478, 10832, 0xd10df779
+1, 99514, 10836, 0xafb7f7a7
0, 102000, 161280, 0x5c112da0
-1, 105004, 10832, 0x4428e1a7
+1, 105043, 10836, 0xd4b1e591
0, 108000, 161280, 0x232fa9eb
-1, 110531, 10832, 0x7ea9b33d
+1, 110571, 10836, 0x4d44b3bb
0, 114000, 161280, 0x9721745d
-1, 116057, 10832, 0x6852a5a5
+1, 116100, 10836, 0xff2ea5b3
0, 120000, 161280, 0x92f1d880
-1, 121584, 10832, 0xfeb78863
+1, 121629, 10836, 0x214e88ad
0, 126000, 161280, 0x16233978
-1, 127110, 10832, 0xf157f928
+1, 127157, 10836, 0xde8bfc9a
0, 132000, 161280, 0x19a27e69
-1, 132637, 10832, 0x86414b3e
+1, 132686, 10836, 0xb3cc4b6a
0, 138000, 161280, 0x7b6ad73a
-1, 138163, 10832, 0x2e28cdf6
-1, 143690, 10832, 0x00212e44
+1, 138214, 10836, 0x670bce40
+1, 143743, 10836, 0xc17d31b2
0, 144000, 161280, 0xa7a674aa
-1, 149216, 10832, 0x2d7f9378
+1, 149271, 10836, 0x7bcb9392
0, 150000, 161280, 0x4e434abb
-1, 154743, 10832, 0x84cb25d7
+1, 154800, 10836, 0x230e28c9
0, 156000, 161280, 0xb96eea14
-1, 160269, 10832, 0x3aca41fa
+1, 160329, 10836, 0x42df4204
0, 162000, 161280, 0x1350188c
-1, 165796, 10832, 0x27ad34b9
+1, 165857, 10836, 0xfa9134b9
0, 168000, 161280, 0x79c6f305
-1, 171322, 10832, 0xe665144a
+1, 171386, 10836, 0x418c1844
0, 174000, 161280, 0xa9c7782d
-1, 176849, 10832, 0xf9546626
+1, 176914, 10836, 0x93ba66b6
0, 180000, 161280, 0x40a4f456
-1, 182376, 10832, 0xe71c4f22
+1, 182443, 10836, 0x264a4ffa
0, 186000, 161280, 0xaf291ed6
-1, 187902, 10832, 0x5e61869c
+1, 187971, 10836, 0x82c78a8e
0, 192000, 161280, 0xab29b4e1
-1, 193429, 10832, 0x571d2c10
+1, 193500, 10836, 0x10d22fdc
0, 198000, 161280, 0xbfcd2712
-1, 198955, 10832, 0xf0e08cd5
+1, 199029, 10836, 0x2d25906b
0, 204000, 161280, 0xff22a0d7
-1, 204482, 10832, 0x66650e49
+1, 204557, 10836, 0xa8a111fb
0, 210000, 161280, 0xb0ae88a9
-1, 210008, 10832, 0x4024deaf
-1, 215535, 10832, 0xda7bdb14
+1, 210086, 10836, 0xbd95df87
+1, 215614, 10836, 0x500ddec0
0, 216000, 161280, 0x811d1259
-1, 221061, 10832, 0xc27a342f
+1, 221143, 10836, 0x95d9350b
0, 222000, 161280, 0x593c39a1
-1, 226588, 10832, 0x574fe679
+1, 226671, 10836, 0xfa54ea1f
0, 228000, 161280, 0x5a5a97f8
-1, 232114, 10832, 0x37db464e
+1, 232200, 10836, 0x51b2467e
0, 234000, 161280, 0xa5639ecf
-1, 237641, 10832, 0xb1fa2a83
+1, 237729, 10836, 0x5d772af9
0, 240000, 161280, 0x543920c6
-1, 243167, 10832, 0x3d98d9b7
+1, 243257, 10836, 0xae25dd8d
0, 246000, 161280, 0xb41689ee
-1, 248694, 10832, 0xb7c908e2
+1, 248786, 10836, 0xe4bd0cb0
0, 252000, 161280, 0xc0ad83de
-1, 254220, 10832, 0x9f7e44d8
+1, 254314, 10836, 0xb33544f0
0, 258000, 161280, 0x9e9e7456
-1, 259747, 10832, 0xae9b8774
+1, 259843, 10836, 0xd5658b12
0, 264000, 161280, 0x777ccbfe
-1, 265273, 10832, 0x36916e3f
+1, 265371, 10836, 0xeff66e5d
0, 270000, 161280, 0x9c2df916
-1, 270800, 10832, 0xd785f5ef
+1, 270900, 10836, 0xb1fff6c5
0, 276000, 161280, 0xe0c13b35
-1, 276327, 10832, 0x2a3a5673
-1, 281853, 10832, 0x7320e379
+1, 276429, 10836, 0x84db56b5
+1, 281957, 10836, 0x0230e3c9
0, 282000, 161280, 0x39bfa5a5
-1, 287380, 10832, 0xec787be5
+1, 287486, 10836, 0xe58a7faf
0, 288000, 161280, 0x35dfb264
-1, 292906, 10832, 0xd0d13aa0
+1, 293014, 10836, 0xc4003e2a
0, 294000, 161280, 0x43018613
-1, 298433, 10832, 0x34dfcb17
+1, 298543, 10836, 0x6360cbbf
0, 300000, 161280, 0x43584b8a
-1, 303959, 10832, 0x1a9c29f1
+1, 304071, 10836, 0xc29c2a05
0, 306000, 161280, 0xa5cd230a
-1, 309486, 10832, 0x3e73dcc1
+1, 309600, 10836, 0xb294dd11
0, 312000, 161280, 0x6fe2cfb3
-1, 315012, 10832, 0x7855b053
+1, 315129, 10836, 0x4388b43b
0, 318000, 161280, 0x88a7c0db
-1, 320539, 10832, 0x5588df8f
+1, 320657, 10836, 0xdd7be367
0, 324000, 161280, 0x476f1cd2
-1, 326065, 10832, 0x6f621299
+1, 326186, 10836, 0xb9f612a9
0, 330000, 161280, 0x96401d49
-1, 331592, 10832, 0xce7f39c2
+1, 331714, 10836, 0xb64a39fe
0, 336000, 161280, 0x7d932919
-1, 337118, 10832, 0xd88e6552
+1, 337243, 10836, 0x6eba6594
0, 342000, 161280, 0x06465481
-1, 342645, 10832, 0xddc63597
+1, 342771, 10836, 0xb4af35c1
0, 348000, 161280, 0x39631520
-1, 348171, 10832, 0xe3071865
-1, 353698, 10832, 0x2a44a123
+1, 348300, 10836, 0x4e581c49
+1, 353829, 10836, 0xb062a19f
0, 354000, 161280, 0xc3fff780
-1, 359224, 10832, 0x08d85d45
+1, 359357, 10836, 0x87cd6135
0, 360000, 161280, 0xa81faf28
-1, 364751, 10832, 0x4dc5f83a
+1, 364886, 10836, 0x37bffbd6
0, 366000, 161280, 0x7a311f4f
-1, 370278, 10832, 0x89497812
+1, 370414, 10836, 0x6c797900
0, 372000, 161280, 0x52f9b931
-1, 375804, 10832, 0x9ee1db54
+1, 375943, 10836, 0x1615df36
0, 378000, 161280, 0x938cf016
-1, 381331, 10832, 0x5277d611
+1, 381471, 10836, 0xb472d9e9
0, 384000, 161280, 0xf8f6e19c
-1, 386857, 10832, 0x570a619c
+1, 387000, 10836, 0xdfff626e
0, 390000, 161280, 0xca90561b
-1, 392384, 10832, 0xa217d70f
+1, 392529, 10836, 0xffa6d771
0, 396000, 161280, 0x8594d06b
-1, 397910, 10832, 0x6f0ecbf4
+1, 398057, 10836, 0xa7f3cf96
0, 402000, 161280, 0xea32bf3b
-1, 403437, 10832, 0x2704b114
+1, 403586, 10836, 0xf556b50a
0, 408000, 161280, 0x4646111a
-1, 408963, 10832, 0xf24e679f
+1, 409114, 10836, 0x99b86b39
0, 414000, 161280, 0xee891162
-1, 414490, 10832, 0x05572099
+1, 414643, 10836, 0x886920d3
0, 420000, 161280, 0xcfc32082
-1, 420016, 10832, 0x33942d0c
-1, 425543, 10832, 0xa77ea674
+1, 420171, 10836, 0xefb0305a
+1, 425700, 10836, 0x4ab7aa32
0, 426000, 161280, 0x863c281a
-1, 431069, 10832, 0xeba663bc
+1, 431229, 10836, 0x7f106530
0, 432000, 161280, 0x01b591aa
-1, 436596, 10832, 0x1338524a
+1, 436757, 10836, 0x6461559a
0, 438000, 161280, 0x211fbc62
-1, 442122, 10832, 0x6182b0b3
+1, 442286, 10836, 0x25e3b12b
0, 444000, 161280, 0xae2bafe2
-1, 447649, 10832, 0xa410a364
+1, 447814, 10836, 0x32cfa3ba
0, 450000, 161280, 0xcfe46dca
-1, 453176, 10832, 0x2f4374b0
+1, 453343, 10836, 0x0bff78a4
0, 456000, 161280, 0xcf8fe8a3
-1, 458702, 10832, 0xf41f3a07
+1, 458871, 10836, 0xe4323d53
0, 462000, 161280, 0x3f8474eb
-1, 464229, 10832, 0x2b1c50c6
+1, 464400, 10836, 0x70b35196
0, 468000, 161280, 0x06da345a
-1, 469755, 10832, 0x3692ac89
+1, 469929, 10836, 0xf2b8b07f
0, 474000, 161280, 0xbd4d3280
-1, 475282, 10832, 0x5d6bc87e
+1, 475457, 10836, 0x826cc972
0, 480000, 161280, 0xb5e70fea
-1, 480808, 10832, 0x1b1cda0c
+1, 480986, 10836, 0x8a0fdce8
0, 486000, 161280, 0x0c99c804
-1, 486335, 10832, 0x11eaa15f
-1, 491861, 10832, 0x73c7d7ef
+1, 486514, 10836, 0xa072a503
0, 492000, 161280, 0x19841ed4
-1, 497388, 10832, 0x65d7e3be
+1, 492043, 10836, 0xd698d8e7
+1, 497571, 10836, 0xfe80e794
0, 498000, 161280, 0xf81dea50
-1, 502914, 10832, 0xb9c00688
+1, 503100, 10836, 0xdd580a5a
0, 504000, 161280, 0x7777d81c
-1, 508441, 10832, 0x0b98c125
+1, 508629, 10836, 0x121bc1bb
0, 510000, 161280, 0x0497cfd8
-1, 513967, 10832, 0x331ed413
+1, 514157, 10836, 0x8cebd7d9
0, 516000, 161280, 0x50b6eb64
-1, 519494, 10832, 0x9b68f485
+1, 519686, 10836, 0x6eaef4d7
0, 522000, 161280, 0x5071fc07
-1, 525020, 10832, 0x1b865c55
+1, 525214, 10836, 0x8f0b5d0b
0, 528000, 161280, 0xbb7527fb
-1, 530547, 10832, 0x68cef565
+1, 530743, 10836, 0x40ccf61f
0, 534000, 161280, 0x13054f1f
-1, 536073, 10832, 0x3a605f15
+1, 536271, 10836, 0xb6db5f1d
0, 540000, 161280, 0x4b78fb27
-1, 541600, 10832, 0xd72ff22e
+1, 541800, 10836, 0xa089f250
0, 546000, 161280, 0xf504968f
-1, 547127, 10832, 0x1c672b67
+1, 547329, 10836, 0xd3512f2b
0, 552000, 161280, 0x555b10b7
-1, 552653, 10832, 0xfd1a7e7e
+1, 552857, 10836, 0xfa127f74
0, 558000, 161280, 0xcc0dde40
-1, 558180, 10832, 0x9bf20ead
-1, 563706, 10832, 0x00000000
+1, 558386, 10836, 0xd6a60ead
+1, 563914, 10836, 0x00000000
0, 564000, 161280, 0xcc0dde40
-1, 569233, 10832, 0x00000000
+1, 569443, 10836, 0x00000000
0, 570000, 161280, 0x367f60c8
-1, 574759, 10832, 0x00000000
+1, 574971, 10836, 0x00000000
0, 576000, 161280, 0x367f60c8
-1, 580286, 10832, 0x00000000
+1, 580500, 10836, 0x00000000
0, 582000, 161280, 0x367f60c8
-1, 585812, 10832, 0x00000000
+1, 586029, 10836, 0x00000000
0, 588000, 161280, 0x367f60c8
-1, 591339, 10832, 0x00000000
+1, 591557, 10836, 0x00000000
0, 594000, 161280, 0x367f60c8
-1, 596865, 10832, 0x00000000
+1, 597086, 10836, 0x00000000
0, 600000, 161280, 0x367f60c8
-1, 602392, 10832, 0x00000000
+1, 602614, 10836, 0x00000000
0, 606000, 161280, 0x367f60c8
-1, 607918, 10832, 0x00000000
+1, 608143, 10836, 0x00000000
0, 612000, 161280, 0x367f60c8
-1, 613445, 10832, 0x00000000
+1, 613671, 10836, 0x00000000
0, 618000, 161280, 0x367f60c8
-1, 618971, 10832, 0x00000000
+1, 619200, 10836, 0x00000000
0, 624000, 161280, 0x367f60c8
diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24
index b0b1c4e..054f6b3 100644
--- a/tests/ref/fate/truemotion1-24
+++ b/tests/ref/fate/truemotion1-24
@@ -1,43 +1,43 @@
0, 0, 69120, 0x68beb30f
-1, 0, 10832, 0x1597b4c8
-1, 5527, 10832, 0xf9479f8b
+1, 0, 10836, 0xedecb6a7
+1, 5529, 10836, 0x8098a323
0, 6000, 69120, 0x3976f5cf
-1, 11053, 10832, 0x8db50e74
+1, 11057, 10836, 0xcfa1112e
0, 12000, 69120, 0xf815bc3c
-1, 16580, 10832, 0x2b33ecbb
+1, 16586, 10836, 0xe241ede4
0, 18000, 69120, 0xa7cc0ae6
-1, 22106, 10832, 0x8d0f537b
+1, 22114, 10836, 0xddf254bb
0, 24000, 69120, 0xd85ac282
-1, 27633, 10832, 0x922081c7
+1, 27643, 10836, 0xa16c8507
0, 30000, 69120, 0xf7fd7edb
-1, 33159, 10832, 0x40291f19
+1, 33171, 10836, 0xbe211f93
0, 36000, 69120, 0x433bb6f6
-1, 38686, 10832, 0x88f5271a
+1, 38700, 10836, 0x26c7283d
0, 42000, 69120, 0xdbac8bee
-1, 44212, 10832, 0x55c6bbe5
+1, 44229, 10836, 0x4d18be56
0, 48000, 69120, 0x88e2a799
-1, 49739, 10832, 0x9b51ae82
+1, 49757, 10836, 0x57b9af6f
0, 54000, 69120, 0x49617b26
-1, 55265, 10832, 0xcdf2409b
+1, 55286, 10836, 0xd5864280
0, 60000, 69120, 0xeb44ca01
-1, 60792, 10832, 0x0933b1a4
+1, 60814, 10836, 0xd582b451
0, 66000, 69120, 0x6fea37e8
-1, 66318, 10832, 0x24b77006
-1, 71845, 10832, 0xf612fa8a
+1, 66343, 10836, 0xec13731d
+1, 71871, 10836, 0xe3d4fbb8
0, 72000, 69120, 0xf55d74c7
-1, 77371, 10832, 0x99884b06
+1, 77400, 10836, 0xcbb54d18
0, 78000, 69120, 0xb5082ca7
-1, 82898, 10832, 0x3c746fbe
+1, 82929, 10836, 0xff7e7133
0, 84000, 69120, 0x5876d758
-1, 88424, 10832, 0x05f3b08a
-1, 93951, 10832, 0xa6560483
-1, 99478, 10832, 0xd98a8e19
-1, 105004, 10832, 0xf98a0b2e
-1, 110531, 10832, 0xb1039582
-1, 116057, 10832, 0x85dd5c3f
-1, 121584, 10832, 0x19fc801a
-1, 127110, 10832, 0x95805089
-1, 132637, 10832, 0x576fdec3
-1, 138163, 10832, 0x704a0905
-1, 143690, 10832, 0xf87ce1fa
-1, 149216, 10832, 0xfc0076b9
+1, 88457, 10836, 0xcc28b1a7
+1, 93986, 10836, 0xbf9e07a5
+1, 99514, 10836, 0x16408f38
+1, 105043, 10836, 0x2b000c9f
+1, 110571, 10836, 0x0ccd9811
+1, 116100, 10836, 0xf9575d48
+1, 121629, 10836, 0x1ee68190
+1, 127157, 10836, 0xde435373
+1, 132686, 10836, 0xd83be17a
+1, 138214, 10836, 0x9a7f0bbe
+1, 143743, 10836, 0x8709e4d3
+1, 149271, 10836, 0xde1879cb
More information about the ffmpeg-cvslog
mailing list