diff --git a/EXPAND3.mix b/EXPAND3.mix deleted file mode 100644 index 9d48a08..0000000 Binary files a/EXPAND3.mix and /dev/null differ diff --git a/SCM01EA.MAP b/SCM01EA.MAP deleted file mode 100644 index f95eeea..0000000 --- a/SCM01EA.MAP +++ /dev/null @@ -1,719 +0,0 @@ -[Basic] -Name=In the thick of it -Intro= -Brief= -Win= -Lose= -Action= -Player=Multi1 -Theme=No theme -CarryOverMoney=0 -ToCarryOver=no -ToInherit=no -TimerInherit=no -CivEvac=no -NewINIFormat=3 -CarryOverCap=0 -EndOfGame=no -NoSpyPlane=no -SkipScore=no -OneTimeOnly=no -SkipMapSelect=no -Official=yes -FillSilos=no -TruckCrate=no -Percent=0 - -[BigOverlayCoords] -0=1283471232 -1=1300248192 -2=1300248448 -3=1300248704 -4=1317025664 -5=1317025920 -6=1317026176 -7=1249916800 -8=1266693760 -9=1266694016 -10=1266694272 -11=1283471488 -12=1283471744 -13=1300248960 -14=1300249216 -15=1216362368 -16=1233139328 -17=1233139584 -18=1233139840 -19=1249917056 -20=1249917312 -21=1266694528 -22=1266694784 -23=1031812992 -24=1031813248 -25=1048589952 -26=1048590208 -27=1048590464 -28=1048590720 -29=1065367424 -30=1065367680 -31=1065367936 -32=1065368192 -33=1082144896 -34=1082145152 -35=1082145408 -36=1098922368 -37=1182807936 -38=1199584896 -39=1199585152 -40=1199585408 -41=1216362624 -42=1216362880 -43=1233140096 -44=1233140352 -45=1249917568 -46=1015036544 -47=1031813504 -48=1031813760 -49=1031814016 -50=1048590976 -51=1048591232 -52=1048591488 -53=1065368448 -54=1065368704 -55=1149253504 -56=1166030464 -57=1166030720 -58=1166030976 -59=1182808192 -60=1182808448 -61=1199585664 -62=1199585920 -63=1216363136 -64=1115699072 -65=1132476032 -66=1132476288 -67=1132476544 -68=1149253760 -69=1149254016 -70=1166031232 -71=1166031488 -72=1182808704 -73=1082144640 -74=1098921600 -75=1098921856 -76=1098922112 -77=1115699328 -78=1115699584 -79=1132476800 -80=1132477056 -81=1149254272 -82=1065367168 -83=1098922624 -84=1082145664 -85=1015037056 -86=1031814272 -87=1031814528 -88=1048591744 -89=1048592000 -90=1065368960 -91=1065369216 -92=1015038592 -93=1031815552 -94=1031815808 -95=1031816064 -96=1048593024 -97=1048593280 -98=1048593536 -99=1065370496 -100=1065370752 -101=1031816320 -102=1031816576 -103=1048593792 -104=1048594048 -105=1065371008 -106=1065371264 -107=1065371520 -108=1082148480 -109=1082148736 -110=1082148992 -111=1098925952 -112=1098926208 -113=1098926464 -114=1115703424 -115=1115703680 -116=1115703936 -117=1132480896 -118=1132481152 -119=1115703168 -120=1132480640 -121=1149258112 -122=1149258368 -123=1149258624 -124=1166035584 -125=1166035840 -126=1166036096 -127=1182813056 -128=1182813312 -129=1182813568 -130=1199590528 -131=1199590784 -132=1199591040 -133=1216368000 -134=1199590272 -135=1216367744 -136=1216368256 -137=1233145216 -138=1233145472 -139=1249922688 -140=796937088 -141=796937344 -142=813714048 -143=813714304 -144=813714560 -145=813714816 -146=830491520 -147=830491776 -148=830492032 -149=830492288 -150=847268992 -151=847269248 -152=847269504 -153=864046464 -154=864046720 -155=796936832 -156=813713792 -157=830491008 -158=830491264 -159=847268480 -160=847268736 -161=864045952 -162=864046208 -163=880823424 -164=796936320 -165=796936576 -166=813713536 -167=796935040 -168=813712000 -169=813712256 -170=813712512 -171=830489216 -172=830489472 -173=830489728 -174=830489984 -175=847266688 -176=847266944 -177=847267200 -178=847267456 -179=864044160 -180=864044416 -181=813711744 -182=830488704 -183=830488960 -184=847265920 -185=847266176 -186=847266432 -187=864043392 -188=864043648 -189=864043904 -190=880820864 -191=880821120 -192=880821376 -193=897598336 -194=813711232 -195=830488192 -196=830488448 -197=847265408 -198=847265664 -199=864042880 -200=864043136 -201=880820352 -202=880820608 -203=897597824 -204=796933504 -205=813710464 -206=813710720 -207=813710976 -208=830487936 -209=780155776 -210=796932736 -211=796932992 -212=796933248 -213=813710208 -214=830487680 -215=847265152 -216=864042624 -217=763378048 -218=780155008 -219=780155264 -220=780155520 -221=796932480 -222=813709952 -223=830487424 -224=847264896 -225=729823360 -226=729823616 -227=746600576 -228=746600832 -229=746601088 -230=763378304 -231=763378560 -232=696268928 -233=696269184 -234=713045888 -235=713046144 -236=713046400 -237=713046656 -238=729823872 -239=729824128 -240=746601344 -241=662714496 -242=662714752 -243=679491712 -244=679491968 -245=679492224 -246=696269440 -247=696269696 -248=713046912 -249=713047168 -250=629160064 -251=629160320 -252=645937280 -253=645937536 -254=645937792 -255=662715008 -256=662715264 -257=679492480 -258=595605632 -259=595605888 -260=612382848 -261=612383104 -262=612383360 -263=629160576 -264=629160832 -265=562051200 -266=578828160 -267=578828416 -268=578828672 -269=595606144 -270=612383616 -271=1249912960 -272=1249913216 -273=1266689920 -274=1266690176 -275=1266690432 -276=1266690688 -277=1283467392 -278=1283467648 -279=1283467904 -280=1283468160 -281=1300244864 -282=1300245120 -283=1300245376 -284=1300245632 -285=1317022336 -286=1317022592 -287=1317022848 -288=1216358528 -289=1216358784 -290=1233135488 -291=1233135744 -292=1233136000 -293=1233136256 -294=1249913472 -295=1249913728 -296=1266690944 -297=1266691200 -298=1283468416 -299=1098917760 -300=1115694720 -301=1115694976 -302=1115695232 -303=1132472192 -304=1132472448 -305=1132472704 -306=1149249920 -307=1149250176 -308=1166027392 -309=1166027648 -310=1082140544 -311=1082140800 -312=1098917504 -313=1098918016 -314=1098918272 -315=1115695488 -316=1115695744 -317=1132472960 -318=1048586368 -319=1048586624 -320=1065363328 -321=1065363584 -322=1065363840 -323=1065364096 -324=1082141056 -325=1082141312 -326=1082141568 -327=1098918528 -328=1098918784 -329=1098919040 -330=1115696000 -331=998254720 -332=1015031680 -333=1015031936 -334=1015032192 -335=1031809152 -336=1031809408 -337=1031809664 -338=1048586880 -339=1048587136 -340=1065364352 -341=1065364608 -342=998254976 -343=1015032448 -344=1031809920 -345=998254208 -346=998254464 -347=1015031424 -348=1031808896 -349=998253696 -350=1015030656 -351=1015030912 -352=1015031168 -353=1031807872 -354=1031808128 -355=1031808384 -356=1031808640 -357=1048585344 -358=1048585600 -359=1048585856 -360=1048586112 -361=1065362816 -362=1065363072 -363=998252928 -364=1015029888 -365=1015030144 -366=1015030400 -367=1031807360 -368=1031807616 -369=1048584832 -370=1048585088 -371=998252416 -372=1015029376 -373=1015029632 -374=1031806848 -375=1031807104 -376=1048584320 -377=1048584576 -378=998251904 -379=1015028864 -380=1015029120 -381=1031806336 -382=1031806592 -383=1048583808 -384=1048584064 -385=998251392 -386=1015028352 -387=1015028608 -388=1031805824 -389=1031806080 -390=1048583296 -391=1048583552 -392=998250880 -393=998251136 -394=1015028096 -395=1031805568 -396=1048583040 -397=796924288 -398=813701504 -399=813701760 -400=830478720 -401=830478976 -402=830479232 -403=847255936 -404=847256192 -405=780147072 -406=780147328 -407=796924544 -408=796924800 -409=813702016 -410=813702272 -411=830479488 -412=830479744 -413=847256704 -414=847256960 -415=796925056 -416=813702528 -417=830480000 -418=847257216 -419=796925312 -420=813702784 -421=830480256 -422=847257472 -423=847257728 -424=864034432 -425=864034688 -426=796925568 -427=796925824 -428=813703040 -429=813703296 -430=830480512 -431=830480768 -432=847257984 -433=847258240 -434=864035200 -435=864035456 -436=813703552 -437=830481024 -438=847258496 -439=864035712 -440=864035968 -441=880812928 -442=880813184 -443=813703808 -444=813704064 -445=830481280 -446=830481536 -447=847258752 -448=847259008 -449=864036224 -450=813704320 -451=813704576 -452=830481792 -453=830482048 -454=847259264 -455=847259520 -456=864036480 -457=864036736 -458=864036992 -459=880813696 -460=880813952 -461=796927872 -462=796928128 -463=813705344 -464=813705600 -465=830482816 -466=830483072 -467=847260288 -468=763373440 -469=780150400 -470=780150656 -471=780150912 -472=796927360 -473=796927616 -474=796928384 -475=813704832 -476=813705088 -477=813705856 -478=830482304 -479=830482560 -480=847259776 -481=847260032 -482=645932672 -483=645932928 -484=662709632 -485=662709888 -486=662710144 -487=662710400 -488=679487616 -489=679487872 -490=696265088 -491=696265344 -492=612378752 -493=629155968 -494=629156224 -495=645933440 -496=645933696 -497=662710912 -498=612379008 -499=629156480 -500=645933952 -501=662711168 -502=662711424 -503=679488384 -504=612379264 -505=629156736 -506=645934208 -507=662711680 -508=679488640 -509=679488896 -510=679489152 -511=696266112 -512=629156992 -513=629157248 -514=645934464 -515=645934720 -516=662711936 -517=662712192 -518=612379776 -519=612380032 -520=629157504 -521=645934976 -522=578825344 -523=595602304 -524=595602560 -525=595602816 -526=612379520 -527=612380288 -528=629157760 -529=562047872 -530=562048128 -531=562048384 -532=578825088 -533=578825600 -534=578825856 -535=595603072 -536=595603328 -537=612380544 - -[BigOverlay] -0=1296971287,56,0,7 -1=1269380647,57,7,8 -2=1234384423,56,15,8 -3=1037645389,52,23,14 -4=1201550919,56,37,9 -5=1033451725,45,46,9 -6=1166292589,56,55,9 -7=1132541557,56,64,9 -8=1098987104,56,73,9 -9=1067005517,57,82,2 -10=1048655829,60,84,1 -11=1033321131,44,85,7 -12=1032470836,44,92,9 -13=1035092827,42,101,12 -14=1077036379,42,113,6 -15=1120028470,42,119,10 -16=1162758552,43,129,5 -17=1189366381,42,134,6 -18=810633875,28,140,15 -19=814827795,27,155,9 -20=802047803,24,164,3 -21=816857629,30,167,14 -22=832585731,28,181,13 -23=830488056,28,194,10 -24=812989421,24,204,5 -25=796604925,2,209,8 -26=776484830,24,217,8 -27=744765314,57,225,7 -28=704919351,48,232,9 -29=670316530,56,241,9 -30=637613982,58,250,8 -31=608253790,57,258,7 -32=573650692,56,265,6 -33=1263544231,36,271,17 -34=1229596588,37,288,11 -37=1120019972,40,299,11 -38=1092691555,32,310,8 -39=1058482009,37,318,13 -40=1017587422,41,331,11 -41=1007101737,39,342,3 -42=1009591661,45,345,4 -43=1010311927,52,349,14 -44=1013129143,45,363,8 -45=1011228095,44,371,7 -46=1013324767,44,378,7 -47=1009129972,44,385,7 -48=1007884343,45,392,5 -49=793253506,6,397,8 -50=793253996,0,405,10 -51=807279234,1,415,4 -52=809376652,28,419,7 -53=811015539,22,426,10 -54=826023822,0,436,7 -55=828842361,30,443,7 -56=817308585,5,450,11 -57=812918401,34,461,7 -58=786703846,37,468,14 -61=655631820,36,482,10 -62=630794033,35,492,6 -63=625289178,7,498,6 -64=626010319,25,504,8 -65=634727242,13,512,6 -66=618670911,17,518,4 -67=593505023,36,522,7 -68=564144917,16,529,9 - -[Map] -Theater=SNOW -X=25 -Y=33 -Width=54 -Height=46 -HomeCell=4386 - -[Waypoints] -0=8990 -1=9024 -2=5186 -3=5279 -98=4386 -99=8256 - -[MapPack] -1=BwAAIIH//v8f/4BXAAAggf/+XQ3/ghsAEAL++gD//wADXg2CFAAQAv76AP//7ANeEYIXAD -2=ACgRLIURaBECACMAyBEyACgRhAAv7SAP//AAJKFv8ABUoR/xQBSh2CGgAQAv6cAP+AGQAA -3=IIH//l0A/4IaABAC/voA//8AAl4A/qIc/4AHAAAggf/+/x//gGgAACCBAP6vFgCCAQL+fQ -4=AAgwMEBf59AACDBgcI/n0AAIMJCgv+fQAA/wABLxf/dwGvFoMBAgMRessqG4ED/mkAAIQE -5=BQYHAXrJqRsQE/5pAACBCAP3AXrJKRwQE/50AAD/fwGwFv/RAa8cgB4AACCBAOsAAIMDBA -6=X+fQAAgwYHCP59AACDCQoL/s4eAIA= - -[TERRAIN] -7207=T01 -7981=T01 -6568=T01 -6818=T01 -6814=T01 -7330=T01 -9522=T01 -9009=T01 -7490=T01 -7105=T01 -7494=T01 -6715=T01 -6328=T01 -6583=T01 -7224=T01 -7226=T01 -5425=T01 -5810=T01 -5814=T01 -5300=T01 -4786=T01 -4917=T01 -4403=T01 -9914=T01 - -[STRUCTURES] -0=Neutral,ABAN01,256,7338,0,None,1,0 -1=Neutral,ABAN01,256,6442,0,None,1,0 -2=Neutral,ABAN01,256,6449,0,None,1,0 -3=Neutral,ABAN01,256,7473,0,None,1,0 -4=Neutral,ABAN02,256,8113,0,None,1,0 -5=Neutral,ABAN02,256,5555,0,None,1,0 -6=Neutral,ABAN03,256,4659,0,None,1,0 -7=Neutral,ABAN02,256,7363,0,None,1,0 -8=Neutral,ABAN02,256,6584,0,None,1,0 -9=Neutral,ABAN02,256,9266,0,None,1,0 - -[Base] -Player=Multi1 -Count=0 - -[OverlayPack] -1=DwEAIIH//qAQ/4EF2JQQ/mMA/4oFBQYHBQYFB/8GMHuBCP5wAP+DBf8HAAODCAcGMHqBB/ -2=5xAP8A+AD/YAH/cQAwEYL/CAEBYAH/cgCwEcutEoEG/nMA/8mvEP91ALAS46QQ/2EArxCB -3=BQAC1jATgQUQAf5cAP+FCAcICAXWMRL/YADKFBJ7gggG1zATARz/YQBJFYEF1zASAHv/Yw -4=DKFdiwEyB+/3EArxD/bgA9FeAoF/76Af//UgDOF+zJGf9/AMoW/1EARxftzRoVAv5OAP8Q -5=T+hNG/9QAEoX7c0b/08ASxoQT+vLG/9QAE0b/4AASxr/dQCrEPbtEf99AKAdIIH/ewBJHj -6=p+/3sASh45ge+WH4CkAAAggf/iAACBBeAJAIIFBdwlAPdqAOJNAIEFAIH+dQD/UPn/WgDK -7=AEBY1k0BQHr/WQDMAN5MATEC/1cATAFgV9dLAf9dAMUBAN1gXtTNAgCA/1wAzABQXtVKAB -8=Ag/1oASQNRANpKAf9cAEcDcFzYrAL/XABKAXGA2awB/2MASwDYRgP/WwBJBXB22y0E/1gA -9=TALkSwL/YwDKANrNBv9dAMYD/lgY/4A= - -[Briefing] -1=Rescue Einstein from the Headquarters inside this Soviet complex. Once -2=found, evacuate him via the helicopter at the signal flare. Einstein and -3=Tanya must be kept alive at all costs. Beware the Soviet's Tesla Coils. -4=Direct Tanya to destroy the westmost power plants to take them off-line. - -[Digest] -1=ty7v+aJuxNMiESmZBtqZtzZ5pIc= - diff --git a/SCU01EA.MAP b/SCU01EA.MAP deleted file mode 100644 index 5be6a2e..0000000 --- a/SCU01EA.MAP +++ /dev/null @@ -1,556 +0,0 @@ -[General] -ChronoTechLevel=12 -ParaTech=5 -ParabombTech=8 -SpyPlaneTech=5 -GPSTechLevel=10 - -[HBOX] -Power=-10 - -[PBOX] -Power=-10 - -[AGUN] -Power=-40 - -[FTUR] -Power=-40 - -[MRJ] -TechLevel=15 -Owner=soviet - -[MGG] -TechLevel=15 - -[MCV] -TechLevel=15 - -[LST] -TechLevel=1 - -[DOG] -TechLevel=3 - -[E4] -TechLevel=6 - -[THF] -TechLevel=15 - -[E7] -Prerequisite=atek -TechLevel=15 -Owner=allies - -[YAK] -TechLevel=1 - -[TRAN] -TechLevel=15 -Owner=allies,soviet - -[HELI] -TechLevel=10 - -[HIND] -TechLevel=10 - -[IRON] -TechLevel=15 - -[ATEK] -TechLevel=10 - -[PDOX] -TechLevel=15 - -[SPEN] -TechLevel=5 - -[HPAD] -TechLevel=10 - -[MSLO] -TechLevel=15 -Owner=soviet - -[AFLD] -TechLevel=4 - -[KENN] -TechLevel=2 - -[FACF] -TechLevel=15 - -[WEAF] -TechLevel=15 - -[SYRF] -TechLevel=15 - -[DOMF] -TechLevel=15 - -[Italy] -MaxUnit=150 -MaxInfantry=150 -MaxBuilding=150 -MaxVessel=20 -Allies=Special - -[USSR] -PlayerControl=yes -Credits=50 -TechLevel=3 - -[Greece] -Credits=100 -TechLevel=3 -IQ=5 -PlayerControl=false - -[Basic] -Name=In the thick of it -Intro= -Brief= -Win= -Lose= -Action= -Player=USSR -Theme=No theme -CarryOverMoney=0 -ToCarryOver=no -ToInherit=no -TimerInherit=no -CivEvac=no -NewINIFormat=3 -CarryOverCap=0 -EndOfGame=no -NoSpyPlane=no -SkipScore=no -OneTimeOnly=no -SkipMapSelect=no -Official=yes -FillSilos=no -TruckCrate=no -Percent=0 - -[Lights] -0=light0,746604672,1.000000,1.000000,1.000000,75.000000,1 -1=light1,750797760,1.000000,1.000000,1.000000,75.000000,1 -2=light2,746602368,1.000000,1.000000,1.000000,75.000000,1 -3=light3,683687744,1.000000,1.000000,1.000000,75.000000,1 -4=light4,645939072,1.000000,1.000000,1.000000,75.000000,1 -5=light5,591413184,1.000000,1.000000,1.000000,75.000000,1 -6=light6,801128384,1.000000,1.000000,1.000000,75.000000,1 -7=light7,864042880,1.000000,1.000000,1.000000,75.000000,1 -8=light8,742406976,1.000000,1.000000,1.000000,75.000000,1 -9=light9,734017344,1.000000,1.000000,1.000000,75.000000,1 -10=light10,742405056,1.000000,1.000000,1.000000,75.000000,1 -11=light11,734015552,1.000000,1.000000,1.000000,75.000000,1 -12=light12,926957376,1.000000,1.000000,1.000000,75.000000,1 -13=light13,985677632,1.000000,1.000000,1.000000,75.000000,1 -14=light14,1052786624,1.000000,1.000000,1.000000,75.000000,1 -15=light15,1115701120,1.000000,1.000000,1.000000,75.000000,1 -16=light16,1153448896,1.000000,1.000000,1.000000,75.000000,1 -17=light17,1153447744,1.000000,1.000000,1.000000,75.000000,1 -18=light18,1145058112,1.000000,1.000000,1.000000,75.000000,1 -19=light19,1086337216,1.000000,1.000000,1.000000,75.000000,1 -20=light20,1027616960,1.000000,1.000000,1.000000,75.000000,1 -21=light21,952119616,1.000000,1.000000,1.000000,75.000000,1 -22=light22,901787840,1.000000,1.000000,1.000000,75.000000,1 -23=light23,851456192,1.000000,1.000000,1.000000,75.000000,1 -24=light24,1145056704,1.000000,1.000000,1.000000,75.000000,1 -25=light25,1145055680,1.000000,1.000000,1.000000,75.000000,1 -26=light26,1145054528,1.000000,1.000000,1.000000,75.000000,1 -27=light27,583023552,1.000000,1.000000,1.000000,75.000000,1 -28=light28,591411136,1.000000,1.000000,1.000000,75.000000,1 -29=light29,591410112,1.000000,1.000000,1.000000,75.000000,1 -30=light30,683684032,1.000000,1.000000,1.000000,75.000000,1 -31=light31,641740864,1.000000,1.000000,1.000000,75.000000,1 -32=light32,557855040,1.000000,1.000000,1.000000,75.000000,1 -33=light33,511717504,1.000000,1.000000,1.000000,75.000000,1 -34=light34,742402112,1.000000,1.000000,1.000000,75.000000,1 -35=light35,734012608,1.000000,1.000000,1.000000,75.000000,1 -36=light36,1098916224,1.000000,1.000000,1.000000,75.000000,1 -37=light37,1044390208,1.000000,1.000000,1.000000,75.000000,1 -38=light38,952115648,1.000000,1.000000,1.000000,75.000000,1 -39=light39,901783872,1.000000,1.000000,1.000000,75.000000,1 -40=light40,859840960,1.000000,1.000000,1.000000,75.000000,1 -41=light41,784343360,1.000000,1.000000,1.000000,75.000000,1 -42=light42,696263040,1.000000,1.000000,1.000000,75.000000,1 -43=light43,650125760,1.000000,1.000000,1.000000,75.000000,1 -44=light44,608182720,1.000000,1.000000,1.000000,75.000000,1 -45=light45,562045312,1.000000,1.000000,1.000000,75.000000,1 -46=light46,511713664,1.000000,1.000000,1.000000,75.000000,1 -47=light47,478159232,1.000000,1.000000,1.000000,75.000000,1 -48=light48,444605824,1.000000,1.000000,1.000000,75.000000,1 -49=light49,432024896,1.000000,1.000000,1.000000,75.000000,1 -50=light50,448800960,1.000000,1.000000,1.000000,75.000000,1 -51=light51,981474432,1.000000,1.000000,1.000000,75.000000,1 -52=light52,998254208,1.000000,1.000000,1.000000,75.000000,1 -53=light53,994061760,1.000000,1.000000,1.000000,75.000000,1 - -[Map] -Theater=SNOW -X=2 -Y=13 -Width=77 -Height=66 -HomeCell=2742 - -[Waypoints] -98=8256 -99=8256 - -[MapPack] -1=wAAAIIH//j8O/4IUABAC1SgOghYAEAL+0gD/hQkACQA6AAL/9gA+DhD+//gAOA8w/BACgT -2=cAAv/2AD4QMAb/8gA6EXH8EAKBOQAC+z4S/7AAXhL//gAsE8ssFIMJAD8gAv/mAUAUzSoW -3=EAKBQCAC/+IAQBbRJhf/BAE2FzMAgRAgAoES1EUZMB7/vABkGNUiGf/mADgZ1yAaUwD/2g -4=BAGtkeG+U2GIIRABAC/7QAZBvdGhzjOBb/tgFeHN8YHv/KADYYgCcCACCB/9AAAIIJAOEU -5=AIFAIAKBFCAC0QAAEAGCFgAQAvNGAP54AP/jFACDCQA/IAL/0ABAAOUSAeM4AYIQABACgR -6=LUYwIwHv6OAP/nEALhOgD/sABeAucQA//SADgD6Q4E5TYCghEAEALzRgX+cAD///wACgWC -7=OADJBgeBNwAC0RAHzSoGgUoAAv/sAEAGgzYAMSD4gTUAAoE0AAKBRwAC/8YBQAeE//8lAM -8=0ICoEkAALJFgoQAoEpAAKBQgACEvowOP/6AEAJgUkguuFeBNtGC4ET2IEL/mgA/xLSMAIS -9=2MkMDBAC0SAHgUn//wA5C4E7AAL/ygA8DN/oCFEAgTMAAsk0DfleCv+OAHwF4wkPgy8ALy -10=EAgT0AAv/4ADwOgS8J+P/4ADgPgzAAMCIAgTkAAv1aEP+WAHwA4xIR/0QAOA7/tAB8EVQA -11=/wABOBKBPAAC/0wAPBOFQwBDACgAAoEnAAIwCBAG/pIA/4MtAC3/BQEzFFwC/0gAQBWDLA -12=As/6UAixWDRQBFKQiBSAAC/1AAPBaBCGAC/pQA/4EFIJb/WAAwF4MrACvIixc7ZP5uAP+C -13=AgAwAtcSGDECOxD/RABWEN18GP9uAJoY3QoZEQKBAQACgRdAAudYDclSGoEYQALbeBf/dA -14=CWGd8JGxD+/wABMBqC////VgAyG/+CAIgZ4wkdF6jHNgr/zAA+Gf9+AAod/6IAiBs1/hCo -15=gUEAAhiogScAEv/AAEAegCABACCB/+wAAIUsACwAQQACgycAPQAChP//EQAQAtUYANtAAI -16=IWABACMAyFKwArAAhgAoEJQAL+kgD/gzAAMCCa/wABOACBQCAC/0oAPgESWP+kAIwBgy8A -17=L8ozAoIQABACgRIgAoETzksDMB7PTAPJWAP/tgCCAoE/IAL/SgA+A/+wAIgB/wgBOAT+SA -18=D/EwBQ9nAC/pIA/xMAcwL+SgD/0YgG/pQA/3EAgT4AAoElIAKBJAACEAiBJwACgShAAlAM -19=0VgIzWgIEAKBKQAC/6IAjgfJLggQAv9aAD4I/pgA/8swCcs8CvlMCf+kAIwIVQA1As84C8 -20=2OBfVaC/6cAP/NMAt2tM+MBf/UAFwLzzAK0UAM91IM/qAA//8AATAN/tAQ/4AHAAAggf/+ -21=/x//gKkCACCBAP4gBwCCAQLZFAf+XQAAgQEAAoMDBAXJkAfMoAf+XQAAiAEDAgMABgcIyQ -22=8IzCAI/lsAAIMBAgMAA/95AJ8HAHuBAhBt/3cAIAgR+4ECEYDcIAf/VwAwBxB7gQIRg9yf -23=CP9YAK8IAP8g/oIBAtsgCf9XAC8JMHwDAQDf/3MAoQkA/IEDIQIQBP9xACEKQHgQBgBf/3 -24=EAoAoiewL4QgAwAzAHQA//XgAzC0N6BH4hADADMAcwDP9eALILE3ggfHMAAAMQBIIGBzAM -25=/1wAMgwiehCB/3YAFwsmcoEBIoFRAP9sAKALJfSCAQMAAQCKgQEQj/9uAB4MAugA9YEBAo -26=AgCGMA/2YAJA4AdRB0AAZCgFMA/2cAow4R8yB4EHk2Av9sAJ0KIPgy+EF81RsOzDAR/kYA -27=ABJ5AfpX+DGK0p0OzK8R/kcAAFH6MHdxAM+vEMwvEv5FAAAx+zV9EHgADsiZDP9hAKQPUP -28=ow/yl2W33/ZAAgEEH4yIkTUImCAgP/YwCgEGH4cAJHCDCM/2AAoxIHX4EEzIUUNQoik/9k -29=ACEQQOrOhRPerBP/RgA+EmDszQYUEIHPMBHZsBX/RwBPE1KG0a0R2i8W/0cAzxNUiNEtEt -30=qvFv5DAAAygjV93i0U/1oAMAc1g/93AB8KMfgRAP91AKAKbgP/egAeF4IDBP9+AJoXUQD/ -31=eAAgGFEA4qAYZS/zzhXZhBnhIBlkMiIx/kYAAFcI4qAZgQFGuP9MAD8ZVoHgIRoxqv9LAE -32=4ayBUb4iAZGLA5Nv5LAAAwW+EgG8WbCTcx/kgAAH2A1CEddJ4SrGk5/kcAABt72DIWEB/J -33=vBpyMf5HAACECAkKC9iyFhAfcwArtf9OAEsdUM3ioRvCGAr/TQDLHVDN4yAc/1cARh4Jme -34=WgHPXIHoAVAQAggQDUAACCAgMAAoYAAQAAAQLKCwDSIQCBATApADP+SgAAAFSBBABQgwME -35=BcmNANKgACCsACwgh/5HAACBAxB9AN6DBgcIyQwB0yAB/1cARQAg3gCE26EB/14AwgAAhN -36=sgAkCsAAMggv5JAABBAAFi26ACQQARfP9UAMwB5XQCMan/TABOAQBPy7AA1qoDUgD/TABN -37=AQF8EQEQ2uAhBAABALL/SwDNAzEAAFMg3N6jBAAB/08ASgQSfIMBAQMRARSKgQXZJgUj+f -38=9MAMwDMQAA1yEBAAMxXnDwI20QcyN1MKT+TgAAIQBTWkJfU2MQmyATMAgQIv9NAEwBYQBC -39=X8k6BBB10jAE/k8AACMAQALhogT+uBgAgA== - -[TERRAIN] -6336=T01 -6720=T01 -7104=T01 -7744=T01 -7360=T01 -7356=T01 -7740=T01 -6069=T01 -6450=T01 -5937=T01 -6833=T01 -6716=T01 -8128=T01 -8640=T01 -8894=T01 -8252=T01 -6080=T01 -4923=T01 -4795=T01 -4792=T01 -4789=T01 -4787=T01 -4786=T01 -4918=T01 -5955=T01 -6343=T01 -6088=T01 -6085=T01 -6340=T01 -5953=T01 -6217=T01 -6347=T01 -6091=T01 -5961=T01 -5828=T01 -5959=T01 -5196=T01 -5192=T01 -5189=T01 -5191=T01 -5186=T01 -5185=T01 -4929=T01 -4932=T01 -4938=T01 -5064=T01 -4677=T01 -4674=T01 -4545=T01 -4418=T01 -4933=T01 -4936=T01 -4551=T01 -5323=T01 -5188=T01 -5058=T01 -4673=T01 -4931=T01 -4675=T01 -4550=T01 -4807=T01 -4683=T01 -4940=T01 -4681=T01 -4162=T01 -4293=T01 -4426=T01 -4428=T01 -4423=T01 -4548=T01 -4289=T01 -4668=T03 -5313=T03 -5826=T03 -5958=T03 -6216=T03 -6218=T03 -5319=T03 -4934=T03 -4547=T03 -4417=T03 -4292=T03 -4937=T03 -4679=T03 -4424=T03 -4811=T03 -4556=T03 -5194=T03 -3638=T01 -3380=T01 -2995=T01 -3127=T01 -3383=T01 -3385=T01 -3130=T01 -3507=T01 -3765=T01 -3520=T01 -3394=T01 -3781=T01 -2881=T01 -3397=T01 -3138=T01 -3910=T01 -3779=T01 -3913=T01 -4170=T01 -3655=T01 -3654=T01 -3909=T01 -4165=T01 -4167=T01 -4035=T01 -3522=T01 -4131=T01 -4645=T01 -4643=T01 -4387=T01 -5157=T01 -4390=T01 -4904=T01 -3880=T01 -3749=T01 -3748=T01 -4134=T01 -4009=T01 -3626=T01 -3623=T01 -2981=T01 -2727=T01 -2474=T01 -2089=T01 -2604=T01 -2731=T01 -2215=T01 -2468=T01 -2724=T01 -5141=T01 -5138=T01 -5533=T01 -6173=T01 -6685=T01 -5027=T01 -5148=T01 -5136=T01 -5133=T01 -5130=T01 -5126=T01 -5124=T01 -5128=T01 -5132=T01 -6422=T01 -5776=T01 -5910=T01 -5771=T01 -5766=T01 -5891=T01 -8087=T01 -8214=T01 -7702=T01 -8094=T01 -8606=T01 -8994=T01 -9000=T01 -8880=T01 -8887=T01 -6687=T01 - -[UNITS] -0=USSR,3TNK,256,5831,192,Guard,None -1=USSR,3TNK,256,5575,192,Guard,None -2=USSR,TTNK,256,5833,192,Guard,None -3=USSR,TTNK,256,5577,192,Guard,None -4=USSR,TTNK,256,5706,192,Guard,None -5=Greece,JEEP,256,5823,0,Area Guard,None -6=Greece,JEEP,256,5311,0,Area Guard,None -7=Greece,JEEP,256,5824,0,Area Guard,None -8=Greece,JEEP,256,5312,0,Area Guard,None -9=Greece,JEEP,256,5684,0,Area Guard,None -10=Greece,JEEP,256,5556,0,Area Guard,None -11=Greece,2TNK,256,6335,0,Area Guard,None -12=Greece,2TNK,256,6336,0,Area Guard,None -13=Greece,2TNK,256,6320,0,Area Guard,None -14=Greece,2TNK,256,6449,0,Area Guard,None - -[INFANTRY] -0=Greece,C1,256,5821,4,Area Guard,0,None -1=Greece,C2,256,5692,0,Guard,0,None -2=Greece,C3,256,5564,0,Guard,0,None -3=Greece,C2,256,5565,1,Guard,0,None -4=Greece,C3,256,5438,1,Guard,0,None -5=Greece,C3,256,5050,2,Guard,0,None -6=Greece,C3,256,5561,1,Guard,0,None -7=Greece,C3,256,6201,2,Guard,0,None -8=Greece,C4,256,6206,0,Guard,0,None -9=Greece,C5,256,5950,4,Guard,0,None -10=Greece,C5,256,5822,0,Guard,0,None -11=Greece,C5,256,6198,1,Guard,0,None -12=Greece,C5,256,5045,1,Guard,0,None -13=Greece,C4,256,5043,1,Guard,0,None -14=Greece,C4,256,5293,2,Guard,0,None -15=Greece,C4,256,6062,0,Guard,0,None -16=Greece,C4,256,5672,3,Guard,0,None -17=Greece,C4,256,5288,3,Guard,0,None -18=Greece,C4,256,5291,1,Guard,0,None -19=Greece,C5,256,6441,4,Guard,0,None -20=Greece,C5,256,6701,1,Guard,0,None -21=Greece,C5,256,6185,3,Guard,0,None -22=Greece,C5,256,6838,4,Guard,0,None -23=Greece,C5,256,7226,4,Guard,0,None -24=Greece,C5,256,6455,3,Guard,0,None -25=Greece,C5,256,7358,4,Guard,0,None -26=Greece,C5,256,7102,1,Guard,0,None -27=Greece,C5,256,6846,4,Guard,0,None -28=Greece,C5,256,6590,2,Guard,0,None -29=Greece,C5,256,7359,2,Guard,0,None -30=Greece,C6,256,6975,4,Guard,0,None -31=Greece,C6,256,7486,4,Guard,0,None -32=Greece,C7,256,6847,4,Area Guard,0,None -33=Greece,C7,256,6332,1,Area Guard,0,None -34=Greece,C8,256,6463,1,Guard,0,None -35=USSR,E6,256,2742,2,Guard,0,None -36=USSR,E6,256,2745,1,Guard,0,None -37=USSR,E6,256,2231,1,Guard,0,None - -[STRUCTURES] -0=Neutral,ABAN01,256,6818,0,None,1,0 -1=Neutral,ABAN01,256,6306,0,None,1,0 -2=Neutral,ABAN01,256,7842,0,None,1,0 -3=Neutral,ABAN01,256,8226,0,None,1,0 -4=Neutral,ABAN01,256,8234,0,None,1,0 -5=Neutral,ABAN01,256,7722,0,None,1,0 -6=Neutral,ABAN02,256,7719,0,None,1,0 -7=Neutral,ABAN02,256,8231,0,None,1,0 -8=Neutral,ABAN03,256,7074,0,None,1,0 -9=Neutral,ABAN03,256,7078,0,None,1,0 -10=Neutral,ABAN03,256,7081,0,None,1,0 -11=Neutral,ABAN01,256,6826,0,None,1,0 -12=Neutral,ABAN01,256,6186,0,None,1,0 -13=Neutral,ABAN01,256,5674,0,None,1,0 -14=Neutral,ABAN02,256,7090,0,None,1,0 -15=Neutral,ABAN02,256,7093,0,None,1,0 -16=Neutral,ABAN03,256,7730,0,None,1,0 -17=Neutral,ABAN03,256,7733,0,None,1,0 -18=Neutral,ABAN03,256,8242,0,None,1,0 -19=Neutral,ABAN03,256,8245,0,None,1,0 -20=Neutral,ABAN02,256,8248,0,None,1,0 -21=Neutral,ABAN01,256,7993,0,None,1,0 -22=Neutral,ABAN01,256,6969,0,None,1,0 -23=Neutral,ABAN01,256,6457,0,None,1,0 -24=Neutral,ABAN01,256,5945,0,None,1,0 -25=Neutral,ABAN03,256,6706,0,None,1,0 -26=Neutral,ABAN03,256,6193,0,None,1,0 -27=Neutral,ABAN03,256,5810,0,None,1,0 -28=Neutral,ABAN03,256,5813,0,None,1,0 -29=Neutral,ABAN02,256,5169,0,None,1,0 -30=Neutral,ABAN02,256,5172,0,None,1,0 -31=Neutral,ABAN02,256,5175,0,None,1,0 -32=Neutral,ABAN02,256,5178,0,None,1,0 -33=Greece,DOME,256,6538,0,None,0,0 -34=Greece,HOSP,256,6154,0,None,0,0 -35=Greece,APWR,256,6160,0,None,0,0 -36=Greece,PROC,256,6800,0,None,0,0 -37=Greece,APWR,256,6548,0,None,0,0 -38=Greece,APWR,256,6036,0,None,0,0 -39=Greece,TENT,256,7571,0,None,0,0 -40=Greece,PBOX,256,7704,0,None,0,0 -41=Greece,PBOX,256,7192,0,None,0,0 -42=Greece,GUN,256,7321,0,None,0,0 -43=Greece,GUN,256,7705,0,None,0,0 -44=Neutral,ABAN01,256,5924,0,None,1,0 -45=Neutral,ABAN01,256,4906,0,None,1,0 -46=Neutral,ABAN01,256,4522,0,None,1,0 -47=Neutral,ABAN02,256,4017,0,None,1,0 -48=Neutral,ABAN02,256,4020,0,None,1,0 -49=Neutral,ABAN02,256,4023,0,None,1,0 -50=Neutral,ABAN02,256,4026,0,None,1,0 -51=USSR,DOME,256,2359,0,None,0,0 -52=USSR,POWR,256,2612,0,None,0,0 -53=USSR,POWR,256,2747,0,None,0,0 -54=USSR,POWR,256,2105,0,None,0,0 -55=Greece,PBOX,256,3891,0,None,0,0 -56=Greece,PBOX,256,3900,0,None,0,0 -57=Greece,PBOX,256,3906,0,None,0,0 -58=Greece,PBOX,256,3886,0,None,0,0 -59=Greece,APWR,256,6925,0,None,0,0 - -[Base] -Player=USSR -Count=0 - -[OverlayPack] -1=bQAAIIH//osZ/4EK/ncA/4EOAAL+egD/gQtgCoEM/vkA/4MM/wn+ewD/gQkQfnGH/nMA/4 -2=EK/30Ahxv/gwCDGoQJ/wwL/34AiByBCwD9/30Aix2BDACD/30AjBqBCgB/gQz/fAAJHAYA -3=gQr/cAAMHYBWAAAggf9wAYMKCv8gAoEJ/ngA/4IJCgB8gwoLDP95ABMAIIUgAf55AP+BCS -4=CB/noA/wB8/4AAkgEQf/96ABMA/30AlABiA/5+AP//gAARA/+CABED/uka/4A= - -[Briefing] -1=A pitiful excuse for resistance has blockaded itself in this village. -2=Stalin has decided to make an example of them. Kill them all and destroy -3=their homes. You will have Yak aircraft to use in teaching these rebels a -4=lesson. - -[Digest] -1=9QVKWgKK7MJHlaf+Cp3h7V2cWSk= - diff --git a/Work/Tilesets/Snow/Build.bat b/Work/Tilesets/Snow/Build.bat deleted file mode 100644 index 65a308f..0000000 --- a/Work/Tilesets/Snow/Build.bat +++ /dev/null @@ -1,4 +0,0 @@ -set PATH="C:\Program Files\ImageMagick-7.0.10-Q16-HDRI" - -magick.exe convert sno1.png -alpha set -virtual-pixel transparent +distort Affine "0,512 0,0 0,0 -87,-50 512,512 87,-50" -background none -compose plus -bordercolor black -compose over -border 5x2 sno1_iso.png -pause \ No newline at end of file diff --git a/Work/Tilesets/Snow/sno1.png b/Work/Tilesets/Snow/sno1.png deleted file mode 100644 index a0d60f6..0000000 Binary files a/Work/Tilesets/Snow/sno1.png and /dev/null differ diff --git a/Work/Tilesets/Snow/sno1_iso.png b/Work/Tilesets/Snow/sno1_iso.png deleted file mode 100644 index 6f7dac3..0000000 Binary files a/Work/Tilesets/Snow/sno1_iso.png and /dev/null differ diff --git a/avcodec-57.dll b/avcodec-57.dll deleted file mode 100644 index feb3ac6..0000000 Binary files a/avcodec-57.dll and /dev/null differ diff --git a/avdevice-57.dll b/avdevice-57.dll deleted file mode 100644 index a2a0fcc..0000000 Binary files a/avdevice-57.dll and /dev/null differ diff --git a/avfilter-6.dll b/avfilter-6.dll deleted file mode 100644 index afcb286..0000000 Binary files a/avfilter-6.dll and /dev/null differ diff --git a/avformat-57.dll b/avformat-57.dll deleted file mode 100644 index c8fd43c..0000000 Binary files a/avformat-57.dll and /dev/null differ diff --git a/avutil-55.dll b/avutil-55.dll deleted file mode 100644 index fd7aad8..0000000 Binary files a/avutil-55.dll and /dev/null differ diff --git a/cache.mix b/cache.mix deleted file mode 100644 index 0590bab..0000000 Binary files a/cache.mix and /dev/null differ diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 4306435..e0e62c9 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -6,12 +6,7 @@ enable_language(ASM) set(CMAKE_CXX_FLAGS "") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../) -SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Od /Ob0 /Zi /DDEBUG /D_DEBUG") -SET(CMAKE_C_FLAGS_DEBUG "/MTd /Od /Ob0 /Zi /DDEBUG /D_DEBUG") - -set(src_launcher - ./launcher/launcher_main.cpp -) +set(CMAKE_VERBOSE_MAKEFILE ON) set(src_io ./redalert/io/userinput.cpp @@ -109,7 +104,7 @@ set(src_win32lib ./redalert/win32lib/wwstd.h ./redalert/win32lib/ww_win.h ./redalert/win32lib/_diptabl.cpp - "redalert/ffmpegmovie.cpp" "redalert/briefing.cpp") +) #Red Alert files set(src_redalert @@ -165,8 +160,6 @@ set(src_redalert ./redalert/carry.cpp ./redalert/carry.h ./redalert/cbn_.h - ./redalert/crc32.cpp - ./redalert/crc32.h ./redalert/ccdde.cpp ./redalert/ccdde.h ./redalert/ccfile.cpp @@ -311,8 +304,6 @@ set(src_redalert ./redalert/idata.cpp ./redalert/infantry.cpp ./redalert/infantry.h - ./redalert/tacticalcoord.cpp - ./redalert/tacticalcoord.h ./redalert/ini.cpp ./redalert/ini.h ./redalert/inibin.cpp @@ -638,16 +629,20 @@ set(src_redalert ./redalert/mapscript.cpp ./redalert/txtprnt.cpp ./redalert/tilesetxml.cpp - "redalert/bigoverlay.cpp" - "redalert/bigoverlay.h" - "redalert/sidebareditor.cpp" - "redalert/rendertexture.cpp" - "redalert/rendertexture.h" - "redalert/light.cpp") + "redalert/sidebareditor.cpp") set(src_external #glew ./external/gl/glew.c + + #libsmacker + ./external/libsmacker/smacker.c + ./external/libsmacker/smacker.h + ./external/libsmacker/smk_bitstream.c + ./external/libsmacker/smk_bitstream.h + ./external/libsmacker/smk_hufftree.c + ./external/libsmacker/smk_hufftree.h + ./external/libsmacker/smk_malloc.h #imgui ./external/imgui/imconfig.h @@ -723,17 +718,9 @@ set(src_external ./external/xml/tinyxml2.cpp ./external/xml/tinyxml2.h ) - -set(FFmpeg_LIBRARIES - "${CMAKE_SOURCE_DIR}/external/ffmpeg-win64/lib/avcodec.lib" - "${CMAKE_SOURCE_DIR}/external/ffmpeg-win64/lib/avformat.lib" - "${CMAKE_SOURCE_DIR}/external/ffmpeg-win64/lib/avutil.lib" - "${CMAKE_SOURCE_DIR}/external/ffmpeg-win64/lib/swscale.lib") + if (MSVC) -# External always compiles with optimizations enabled. -set_source_files_properties(${src_external} PROPERTIES COMPILE_FLAGS "/O2") - add_definitions(-D RA_AF -DCHEAT_KEYS -DIMGUI_IMPL_OPENGL_LOADER_GLEW -DSCENARIO_EDITOR -DWINDOWS_IGNORE_PACKING_MISMATCH -DTRUE_FALSE_DEFINED -DWIN32 -DWINDOWS -DENGLISH -D_USRDLL -DREDALERT_EXPORTS) add_compile_options(/permissive+ /Zc:forScope- /Zp1) endif(MSVC) @@ -742,20 +729,15 @@ if (UNIX) add_definitions(-D RA_AF -DCHEAT_KEYS -DIMGUI_IMPL_OPENGL_LOADER_GLEW -DSCENARIO_EDITOR -DTRUE_FALSE_DEFINED -DENGLISH -D_USRDLL -DREDALERT_EXPORTS) endif(UNIX) -add_library(RedAlertDLL SHARED ${src_io} ${src_win32lib} ${src_redalert} ${src_external} "redalert/light.cpp" "redalert/briefing.cpp") +add_executable(RedAlert ${src_io} ${src_win32lib} ${src_redalert} ${src_external}) if (MSVC) -set_target_properties(RedAlertDLL PROPERTIES OUTPUT_NAME "RedAlertx64" LINK_FLAGS "/PDB:\"RedAlertx64.pdb\" /SUBSYSTEM:WINDOWS /DEF:${CMAKE_CURRENT_SOURCE_DIR}/exports.def" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../" ) -target_link_libraries(RedAlertDLL "opengl32.lib" "winmm.lib" "Ws2_32.lib" "${CMAKE_SOURCE_DIR}/external/devil/ilu.lib" "${CMAKE_SOURCE_DIR}/external/devil/DevIL.lib" "${CMAKE_SOURCE_DIR}/external/sdl2/lib/x64/SDL2.lib" "${CMAKE_SOURCE_DIR}/external/openal/out/build/x64-Release/OpenAL32.lib" ${FFmpeg_LIBRARIES}) - -add_executable(Launcher ${src_launcher}) -target_link_libraries(Launcher RedAlertDLL) -set_target_properties(Launcher PROPERTIES OUTPUT_NAME "RedAlert" LINK_FLAGS "/SUBSYSTEM:WINDOWS /PDB:\"RedAlert.pdb\"") - +set_target_properties(RedAlert PROPERTIES OUTPUT_NAME "RedAlert" LINK_FLAGS "/PDB:\"RedAlert.pdb\" /SUBSYSTEM:WINDOWS" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../" ) +target_link_libraries(RedAlert "opengl32.lib" "winmm.lib" "Ws2_32.lib" "${CMAKE_SOURCE_DIR}/external/devil/ilu.lib" "${CMAKE_SOURCE_DIR}/external/devil/DevIL.lib" "${CMAKE_SOURCE_DIR}/external/sdl2/lib/x64/SDL2.lib" "${CMAKE_SOURCE_DIR}/external/openal/out/build/x64-Release/OpenAL32.lib") endif(MSVC) if (UNIX) set_target_properties(RedAlert PROPERTIES OUTPUT_NAME "RedAlert" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/.." ) endif(UNIX) -target_include_directories(RedAlertDLL PRIVATE ./external/ffmpeg-win64/include/;./external/xml/;./external/devil/;./external/;./redalert/win32lib;./external/lua/;./external/imgui;./external/dxsdk/Include;./external/ffmpeg-win32/include;./external/sdl2/include;./win32lib;./external/openal/include) \ No newline at end of file +target_include_directories(RedAlert PRIVATE ./external/xml/;./external/devil/;./external/;./redalert/win32lib;./external/lua/;./external/imgui;./external/dxsdk/Include;./external/ffmpeg-win32/include;./external/sdl2/include;./win32lib;./external/openal/include) \ No newline at end of file diff --git a/code/exports.def b/code/exports.def deleted file mode 100644 index 615a127..0000000 --- a/code/exports.def +++ /dev/null @@ -1,2 +0,0 @@ -EXPORTS - CnCMain @1 diff --git a/code/external/ffmpeg-win64/README.txt b/code/external/ffmpeg-win64/README.txt deleted file mode 100644 index 13e1db2..0000000 --- a/code/external/ffmpeg-win64/README.txt +++ /dev/null @@ -1,111 +0,0 @@ -This is a FFmpeg win64 shared build by Kyle Schwarz. - -Zeranoe's FFmpeg Builds Home Page: - -FFmpeg version: 20151105-git-c878082 - libavutil 54. 30.100 / 54. 30.100 - libavcodec 56. 57.100 / 56. 57.100 - libavformat 56. 40.101 / 56. 40.101 - libavdevice 56. 4.100 / 56. 4.100 - libavfilter 5. 32.100 / 5. 32.100 - libswscale 3. 1.101 / 3. 1.101 - libswresample 1. 2.101 / 1. 2.101 - libpostproc 53. 3.100 / 53. 3.100 - -This FFmpeg build was configured with: - --disable-static - --enable-shared - --enable-gpl - --enable-version3 - --disable-w32threads - --enable-avisynth - --enable-bzlib - --enable-fontconfig - --enable-frei0r - --enable-gnutls - --enable-iconv - --enable-libass - --enable-libbluray - --enable-libbs2b - --enable-libcaca - --enable-libdcadec - --enable-libfreetype - --enable-libgme - --enable-libgsm - --enable-libilbc - --enable-libmodplug - --enable-libmp3lame - --enable-libopencore-amrnb - --enable-libopencore-amrwb - --enable-libopenjpeg - --enable-libopus - --enable-librtmp - --enable-libschroedinger - --enable-libsoxr - --enable-libspeex - --enable-libtheora - --enable-libtwolame - --enable-libvidstab - --enable-libvo-aacenc - --enable-libvo-amrwbenc - --enable-libvorbis - --enable-libvpx - --enable-libwavpack - --enable-libwebp - --enable-libx264 - --enable-libx265 - --enable-libxavs - --enable-libxvid - --enable-lzma - --enable-decklink - --enable-zlib - -This build was compiled with the following external libraries: - bzip2 1.0.6 - Fontconfig 2.11.94 - Frei0r 20130909-git-10d8360 - GnuTLS 3.3.16 - libiconv 1.14 - libass 0.13.0 - libbluray 0.9.0 - libbs2b 3.1.0 - libcaca 0.99.beta18 - dcadec 20150506-git-98fb3b6 - FreeType 2.6.1 - Game Music Emu 0.6.0 - GSM 1.0.13-4 - iLBC 20141214-git-ef04ebe - Modplug-XMMS 0.8.8.5 - LAME 3.99.5 - OpenCORE AMR 0.1.3 - OpenJPEG 1.5.2 - Opus 1.1 - RTMPDump 20140707-git-a1900c3 - Schroedinger 1.0.11 - libsoxr 0.1.2 - Speex 1.2rc2 - Theora 1.1.1 - TwoLAME 0.3.13 - vid.stab 0.98 - VisualOn AAC 0.1.3 - VisualOn AMR-WB 0.1.2 - Vorbis 1.3.5 - vpx 1.4.0 - WavPack 4.75.0 - WebP 0.4.3 - x264 20151011-git-7599210 - x265 1.8 - XAVS svn-r55 - Xvid 1.3.4 - XZ Utils 5.2.2 - zlib 1.2.8 - -The source code for this FFmpeg build can be found at: - -This build was compiled on Debian 8.2 (64-bit): - -GCC 5.2.0 was used to compile this FFmpeg build: - -This build was compiled using the MinGW-w64 toolchain: - -Licenses for each library can be found in the 'licenses' folder. diff --git a/code/external/ffmpeg-win64/doc/developer.html b/code/external/ffmpeg-win64/doc/developer.html deleted file mode 100644 index f54e932..0000000 --- a/code/external/ffmpeg-win64/doc/developer.html +++ /dev/null @@ -1,785 +0,0 @@ - - - - - - - Developer Documentation - - - - - - -
-

- Developer Documentation -

-
-
- - - - - -

Table of Contents

- -
- - -
- - - -

1 Developers Guide

- - -

1.1 Notes for external developers

- -

This document is mostly useful for internal FFmpeg developers. -External developers who need to use the API in their application should -refer to the API doxygen documentation in the public headers, and -check the examples in doc/examples and in the source code to -see how the public API is employed. -

-

You can use the FFmpeg libraries in your commercial program, but you -are encouraged to publish any patch you make. In this case the -best way to proceed is to send your patches to the ffmpeg-devel -mailing list following the guidelines illustrated in the remainder of -this document. -

-

For more detailed legal information about the use of FFmpeg in -external programs read the LICENSE file in the source tree and -consult https://ffmpeg.org/legal.html. -

- -

1.2 Contributing

- -

There are 3 ways by which code gets into ffmpeg. -

    -
  • Submitting Patches to the main developer mailing list - see Submitting patches for details. -
  • Directly committing changes to the main tree. -
  • Committing changes to a git clone, for example on github.com or - gitorious.org. And asking us to merge these changes. -
- -

Whichever way, changes should be reviewed by the maintainer of the code -before they are committed. And they should follow the Coding Rules. -The developer making the commit and the author are responsible for their changes -and should try to fix issues their commit causes. -

