Merge branch 'readonly-p4-donut' into donut (e6a9b452) · Commits · e / os / android_frameworks_base

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

+13 −5

Original line number	Original line	Diff line number	Diff line
	page.title=Android Supported Media Formats		page.title=Android Supported Media Formats
	@jd:body		@jd:body

	<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed here. </p>		<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed in the table. </p>
	<p>For your convenience, the table <a href="#g1">T-Mobile G1 Media Formats</a> describes the additional media formats supported by the T-Mobile G1 device. </p>		<p>For your convenience, the table <a href="#g1">T-Mobile G1 Media Formats</a> describes additional media format details for the T-Mobile G1 device. </p>


	<h2 id="core">Core Media Formats</h2>		<h2 id="core">Core Media Formats</h2>
	@@ -127,7 +127,7 @@ page.title=Android Supported Media Formats
	<tr>		<tr>
	<td rowspan="3">Video</td>		<td rowspan="3">Video</td>
	<td>H.263</td>		<td>H.263</td>
	<td style="text-align: center;"></td>		<td style="text-align: center;">X</td>
	<td style="text-align: center;">X</td>		<td style="text-align: center;">X</td>
	<td> </td>		<td> </td>
	<td>3GPP (.3gp)</td>		<td>3GPP (.3gp)</td>
	@@ -184,7 +184,7 @@ Mono and stereo profiles with 16-bits per sample. Decoder does not support WMA P
	</tr>		</tr>

	<tr>		<tr>
	<td rowspan="2">Video</td>		<td rowspan="3">Video</td>
	<td>WMV</td>		<td>WMV</td>
	<td> </td>		<td> </td>
	<td style="text-align: center;">X</td>		<td style="text-align: center;">X</td>
	@@ -193,7 +193,15 @@ Mono and stereo profiles with 16-bits per sample. Decoder does not support WMA P
	</tr>		</tr>

	<tr>		<tr>
	<td>H.264 AVC</td>		<td>H.263</td>
			<td style="text-align: center;">X</td>
			<td style="text-align: center;">X</td>
			<td> </td>
			<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
			</tr>

			<tr>
			<td>H.264 AVC</td>
	<td> </td>		<td> </td>
	<td style="text-align: center;">X</td>		<td style="text-align: center;">X</td>
	<td>Limited to baseline profile up to 480x320, and 600 kbps average bitrate for the video stream.</td>		<td>Limited to baseline profile up to 480x320, and 600 kbps average bitrate for the video stream.</td>

docs/html/guide/topics/media/index.jd

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -44,14 +44,13 @@ can play audio or video from media files stored in the application's resources
	arriving over a network connection. To play audio or video from your		arriving over a network connection. To play audio or video from your
	application, use the {@link android.media.MediaPlayer} class.</p>		application, use the {@link android.media.MediaPlayer} class.</p>

	<p>The platform also lets you record audio, where supported by the mobile device		<p>The platform also lets you record audio and video, where supported by the
	hardware. Recording of video is not currently supported, but is planned for a		mobile device hardware. To record audio or video, use the {@link
	future release. To record audio, use the		android.media.MediaRecorder} class. Note that the emulator doesn't have hardware
	{@link android.media.MediaRecorder} class. Note that the emulator doesn't have		to capture audio or video, but actual mobile devices are likely to provide these
	hardware to capture audio, but actual mobile devices are likely to provide these		capabilities, accessible through the MediaRecorder class. </p>
	capabilities that you can access through MediaRecorder. </p>
			<p>For a list of media formats for which Android offers built-in support,
	<p>For a list of the media formats for which Android offers built-in support,
	see the <a href="{@docRoot}guide/appendix/media-formats.html">Android Media		see the <a href="{@docRoot}guide/appendix/media-formats.html">Android Media
	Formats</a> appendix. </p>		Formats</a> appendix. </p>