624 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
5b0b63b674 Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build 2009-09-24 16:17:14 -07:00
Dianne Hackborn
74468de20b am 9d31e1be: Merge change 26686 into eclair
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.
2009-09-23 15:28:53 -07:00
Dianne Hackborn
a52b4d764e Fix broken build.
I -did- run it...  why did this later break on me?!?

Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
2009-09-23 15:17:39 -07:00
Ray Chen
94cdc3d0e2 am 830207ca: Merge change 25635 into eclair
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
2009-09-23 11:38:06 -07:00
Yu Shan Emily Lau
f97eb8f932 am 5653e41e: am 008fc5d1: Merge change 26332 into eclair
Merge commit '5653e41e71a07c104da3f01e5a022198ee39dafe'

* commit '5653e41e71a07c104da3f01e5a022198ee39dafe':
  1) Add the wma / wmv profile reader.
2009-09-23 11:30:58 -07:00
Ray Chen
00c575a3fc Add new thumbnail API. 2009-09-23 11:23:45 -07:00
Yu Shan Emily Lau
5653e41e71 am 008fc5d1: Merge change 26332 into eclair
Merge commit '008fc5d142b58688a3827a544c524dff11204c62' into eclair-plus-aosp

* commit '008fc5d142b58688a3827a544c524dff11204c62':
  1) Add the wma / wmv profile reader.
2009-09-22 12:32:29 -07:00
Android (Google) Code Review
008fc5d142 Merge change 26332 into eclair
* changes:
  1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2009-09-22 15:09:33 -04:00
Yu Shan Emily Lau
dc1af5befa 1) Add the wma / wmv profile reader.
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2009-09-22 10:52:56 -07:00
Chih-Chung Chang
e82fff6eaf am 1e577ced: am 7b7029e0: Merge change 26236 into eclair
Merge commit '1e577ced7dcd973267f38351616d28f8a090f013'

* commit '1e577ced7dcd973267f38351616d28f8a090f013':
  Make media scanner read the jpeg orientation tag.
2009-09-22 10:09:45 -07:00
Chih-Chung Chang
1e577ced7d am 7b7029e0: Merge change 26236 into eclair
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.
2009-09-22 09:59:46 -07:00
Chih-Chung Chang
b8f4725d1b Make media scanner read the jpeg orientation tag. 2009-09-22 04:42:02 +08:00
Yu Shan Emily Lau
f7e8872036 am 58c24345: am 92b27daf: Merge change 25858 into eclair
Merge commit '58c243450d054893c234159ea62262c7f2c0a139'

* commit '58c243450d054893c234159ea62262c7f2c0a139':
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 20:19:00 -07:00
Yu Shan Emily Lau
58c243450d am 92b27daf: Merge change 25858 into eclair
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp

* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 20:13:31 -07:00
Android (Google) Code Review
92b27dafe9 Merge change 25858 into eclair
* changes:
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 23:07:00 -04:00
Yu Shan Emily Lau
ac11ffad0b am 5813b309: am e785d180: Merge change 25826 into eclair
Merge commit '5813b3097451dc4d061eb75e5479e4ea15d886c7'

* commit '5813b3097451dc4d061eb75e5479e4ea15d886c7':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 18:16:38 -07:00
Yu Shan Emily Lau
17d7ea4947 There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension 2009-09-18 16:27:24 -07:00
Yu Shan Emily Lau
5813b30974 am e785d180: Merge change 25826 into eclair
Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp

* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 16:23:06 -07:00
Android (Google) Code Review
e785d1804d Merge change 25826 into eclair
* changes:
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 19:14:32 -04:00
Yu Shan Emily Lau
9d7b2fa808 Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore. 2009-09-18 14:58:56 -07:00
Chih-Chung Chang
d93ee52927 am 87012028: am f22b7410: Merge change 25464 into eclair
Merge commit '87012028344dae6e9a0b0ad4615797284ce6c83f'

* commit '87012028344dae6e9a0b0ad4615797284ce6c83f':
  Improve ExifInterface API.
2009-09-18 12:08:33 -07:00
Chih-Chung Chang
8701202834 am f22b7410: Merge change 25464 into eclair
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
2009-09-18 12:02:50 -07:00
Chih-Chung Chang
872a30ec72 Improve ExifInterface API.
Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
2009-09-18 11:30:47 -07:00
Yu Shan Emily Lau
baf71a65ab am 667bc1e8: am b39dcb79: Merge change 25722 into eclair
Merge commit '667bc1e862c5e6b2a703846e786bf0b624830da8'

* commit '667bc1e862c5e6b2a703846e786bf0b624830da8':
  Modified the validation to use singal media player instance.
2009-09-18 00:05:15 -07:00
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