From 67499cba4f11c3284c0d9b2c15a1089f9c5e7927 Mon Sep 17 00:00:00 2001 From: Joseph Cullen Date: Wed, 14 Aug 2024 11:10:09 -0400 Subject: [PATCH] Fix AAC-LC Specific Config in test vectors to obey ISO+IEC-14496-1:2010 spec. - Resolves both parts A and B in #119 for the test vectors. - Part A: Add missing "expandable" size field to both of the `DecoderConfigDescriptor` and `DecoderSpecificInfo`. - Part B: Flip `DecoderConfigDescriptor` `reserved` bit to 1. - Based on AOMediaCodec/iamf-tools@57324193. --- proto/codec_config.proto | 2 +- tests/test_000076.iamf | Bin 40413 -> 40415 bytes tests/test_000076_f.mp4 | Bin 41341 -> 41343 bytes tests/test_000076_s.mp4 | Bin 41209 -> 41211 bytes tests/test_000090.iamf | Bin 40416 -> 40418 bytes tests/test_000090_f.mp4 | Bin 41444 -> 41446 bytes tests/test_000090_s.mp4 | Bin 41220 -> 41222 bytes tests/test_000091.iamf | Bin 40413 -> 40415 bytes tests/test_000091_f.mp4 | Bin 41315 -> 41317 bytes tests/test_000091_s.mp4 | Bin 41183 -> 41185 bytes tests/test_000092.iamf | Bin 1095147 -> 1095149 bytes tests/test_000092_f.mp4 | Bin 1097863 -> 1097865 bytes tests/test_000092_s.mp4 | Bin 1096831 -> 1096833 bytes tests/test_000093.iamf | Bin 80619 -> 80621 bytes tests/test_000093_f.mp4 | Bin 81647 -> 81649 bytes tests/test_000093_s.mp4 | Bin 81423 -> 81425 bytes tests/test_000094.iamf | Bin 321303 -> 321305 bytes tests/test_000094_f.mp4 | Bin 322331 -> 322333 bytes tests/test_000094_s.mp4 | Bin 322107 -> 322109 bytes 19 files changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/codec_config.proto b/proto/codec_config.proto index 3b857806..6c6566bc 100644 --- a/proto/codec_config.proto +++ b/proto/codec_config.proto @@ -99,7 +99,7 @@ message AacDecoderConfig { optional uint32 object_type_indication = 1 [default = 0x40]; optional uint32 stream_type = 2 [default = 5]; optional bool upstream = 3 [default = false]; - optional bool reserved = 4; + optional bool reserved = 4 [default = true]; // As per ISO 14496-1:2010. optional uint32 buffer_size_db = 5; optional uint32 max_bitrate = 6; optional uint32 average_bit_rate = 7; diff --git a/tests/test_000076.iamf b/tests/test_000076.iamf index 39a6f3a81f3e141d3e70c5bd82a587a7c3d02c7a..23ca60da507927fcc9ca6c67898e7356728f305f 100644 GIT binary patch delta 48 wcmcb+o9X^;CeDC+2LP>> B9_;`C diff --git a/tests/test_000076_s.mp4 b/tests/test_000076_s.mp4 index 310974aa85bd11c58ae77d87a48b492cc5216a47..821a229cf8c50e917d177e1374461de5a298d09c 100644 GIT binary patch delta 114 zcmex)km>h9rVY(=8LKC^%q?bQpZsHPJ7fLihIws_KPI!!*OuH{s-b|DY4gna G35)=beT#}T-z`$^%xTH7* zNP_?)5O106JzrUSLS|xe5@Rdl54Oz2+%%xD^a;k?0+YlBj{pBz97I5hp@4Ps?D+|d E07U#G0{{R3 diff --git a/tests/test_000090.iamf b/tests/test_000090.iamf index 08e7eb6296a144bbfec963957b94fc96f5d0fc28..a89d61e036ccc7dbfb35bbb99e6cc51b0d0c3e38 100644 GIT binary patch delta 48 wcmaE`o9WSRCekI`n+;?D diff --git a/tests/test_000090_f.mp4 b/tests/test_000090_f.mp4 index a1763a2e474186238cc0b6747906072798b01482..644813cea6112a031ec5f93690b27dabc8fcf8d6 100644 GIT binary patch delta 111 zcmaEInCaPJrU}xFKPSq}W{jPBQL2LPHn BA0z+( diff --git a/tests/test_000090_s.mp4 b/tests/test_000090_s.mp4 index 43bb34bf5e5648f9e920993a1023eecf23e1f5d8..d9cc98398f66d82d574ab490530d8df88939f08a 100644 GIT binary patch delta 129 zcmZoU#ME|(X+zsw#^%ZGbBh`IC;y(?&fT7yl9|ZBz@U(uGI`=$vB`_)r7|%wOy-)e zEqSE4Bq;|db*#9gI0Z<903#4@o9s7VS$9%qVsa8=JL3UC*bBh^yC;y(?&fS`ul9|ZBz@U(uGI`=$vB`_)r7|)8o6I#| zTk=qGNm33_>PT@(aSD(I0Y)I+GTCpwvi5|`#N;H#R>mJ}nTfe+Kw;?*jg$GZ+Ct_9xB& diff --git a/tests/test_000091.iamf b/tests/test_000091.iamf index 8ac610eac38c80f2d4a4818976c1f2fb68631950..caf4e8a883306999703db6eaa1cfc7a6d5728d8d 100644 GIT binary patch delta 48 wcmcb+o9X^;CeRa{vGU delta 46 ucmcb=o9XUuCgmS&nTfe+3=9m?Cm3@JOcEP77#LU_M1TS?z`9X&*IWQevkP4S diff --git a/tests/test_000091_f.mp4 b/tests/test_000091_f.mp4 index e7d34bdf414475d1640e65aaa92aa541601e2e86..241e50b439c5bbe336bfe584a42a096053bfb7c1 100644 GIT binary patch delta 111 zcmaESi0SDerU}xFKPSq}W{jP$GrVY(=8RI9n%q?boJ^9DncE;q%4fEO#qjIYut2t1|yqWq}i00ZPjmn*aa+ delta 94 zcmaF++UfOcC*>b(nTfe+3=9m?Cm3@JOcEP7{{Lrj5CICn0BfUat14rwDpRW}bE_&# qt14@&DqE{6d#fr(t14%!Dp#v2cdIH-t154+DqpKA|5jCj6I%f=2pOdS diff --git a/tests/test_000092_f.mp4 b/tests/test_000092_f.mp4 index 7859d4f5830a80addfff956a97875a19293db4e1..52c5b24d2779198faff878ffd5ec1f94a89edebb 100644 GIT binary patch delta 175 zcmZo~bna|)o*>OAKT&2jWAnrv?To)CJ218}mP|g*s4ZzxT#}T-z`*dPxTH7*NP_?) z5Z{^1&7`cmBQr5MiE%CC54Oz2+%%xD>{s-b|DsX3CVJ(7tL sh(RrFA(zqG5_{RCIP*D0Ph7YPyhe` delta 173 zcmeBdbZ&2So*>OAJ5gpfW8=gf?TkMsJ218}7EM0Rs4Zz$T#}T-z`*dTxTH7*NP_?) z5Z{{2&7`coEi*AWiE%aK54Oz2+%%xD^a;k?0+YlBj{pBz97I5hp@6kHnyEdSi4llF qG&2yh05K~NvjH(X5OV-AClGT1F*gwN05LBR^8qpc_Gl&ny?p?wN-anL diff --git a/tests/test_000092_s.mp4 b/tests/test_000092_s.mp4 index 94877063aa282919523e5df98bd67ef71a4ec2b6..6f5e3198d2b64cb14cd097860d24288d900bccba 100644 GIT binary patch delta 152 zcmezW!>RG7Q$q`53sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttQW7J=-ojFQuHwh9z8 zE}i~ht3W%W?DULn0&R@broZ1Npe-3yT#}T-z`*dPxTH7*NP_?)5Z{?@yj?(9cSmMo sauVZO#vg2%iMeS&aoH1$xdkSP4IKafvj{qff|Nr6E7SJI?E?Q;0DTuPGynhq delta 150 zcmZqt>Gc1HQ$q`53sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttQW7J=-ojN;RCwh9z8 zE}s5it3W%W^z@8v0&R>_roZ1Npe-3uT#}T-z`*dTxTH7*NP_?)5Z{_^yj?(9ds}8= qauVZe#vg2%iMeS&ap@C`xdkSP4IKafvp9%=R6_yl_U7#Z|5yMVB`*vB diff --git a/tests/test_000093.iamf b/tests/test_000093.iamf index f11e366c7271854d769c24ca1356ad5419001457..a8c933ca9518b46f90d15249790c5688127fa229 100644 GIT binary patch delta 51 zcmaF;mF4YM7S$hYnTfe+3=9miCm3@JOcEP7{{LqYbPxrKzyK>#qw-c|#uHWm&2|o1 delta 49 xcmaF+mF4wU7UdsonTfe+3=9m?Cm3@JOcEP7{{Lrj5CICn0BfV_R#nCmRsgga4n+U} diff --git a/tests/test_000093_f.mp4 b/tests/test_000093_f.mp4 index 9eb8747e3f6005d9ea71029276426485c58f5192..c6428fe9fdcdba3dc93eeb9c7a85ceccd165d26c 100644 GIT binary patch delta 115 zcmaF=m*wMMmI=~~|0l}KW=x*Aqn+{gWCzAJ#*oR!8MP%Pic6Am7#JAN6qgjI0BI0l z1mZoDxtWx8XJjTOCo%Ri{$R^Y%uNFd%bsA&Eig%J;Q0TaMbJSMq#6oXnVKV+wns8C HPO||3rwAaM delta 113 zcmezPm*xFmmI=~~e<#Y!W=x#8qn+{QWCzAJ#-Pc^8MP(Fic6Am7#J8%6_*sJ0BI0l z1mazjxtWx;r)4H4Coy(2{$R^Y%uNFdOP^rOEig%J;Q0Ta#X$t57z$XMqnWlxGciuH F0RUtJAawu$ diff --git a/tests/test_000093_s.mp4 b/tests/test_000093_s.mp4 index eac4096015265dbc8d5ecd71f890f7c01bce36e8..82e306ebb0fa065c0d8b6979abcda5e0cd702d80 100644 GIT binary patch delta 121 zcmeDG!!q#?OT!k%ZY##l={;7A#f+lUtQp%Gd#86;Gqy3ZP3N~^)RsI|T#}T-z`$^( zxTH7*NP_?)5bv2DY{RImJ0mkOIf=2C@dsOGVs08xT=oQGZh=W+1IPdWEP@WAAmvcN M%Cvo<4Pzc70IlC3V*mgE delta 119 zcmbREho%1yOT!k%ZY#$2={;7A#f-w!tQp%GyQg@)RsI^T#}T-z`$^- zxTH7*NP_?)5bv5EY{RImJuNdaIf=2G@dsOGVs08xT>1oKZh=W+1IPdWEDj#qjIY diff --git a/tests/test_000094_f.mp4 b/tests/test_000094_f.mp4 index 2446186e571da561456fe70b425841124b73c89b..a2a566bc1a312640cbe84c0f30531ac2647a468d 100644 GIT binary patch delta 127 zcmbPzO?d7#;R(`=;uB?NGgeRB(a!jJvIAoqW6tE`jM|b0#U)8O3=9lUic5-9fHVj& z0`Zl}+)T>48!{7a>oOCQlNc8>{$R^Y%uNFdOP^rOEig%J;Q0Ta#X$t57z$XMqnX;HnHYf> NL^E%XW@0(?0sv>CBLV;b diff --git a/tests/test_000094_s.mp4 b/tests/test_000094_s.mp4 index f40a4bcf4efde17c7079b3dafcfd1d10c1c7b8f2..c8928bbc1b75db1ba7bfec167fdeb49c6dd91925 100644 GIT binary patch delta 128 zcmdmeMR@NO;f5B*7N!>FEiCh&F)p0G;2BFXqwaK(=Pd1vOQ+9y&eFyxH(mJ!i?-yW z;*z8s1_p*F#U;flKpF%Xf%wYw^cO73x*IYRlam;iGX7x8Ow3IKip!p0%q=iUY~c9+ UpGD9?6r>yqSedqOeE~EW0EJ*EVE_OC delta 126 zcmdmcMR@lW;f5B*7N!>FEiCh&G0va9;2BFXqxN)>=Pd1vi>J?d&eFyxGhO)wi?-y0 z;*z8s1_p*l#U;flKpF%Xf%ww&^cO73+UqhClam-1GyY)9Ow3IKic6nh%q=iUY~c9+ SpT$80q#6oXw{L#|G!_6eO(;14