Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c0b254 authored by Scott Rowe's avatar Scott Rowe Committed by Android Git Automerger
Browse files

am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols,... 

am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit 'ccfedfcc':
  docs: Supported media protocols, codecs, formats for Android TV
parents 4c1f70db ccfedfcc

docs/html/guide/appendix/media-formats.jd

+30 −2
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ page.tags=video,audio,mpeg,mp4,m4a,mp3,3gp,3gpp,flac,wave,wav 
</tr>

</tr>





<tr>

<tr>

<td rowspan="11">Audio</td>

<td rowspan="12">Audio</td>

<td>AAC LC</td>

<td>AAC LC</td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>
@@ -179,6 +179,15 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> 
  WAVE (.wav)</td>

  WAVE (.wav)</td>

</tr>

</tr>





<tr>

<td>Opus</td>

<td style="text-align: center;"></td>

<td style="text-align: center;"><big>&bull;</big><br><small>(Android 5.0+)</small></td>

<td></td>

<td>

  Matroska (.mkv)</td>

</tr>



<tr>

<tr>

<td rowspan="5">Image</td>

<td rowspan="5">Image</td>

<td>JPEG</td>

<td>JPEG</td>
@@ -235,7 +244,7 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> 








<tr>

<tr>

<td rowspan="4">Video</td>

<td rowspan="6">Video</td>

<td>H.263</td>

<td>H.263</td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>
@@ -256,6 +265,15 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> 
  &bull; MPEG-TS (.ts, AAC audio only, not seekable, Android 3.0+)</td>

  &bull; MPEG-TS (.ts, AAC audio only, not seekable, Android 3.0+)</td>

</tr>

</tr>





<tr>

<td>H.265 HEVC</td>

<td style="text-align: center;" nowrap></td>

<td style="text-align: center;" nowrap><big>&bull;</big><br><small>(Android 5.0+)</small></td>

<td>Main Profile Level 3 for mobile devices and Main Profile Level 4.1 for Android TV</td>

<td>

  &bull; MPEG-4 (.mp4)<br>

</tr>



<tr>

<tr>

<td>MPEG-4 SP</td>

<td>MPEG-4 SP</td>

<td>&nbsp;</td>

<td>&nbsp;</td>
@@ -275,6 +293,16 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> 
  &bull; Matroska (.mkv, Android 4.0+)</td>

  &bull; Matroska (.mkv, Android 4.0+)</td>

</tr>

</tr>





<tr>

<td>VP9</td>

<td style="text-align: center;" nowrap></td>

<td style="text-align: center;" nowrap><big>&bull;</big><br><small>(Android 4.4+)</small></td>

<td></td>

<td>

  &bull; <a href="http://www.webmproject.org/">WebM</a> (.webm)<br>

  &bull; Matroska (.mkv, Android 4.0+)</td>

</tr>



</tbody></table>

</tbody></table>

docs/html/training/tv/start/start.jd

+21 −2
Original line number Original line Diff line number Diff line 
page.title=Get Started with TV Apps

page.title=Getting Started with TV Apps

page.tags="leanback","recyclerview","launcher"

page.tags="leanback","recyclerview","launcher"





trainingnavtop=true

trainingnavtop=true
@@ -10,6 +10,7 @@ startpage=true 
<div id="tb">

<div id="tb">

  <h2>This lesson teaches you how to</h2>

  <h2>This lesson teaches you how to</h2>

  <ol>

  <ol>

    <li><a href="#media">Determine Media Format Support</a></li>

    <li><a href="#dev-project">Setup a TV Project</a></li>

    <li><a href="#dev-project">Setup a TV Project</a></li>

    <li><a href="#tv-libraries">Add TV Support Libraries</a></li>

    <li><a href="#tv-libraries">Add TV Support Libraries</a></li>

    <li><a href="#build-it">Build TV Apps</a></li>

    <li><a href="#build-it">Build TV Apps</a></li>
@@ -42,6 +43,18 @@ startpage=true 
  minimum required changes to enable an app to run on TV devices.

  minimum required changes to enable an app to run on TV devices.

</p>

</p>





<h2 id="media">Determine Media Format Support</h2>



<p>See the following documentation for information about the codecs, protocols, and formats

supported by Android TV.</p>



<ul>

  <li><a href="{@docRoot}guide/appendix/media-formats.html">Supported Media Formats</a></li>

  <li><a class="external-link" href="https://source.android.com/devices/drm.html">DRM</a></li>

  <li><code><a href="{@docRoot}reference/android/drm/package-summary.html">android.drm</a></code></li>

  <li><a href="{@docRoot}guide/topics/media/exoplayer.html">ExoPlayer</a></li>

  <li>{@link android.media.MediaPlayer android.media.MediaPlayer}</li>

</ul>





<h2 id="dev-project">Set up a TV Project</h2>

<h2 id="dev-project">Set up a TV Project</h2>
@@ -284,9 +297,15 @@ startpage=true 
    TV devices.

    TV devices.

  </li>

  </li>

  <li>

  <li>

    <a href="{@docRoot}training/tv/games/index.html">Games for TV</a> - TV devices are a great

    <a href="{@docRoot}training/tv/games/index.html">Building TV Games</a> - TV devices are a great

    platform for games. See this topic for information on building great game experiences for TV.

    platform for games. See this topic for information on building great game experiences for TV.

  </li>

  </li>

    <li>

    <a href="{@docRoot}training/tv/tif/index.html">Building Live TV Apps</a> - Present your video

    content in a linear, "broadcast TV" style with channels and programs that your users can access

    through a program guide as well as the channel up/down buttons.

  </li>



</ul>

</ul>