projects: Update for recent upstream merge.

SMP/config.asm

@@ -452,6 +452,7 @@
 %define CONFIG_LIBBS2B 0
 %define CONFIG_LIBCACA 0
 %define CONFIG_LIBCELT 0
+%define CONFIG_LIBCODEC2 0
 %define CONFIG_LIBDC1394 0
 %define CONFIG_LIBDRM 0
 %define CONFIG_LIBFLITE 0
@@ -1166,6 +1167,7 @@
 %define CONFIG_QDMC_AT_DECODER 0
 %define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
+%define CONFIG_LIBCODEC2_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1355,6 +1357,7 @@
 %define CONFIG_ILBC_AT_ENCODER 0
 %define CONFIG_PCM_ALAW_AT_ENCODER 0
 %define CONFIG_PCM_MULAW_AT_ENCODER 0
+%define CONFIG_LIBCODEC2_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
 %define CONFIG_LIBGSM_MS_ENCODER 0
@@ -1423,6 +1426,8 @@
 %define CONFIG_HEVC_VAAPI_HWACCEL 0
 %define CONFIG_HEVC_VDPAU_HWACCEL 0
 %define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MJPEG_NVDEC_HWACCEL 1
+%define CONFIG_MJPEG_VAAPI_HWACCEL 0
 %define CONFIG_MPEG1_NVDEC_HWACCEL 1
 %define CONFIG_MPEG1_VDPAU_HWACCEL 0
 %define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
@@ -1499,6 +1504,7 @@
 %define CONFIG_VP9_PARSER 1
 %define CONFIG_XMA_PARSER 1
 %define CONFIG_ALSA_INDEV 0
+%define CONFIG_ANDROID_CAMERA_INDEV 0
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_BKTR_INDEV 0
 %define CONFIG_DECKLINK_INDEV 0
@@ -1941,6 +1947,8 @@
 %define CONFIG_CDG_DEMUXER 1
 %define CONFIG_CDXL_DEMUXER 1
 %define CONFIG_CINE_DEMUXER 1
+%define CONFIG_CODEC2_DEMUXER 1
+%define CONFIG_CODEC2RAW_DEMUXER 1
 %define CONFIG_CONCAT_DEMUXER 1
 %define CONFIG_DASH_DEMUXER 1
 %define CONFIG_DATA_DEMUXER 1
@@ -2200,6 +2208,8 @@
 %define CONFIG_BIT_MUXER 1
 %define CONFIG_CAF_MUXER 1
 %define CONFIG_CAVSVIDEO_MUXER 1
+%define CONFIG_CODEC2_MUXER 1
+%define CONFIG_CODEC2RAW_MUXER 1
 %define CONFIG_CRC_MUXER 1
 %define CONFIG_DASH_MUXER 1
 %define CONFIG_DATA_MUXER 1

SMP/config.h

@@ -502,6 +502,7 @@
 #define CONFIG_LIBBS2B 0
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
+#define CONFIG_LIBCODEC2 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
@@ -1231,6 +1232,7 @@
 #define CONFIG_QDMC_AT_DECODER 0
 #define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
+#define CONFIG_LIBCODEC2_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1420,6 +1422,7 @@
 #define CONFIG_ILBC_AT_ENCODER 0
 #define CONFIG_PCM_ALAW_AT_ENCODER 0
 #define CONFIG_PCM_MULAW_AT_ENCODER 0
+#define CONFIG_LIBCODEC2_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
 #define CONFIG_LIBGSM_MS_ENCODER 0
@@ -1488,6 +1491,8 @@
 #define CONFIG_HEVC_VAAPI_HWACCEL 0
 #define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MJPEG_NVDEC_HWACCEL 1
+#define CONFIG_MJPEG_VAAPI_HWACCEL 0
 #define CONFIG_MPEG1_NVDEC_HWACCEL 1
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
@@ -1585,6 +1590,7 @@
 #define CONFIG_VP9_PARSER 1
 #define CONFIG_XMA_PARSER 1
 #define CONFIG_ALSA_INDEV 0
+#define CONFIG_ANDROID_CAMERA_INDEV 0
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_BKTR_INDEV 0
 #define CONFIG_DECKLINK_INDEV 0
@@ -2027,6 +2033,8 @@
 #define CONFIG_CDG_DEMUXER 1
 #define CONFIG_CDXL_DEMUXER 1
 #define CONFIG_CINE_DEMUXER 1
+#define CONFIG_CODEC2_DEMUXER 1
+#define CONFIG_CODEC2RAW_DEMUXER 1
 #define CONFIG_CONCAT_DEMUXER 1
 #define CONFIG_DASH_DEMUXER 1
 #define CONFIG_DATA_DEMUXER 1
@@ -2286,6 +2294,8 @@
 #define CONFIG_BIT_MUXER 1
 #define CONFIG_CAF_MUXER 1
 #define CONFIG_CAVSVIDEO_MUXER 1
+#define CONFIG_CODEC2_MUXER 1
+#define CONFIG_CODEC2RAW_MUXER 1
 #define CONFIG_CRC_MUXER 1
 #define CONFIG_DASH_MUXER 1
 #define CONFIG_DATA_MUXER 1

SMP/libavcodec.vcxproj

@@ -847,6 +847,7 @@
     <ClCompile Include="..\libavcodec\nvdec_h264.c" />
     <ClCompile Include="..\libavcodec\dxva2_hevc.c" />
     <ClCompile Include="..\libavcodec\nvdec_hevc.c" />
