Advertisement
techmik

Untitled

Aug 5th, 2012
104
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 11.91 KB | None | 0 0
  1. techmik@kragar ~ $ diff ~/Desktop/sky-media_codecs.xml ~/Desktop/surf-media_codecs.xml
  2. 1c1
  3. < <?xml version="1.0" encoding="utf-8" ?>
  4. ---
  5. > <?xml version="1.0" encoding="utf-8"?>
  6. 16d15
  7. <
  8. 18,75c17,19
  9. < <!DOCTYPE MediaCodecs [
  10. < <!ELEMENT MediaCodecs (Decoders,Encoders)>
  11. < <!ELEMENT Decoders (MediaCodec*)>
  12. < <!ELEMENT Encoders (MediaCodec*)>
  13. < <!ELEMENT MediaCodec (Type*,Quirk*)>
  14. < <!ATTLIST MediaCodec name CDATA #REQUIRED>
  15. < <!ATTLIST MediaCodec type CDATA>
  16. < <!ELEMENT Type EMPTY>
  17. < <!ATTLIST Type name CDATA #REQUIRED>
  18. < <!ELEMENT Quirk EMPTY>
  19. < <!ATTLIST Quirk name CDATA #REQUIRED>
  20. < ]>
  21. <
  22. < There's a simple and a complex syntax to declare the availability of a
  23. < media codec:
  24. <
  25. < A codec that properly follows the OpenMax spec and therefore doesn't have any
  26. < quirks and that only supports a single content type can be declared like so:
  27. <
  28. <     <MediaCodec name="OMX.foo.bar" type="something/interesting" />
  29. <
  30. < If a codec has quirks OR supports multiple content types, the following syntax
  31. < can be used:
  32. <
  33. <     <MediaCodec name="OMX.foo.bar" >
  34. <         <Type name="something/interesting" />
  35. <         <Type name="something/else" />
  36. <         ...
  37. <         <Quirk name="requires-allocate-on-input-ports" />
  38. <         <Quirk name="requires-allocate-on-output-ports" />
  39. <         <Quirk name="output-buffers-are-unreadable" />
  40. <     </MediaCodec>
  41. <
  42. < Only the three quirks included above are recognized at this point:
  43. <
  44. < "requires-allocate-on-input-ports"
  45. <     must be advertised if the component does not properly support specification
  46. <     of input buffers using the OMX_UseBuffer(...) API but instead requires
  47. <     OMX_AllocateBuffer to be used.
  48. <
  49. < "requires-allocate-on-output-ports"
  50. <     must be advertised if the component does not properly support specification
  51. <     of output buffers using the OMX_UseBuffer(...) API but instead requires
  52. <     OMX_AllocateBuffer to be used.
  53. <
  54. < "output-buffers-are-unreadable"
  55. <     must be advertised if the emitted output buffers of a decoder component
  56. <     are not readable, i.e. use a custom format even though abusing one of
  57. <     the official OMX colorspace constants.
  58. <     Clients of such decoders will not be able to access the decoded data,
  59. <     naturally making the component much less useful. The only use for
  60. <     a component with this quirk is to render the output to the screen.
  61. <     Audio decoders MUST NOT advertise this quirk.
  62. <     Video decoders that advertise this quirk must be accompanied by a
  63. <     corresponding color space converter for thumbnail extraction,
  64. <     matching surfaceflinger support that can render the custom format to
  65. <     a texture and possibly other code, so just DON'T USE THIS QUIRK.
  66. <
  67. ---
  68. >      Copyright (c) 2012, Code Aurora Forum. All rights reserved.
  69. >      Not a Contribution, Apache license notifications and license are retained
  70. >      for attribution purposes only.
  71. 77,78c21,62
  72. <
  73. < <MediaCodecs>
  74. ---
  75. > <CodecList>
  76. >     <Encoders>
  77. >         <!-- Audio Hardware  -->
  78. >         <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
  79. >         <MediaCodec name="OMX.qcom.audio.encoder.aac" type="audio/mp4a-latm" />
  80. >         <MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
  81. >             <Quirk name="requires-allocate-on-input-ports" />
  82. >             <Quirk name="requires-allocate-on-output-ports" />
  83. >         </MediaCodec>
  84. >         <MediaCodec name="OMX.qcom.audio.encoder.qcelp13" type="audio/qcelp" >
  85. >             <Quirk name="requires-allocate-on-input-ports" />
  86. >             <Quirk name="requires-allocate-on-output-ports" />
  87. >         </MediaCodec>
  88. >         <!-- Audio Software  -->
  89. >         <MediaCodec name="AACEncoder" type="audio/mp4a-latm" />
  90. >         <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
  91. >         <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
  92. >         <!-- Video Hardware  -->
  93. >         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
  94. >             <Quirk name="requires-allocate-on-input-ports" />
  95. >             <Quirk name="requires-allocate-on-output-ports" />
  96. >             <Quirk name="requires-loaded-to-idle-after-allocation" />
  97. >         </MediaCodec>
  98. >         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
  99. >             <Quirk name="requires-allocate-on-input-ports" />
  100. >             <Quirk name="requires-allocate-on-output-ports" />
  101. >             <Quirk name="requires-loaded-to-idle-after-allocation"/>
  102. >         </MediaCodec>
  103. >         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
  104. >             <Quirk name="requires-allocate-on-input-ports" />
  105. >             <Quirk name="requires-allocate-on-output-ports" />
  106. >             <Quirk name="requires-loaded-to-idle-after-allocation" />
  107. >         </MediaCodec>
  108. >         <!-- Video Software  -->
  109. >         <MediaCodec name="OMX.ittiam.video.encoder.avc" type="video/avc" >
  110. >             <Quirk name="requires-allocate-on-input-ports" />
  111. >             <Quirk name="requies-loaded-to-idle-after-allocation" />
  112. >         </MediaCodec>
  113. >         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" />
  114. >         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" />
  115. >         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" />
  116. >     </Encoders>
  117. 80,86c64,91
  118. <         <MediaCodec name="OMX.QCOM.MSM8660.MPEG4.VIDEO.Decoder" type="video/mp4v-es" />
  119. <         <MediaCodec name="OMX.QCOM.MSM8660.H263.VIDEO.Decoder" type="video/3gpp" />
  120. <         <MediaCodec name="OMX.QCOM.MSM8660.AVC.VIDEO.Decoder" type="video/avc" />
  121. <         <MediaCodec name="OMX.QCOM.MSM8660.AAC.AUDIO.Decoder" type="audio/aac" />
  122. <         <MediaCodec name="OMX.QCOM.MSM8660.AC3.AUDIO.Decoder" type="audio/ac3" />
  123. <         <MediaCodec name="OMX.QCOM.MSM8660.MP3.AUDIO.Decoder" type="audio/mp3" />
  124. <
  125. ---
  126. >         <!-- Audio Hardware  -->
  127. >         <MediaCodec name="OMX.qcom.audio.decoder.Qcelp13Hw" type="audio/qcelp" >
  128. >             <Quirk name="requires-global-flush" />
  129. >         </MediaCodec>
  130. >         <MediaCodec name="OMX.qcom.audio.decoder.evrchw" type="audio/evrc" >
  131. >             <Quirk name="requires-global-flush" />
  132. >         </MediaCodec>
  133. >         <MediaCodec name="OMX.qcom.audio.decoder.ac3" type="audio/ac3" >
  134. >             <Quirk name="requires-allocate-on-input-ports" />
  135. >             <Quirk name="requires-allocate-on-output-ports" />
  136. >         </MediaCodec>
  137. >         <MediaCodec name="OMX.qcom.audio.decoder.wma" type="audio/x-ms-wma" >
  138. >             <Quirk name="requires-global-flush" />
  139. >             <Quirk name="requires-wma-pro-component" />
  140. >         </MediaCodec>
  141. >         <MediaCodec name="OMX.qcom.audio.decoder.wmaLossLess" type="audio/x-ms-wma" >
  142. >             <Quirk name="requires-global-flush" />
  143. >             <Quirk name="requires-wma-pro-component" />
  144. >         </MediaCodec>
  145. >         <MediaCodec name="OMX.qcom.audio.decoder.wma10Pro" type="audio/x-ms-wma" >
  146. >             <Quirk name="requires-global-flush" />
  147. >             <Quirk name="requires-wma-pro-component" />
  148. >         </MediaCodec>
  149. >         <MediaCodec name="OMX.qcom.audio.decoder.mp3" type="audio/mpeg" >
  150. >             <Quirk name="requires-global-flush" />
  151. >         </MediaCodec>
  152. >         <!-- Audio Software  -->
  153. >         <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
  154. 93,104c98,105
  155. <         <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
  156. <
  157. <         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
  158. <         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
  159. <         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
  160. <         <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
  161. <     </Decoders>
  162. <
  163. <     <Encoders>
  164. <         <MediaCodec name="OMX.QCOM.VIDEO.MPEG4E" >
  165. <             <Type name="video/mp4v-es" />
  166. <             <Type name="video/3gpp" />
  167. ---
  168. >         <MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
  169. >             <Quirk name="requires-global-flush" />
  170. >         </MediaCodec>
  171. >         <MediaCodec name="OMX.qcom.audio.decoder.evrc" type="audio/evrc" >
  172. >             <Quirk name="requires-global-flush" />
  173. >         </MediaCodec>
  174. >         <!-- Video Hardware  -->
  175. >         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
  176. 106a108
  177. >             <Quirk name="defers-output-buffer-allocation" />
  178. 108,109c110
  179. <
  180. <         <MediaCodec name="OMX.QCOM.VIDEO.H264E" type="video/avc" >
  181. ---
  182. >         <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
  183. 111a113
  184. >             <Quirk name="defers-output-buffer-allocation" />
  185. 113,119c115,164
  186. <
  187. <         <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
  188. <         <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
  189. <         <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
  190. <         <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
  191. <     </Encoders>
  192. < </MediaCodecs>
  193. ---
  194. >         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
  195. >             <Quirk name="requires-allocate-on-input-ports" />
  196. >             <Quirk name="requires-allocate-on-output-ports" />
  197. >             <Quirk name="defers-output-buffer-allocation" />
  198. >         </MediaCodec>
  199. >         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
  200. >             <Quirk name="requires-allocate-on-input-ports" />
  201. >             <Quirk name="requires-allocate-on-output-ports" />
  202. >             <Quirk name="defers-output-buffer-allocation" />
  203. >         </MediaCodec>
  204. >         <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
  205. >             <Quirk name="requires-allocate-on-input-ports" />
  206. >             <Quirk name="requires-allocate-on-output-ports" />
  207. >             <Quirk name="defers-output-buffer-allocation" />
  208. >         </MediaCodec>
  209. >         <MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
  210. >             <Quirk name="requires-allocate-on-input-ports" />
  211. >             <Quirk name="requires-allocate-on-output-ports" />
  212. >             <Quirk name="defers-output-buffer-allocation" />
  213. >         </MediaCodec>
  214. >         <MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
  215. >             <Quirk name="requires-allocate-on-input-ports" />
  216. >             <Quirk name="requires-allocate-on-output-ports" />
  217. >             <Quirk name="defers-output-buffer-allocation" />
  218. >         </MediaCodec>
  219. >         <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
  220. >             <Quirk name="requires-allocate-on-input-ports" />
  221. >             <Quirk name="requires-allocate-on-output-ports" />
  222. >             <Quirk name="defers-output-buffer-allocation" />
  223. >         </MediaCodec>
  224. >         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
  225. >             <Quirk name="requires-allocate-on-input-ports" />
  226. >             <Quirk name="requires-allocate-on-output-ports" />
  227. >             <Quirk name="defers-output-buffer-allocation" />
  228. >         </MediaCodec>
  229. >         <!-- Video Software  -->
  230. >         <MediaCodec name="OMX.ittiam.video.decoder.avc" type="video/avc" >
  231. >             <Quirk name="requires-allocate-on-output-ports" />
  232. >             <Quirk name="defers-output-buffer-allocation" />
  233. >         </MediaCodec>
  234. >         <MediaCodec name="OMX.ittiam.video.decoder.mpeg4" type="video/mp4v-es" >
  235. >             <Quirk name="requires-allocate-on-output-ports" />
  236. >             <Quirk name="defers-output-buffer-allocation" />
  237. >         </MediaCodec>
  238. >         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
  239. >         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
  240. >         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
  241. >         <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
  242. >     </Decoders>
  243. > </CodecList>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement