drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,527 Commits 1 Branch 0 Tags
Commit Graph

482 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
667bc1e862 am b39dcb79: Merge change 25722 into eclair 
Merge commit 'b39dcb796ddf40fb87724ac28932a687756c91bd' into eclair-plus-aosp

* commit 'b39dcb796ddf40fb87724ac28932a687756c91bd':
  Modified the validation to use singal media player instance.
 2009-09-18 00:00:05 -07:00
Yu Shan Emily Lau
bc95d663ad Modified the validation to use singal media player instance. 2009-09-17 23:43:18 -07:00
Yu Shan Emily Lau
64ea3d3fd8 am 56af9e9f: Merge change 25452 into eclair 
Merge commit '56af9e9f9cbc3626acf55558d581efd2de3caa03' into eclair-plus-aosp

* commit '56af9e9f9cbc3626acf55558d581efd2de3caa03':
  Modified the new stream video url.
 2009-09-17 23:28:09 -07:00
Android (Google) Code Review
56af9e9f9c Merge change 25452 into eclair 
* changes:
  Modified the new stream video url.
 2009-09-18 02:20:43 -04:00
Andreas Huber
b66fb49883 am 3065a3ca: Merge change 25528 into eclair 
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp

* commit '3065a3cad069b847165c99a38a251c072950d07f':
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
 2009-09-17 12:00:45 -07:00
Android (Google) Code Review
3065a3cad0 Merge change 25528 into eclair 
* changes:
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
 2009-09-17 14:46:45 -04:00
Andreas Huber
1a77b68e90 Another stagefright test-case and ignore end-of-stream notifications while we're flushing. 2009-09-17 11:16:52 -07:00
Yu Shan Emily Lau
00e6beb6ea am c82e65ae: Merge change 25228 into eclair 
Merge commit 'c82e65aed57592d40009a9695f513ebf402e687c' into eclair-plus-aosp

* commit 'c82e65aed57592d40009a9695f513ebf402e687c':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
 2009-09-17 08:45:01 -07:00
Yu Shan Emily Lau
208ad8e413 Modified the new stream video url. 2009-09-16 23:16:44 -07:00
Android (Google) Code Review
c82e65aed5 Merge change 25228 into eclair 
* changes:
  	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java Added the error callback to handle the media server crash.
 2009-09-16 22:16:58 -04:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Jean-Baptiste Queru
ea5f767246 Update documentation for getVideoWidth and getVideoHeight. 
Ref: http://code.google.com/p/android/issues/detail?id=3024
 2009-09-16 15:06:25 -07:00
Chih-Chung Chang
d5423a9fc8 am fc5f1026: Merge change 25291 into eclair 
Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp

* commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70':
  Try to fix sdk build again.
 2009-09-16 10:32:14 -07:00
Android (Google) Code Review
fc5f10265f Merge change 25291 into eclair 
* changes:
  Try to fix sdk build again.
 2009-09-16 13:23:35 -04:00
Chih-Chung Chang
8bc2495e5e am de88c515: Merge change 25286 into eclair 
Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp

* commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df':
  Fix sdk build.
 2009-09-16 10:22:56 -07:00
Chih-Chung Chang
9081aec61f Try to fix sdk build again. 2009-09-17 01:20:05 +08:00
Android (Google) Code Review
de88c515ce Merge change 25286 into eclair 
* changes:
  Fix sdk build.
 2009-09-16 13:15:45 -04:00
Chih-Chung Chang
7b886f9e8c Fix sdk build. 2009-09-17 01:09:08 +08:00
Andreas Huber
51173401f4 am f7c3679f: Merge change 25158 into eclair 
Merge commit 'f7c3679f898cdcb208bc1675c79573e1d637083a' into eclair-plus-aosp

* commit 'f7c3679f898cdcb208bc1675c79573e1d637083a':
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
 2009-09-16 10:08:13 -07:00
Android (Google) Code Review
f7c3679f89 Merge change 25158 into eclair 
* changes:
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
 2009-09-16 13:01:57 -04:00
Chih-Chung Chang
53a673661c am d3ba4811: Merge change 25272 into eclair 
Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
  Make ExifInterface public.
 2009-09-16 09:19:41 -07:00
Android (Google) Code Review
d3ba4811d4 Merge change 25272 into eclair 
* changes:
  Make ExifInterface public.
 2009-09-16 12:12:03 -04:00
Jean-Michel Trivi
2edbd217af am b53eaac6: Merge change 25155 into eclair 
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
 2009-09-16 09:10:31 -07:00
Android (Google) Code Review
b53eaac659 Merge change 25155 into eclair 
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
 2009-09-16 12:07:37 -04:00
Chih-Chung Chang
017bb4ccf7 Make ExifInterface public. 2009-09-16 23:38:34 +08:00
Chih-Chung Chang
e1c64f8f14 am ccd064d4: Merge change 25255 into eclair 
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
 2009-09-16 05:21:54 -07:00