- -

1.3 Coding Rules

- - -

1.3.1 Code formatting conventions

- -

There are the following guidelines regarding the indentation in files: -

-
    -
  • Indent size is 4. - -
  • The TAB character is forbidden outside of Makefiles as is any -form of trailing whitespace. Commits containing either will be -rejected by the git repository. - -
  • You should try to limit your code lines to 80 characters; however, do so if -and only if this improves readability. -
-

The presentation is one inspired by ’indent -i4 -kr -nut’. -

-

The main priority in FFmpeg is simplicity and small code size in order to -minimize the bug count. -

- -

1.3.2 Comments

-

Use the JavaDoc/Doxygen format (see examples below) so that code documentation -can be generated automatically. All nontrivial functions should have a comment -above them explaining what the function does, even if it is just one sentence. -All structures and their member variables should be documented, too. -

-

Avoid Qt-style and similar Doxygen syntax with ! in it, i.e. replace -//! with /// and similar. Also @ syntax should be employed -for markup commands, i.e. use @param and not \param. -

-
-
/**
- * @file
- * MPEG codec.
- * @author ...
- */
-
-/**
- * Summary sentence.
- * more text ...
- * ...
- */
-typedef struct Foobar {
-    int var1; /**< var1 description */
-    int var2; ///< var2 description
-    /** var3 description */
-    int var3;
-} Foobar;
-
-/**
- * Summary sentence.
- * more text ...
- * ...
- * @param my_parameter description of my_parameter
- * @return return value description
- */
-int myfunc(int my_parameter)
-...
-
- - -

