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

700 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
dd74c01efc am 64ea3d3f: am 56af9e9f: Merge change 25452 into eclair 
Merge commit '64ea3d3fd847d5055a8a39b0cd7ff89c4beea042'

* commit '64ea3d3fd847d5055a8a39b0cd7ff89c4beea042':
  Modified the new stream video url.
 2009-09-17 23:37:02 -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
d76ca9578f am b66fb498: am 3065a3ca: Merge change 25528 into eclair 
Merge commit 'b66fb4988320b1b8ad79823713b3e0d8acb4d24f'

* commit 'b66fb4988320b1b8ad79823713b3e0d8acb4d24f':
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
 2009-09-17 12:23:57 -07:00
Yu Shan Emily Lau
182d75ec09 am 00e6beb6: am c82e65ae: Merge change 25228 into eclair 
Merge commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1'

* commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
 2009-09-17 12:13:51 -07:00
Jean-Baptiste Queru
e910ef2258 am e525eef4: merge from open-source master 
Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'

* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
  Update comment in mediaplayer.h.
  Update documentation for getVideoWidth and getVideoHeight.
  Make Uri.parseUserPart, parseHost, and parsePort symmetric
  Javadoc used startApplication() which doesnt exists, changed to createApplication()
 2009-09-17 12:10:47 -07: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
Chih-Chung Chang
8441c267dc am d5423a9f: am fc5f1026: Merge change 25291 into eclair 
Merge commit 'd5423a9fc8c0caebdd29d1c673cf14725ad7205e'

* commit 'd5423a9fc8c0caebdd29d1c673cf14725ad7205e':
  Try to fix sdk build again.
 2009-09-17 09:55:56 -07:00
Chih-Chung Chang
903c2cc47f am 8bc2495e: am de88c515: Merge change 25286 into eclair 
Merge commit '8bc2495e5ee83d2815b3e7ed151271dae057db67'

* commit '8bc2495e5ee83d2815b3e7ed151271dae057db67':
  Fix sdk build.
 2009-09-17 09:55:34 -07:00
Andreas Huber
181a6ebed6 am 51173401: am f7c3679f: Merge change 25158 into eclair 
Merge commit '51173401f4742d92d46af602190a98372f10bda9'

* commit '51173401f4742d92d46af602190a98372f10bda9':
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
 2009-09-17 09:55:04 -07:00
Chih-Chung Chang
696605ad77 am 53a67366: am d3ba4811: Merge change 25272 into eclair 
Merge commit '53a673661cebc93649532a716b19cc22497c5bb6'

* commit '53a673661cebc93649532a716b19cc22497c5bb6':
  Make ExifInterface public.
 2009-09-17 09:54:32 -07:00
Jean-Michel Trivi
09a11afd40 am 2edbd217: am b53eaac6: Merge change 25155 into eclair 
Merge commit '2edbd217af15ce3e1e3632da1e679db5153111b8'

* commit '2edbd217af15ce3e1e3632da1e679db5153111b8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
 2009-09-17 09:54:23 -07:00
Chih-Chung Chang
d52c567285 am e1c64f8f: am ccd064d4: Merge change 25255 into eclair 
Merge commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de'

* commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de':
  Clean ExifInterface. Prepare to make it public.
 2009-09-17 09:53:12 -07:00
Yu Shan Emily Lau
3aea463e3d am 036033fc: am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration 
Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b'

* commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
 2009-09-17 09:50:39 -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
Andreas Huber
934d2d03f0 am 39b3bb95: am 781a5dd5: Merge change 25142 into eclair 
Merge commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950'

* commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950':
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
 2009-09-17 06:43:25 -07:00
Andreas Huber
dab775454b am ecbcbf32: am a4fe2aca: Merge change 25128 into eclair 
Merge commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085'

* commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085':
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
 2009-09-17 06:42:15 -07:00
Andreas Huber
c66fa908c4 am 1198aa27: am 0edada08: Merge change 25101 into eclair 
Merge commit '1198aa27f1c1952199dac8b59a14ab76a8fde607'

* commit '1198aa27f1c1952199dac8b59a14ab76a8fde607':
  Added an API IOMX::createRendererFromJavaSurface.
 2009-09-17 06:42:08 -07:00
Yu Shan Emily Lau
46a01f6303 am 44934f30: am 4d445d68: Merge change 24955 into eclair 
Merge commit '44934f3042939decc61ab6335acbf111e3ca09d9'

* commit '44934f3042939decc61ab6335acbf111e3ca09d9':
  new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
 2009-09-17 06:41:18 -07:00
Andreas Huber
7b6add2357 am 1ff4cdad: am 0d558113: Merge change 24932 into eclair 
Merge commit '1ff4cdadd5d704764bd6f822c42a2517b9b675b1'

* commit '1ff4cdadd5d704764bd6f822c42a2517b9b675b1':
  Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
 2009-09-16 23:55:44 -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
b88ce51f1b Merge change 24674 
* changes:
  Implement OmxJpegImageDecoder.
 2009-09-16 23:48:19 -04: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