projects: Update for upstream merge.

SMP/config.asm

@@ -489,6 +489,7 @@
 %define CONFIG_LIBOPENCV 0
 %define CONFIG_LIBOPENH264 0
 %define CONFIG_LIBOPENJPEG 0
+%define CONFIG_LIBOPENMPT 0
 %define CONFIG_LIBOPUS 1
 %define CONFIG_LIBPULSE 0
 %define CONFIG_LIBRTMP 0
@@ -1415,6 +1416,7 @@
 %define CONFIG_LIBGME_DEMUXER 1
 %define CONFIG_LIBMODPLUG_DEMUXER 1
 %define CONFIG_LIBNUT_DEMUXER 0
+%define CONFIG_LIBOPENMPT_DEMUXER 0
 %define CONFIG_A64MULTI_ENCODER 1
 %define CONFIG_A64MULTI5_ENCODER 1
 %define CONFIG_ALIAS_PIX_ENCODER 1
@@ -1899,6 +1901,7 @@
 %define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
+%define CONFIG_H264_MEDIACODEC_HWACCEL 0
 %define CONFIG_H264_MMAL_HWACCEL 0
 %define CONFIG_H264_QSV_HWACCEL 1
 %define CONFIG_H264_VAAPI_HWACCEL 0

SMP/config.h

@@ -531,6 +531,7 @@
 #define CONFIG_LIBOPENCV 0
 #define CONFIG_LIBOPENH264 0
 #define CONFIG_LIBOPENJPEG 0
+#define CONFIG_LIBOPENMPT 0
 #define CONFIG_LIBOPUS 1
 #define CONFIG_LIBPULSE 0
 #define CONFIG_LIBRTMP 0
@@ -1465,6 +1466,7 @@
 #define CONFIG_LIBGME_DEMUXER 1
 #define CONFIG_LIBMODPLUG_DEMUXER 1
 #define CONFIG_LIBNUT_DEMUXER 0
+#define CONFIG_LIBOPENMPT_DEMUXER 0
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
 #define CONFIG_ALIAS_PIX_ENCODER 1
@@ -1949,6 +1951,7 @@
 #define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 1
 #define CONFIG_H264_DXVA2_HWACCEL 1
+#define CONFIG_H264_MEDIACODEC_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
 #define CONFIG_H264_QSV_HWACCEL 1
 #define CONFIG_H264_VAAPI_HWACCEL 0

SMP/libavcodec.def

@@ -72,6 +72,10 @@ EXPORTS
     av_mdct_calc
     av_mdct_end
     av_mdct_init
+    av_mediacodec_alloc_context
+    av_mediacodec_default_free
+    av_mediacodec_default_init
+    av_mediacodec_release_buffer
     av_new_packet
     av_packet_add_side_data
     av_packet_alloc

SMP/libavcodec.vcxproj

@@ -166,6 +166,7 @@
     <ClCompile Include="..\libavcodec\imgconvert.c" />
     <ClCompile Include="..\libavcodec\jni.c" />
     <ClCompile Include="..\libavcodec\mathtables.c" />
+    <ClCompile Include="..\libavcodec\mediacodec.c" />
     <ClCompile Include="..\libavcodec\options.c" />
     <ClCompile Include="..\libavcodec\parser.c" />
     <ClCompile Include="..\libavcodec\profiles.c" />
@@ -385,6 +386,7 @@
     <ClCompile Include="..\libavcodec\diracdec.c" />
     <ClCompile Include="..\libavcodec\diractab.c" />
     <ClCompile Include="..\libavcodec\dirac_arith.c" />
+    <ClCompile Include="..\libavcodec\dirac_vlc.c" />
     <ClCompile Include="..\libavcodec\dfa.c" />
     <ClCompile Include="..\libavcodec\dnxhddec.c" />
     <ClCompile Include="..\libavcodec\dnxhddata.c" />
@@ -1081,6 +1083,7 @@
     <ClInclude Include="..\libavcodec\dv_profile.h" />
     <ClInclude Include="..\libavcodec\dxva2.h" />
     <ClInclude Include="..\libavcodec\jni.h" />
+    <ClInclude Include="..\libavcodec\mediacodec.h" />
     <ClInclude Include="..\libavcodec\qsv.h" />
     <ClInclude Include="..\libavcodec\vaapi.h" />
     <ClInclude Include="..\libavcodec\vda.h" />
@@ -1370,6 +1373,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -1453,6 +1457,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -1542,6 +1547,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -1635,6 +1641,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -1729,6 +1736,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -1822,6 +1830,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -1916,6 +1925,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2005,6 +2015,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2101,6 +2112,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2196,6 +2208,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2292,6 +2305,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2387,6 +2401,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2476,6 +2491,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
@@ -2565,6 +2581,7 @@ copy ..\libavcodec\dirac.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\jni.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\mediacodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec

SMP/libavcodec.vcxproj.filters

@@ -318,6 +318,9 @@
     <ClCompile Include="..\libavcodec\mathtables.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mediacodec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\options.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -975,6 +978,9 @@
     <ClCompile Include="..\libavcodec\dirac_arith.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dirac_vlc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dfa.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2783,6 +2789,9 @@
     <ClInclude Include="..\libavcodec\jni.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\mediacodec.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\qsv.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>