1.3.3 C language features

- -

FFmpeg is programmed in the ISO C90 language with a few additional -features from ISO C99, namely: -

-
    -
  • the ‘inline’ keyword; - -
  • ‘//’ comments; - -
  • designated struct initializers (‘struct s x = { .i = 17 };’); - -
  • compound literals (‘x = (struct s) { 17, 23 };’). -
- -

These features are supported by all compilers we care about, so we will not -accept patches to remove their use unless they absolutely do not impair -clarity and performance. -

-

All code must compile with recent versions of GCC and a number of other -currently supported compilers. To ensure compatibility, please do not use -additional C99 features or GCC extensions. Especially watch out for: -

-
    -
  • mixing statements and declarations; - -
  • ‘long long’ (use ‘int64_t’ instead); - -
  • ‘__attribute__’ not protected by ‘#ifdef __GNUC__’ or similar; - -
  • GCC statement expressions (‘(x = ({ int y = 4; y; })’). -
- - -

1.3.4 Naming conventions

-

All names should be composed with underscores (_), not CamelCase. For example, -‘avfilter_get_video_buffer’ is an acceptable function name and -‘AVFilterGetVideo’ is not. The exception from this are type names, like -for example structs and enums; they should always be in CamelCase. -

-

There are the following conventions for naming variables and functions: -

-
    -
  • For local variables no prefix is required. - -
  • For file-scope variables and functions declared as static, no prefix -is required. - -
  • For variables and functions visible outside of file scope, but only used -internally by a library, an ff_ prefix should be used, -e.g. ‘ff_w64_demuxer’. - -
  • For variables and functions visible outside of file scope, used internally -across multiple libraries, use avpriv_ as prefix, for example, -‘avpriv_aac_parse_header’. - -
  • Each library has its own prefix for public symbols, in addition to the -commonly used av_ (avformat_ for libavformat, -avcodec_ for libavcodec, swr_ for libswresample, etc). -Check the existing code and choose names accordingly. -Note that some symbols without these prefixes are also exported for -retro-compatibility reasons. These exceptions are declared in the -lib<name>/lib<name>.v files. -
- -

Furthermore, name space reserved for the system should not be invaded. -Identifiers ending in _t are reserved by -POSIX. -Also avoid names starting with __ or _ followed by an uppercase -letter as they are reserved by the C standard. Names starting with _ -are reserved at the file level and may not be used for externally visible -symbols. If in doubt, just avoid names starting with _ altogether. -

- -

1.3.5 Miscellaneous conventions

- -
    -
  • fprintf and printf are forbidden in libavformat and libavcodec, -please use av_log() instead. - -
  • Casts should be used only when necessary. Unneeded parentheses -should also be avoided if they don’t make the code easier to understand. -
- - -

1.3.6 Editor configuration

-

In order to configure Vim to follow FFmpeg formatting conventions, paste -the following snippet into your .vimrc: -

-
" indentation rules for FFmpeg: 4 spaces, no tabs
-set expandtab
-set shiftwidth=4
-set softtabstop=4
-set cindent
-set cinoptions=(0
-" Allow tabs in Makefiles.
-autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8
-" Trailing whitespace and tabs are forbidden, so highlight them.
-highlight ForbiddenWhitespace ctermbg=red guibg=red
-match ForbiddenWhitespace /\s\+$\|\t/
-" Do not highlight spaces at the end of line while typing on that line.
-autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@<!$/
-
- -

For Emacs, add these roughly equivalent lines to your .emacs.d/init.el: -

-
(c-add-style "ffmpeg"
-             '("k&r"
-               (c-basic-offset . 4)
-               (indent-tabs-mode . nil)
-               (show-trailing-whitespace . t)
-               (c-offsets-alist
-                (statement-cont . (c-lineup-assignments +)))
-               )
-             )
-(setq c-default-style "ffmpeg")
-
- - -

1.4 Development Policy

- -
    -
  1. Contributions should be licensed under the -LGPL 2.1, -including an "or any later version" clause, or, if you prefer -a gift-style license, the -ISC or -MIT license. -GPL 2 including -an "or any later version" clause is also acceptable, but LGPL is -preferred. -If you add a new file, give it a proper license header. Do not copy and -paste it from a random place, use an existing file as template. - -
  2. You must not commit code which breaks FFmpeg! (Meaning unfinished but -enabled code which breaks compilation or compiles but does not work or -breaks the regression tests) -You can commit unfinished stuff (for testing etc), but it must be disabled -(#ifdef etc) by default so it does not interfere with other developers’ -work. - -
  3. The commit message should have a short first line in the form of -a ‘topic: short description’ as a header, separated by a newline -from the body consisting of an explanation of why the change is necessary. -If the commit fixes a known bug on the bug tracker, the commit message -should include its bug ID. Referring to the issue on the bug tracker does -not exempt you from writing an excerpt of the bug in the commit message. - -
  4. You do not have to over-test things. If it works for you, and you think it -should work for others, then commit. If your code has problems -(portability, triggers compiler bugs, unusual environment etc) they will be -reported and eventually fixed. - -
  5. Do not commit unrelated changes together, split them into self-contained -pieces. Also do not forget that if part B depends on part A, but A does not -depend on B, then A can and should be committed first and separate from B. -Keeping changes well split into self-contained parts makes reviewing and -understanding them on the commit log mailing list easier. This also helps -in case of debugging later on. -Also if you have doubts about splitting or not splitting, do not hesitate to -ask/discuss it on the developer mailing list. - -
  6. Do not change behavior of the programs (renaming options etc) or public -API or ABI without first discussing it on the ffmpeg-devel mailing list. -Do not remove functionality from the code. Just improve! - -

    Note: Redundant code can be removed. -

    -
  7. Do not commit changes to the build system (Makefiles, configure script) -which change behavior, defaults etc, without asking first. The same -applies to compiler warning fixes, trivial looking fixes and to code -maintained by other developers. We usually have a reason for doing things -the way we do. Send your changes as patches to the ffmpeg-devel mailing -list, and if the code maintainers say OK, you may commit. This does not -apply to files you wrote and/or maintain. - -
  8. We refuse source indentation and other cosmetic changes if they are mixed -with functional changes, such commits will be rejected and removed. Every -developer has his own indentation style, you should not change it. Of course -if you (re)write something, you can use your own style, even though we would -prefer if the indentation throughout FFmpeg was consistent (Many projects -force a given indentation style - we do not.). If you really need to make -indentation changes (try to avoid this), separate them strictly from real -changes. - -

    NOTE: If you had to put if(){ .. } over a large (> 5 lines) chunk of code, -then either do NOT change the indentation of the inner part within (do not -move it to the right)! or do so in a separate commit -

    -
  9. Always fill out the commit log message. Describe in a few lines what you -changed and why. You can refer to mailing list postings if you fix a -particular bug. Comments such as "fixed!" or "Changed it." are unacceptable. -Recommended format: - -
    -
    area changed: Short 1 line description
-
-details describing what and why and giving references.
-
    - -
  10. Make sure the author of the commit is set correctly. (see git commit –author) -If you apply a patch, send an -answer to ffmpeg-devel (or wherever you got the patch from) saying that -you applied the patch. - -
  11. When applying patches that have been discussed (at length) on the mailing -list, reference the thread in the log message. - -
  12. Do NOT commit to code actively maintained by others without permission. -Send a patch to ffmpeg-devel instead. If no one answers within a reasonable -timeframe (12h for build failures and security fixes, 3 days small changes, -1 week for big patches) then commit your patch if you think it is OK. -Also note, the maintainer can simply ask for more time to review! - -
  13. Subscribe to the ffmpeg-cvslog mailing list. The diffs of all commits -are sent there and reviewed by all the other developers. Bugs and possible -improvements or general questions regarding commits are discussed there. We -expect you to react if problems with your code are uncovered. - -
  14. Update the documentation if you change behavior or add features. If you are -unsure how best to do this, send a patch to ffmpeg-devel, the documentation -maintainer(s) will review and commit your stuff. - -
  15. Try to keep important discussions and requests (also) on the public -developer mailing list, so that all developers can benefit from them. - -
  16. Never write to unallocated memory, never write over the end of arrays, -always check values read from some untrusted source before using them -as array index or other risky things. - -
  17. Remember to check if you need to bump versions for the specific libav* -parts (libavutil, libavcodec, libavformat) you are changing. You need -to change the version integer. -Incrementing the first component means no backward compatibility to -previous versions (e.g. removal of a function from the public API). -Incrementing the second component means backward compatible change -(e.g. addition of a function to the public API or extension of an -existing data structure). -Incrementing the third component means a noteworthy binary compatible -change (e.g. encoder bug fix that matters for the decoder). The third -component always starts at 100 to distinguish FFmpeg from Libav. - -
  18. Compiler warnings indicate potential bugs or code with bad style. If a type of -warning always points to correct and clean code, that warning should -be disabled, not the code changed. -Thus the remaining warnings can either be bugs or correct code. -If it is a bug, the bug has to be fixed. If it is not, the code should -be changed to not generate a warning unless that causes a slowdown -or obfuscates the code. - -
  19. Make sure that no parts of the codebase that you maintain are missing from the -MAINTAINERS file. If something that you want to maintain is missing add it with -your name after it. -If at some point you no longer want to maintain some code, then please help -finding a new maintainer and also don’t forget updating the MAINTAINERS file. -
- -

We think our rules are not too hard. If you have comments, contact us. -

- -

1.5 Submitting patches

- -

First, read the Coding Rules above if you did not yet, in particular -the rules regarding patch submission. -

-

When you submit your patch, please use git format-patch or -git send-email. We cannot read other diffs :-) -

-

Also please do not submit a patch which contains several unrelated changes. -Split it into separate, self-contained pieces. This does not mean splitting -file by file. Instead, make the patch as small as possible while still -keeping it as a logical unit that contains an individual change, even -if it spans multiple files. This makes reviewing your patches much easier -for us and greatly increases your chances of getting your patch applied. -

-

Use the patcheck tool of FFmpeg to check your patch. -The tool is located in the tools directory. -

-

Run the Regression tests before submitting a patch in order to verify -it does not cause unexpected problems. -

-

It also helps quite a bit if you tell us what the patch does (for example -’replaces lrint by lrintf’), and why (for example ’*BSD isn’t C99 compliant -and has no lrint()’) -

-

Also please if you send several patches, send each patch as a separate mail, -do not attach several unrelated patches to the same mail. -

-

Patches should be posted to the -ffmpeg-devel -mailing list. Use git send-email when possible since it will properly -send patches without requiring extra care. If you cannot, then send patches -as base64-encoded attachments, so your patch is not trashed during -transmission. -

-

Your patch will be reviewed on the mailing list. You will likely be asked -to make some changes and are expected to send in an improved version that -incorporates the requests from the review. This process may go through -several iterations. Once your patch is deemed good enough, some developer -will pick it up and commit it to the official FFmpeg tree. -

-

Give us a few days to react. But if some time passes without reaction, -send a reminder by email. Your patch should eventually be dealt with. -

- - -

1.6 New codecs or formats checklist

- -
    -
  1. Did you use av_cold for codec initialization and close functions? - -
  2. Did you add a long_name under NULL_IF_CONFIG_SMALL to the AVCodec or -AVInputFormat/AVOutputFormat struct? - -
  3. Did you bump the minor version number (and reset the micro version -number) in libavcodec/version.h or libavformat/version.h? - -
  4. Did you register it in allcodecs.c or allformats.c? - -
  5. Did you add the AVCodecID to avcodec.h? -When adding new codec IDs, also add an entry to the codec descriptor -list in libavcodec/codec_desc.c. - -
  6. If it has a FourCC, did you add it to libavformat/riff.c, -even if it is only a decoder? - -
  7. Did you add a rule to compile the appropriate files in the Makefile? -Remember to do this even if you’re just adding a format to a file that is -already being compiled by some other rule, like a raw demuxer. - -
  8. Did you add an entry to the table of supported formats or codecs in -doc/general.texi? - -
  9. Did you add an entry in the Changelog? - -
  10. If it depends on a parser or a library, did you add that dependency in -configure? - -
  11. Did you git add the appropriate files before committing? - -
  12. Did you make sure it compiles standalone, i.e. with -configure --disable-everything --enable-decoder=foo -(or --enable-demuxer or whatever your component is)? -
- - - -

1.7 patch submission checklist

- -
    -
  1. Does make fate pass with the patch applied? - -
  2. Was the patch generated with git format-patch or send-email? - -
  3. Did you sign off your patch? (git commit -s) -See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob_plain;f=Documentation/SubmittingPatches for the meaning -of sign off. - -
  4. Did you provide a clear git commit log message? - -
  5. Is the patch against latest FFmpeg git master branch? - -
  6. Are you subscribed to ffmpeg-devel? -(the list is subscribers only due to spam) - -
  7. Have you checked that the changes are minimal, so that the same cannot be -achieved with a smaller patch and/or simpler final code? - -
  8. If the change is to speed critical code, did you benchmark it? - -
  9. If you did any benchmarks, did you provide them in the mail? - -
  10. Have you checked that the patch does not introduce buffer overflows or -other security issues? - -
  11. Did you test your decoder or demuxer against damaged data? If no, see -tools/trasher, the noise bitstream filter, and -zzuf. Your decoder or demuxer -should not crash, end in a (near) infinite loop, or allocate ridiculous -amounts of memory when fed damaged data. - -
  12. Did you test your decoder or demuxer against sample files? -Samples may be obtained at https://samples.ffmpeg.org. - -
  13. Does the patch not mix functional and cosmetic changes? - -
  14. Did you add tabs or trailing whitespace to the code? Both are forbidden. - -
  15. Is the patch attached to the email you send? - -
  16. Is the mime type of the patch correct? It should be text/x-diff or -text/x-patch or at least text/plain and not application/octet-stream. - -
  17. If the patch fixes a bug, did you provide a verbose analysis of the bug? - -
  18. If the patch fixes a bug, did you provide enough information, including -a sample, so the bug can be reproduced and the fix can be verified? -Note please do not attach samples >100k to mails but rather provide a -URL, you can upload to ftp://upload.ffmpeg.org - -
  19. Did you provide a verbose summary about what the patch does change? - -
  20. Did you provide a verbose explanation why it changes things like it does? - -
  21. Did you provide a verbose summary of the user visible advantages and -disadvantages if the patch is applied? - -
  22. Did you provide an example so we can verify the new feature added by the -patch easily? - -
  23. If you added a new file, did you insert a license header? It should be -taken from FFmpeg, not randomly copied and pasted from somewhere else. - -
  24. You should maintain alphabetical order in alphabetically ordered lists as -long as doing so does not break API/ABI compatibility. - -
  25. Lines with similar content should be aligned vertically when doing so -improves readability. - -
  26. Consider to add a regression test for your code. - -
  27. If you added YASM code please check that things still work with –disable-yasm - -
  28. Make sure you check the return values of function and return appropriate -error codes. Especially memory allocation functions like av_malloc() -are notoriously left unchecked, which is a serious problem. - -
  29. Test your code with valgrind and or Address Sanitizer to ensure it’s free -of leaks, out of array accesses, etc. -
- - -

1.8 Patch review process

- -

All patches posted to ffmpeg-devel will be reviewed, unless they contain a -clear note that the patch is not for the git master branch. -Reviews and comments will be posted as replies to the patch on the -mailing list. The patch submitter then has to take care of every comment, -that can be by resubmitting a changed patch or by discussion. Resubmitted -patches will themselves be reviewed like any other patch. If at some point -a patch passes review with no comments then it is approved, that can for -simple and small patches happen immediately while large patches will generally -have to be changed and reviewed many times before they are approved. -After a patch is approved it will be committed to the repository. -

-

We will review all submitted patches, but sometimes we are quite busy so -especially for large patches this can take several weeks. -

-

If you feel that the review process is too slow and you are willing to try to -take over maintainership of the area of code you change then just clone -git master and maintain the area of code there. We will merge each area from -where its best maintained. -

-

When resubmitting patches, please do not make any significant changes -not related to the comments received during review. Such patches will -be rejected. Instead, submit significant changes or new features as -separate patches. -

-

Everyone is welcome to review patches. Also if you are waiting for your patch -to be reviewed, please consider helping to review other patches, that is a great -way to get everyone’s patches reviewed sooner. -

- -

1.9 Regression tests

- -

Before submitting a patch (or committing to the repository), you should at least -test that you did not break anything. -

-

Running ’make fate’ accomplishes this, please see fate.html for details. -

-

[Of course, some patches may change the results of the regression tests. In -this case, the reference results of the regression tests shall be modified -accordingly]. -

- -

1.9.1 Adding files to the fate-suite dataset

- -

When there is no muxer or encoder available to generate test media for a -specific test then the media has to be included in the fate-suite. -First please make sure that the sample file is as small as possible to test the -respective decoder or demuxer sufficiently. Large files increase network -bandwidth and disk space requirements. -Once you have a working fate test and fate sample, provide in the commit -message or introductory message for the patch series that you post to -the ffmpeg-devel mailing list, a direct link to download the sample media. -

- - -

1.9.2 Visualizing Test Coverage

- -

The FFmpeg build system allows visualizing the test coverage in an easy -manner with the coverage tools gcov/lcov. This involves -the following steps: -

-
    -
  1. Configure to compile with instrumentation enabled: - configure --toolchain=gcov. - -
  2. Run your test case, either manually or via FATE. This can be either - the full FATE regression suite, or any arbitrary invocation of any - front-end tool provided by FFmpeg, in any combination. - -
  3. Run make lcov to generate coverage data in HTML format. - -
  4. View lcov/index.html in your preferred HTML viewer. -
- -

You can use the command make lcov-reset to reset the coverage -measurements. You will need to rerun make lcov after running a -new test. -

- -

1.9.3 Using Valgrind

- -

The configure script provides a shortcut for using valgrind to spot bugs -related to memory handling. Just add the option ---toolchain=valgrind-memcheck or --toolchain=valgrind-massif -to your configure line, and reasonable defaults will be set for running -FATE under the supervision of either the memcheck or the -massif tool of the valgrind suite. -

-

In case you need finer control over how valgrind is invoked, use the ---target-exec='valgrind <your_custom_valgrind_options> option in -your configure line instead. -

- -

1.10 Release process

- -

FFmpeg maintains a set of release branches, which are the -recommended deliverable for system integrators and distributors (such as -Linux distributions, etc.). At regular times, a release -manager prepares, tests and publishes tarballs on the -https://ffmpeg.org website. -

-

There are two kinds of releases: -

-
    -
  1. Major releases always include the latest and greatest -features and functionality. - -
  2. Point releases are cut from release branches, -which are named release/X, with X being the release -version number. -
- -

Note that we promise to our users that shared libraries from any FFmpeg -release never break programs that have been compiled against -previous versions of the same release series in any case! -

-

However, from time to time, we do make API changes that require adaptations -in applications. Such changes are only allowed in (new) major releases and -require further steps such as bumping library version numbers and/or -adjustments to the symbol versioning file. Please discuss such changes -on the ffmpeg-devel mailing list in time to allow forward planning. -

- -

1.10.1 Criteria for Point Releases

- -

Changes that match the following criteria are valid candidates for -inclusion into a point release: -

-
    -
  1. Fixes a security issue, preferably identified by a CVE -number issued by http://cve.mitre.org/. - -
  2. Fixes a documented bug in https://trac.ffmpeg.org. - -
  3. Improves the included documentation. - -
  4. Retains both source code and binary compatibility with previous -point releases of the same release branch. -
- -

The order for checking the rules is (1 OR 2 OR 3) AND 4. -

- - -

1.10.2 Release Checklist

- -

The release process involves the following steps: -

-
    -
  1. Ensure that the RELEASE file contains the version number for -the upcoming release. - -
  2. Add the release at https://trac.ffmpeg.org/admin/ticket/versions. - -
  3. Announce the intent to do a release to the mailing list. - -
  4. Make sure all relevant security fixes have been backported. See -https://ffmpeg.org/security.html. - -
  5. Ensure that the FATE regression suite still passes in the release -branch on at least i386 and amd64 -(cf. Regression tests). - -
  6. Prepare the release tarballs in bz2 and gz formats, and -supplementing files that contain gpg signatures - -
  7. Publish the tarballs at https://ffmpeg.org/releases. Create and -push an annotated tag in the form nX, with X -containing the version number. - -
  8. Propose and send a patch to the ffmpeg-devel mailing list -with a news entry for the website. - -
  9. Publish the news entry. - -
  10. Send announcement to the mailing list. -
- - -

- This document was generated using makeinfo. -

-
- - diff --git a/code/external/ffmpeg-win64/doc/examples/Makefile b/code/external/ffmpeg-win64/doc/examples/Makefile deleted file mode 100644 index af38159..0000000 --- a/code/external/ffmpeg-win64/doc/examples/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# use pkg-config for getting CFLAGS and LDLIBS -FFMPEG_LIBS= libavdevice \ - libavformat \ - libavfilter \ - libavcodec \ - libswresample \ - libswscale \ - libavutil \ - -CFLAGS += -Wall -g -CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS) -LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS) - -EXAMPLES= avio_dir_cmd \ - avio_reading \ - decoding_encoding \ - demuxing_decoding \ - extract_mvs \ - filtering_video \ - filtering_audio \ - http_multiclient \ - metadata \ - muxing \ - remuxing \ - resampling_audio \ - scaling_video \ - transcode_aac \ - transcoding \ - -OBJS=$(addsuffix .o,$(EXAMPLES)) - -# the following examples make explicit use of the math library -avcodec: LDLIBS += -lm -decoding_encoding: LDLIBS += -lm -muxing: LDLIBS += -lm -resampling_audio: LDLIBS += -lm - -.phony: all clean-test clean - -all: $(OBJS) $(EXAMPLES) - -clean-test: - $(RM) test*.pgm test.h264 test.mp2 test.sw test.mpg - -clean: clean-test - $(RM) $(EXAMPLES) $(OBJS) diff --git a/code/external/ffmpeg-win64/doc/examples/README b/code/external/ffmpeg-win64/doc/examples/README deleted file mode 100644 index c1ce619..0000000 --- a/code/external/ffmpeg-win64/doc/examples/README +++ /dev/null @@ -1,23 +0,0 @@ -FFmpeg examples README ----------------------- - -Both following use cases rely on pkg-config and make, thus make sure -that you have them installed and working on your system. - - -Method 1: build the installed examples in a generic read/write user directory - -Copy to a read/write user directory and just use "make", it will link -to the libraries on your system, assuming the PKG_CONFIG_PATH is -correctly configured. - -Method 2: build the examples in-tree - -Assuming you are in the source FFmpeg checkout directory, you need to build -FFmpeg (no need to make install in any prefix). Then just run "make examples". -This will build the examples using the FFmpeg build system. You can clean those -examples using "make examplesclean" - -If you want to try the dedicated Makefile examples (to emulate the first -method), go into doc/examples and run a command such as -PKG_CONFIG_PATH=pc-uninstalled make. diff --git a/code/external/ffmpeg-win64/doc/examples/avio_dir_cmd.c b/code/external/ffmpeg-win64/doc/examples/avio_dir_cmd.c deleted file mode 100644 index 50c435c..0000000 --- a/code/external/ffmpeg-win64/doc/examples/avio_dir_cmd.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (c) 2014 Lukasz Marek - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include -#include -#include - -static const char *type_string(int type) -{ - switch (type) { - case AVIO_ENTRY_DIRECTORY: - return ""; - case AVIO_ENTRY_FILE: - return ""; - case AVIO_ENTRY_BLOCK_DEVICE: - return ""; - case AVIO_ENTRY_CHARACTER_DEVICE: - return ""; - case AVIO_ENTRY_NAMED_PIPE: - return ""; - case AVIO_ENTRY_SYMBOLIC_LINK: - return ""; - case AVIO_ENTRY_SOCKET: - return ""; - case AVIO_ENTRY_SERVER: - return ""; - case AVIO_ENTRY_SHARE: - return ""; - case AVIO_ENTRY_WORKGROUP: - return ""; - case AVIO_ENTRY_UNKNOWN: - default: - break; - } - return ""; -} - -static int list_op(const char *input_dir) -{ - AVIODirEntry *entry = NULL; - AVIODirContext *ctx = NULL; - int cnt, ret; - char filemode[4], uid_and_gid[20]; - - if ((ret = avio_open_dir(&ctx, input_dir, NULL)) < 0) { - av_log(NULL, AV_LOG_ERROR, "Cannot open directory: %s.\n", av_err2str(ret)); - goto fail; - } - - cnt = 0; - for (;;) { - if ((ret = avio_read_dir(ctx, &entry)) < 0) { - av_log(NULL, AV_LOG_ERROR, "Cannot list directory: %s.\n", av_err2str(ret)); - goto fail; - } - if (!entry) - break; - if (entry->filemode == -1) { - snprintf(filemode, 4, "???"); - } else { - snprintf(filemode, 4, "%3"PRIo64, entry->filemode); - } - snprintf(uid_and_gid, 20, "%"PRId64"(%"PRId64")", entry->user_id, entry->group_id); - if (cnt == 0) - av_log(NULL, AV_LOG_INFO, "%-9s %12s %30s %10s %s %16s %16s %16s\n", - "TYPE", "SIZE", "NAME", "UID(GID)", "UGO", "MODIFIED", - "ACCESSED", "STATUS_CHANGED"); - av_log(NULL, AV_LOG_INFO, "%-9s %12"PRId64" %30s %10s %s %16"PRId64" %16"PRId64" %16"PRId64"\n", - type_string(entry->type), - entry->size, - entry->name, - uid_and_gid, - filemode, - entry->modification_timestamp, - entry->access_timestamp, - entry->status_change_timestamp); - avio_free_directory_entry(&entry); - cnt++; - }; - - fail: - avio_close_dir(&ctx); - return ret; -} - -static int del_op(const char *url) -{ - int ret = avpriv_io_delete(url); - if (ret < 0) - av_log(NULL, AV_LOG_ERROR, "Cannot delete '%s': %s.\n", url, av_err2str(ret)); - return ret; -} - -static int move_op(const char *src, const char *dst) -{ - int ret = avpriv_io_move(src, dst); - if (ret < 0) - av_log(NULL, AV_LOG_ERROR, "Cannot move '%s' into '%s': %s.\n", src, dst, av_err2str(ret)); - return ret; -} - - -static void usage(const char *program_name) -{ - fprintf(stderr, "usage: %s OPERATION entry1 [entry2]\n" - "API example program to show how to manipulate resources " - "accessed through AVIOContext.\n" - "OPERATIONS:\n" - "list list content of the directory\n" - "move rename content in directory\n" - "del delete content in directory\n", - program_name); -} - -int main(int argc, char *argv[]) -{ - const char *op = NULL; - int ret; - - av_log_set_level(AV_LOG_DEBUG); - - if (argc < 2) { - usage(argv[0]); - return 1; - } - - /* register codecs and formats and other lavf/lavc components*/ - av_register_all(); - avformat_network_init(); - - op = argv[1]; - if (strcmp(op, "list") == 0) { - if (argc < 3) { - av_log(NULL, AV_LOG_INFO, "Missing argument for list operation.\n"); - ret = AVERROR(EINVAL); - } else { - ret = list_op(argv[2]); - } - } else if (strcmp(op, "del") == 0) { - if (argc < 3) { - av_log(NULL, AV_LOG_INFO, "Missing argument for del operation.\n"); - ret = AVERROR(EINVAL); - } else { - ret = del_op(argv[2]); - } - } else if (strcmp(op, "move") == 0) { - if (argc < 4) { - av_log(NULL, AV_LOG_INFO, "Missing argument for move operation.\n"); - ret = AVERROR(EINVAL); - } else { - ret = move_op(argv[2], argv[3]); - } - } else { - av_log(NULL, AV_LOG_INFO, "Invalid operation %s\n", op); - ret = AVERROR(EINVAL); - } - - avformat_network_deinit(); - - return ret < 0 ? 1 : 0; -} diff --git a/code/external/ffmpeg-win64/doc/examples/avio_reading.c b/code/external/ffmpeg-win64/doc/examples/avio_reading.c deleted file mode 100644 index 02474e9..0000000 --- a/code/external/ffmpeg-win64/doc/examples/avio_reading.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2014 Stefano Sabatini - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/** - * @file - * libavformat AVIOContext API example. - * - * Make libavformat demuxer access media content through a custom - * AVIOContext read callback. - * @example avio_reading.c - */ - -#include -#include -#include -#include - -struct buffer_data { - uint8_t *ptr; - size_t size; ///< size left in the buffer -}; - -static int read_packet(void *opaque, uint8_t *buf, int buf_size) -{ - struct buffer_data *bd = (struct buffer_data *)opaque; - buf_size = FFMIN(buf_size, bd->size); - - printf("ptr:%p size:%zu\n", bd->ptr, bd->size); - - /* copy internal buffer data to buf */ - memcpy(buf, bd->ptr, buf_size); - bd->ptr += buf_size; - bd->size -= buf_size; - - return buf_size; -} - -int main(int argc, char *argv[]) -{ - AVFormatContext *fmt_ctx = NULL; - AVIOContext *avio_ctx = NULL; - uint8_t *buffer = NULL, *avio_ctx_buffer = NULL; - size_t buffer_size, avio_ctx_buffer_size = 4096; - char *input_filename = NULL; - int ret = 0; - struct buffer_data bd = { 0 }; - - if (argc != 2) { - fprintf(stderr, "usage: %s input_file\n" - "API example program to show how to read from a custom buffer " - "accessed through AVIOContext.\n", argv[0]); - return 1; - } - input_filename = argv[1]; - - /* register codecs and formats and other lavf/lavc components*/ - av_register_all(); - - /* slurp file content into buffer */ - ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); - if (ret < 0) - goto end; - - /* fill opaque structure used by the AVIOContext read callback */ - bd.ptr = buffer; - bd.size = buffer_size; - - if (!(fmt_ctx = avformat_alloc_context())) { - ret = AVERROR(ENOMEM); - goto end; - } - - avio_ctx_buffer = av_malloc(avio_ctx_buffer_size); - if (!avio_ctx_buffer) { - ret = AVERROR(ENOMEM); - goto end; - } - avio_ctx = avio_alloc_context(avio_ctx_buffer, avio_ctx_buffer_size, - 0, &bd, &read_packet, NULL, NULL); - if (!avio_ctx) { - ret = AVERROR(ENOMEM); - goto end; - } - fmt_ctx->pb = avio_ctx; - - ret = avformat_open_input(&fmt_ctx, NULL, NULL, NULL); - if (ret < 0) { - fprintf(stderr, "Could not open input\n"); - goto end; - } - - ret = avformat_find_stream_info(fmt_ctx, NULL); - if (ret < 0) { - fprintf(stderr, "Could not find stream information\n"); - goto end; - } - - av_dump_format(fmt_ctx, 0, input_filename, 0); - -end: - avformat_close_input(&fmt_ctx); - /* note: the internal buffer could have changed, and be != avio_ctx_buffer */ - if (avio_ctx) { - av_freep(&avio_ctx->buffer); - av_freep(&avio_ctx); - } - av_file_unmap(buffer, buffer_size); - - if (ret < 0) { - fprintf(stderr, "Error occurred: %s\n", av_err2str(ret)); - return 1; - } - - return 0; -} diff --git a/code/external/ffmpeg-win64/doc/examples/decoding_encoding.c b/code/external/ffmpeg-win64/doc/examples/decoding_encoding.c deleted file mode 100644 index 06a98a6..0000000 --- a/code/external/ffmpeg-win64/doc/examples/decoding_encoding.c +++ /dev/null @@ -1,665 +0,0 @@ -/* - * Copyright (c) 2001 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/** - * @file - * libavcodec API use example. - * - * @example decoding_encoding.c - * Note that libavcodec only handles codecs (mpeg, mpeg4, etc...), - * not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the - * format handling - */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#define INBUF_SIZE 4096 -#define AUDIO_INBUF_SIZE 20480 -#define AUDIO_REFILL_THRESH 4096 - -/* check that a given sample format is supported by the encoder */ -static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt) -{ - const enum AVSampleFormat *p = codec->sample_fmts; - - while (*p != AV_SAMPLE_FMT_NONE) { - if (*p == sample_fmt) - return 1; - p++; - } - return 0; -} - -/* just pick the highest supported samplerate */ -static int select_sample_rate(AVCodec *codec) -{ - const int *p; - int best_samplerate = 0; - - if (!codec->supported_samplerates) - return 44100; - - p = codec->supported_samplerates; - while (*p) { - best_samplerate = FFMAX(*p, best_samplerate); - p++; - } - return best_samplerate; -} - -/* select layout with the highest channel count */ -static int select_channel_layout(AVCodec *codec) -{ - const uint64_t *p; - uint64_t best_ch_layout = 0; - int best_nb_channels = 0; - - if (!codec->channel_layouts) - return AV_CH_LAYOUT_STEREO; - - p = codec->channel_layouts; - while (*p) { - int nb_channels = av_get_channel_layout_nb_channels(*p); - - if (nb_channels > best_nb_channels) { - best_ch_layout = *p; - best_nb_channels = nb_channels; - } - p++; - } - return best_ch_layout; -} - -/* - * Audio encoding example - */ -static void audio_encode_example(const char *filename) -{ - AVCodec *codec; - AVCodecContext *c= NULL; - AVFrame *frame; - AVPacket pkt; - int i, j, k, ret, got_output; - int buffer_size; - FILE *f; - uint16_t *samples; - float t, tincr; - - printf("Encode audio file %s\n", filename); - - /* find the MP2 encoder */ - codec = avcodec_find_encoder(AV_CODEC_ID_MP2); - if (!codec) { - fprintf(stderr, "Codec not found\n"); - exit(1); - } - - c = avcodec_alloc_context3(codec); - if (!c) { - fprintf(stderr, "Could not allocate audio codec context\n"); - exit(1); - } - - /* put sample parameters */ - c->bit_rate = 64000; - - /* check that the encoder supports s16 pcm input */ - c->sample_fmt = AV_SAMPLE_FMT_S16; - if (!check_sample_fmt(codec, c->sample_fmt)) { - fprintf(stderr, "Encoder does not support sample format %s", - av_get_sample_fmt_name(c->sample_fmt)); - exit(1); - } - - /* select other audio parameters supported by the encoder */ - c->sample_rate = select_sample_rate(codec); - c->channel_layout = select_channel_layout(codec); - c->channels = av_get_channel_layout_nb_channels(c->channel_layout); - - /* open it */ - if (avcodec_open2(c, codec, NULL) < 0) { - fprintf(stderr, "Could not open codec\n"); - exit(1); - } - - f = fopen(filename, "wb"); - if (!f) { - fprintf(stderr, "Could not open %s\n", filename); - exit(1); - } - - /* frame containing input raw audio */ - frame = av_frame_alloc(); - if (!frame) { - fprintf(stderr, "Could not allocate audio frame\n"); - exit(1); - } - - frame->nb_samples = c->frame_size; - frame->format = c->sample_fmt; - frame->channel_layout = c->channel_layout; - - /* the codec gives us the frame size, in samples, - * we calculate the size of the samples buffer in bytes */ - buffer_size = av_samples_get_buffer_size(NULL, c->channels, c->frame_size, - c->sample_fmt, 0); - if (buffer_size < 0) { - fprintf(stderr, "Could not get sample buffer size\n"); - exit(1); - } - samples = av_malloc(buffer_size); - if (!samples) { - fprintf(stderr, "Could not allocate %d bytes for samples buffer\n", - buffer_size); - exit(1); - } - /* setup the data pointers in the AVFrame */ - ret = avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt, - (const uint8_t*)samples, buffer_size, 0); - if (ret < 0) { - fprintf(stderr, "Could not setup audio frame\n"); - exit(1); - } - - /* encode a single tone sound */ - t = 0; - tincr = 2 * M_PI * 440.0 / c->sample_rate; - for (i = 0; i < 200; i++) { - av_init_packet(&pkt); - pkt.data = NULL; // packet data will be allocated by the encoder - pkt.size = 0; - - for (j = 0; j < c->frame_size; j++) { - samples[2*j] = (int)(sin(t) * 10000); - - for (k = 1; k < c->channels; k++) - samples[2*j + k] = samples[2*j]; - t += tincr; - } - /* encode the samples */ - ret = avcodec_encode_audio2(c, &pkt, frame, &got_output); - if (ret < 0) { - fprintf(stderr, "Error encoding audio frame\n"); - exit(1); - } - if (got_output) { - fwrite(pkt.data, 1, pkt.size, f); - av_packet_unref(&pkt); - } - } - - /* get the delayed frames */ - for (got_output = 1; got_output; i++) { - ret = avcodec_encode_audio2(c, &pkt, NULL, &got_output); - if (ret < 0) { - fprintf(stderr, "Error encoding frame\n"); - exit(1); - } - - if (got_output) { - fwrite(pkt.data, 1, pkt.size, f); - av_packet_unref(&pkt); - } - } - fclose(f); - - av_freep(&samples); - av_frame_free(&frame); - avcodec_close(c); - av_free(c); -} - -/* - * Audio decoding. - */ -static void audio_decode_example(const char *outfilename, const char *filename) -{ - AVCodec *codec; - AVCodecContext *c= NULL; - int len; - FILE *f, *outfile; - uint8_t inbuf[AUDIO_INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; - AVPacket avpkt; - AVFrame *decoded_frame = NULL; - - av_init_packet(&avpkt); - - printf("Decode audio file %s to %s\n", filename, outfilename); - - /* find the mpeg audio decoder */ - codec = avcodec_find_decoder(AV_CODEC_ID_MP2); - if (!codec) { - fprintf(stderr, "Codec not found\n"); - exit(1); - } - - c = avcodec_alloc_context3(codec); - if (!c) { - fprintf(stderr, "Could not allocate audio codec context\n"); - exit(1); - } - - /* open it */ - if (avcodec_open2(c, codec, NULL) < 0) { - fprintf(stderr, "Could not open codec\n"); - exit(1); - } - - f = fopen(filename, "rb"); - if (!f) { - fprintf(stderr, "Could not open %s\n", filename); - exit(1); - } - outfile = fopen(outfilename, "wb"); - if (!outfile) { - av_free(c); - exit(1); - } - - /* decode until eof */ - avpkt.data = inbuf; - avpkt.size = fread(inbuf, 1, AUDIO_INBUF_SIZE, f); - - while (avpkt.size > 0) { - int i, ch; - int got_frame = 0; - - if (!decoded_frame) { - if (!(decoded_frame = av_frame_alloc())) { - fprintf(stderr, "Could not allocate audio frame\n"); - exit(1); - } - } - - len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); - if (len < 0) { - fprintf(stderr, "Error while decoding\n"); - exit(1); - } - if (got_frame) { - /* if a frame has been decoded, output it */ - int data_size = av_get_bytes_per_sample(c->sample_fmt); - if (data_size < 0) { - /* This should not occur, checking just for paranoia */ - fprintf(stderr, "Failed to calculate data size\n"); - exit(1); - } - for (i=0; inb_samples; i++) - for (ch=0; chchannels; ch++) - fwrite(decoded_frame->data[ch] + data_size*i, 1, data_size, outfile); - } - avpkt.size -= len; - avpkt.data += len; - avpkt.dts = - avpkt.pts = AV_NOPTS_VALUE; - if (avpkt.size < AUDIO_REFILL_THRESH) { - /* Refill the input buffer, to avoid trying to decode - * incomplete frames. Instead of this, one could also use - * a parser, or use a proper container format through - * libavformat. */ - memmove(inbuf, avpkt.data, avpkt.size); - avpkt.data = inbuf; - len = fread(avpkt.data + avpkt.size, 1, - AUDIO_INBUF_SIZE - avpkt.size, f); - if (len > 0) - avpkt.size += len; - } - } - - fclose(outfile); - fclose(f); - - avcodec_close(c); - av_free(c); - av_frame_free(&decoded_frame); -} - -/* - * Video encoding example - */ -static void video_encode_example(const char *filename, int codec_id) -{ - AVCodec *codec; - AVCodecContext *c= NULL; - int i, ret, x, y, got_output; - FILE *f; - AVFrame *frame; - AVPacket pkt; - uint8_t endcode[] = { 0, 0, 1, 0xb7 }; - - printf("Encode video file %s\n", filename); - - /* find the mpeg1 video encoder */ - codec = avcodec_find_encoder(codec_id); - if (!codec) { - fprintf(stderr, "Codec not found\n"); - exit(1); - } - - c = avcodec_alloc_context3(codec); - if (!c) { - fprintf(stderr, "Could not allocate video codec context\n"); - exit(1); - } - - /* put sample parameters */ - c->bit_rate = 400000; - /* resolution must be a multiple of two */ - c->width = 352; - c->height = 288; - /* frames per second */ - c->time_base = (AVRational){1,25}; - /* emit one intra frame every ten frames - * check frame pict_type before passing frame - * to encoder, if frame->pict_type is AV_PICTURE_TYPE_I - * then gop_size is ignored and the output of encoder - * will always be I frame irrespective to gop_size - */ - c->gop_size = 10; - c->max_b_frames = 1; - c->pix_fmt = AV_PIX_FMT_YUV420P; - - if (codec_id == AV_CODEC_ID_H264) - av_opt_set(c->priv_data, "preset", "slow", 0); - - /* open it */ - if (avcodec_open2(c, codec, NULL) < 0) { - fprintf(stderr, "Could not open codec\n"); - exit(1); - } - - f = fopen(filename, "wb"); - if (!f) { - fprintf(stderr, "Could not open %s\n", filename); - exit(1); - } - - frame = av_frame_alloc(); - if (!frame) { - fprintf(stderr, "Could not allocate video frame\n"); - exit(1); - } - frame->format = c->pix_fmt; - frame->width = c->width; - frame->height = c->height; - - /* the image can be allocated by any means and av_image_alloc() is - * just the most convenient way if av_malloc() is to be used */ - ret = av_image_alloc(frame->data, frame->linesize, c->width, c->height, - c->pix_fmt, 32); - if (ret < 0) { - fprintf(stderr, "Could not allocate raw picture buffer\n"); - exit(1); - } - - /* encode 1 second of video */ - for (i = 0; i < 25; i++) { - av_init_packet(&pkt); - pkt.data = NULL; // packet data will be allocated by the encoder - pkt.size = 0; - - fflush(stdout); - /* prepare a dummy image */ - /* Y */ - for (y = 0; y < c->height; y++) { - for (x = 0; x < c->width; x++) { - frame->data[0][y * frame->linesize[0] + x] = x + y + i * 3; - } - } - - /* Cb and Cr */ - for (y = 0; y < c->height/2; y++) { - for (x = 0; x < c->width/2; x++) { - frame->data[1][y * frame->linesize[1] + x] = 128 + y + i * 2; - frame->data[2][y * frame->linesize[2] + x] = 64 + x + i * 5; - } - } - - frame->pts = i; - - /* encode the image */ - ret = avcodec_encode_video2(c, &pkt, frame, &got_output); - if (ret < 0) { - fprintf(stderr, "Error encoding frame\n"); - exit(1); - } - - if (got_output) { - printf("Write frame %3d (size=%5d)\n", i, pkt.size); - fwrite(pkt.data, 1, pkt.size, f); - av_packet_unref(&pkt); - } - } - - /* get the delayed frames */ - for (got_output = 1; got_output; i++) { - fflush(stdout); - - ret = avcodec_encode_video2(c, &pkt, NULL, &got_output); - if (ret < 0) { - fprintf(stderr, "Error encoding frame\n"); - exit(1); - } - - if (got_output) { - printf("Write frame %3d (size=%5d)\n", i, pkt.size); - fwrite(pkt.data, 1, pkt.size, f); - av_packet_unref(&pkt); - } - } - - /* add sequence end code to have a real mpeg file */ - fwrite(endcode, 1, sizeof(endcode), f); - fclose(f); - - avcodec_close(c); - av_free(c); - av_freep(&frame->data[0]); - av_frame_free(&frame); - printf("\n"); -} - -/* - * Video decoding example - */ - -static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize, - char *filename) -{ - FILE *f; - int i; - - f = fopen(filename,"w"); - fprintf(f, "P5\n%d %d\n%d\n", xsize, ysize, 255); - for (i = 0; i < ysize; i++) - fwrite(buf + i * wrap, 1, xsize, f); - fclose(f); -} - -static int decode_write_frame(const char *outfilename, AVCodecContext *avctx, - AVFrame *frame, int *frame_count, AVPacket *pkt, int last) -{ - int len, got_frame; - char buf[1024]; - - len = avcodec_decode_video2(avctx, frame, &got_frame, pkt); - if (len < 0) { - fprintf(stderr, "Error while decoding frame %d\n", *frame_count); - return len; - } - if (got_frame) { - printf("Saving %sframe %3d\n", last ? "last " : "", *frame_count); - fflush(stdout); - - /* the picture is allocated by the decoder, no need to free it */ - snprintf(buf, sizeof(buf), outfilename, *frame_count); - pgm_save(frame->data[0], frame->linesize[0], - frame->width, frame->height, buf); - (*frame_count)++; - } - if (pkt->data) { - pkt->size -= len; - pkt->data += len; - } - return 0; -} - -static void video_decode_example(const char *outfilename, const char *filename) -{ - AVCodec *codec; - AVCodecContext *c= NULL; - int frame_count; - FILE *f; - AVFrame *frame; - uint8_t inbuf[INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; - AVPacket avpkt; - - av_init_packet(&avpkt); - - /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */ - memset(inbuf + INBUF_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - printf("Decode video file %s to %s\n", filename, outfilename); - - /* find the mpeg1 video decoder */ - codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO); - if (!codec) { - fprintf(stderr, "Codec not found\n"); - exit(1); - } - - c = avcodec_alloc_context3(codec); - if (!c) { - fprintf(stderr, "Could not allocate video codec context\n"); - exit(1); - } - - if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) - c->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames - - /* For some codecs, such as msmpeg4 and mpeg4, width and height - MUST be initialized there because this information is not - available in the bitstream. */ - - /* open it */ - if (avcodec_open2(c, codec, NULL) < 0) { - fprintf(stderr, "Could not open codec\n"); - exit(1); - } - - f = fopen(filename, "rb"); - if (!f) { - fprintf(stderr, "Could not open %s\n", filename); - exit(1); - } - - frame = av_frame_alloc(); - if (!frame) { - fprintf(stderr, "Could not allocate video frame\n"); - exit(1); - } - - frame_count = 0; - for (;;) { - avpkt.size = fread(inbuf, 1, INBUF_SIZE, f); - if (avpkt.size == 0) - break; - - /* NOTE1: some codecs are stream based (mpegvideo, mpegaudio) - and this is the only method to use them because you cannot - know the compressed data size before analysing it. - - BUT some other codecs (msmpeg4, mpeg4) are inherently frame - based, so you must call them with all the data for one - frame exactly. You must also initialize 'width' and - 'height' before initializing them. */ - - /* NOTE2: some codecs allow the raw parameters (frame size, - sample rate) to be changed at any frame. We handle this, so - you should also take care of it */ - - /* here, we use a stream based decoder (mpeg1video), so we - feed decoder and see if it could decode a frame */ - avpkt.data = inbuf; - while (avpkt.size > 0) - if (decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 0) < 0) - exit(1); - } - - /* some codecs, such as MPEG, transmit the I and P frame with a - latency of one frame. You must do the following to have a - chance to get the last frame of the video */ - avpkt.data = NULL; - avpkt.size = 0; - decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 1); - - fclose(f); - - avcodec_close(c); - av_free(c); - av_frame_free(&frame); - printf("\n"); -} - -int main(int argc, char **argv) -{ - const char *output_type; - - /* register all the codecs */ - avcodec_register_all(); - - if (argc < 2) { - printf("usage: %s output_type\n" - "API example program to decode/encode a media stream with libavcodec.\n" - "This program generates a synthetic stream and encodes it to a file\n" - "named test.h264, test.mp2 or test.mpg depending on output_type.\n" - "The encoded stream is then decoded and written to a raw data output.\n" - "output_type must be chosen between 'h264', 'mp2', 'mpg'.\n", - argv[0]); - return 1; - } - output_type = argv[1]; - - if (!strcmp(output_type, "h264")) { - video_encode_example("test.h264", AV_CODEC_ID_H264); - } else if (!strcmp(output_type, "mp2")) { - audio_encode_example("test.mp2"); - audio_decode_example("test.pcm", "test.mp2"); - } else if (!strcmp(output_type, "mpg")) { - video_encode_example("test.mpg", AV_CODEC_ID_MPEG1VIDEO); - video_decode_example("test%02d.pgm", "test.mpg"); - } else { - fprintf(stderr, "Invalid output type '%s', choose between 'h264', 'mp2', or 'mpg'\n", - output_type); - return 1; - } - - return 0; -} diff --git a/code/external/ffmpeg-win64/doc/examples/demuxing_decoding.c b/code/external/ffmpeg-win64/doc/examples/demuxing_decoding.c deleted file mode 100644 index 59e0ccc..0000000 --- a/code/external/ffmpeg-win64/doc/examples/demuxing_decoding.c +++ /dev/null @@ -1,383 +0,0 @@ -/* - * Copyright (c) 2012 Stefano Sabatini - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/** - * @file - * Demuxing and decoding example. - * - * Show how to use the libavformat and libavcodec API to demux and - * decode audio and video data. - * @example demuxing_decoding.c - */ - -#include -#include -#include -#include - -static AVFormatContext *fmt_ctx = NULL; -static AVCodecContext *video_dec_ctx = NULL, *audio_dec_ctx; -static int width, height; -static enum AVPixelFormat pix_fmt; -static AVStream *video_stream = NULL, *audio_stream = NULL; -static const char *src_filename = NULL; -static const char *video_dst_filename = NULL; -static const char *audio_dst_filename = NULL; -static FILE *video_dst_file = NULL; -static FILE *audio_dst_file = NULL; - -static uint8_t *video_dst_data[4] = {NULL}; -static int video_dst_linesize[4]; -static int video_dst_bufsize; - -static int video_stream_idx = -1, audio_stream_idx = -1; -static AVFrame *frame = NULL; -static AVPacket pkt; -static int video_frame_count = 0; -static int audio_frame_count = 0; - -/* Enable or disable frame reference counting. You are not supposed to support - * both paths in your application but pick the one most appropriate to your - * needs. Look for the use of refcount in this example to see what are the - * differences of API usage between them. */ -static int refcount = 0; - -static int decode_packet(int *got_frame, int cached) -{ - int ret = 0; - int decoded = pkt.size; - - *got_frame = 0; - - if (pkt.stream_index == video_stream_idx) { - /* decode video frame */ - ret = avcodec_decode_video2(video_dec_ctx, frame, got_frame, &pkt); - if (ret < 0) { - fprintf(stderr, "Error decoding video frame (%s)\n", av_err2str(ret)); - return ret; - } - - if (*got_frame) { - - if (frame->width != width || frame->height != height || - frame->format != pix_fmt) { - /* To handle this change, one could call av_image_alloc again and - * decode the following frames into another rawvideo file. */ - fprintf(stderr, "Error: Width, height and pixel format have to be " - "constant in a rawvideo file, but the width, height or " - "pixel format of the input video changed:\n" - "old: width = %d, height = %d, format = %s\n" - "new: width = %d, height = %d, format = %s\n", - width, height, av_get_pix_fmt_name(pix_fmt), - frame->width, frame->height, - av_get_pix_fmt_name(frame->format)); - return -1; - } - - printf("video_frame%s n:%d coded_n:%d pts:%s\n", - cached ? "(cached)" : "", - video_frame_count++, frame->coded_picture_number, - av_ts2timestr(frame->pts, &video_dec_ctx->time_base)); - - /* copy decoded frame to destination buffer: - * this is required since rawvideo expects non aligned data */ - av_image_copy(video_dst_data, video_dst_linesize, - (const uint8_t **)(frame->data), frame->linesize, - pix_fmt, width, height); - - /* write to rawvideo file */ - fwrite(video_dst_data[0], 1, video_dst_bufsize, video_dst_file); - } - } else if (pkt.stream_index == audio_stream_idx) { - /* decode audio frame */ - ret = avcodec_decode_audio4(audio_dec_ctx, frame, got_frame, &pkt); - if (ret < 0) { - fprintf(stderr, "Error decoding audio frame (%s)\n", av_err2str(ret)); - return ret; - } - /* Some audio decoders decode only part of the packet, and have to be - * called again with the remainder of the packet data. - * Sample: fate-suite/lossless-audio/luckynight-partial.shn - * Also, some decoders might over-read the packet. */ - decoded = FFMIN(ret, pkt.size); - - if (*got_frame) { - size_t unpadded_linesize = frame->nb_samples * av_get_bytes_per_sample(frame->format); - printf("audio_frame%s n:%d nb_samples:%d pts:%s\n", - cached ? "(cached)" : "", - audio_frame_count++, frame->nb_samples, - av_ts2timestr(frame->pts, &audio_dec_ctx->time_base)); - - /* Write the raw audio data samples of the first plane. This works - * fine for packed formats (e.g. AV_SAMPLE_FMT_S16). However, - * most audio decoders output planar audio, which uses a separate - * plane of audio samples for each channel (e.g. AV_SAMPLE_FMT_S16P). - * In other words, this code will write only the first audio channel - * in these cases. - * You should use libswresample or libavfilter to convert the frame - * to packed data. */ - fwrite(frame->extended_data[0], 1, unpadded_linesize, audio_dst_file); - } - } - - /* If we use frame reference counting, we own the data and need - * to de-reference it when we don't use it anymore */ - if (*got_frame && refcount) - av_frame_unref(frame); - - return decoded; -} - -static int open_codec_context(int *stream_idx, - AVFormatContext *fmt_ctx, enum AVMediaType type) -{ - int ret, stream_index; - AVStream *st; - AVCodecContext *dec_ctx = NULL; - AVCodec *dec = NULL; - AVDictionary *opts = NULL; - - ret = av_find_best_stream(fmt_ctx, type, -1, -1, NULL, 0); - if (ret < 0) { - fprintf(stderr, "Could not find %s stream in input file '%s'\n", - av_get_media_type_string(type), src_filename); - return ret; - } else { - stream_index = ret; - st = fmt_ctx->streams[stream_index]; - - /* find decoder for the stream */ - dec_ctx = st->codec; - dec = avcodec_find_decoder(dec_ctx->codec_id); - if (!dec) { - fprintf(stderr, "Failed to find %s codec\n", - av_get_media_type_string(type)); - return AVERROR(EINVAL); - } - - /* Init the decoders, with or without reference counting */ - av_dict_set(&opts, "refcounted_frames", refcount ? "1" : "0", 0); - if ((ret = avcodec_open2(dec_ctx, dec, &opts)) < 0) { - fprintf(stderr, "Failed to open %s codec\n", - av_get_media_type_string(type)); - return ret; - } - *stream_idx = stream_index; - } - - return 0; -} - -static int get_format_from_sample_fmt(const char **fmt, - enum AVSampleFormat sample_fmt) -{ - int i; - struct sample_fmt_entry { - enum AVSampleFormat sample_fmt; const char *fmt_be, *fmt_le; - } sample_fmt_entries[] = { - { AV_SAMPLE_FMT_U8, "u8", "u8" }, - { AV_SAMPLE_FMT_S16, "s16be", "s16le" }, - { AV_SAMPLE_FMT_S32, "s32be", "s32le" }, - { AV_SAMPLE_FMT_FLT, "f32be", "f32le" }, - { AV_SAMPLE_FMT_DBL, "f64be", "f64le" }, - }; - *fmt = NULL; - - for (i = 0; i < FF_ARRAY_ELEMS(sample_fmt_entries); i++) { - struct sample_fmt_entry *entry = &sample_fmt_entries[i]; - if (sample_fmt == entry->sample_fmt) { - *fmt = AV_NE(entry->fmt_be, entry->fmt_le); - return 0; - } - } - - fprintf(stderr, - "sample format %s is not supported as output format\n", - av_get_sample_fmt_name(sample_fmt)); - return -1; -} - -int main (int argc, char **argv) -{ - int ret = 0, got_frame; - - if (argc != 4 && argc != 5) { - fprintf(stderr, "usage: %s [-refcount] input_file video_output_file audio_output_file\n" - "API example program to show how to read frames from an input file.\n" - "This program reads frames from a file, decodes them, and writes decoded\n" - "video frames to a rawvideo file named video_output_file, and decoded\n" - "audio frames to a rawaudio file named audio_output_file.\n\n" - "If the -refcount option is specified, the program use the\n" - "reference counting frame system which allows keeping a copy of\n" - "the data for longer than one decode call.\n" - "\n", argv[0]); - exit(1); - } - if (argc == 5 && !strcmp(argv[1], "-refcount")) { - refcount = 1; - argv++; - } - src_filename = argv[1]; - video_dst_filename = argv[2]; - audio_dst_filename = argv[3]; - - /* register all formats and codecs */ - av_register_all(); - - /* open input file, and allocate format context */ - if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { - fprintf(stderr, "Could not open source file %s\n", src_filename); - exit(1); - } - - /* retrieve stream information */ - if (avformat_find_stream_info(fmt_ctx, NULL) < 0) { - fprintf(stderr, "Could not find stream information\n"); - exit(1); - } - - if (open_codec_context(&video_stream_idx, fmt_ctx, AVMEDIA_TYPE_VIDEO) >= 0) { - video_stream = fmt_ctx->streams[video_stream_idx]; - video_dec_ctx = video_stream->codec; - - video_dst_file = fopen(video_dst_filename, "wb"); - if (!video_dst_file) { - fprintf(stderr, "Could not open destination file %s\n", video_dst_filename); - ret = 1; - goto end; - } - - /* allocate image where the decoded image will be put */ - width = video_dec_ctx->width; - height = video_dec_ctx->height; - pix_fmt = video_dec_ctx->pix_fmt; - ret = av_image_alloc(video_dst_data, video_dst_linesize, - width, height, pix_fmt, 1); - if (ret < 0) { - fprintf(stderr, "Could not allocate raw video buffer\n"); - goto end; - } - video_dst_bufsize = ret; - } - - if (open_codec_context(&audio_stream_idx, fmt_ctx, AVMEDIA_TYPE_AUDIO) >= 0) { - audio_stream = fmt_ctx->streams[audio_stream_idx]; - audio_dec_ctx = audio_stream->codec; - audio_dst_file = fopen(audio_dst_filename, "wb"); - if (!audio_dst_file) { - fprintf(stderr, "Could not open destination file %s\n", audio_dst_filename); - ret = 1; - goto end; - } - } - - /* dump input information to stderr */ - av_dump_format(fmt_ctx, 0, src_filename, 0); - - if (!audio_stream && !video_stream) { - fprintf(stderr, "Could not find audio or video stream in the input, aborting\n"); - ret = 1; - goto end; - } - - frame = av_frame_alloc(); - if (!frame) { - fprintf(stderr, "Could not allocate frame\n"); - ret = AVERROR(ENOMEM); - goto end; - } - - /* initialize packet, set data to NULL, let the demuxer fill it */ - av_init_packet(&pkt); - pkt.data = NULL; - pkt.size = 0; - - if (video_stream) - printf("Demuxing video from file '%s' into '%s'\n", src_filename, video_dst_filename); - if (audio_stream) - printf("Demuxing audio from file '%s' into '%s'\n", src_filename, audio_dst_filename); - - /* read frames from the file */ - while (av_read_frame(fmt_ctx, &pkt) >= 0) { - AVPacket orig_pkt = pkt; - do { - ret = decode_packet(&got_frame, 0); - if (ret < 0) - break; - pkt.data += ret; - pkt.size -= ret; - } while (pkt.size > 0); - av_packet_unref(&orig_pkt); - } - - /* flush cached frames */ - pkt.data = NULL; - pkt.size = 0; - do { - decode_packet(&got_frame, 1); - } while (got_frame); - - printf("Demuxing succeeded.\n"); - - if (video_stream) { - printf("Play the output video file with the command:\n" - "ffplay -f rawvideo -pix_fmt %s -video_size %dx%d %s\n", - av_get_pix_fmt_name(pix_fmt), width, height, - video_dst_filename); - } - - if (audio_stream) { - enum AVSampleFormat sfmt = audio_dec_ctx->sample_fmt; - int n_channels = audio_dec_ctx->channels; - const char *fmt; - - if (av_sample_fmt_is_planar(sfmt)) { - const char *packed = av_get_sample_fmt_name(sfmt); - printf("Warning: the sample format the decoder produced is planar " - "(%s). This example will output the first channel only.\n", - packed ? packed : "?"); - sfmt = av_get_packed_sample_fmt(sfmt); - n_channels = 1; - } - - if ((ret = get_format_from_sample_fmt(&fmt, sfmt)) < 0) - goto end; - - printf("Play the output audio file with the command:\n" - "ffplay -f %s -ac %d -ar %d %s\n", - fmt, n_channels, audio_dec_ctx->sample_rate, - audio_dst_filename); - } - -end: - avcodec_close(video_dec_ctx); - avcodec_close(audio_dec_ctx); - avformat_close_input(&fmt_ctx); - if (video_dst_file) - fclose(video_dst_file); - if (audio_dst_file) - fclose(audio_dst_file); - av_frame_free(&frame); - av_free(video_dst_data[0]); - - return ret < 0; -} diff --git a/code/external/ffmpeg-win64/doc/examples/extract_mvs.c b/code/external/ffmpeg-win64/doc/examples/extract_mvs.c deleted file mode 100644 index 975189c..0000000 --- a/code/external/ffmpeg-win64/doc/examples/extract_mvs.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (c) 2012 Stefano Sabatini - * Copyright (c) 2014 Clément Bœsch - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include -#include - -static AVFormatContext *fmt_ctx = NULL; -static AVCodecContext *video_dec_ctx = NULL; -static AVStream *video_stream = NULL; -static const char *src_filename = NULL; - -static int video_stream_idx = -1; -static AVFrame *frame = NULL; -static AVPacket pkt; -static int video_frame_count = 0; - -static int decode_packet(int *got_frame, int cached) -{ - int decoded = pkt.size; - - *got_frame = 0; - - if (pkt.stream_index == video_stream_idx) { - int ret = avcodec_decode_video2(video_dec_ctx, frame, got_frame, &pkt); - if (ret < 0) { - fprintf(stderr, "Error decoding video frame (%s)\n", av_err2str(ret)); - return ret; - } - - if (*got_frame) { - int i; - AVFrameSideData *sd; - - video_frame_count++; - sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); - if (sd) { - const AVMotionVector *mvs = (const AVMotionVector *)sd->data; - for (i = 0; i < sd->size / sizeof(*mvs); i++) { - const AVMotionVector *mv = &mvs[i]; - printf("%d,%2d,%2d,%2d,%4d,%4d,%4d,%4d,0x%"PRIx64"\n", - video_frame_count, mv->source, - mv->w, mv->h, mv->src_x, mv->src_y, - mv->dst_x, mv->dst_y, mv->flags); - } - } - } - } - - return decoded; -} - -static int open_codec_context(int *stream_idx, - AVFormatContext *fmt_ctx, enum AVMediaType type) -{ - int ret; - AVStream *st; - AVCodecContext *dec_ctx = NULL; - AVCodec *dec = NULL; - AVDictionary *opts = NULL; - - ret = av_find_best_stream(fmt_ctx, type, -1, -1, NULL, 0); - if (ret < 0) { - fprintf(stderr, "Could not find %s stream in input file '%s'\n", - av_get_media_type_string(type), src_filename); - return ret; - } else { - *stream_idx = ret; - st = fmt_ctx->streams[*stream_idx]; - - /* find decoder for the stream */ - dec_ctx = st->codec; - dec = avcodec_find_decoder(dec_ctx->codec_id); - if (!dec) { - fprintf(stderr, "Failed to find %s codec\n", - av_get_media_type_string(type)); - return AVERROR(EINVAL); - } - - /* Init the video decoder */ - av_dict_set(&opts, "flags2", "+export_mvs", 0); - if ((ret = avcodec_open2(dec_ctx, dec, &opts)) < 0) { - fprintf(stderr, "Failed to open %s codec\n", - av_get_media_type_string(type)); - return ret; - } - } - - return 0; -} - -int main(int argc, char **argv) -{ - int ret = 0, got_frame; - - if (argc != 2) { - fprintf(stderr, "Usage: %s