Chih-Chung Chang
700beb4846 Clean ExifInterface. Prepare to make it public. 
Change-Id: Ibff719d02f525c1e8583d1892737224a0cc42c37
 2009-09-16 20:03:48 +08:00
Yu Shan Emily Lau
20a6b955fe modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java 
Added the error callback to handle the media server crash.

	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
 2009-09-15 21:42:07 -07:00
Yu Shan Emily Lau
036033fc6d am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration 
Merge commit '610e3595d250f78c857126cd08ef2a82ee650415' into eclair-plus-aosp

* commit '610e3595d250f78c857126cd08ef2a82ee650415':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
 2009-09-15 20:59:10 -07:00
Yu Shan Emily Lau
610e3595d2 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java 
Fixed the meta data duration
 2009-09-15 20:40:07 -07:00
Andreas Huber
39b3bb95a7 am 781a5dd5: Merge change 25142 into eclair 
Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp

* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
 2009-09-15 16:19:35 -07:00
Andreas Huber
4f23457958 Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565. 2009-09-15 16:19:08 -07:00
Jean-Michel Trivi
fccb25d207 Fix bug 2115258 where the AudioManager javadoc doesn't warn against 
misuse of some of the methods that should only be used to implement
the Settings and Phone apps, and the audio service.
 2009-09-15 16:13:59 -07:00
Andreas Huber
0446b82617 The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now. 
If they aren't, a later call to OMX_FreeBuffer crashes...
 2009-09-15 15:50:31 -07:00
Andreas Huber
ecbcbf32b0 am a4fe2aca: Merge change 25128 into eclair 
Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp

* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
 2009-09-15 14:51:30 -07:00
Andreas Huber
1198aa27f1 am 0edada08: Merge change 25101 into eclair 
Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp

* commit '0edada085e175e81b6d38a48b5b022917b410a98':
  Added an API IOMX::createRendererFromJavaSurface.
 2009-09-15 14:51:23 -07:00
Android (Google) Code Review
a4fe2aca52 Merge change 25128 into eclair 
* changes:
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
 2009-09-15 17:48:33 -04:00
Android (Google) Code Review
0edada085e Merge change 25101 into eclair 
* changes:
  Added an API IOMX::createRendererFromJavaSurface.
 2009-09-15 17:48:22 -04:00
Andreas Huber
c966a3c255 Support CbYCrY -> RGB565 color conversion in IOMXRenderer. 2009-09-15 14:32:59 -07:00
Yu Shan Emily Lau
44934f3042 am 4d445d68: Merge change 24955 into eclair 
Merge commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7' into eclair-plus-aosp

* commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7':
  new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
 2009-09-15 14:16:27 -07:00
Android (Google) Code Review
4d445d682e Merge change 24955 into eclair 
* changes:
  	new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java 	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
 2009-09-15 17:10:54 -04:00
Andreas Huber
9f9afef3d5 Added an API IOMX::createRendererFromJavaSurface. 
This api allows to instantiate a renderer by specifying the hosting java Surface object. This hides the implementation details of (java-)Surface, (native-)Surface and friends.
 2009-09-15 12:49:11 -07:00
Yu Shan Emily Lau
1619367ab8 new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java 
modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.

	new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
 2009-09-14 16:27:34 -07:00
Andreas Huber
1ff4cdadd5 am 0d558113: Merge change 24932 into eclair 
Merge commit '0d5581133285cef4d7582b531e0bf09cee86aa90' into eclair-plus-aosp

* commit '0d5581133285cef4d7582b531e0bf09cee86aa90':
  Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
 2009-09-14 15:54:15 -07:00
Andreas Huber
92022857fb Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues... 2009-09-14 15:24:14 -07:00
Andreas Huber
5962166750 am 714ec136: Merge change 24742 into eclair 
Merge commit '714ec1360cde8b1cbf6e6b8572256e4100f11560' into eclair-plus-aosp

* commit '714ec1360cde8b1cbf6e6b8572256e4100f11560':
  Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
 2009-09-14 10:13:30 -07:00
Android (Google) Code Review
714ec1360c Merge change 24742 into eclair 
* changes:
  Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
 2009-09-14 13:08:02 -04:00
Eric Laurent
6fc35e3e7e am 91e2d865: Merge change 24337 into eclair 
Merge commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430' into eclair-plus-aosp

* commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430':
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
 2009-09-13 23:50:52 -07:00
Android (Google) Code Review
91e2d8651f Merge change 24337 into eclair 
* changes:
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
 2009-09-14 02:43:52 -04:00
Yu Shan Emily Lau
f23eb2839a am 9a7efa45: Merge change 24789 into eclair 
Merge commit '9a7efa452909b7a4f12840c44291c51a699acade' into eclair-plus-aosp

* commit '9a7efa452909b7a4f12840c44291c51a699acade':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
 2009-09-11 18:05:02 -07:00