+    <ClCompile Include="..\libavcodec\nvdec_mjpeg.c" />
     <ClCompile Include="..\libavcodec\nvdec_mpeg12.c" />
     <ClCompile Include="..\libavcodec\dxva2_mpeg2.c" />
     <ClCompile Include="..\libavcodec\nvdec_mpeg4.c" />

SMP/libavcodec.vcxproj.filters

@@ -2364,6 +2364,9 @@
     <ClCompile Include="..\libavcodec\nvdec_hevc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\nvdec_mjpeg.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\nvdec_mpeg12.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavformat.def

@@ -162,6 +162,9 @@ EXPORTS
     avio_wl64
     avio_write
     avio_write_marker
+    avpriv_codec2_mode_bit_rate
+    avpriv_codec2_mode_block_align
+    avpriv_codec2_mode_frame_size
     avpriv_dv_get_packet
     avpriv_dv_init_demux
     avpriv_dv_produce_packet

SMP/libavformat.vcxproj

@@ -195,6 +195,8 @@
     <ClCompile Include="..\libavformat\cdg.c" />
     <ClCompile Include="..\libavformat\cdxl.c" />
     <ClCompile Include="..\libavformat\cinedec.c" />
+    <ClCompile Include="..\libavcodec\codec2utils.c" />
+    <ClCompile Include="..\libavformat\codec2.c" />
     <ClCompile Include="..\libavformat\concatdec.c" />
     <ClCompile Include="..\libavformat\crcenc.c" />
     <ClCompile Include="..\libavformat\dash.c" />

SMP/libavformat.vcxproj.filters

@@ -16,9 +16,12 @@
     <Filter Include="Resource Files\libavformat">
       <UniqueIdentifier>{9fee14b2-1b77-463a-bd6b-60efdcf8850f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\libavformat">
+    <Filter Include="Source Files\libavcodec">
       <UniqueIdentifier>{bf017c32-250d-47da-b7e6-d5a5091cb1e6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\libavformat">
+      <UniqueIdentifier>{fd9e10e9-18f6-437d-b5d7-17290540c8b8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include=".\libavformat.def">
@@ -409,6 +412,12 @@
     <ClCompile Include="..\libavformat\cinedec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\codec2utils.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavformat\codec2.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\concatdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/demuxer_list.c

@@ -66,6 +66,8 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_cdg_demuxer,
     &ff_cdxl_demuxer,
     &ff_cine_demuxer,
+    &ff_codec2_demuxer,
+    &ff_codec2raw_demuxer,
     &ff_concat_demuxer,
     &ff_dash_demuxer,
     &ff_data_demuxer,

SMP/libavformat/muxer_list.c

@@ -38,6 +38,8 @@ static const AVOutputFormat *muxer_list[] = {
     &ff_bit_muxer,
     &ff_caf_muxer,
     &ff_cavsvideo_muxer,
+    &ff_codec2_muxer,
+    &ff_codec2raw_muxer,
     &ff_crc_muxer,
     &ff_dash_muxer,
     &ff_data_muxer,

SMP/project_get_dependencies.bat

@@ -131,9 +131,9 @@ ECHO %REPONAME%: Getting latest release...
 SET UPSTREAMAPIURL=%UPSTREAMURL:github.com=api.github.com/repos%
 REM Check if secure OAuth is available
 IF "%GITHUBTOKEN%" == "" (
-    powershell -nologo -noprofile -command "try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest > latest.json } catch {exit 1}"
+    powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest > latest.json } catch {exit 1}"
 ) ELSE (
-    powershell -nologo -noprofile -command "try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest -Headers @{'Authorization' = 'token %GITHUBTOKEN%'} > latest.json } catch {exit 1}"
+    powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest -Headers @{'Authorization' = 'token %GITHUBTOKEN%'} > latest.json } catch {exit 1}"
 )
 IF ERRORLEVEL 1 ( ECHO Failed getting latest %REPONAME% release & EXIT /B 1 )
 REM Get tag for latest release
@@ -156,7 +156,7 @@ REM Download a pre-built archive and extract
 ECHO %REPONAME%: Downloading %LIBNAME%_%TAG%_msvc%MSVC_VER%.zip...
 SET PREBUILTDIR=prebuilt
 MKDIR %PREBUILTDIR% >NUL 2>&1
-powershell -nologo -noprofile -command "try { (New-Object Net.WebClient).DownloadFile('%DLURL%', '%PREBUILTDIR%\temp.zip') } catch {exit 1}"
+powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { (New-Object Net.WebClient).DownloadFile('%DLURL%', '%PREBUILTDIR%\temp.zip') } catch {exit 1}"
 IF ERRORLEVEL 1 ( ECHO Failed downloading %DLURL% & EXIT /B 1 )
 powershell -nologo -noprofile -command "Add-Type -AssemblyName System.IO.Compression.FileSystem; $zip=[System.IO.Compression.ZipFile]::OpenRead('%PREBUILTDIR%\temp.zip'); foreach ($item in $zip.Entries) { try {$file=(Join-Path -Path .\%PREBUILTDIR% -ChildPath $item.FullName); $null=[System.IO.Directory]::CreateDirectory((Split-Path -Path $file)); [System.IO.Compression.ZipFileExtensions]::ExtractToFile($item,$file,$true)} catch {exit 1} }"
 IF ERRORLEVEL 1 ( ECHO Failed extracting downloaded archive & EXIT /B 1 )