404 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
780dc88ddb Fix the media memeory stress test.
The media memory stress test used the ps mediaserver to
capture the memory usage of mediaserver. As the media.log
is enabled recently, when runnign the ps mediaserver, it will
show both entries. The fix is simply skip the first two lines
and parse the laste output.

Change-Id: Ib2a4ba7936505b4ea24463bf8a5af2c499b71138
2013-03-19 17:42:50 -07:00
Yu Shan Emily Lau
984505d816 Media test clean up.
Remove duplicated camera preview stress test.
Remove duplicated recorder stress test.
Remove camera recorder switching stress test.
Reduced the total number of iterations for all the stress loop.

Change-Id: I447f8060fadd0599c160727fb7dda8a4cc384656
2013-03-14 18:14:54 -07:00
Dianne Hackborn
cd2216870b am a7110fd1: Merge "Fix build."
* commit 'a7110fd19aa1a2aaa1d84fdb038c02dec4ec9c50':
  Fix build.
2013-01-16 15:39:47 -08:00
Dianne Hackborn
9139625aae Fix build.
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
2013-01-16 15:34:35 -08:00
Jason Noguchi
aefc63bb3d am ceea8857: am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus e
* commit 'ceea88578ce53bdee96c561cd5fa5dae725f9a7b':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-09 11:59:12 -08:00
Jason Noguchi
ceb38fce56 am 9964fd37: am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '9964fd37a6d7f30ce96f854f8e67df192f4213be':
  Adding camera scene mode stress test.
2013-01-09 11:59:09 -08:00
Jason Noguchi
ceea88578c am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the
* commit '68ba8b919f8659711b85d8c5bd8a5cb013f441bc':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-09 11:53:55 -08:00
Jason Noguchi
9964fd37a6 am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '8d73c043c8c4fe5af8963bbe5c29a47a3dff2677':
  Adding camera scene mode stress test.
2013-01-09 11:53:51 -08:00
Jason Noguchi
68ba8b919f am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record durati
* commit 'e71bb7722b26ba2ada948ce3dbd626f14aabeb68':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-07 19:22:03 -08:00
Jason Noguchi
3f72bf323f Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev 2013-01-07 19:12:11 -08:00
Jason Noguchi
8d73c043c8 am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit 'be6ff0b83659dffa0c7c290c520474eda70bee07':
  Adding camera scene mode stress test.
2013-01-07 18:48:46 -08:00
Jason Noguchi
ca6a5eee8f Refactoring the media recorder stress test.
Added test cases for:
- record & playback @ 1080p
- record & playback @ 720p
- record & playback @ 480p
- record & playback @ custom
Plus extending the record duration to a full minute.

Change-Id: I294714811606c1ae57907d6ef6a7052044b6247c
2013-01-03 12:27:48 -08:00
Jason Noguchi
bac8666893 Adding camera scene mode stress test.
Change-Id: I3f9afef4edc6ea1f659263bf2dbd8ca247039ce0
2013-01-02 20:28:34 -08:00
Derek Sollenberger
2fa54cef47 Merge "Update framework to support r5967 of Skia." into master-chromium 2012-12-19 06:18:11 -08:00
Andy McFadden
d47f7d8b5f Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
2012-12-18 11:22:21 -08:00
Derek Sollenberger
ca79cf69d0 Update framework to support r5967 of Skia.
bug: 6906025
Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
2012-12-12 15:28:54 -05:00
Glenn Kasten
3766755665 Turn off execute bit for ordinary media files
Change-Id: Idbb4f793307d4e1c4af289f855bd4a1a781722db
2012-11-15 15:34:43 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Yu Shan Emily Lau
3662f2011f Append the test case name in the beginning
of the test log.

Change-Id: I621286274d84bfff474f1cc1e01353b3fd66dc23
2012-10-17 14:36:37 -07:00
Yu Shan Emily Lau
87b8a1c3b6 Fix the NPE for the memwriter.
Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
2012-10-17 11:10:32 -07:00
Yu Shan Emily Lau
2ffd20753e Instead of collecting the procmem output in
the test, change it as optional. This is to avoid
the tool breakage will block the whole memory test sutie.

Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
2012-10-09 19:12:46 -07:00
Marco Nelissen
af68e7c5f5 Visualizer only works on sounds >5 sec.
Various media framework tests use a Visualizer to look at the output
of another effect, but this requires the played file  to be longer
than 5 seconds.
b/4571740
b/7173543
b/7173545
b/7175623

Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
2012-09-18 09:19:55 -07:00
Marco Nelissen
c7fb118d90 Activity.onStop(Bundle) does not exist
Since that method doesn't exist, the MediaFrameworkTest wake lock was
never released, which caused the test to be killed when the GC collected
the still active wake lock.

Change-Id: Iee2c0478470be987ade405a45abf42ca61b681ab
2012-09-17 17:03:30 -07:00
Marco Nelissen
80cd3fcd5c EffectsTest enhancements
Fix the session edit boxes, and make the effects list more readable
by translating known effect type UUIDs

Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
2012-09-11 13:47:16 -07:00
Marco Nelissen
2e2beaaee2 Audio Effects test app
Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f
2012-09-06 12:37:30 -07:00
Yu Shan Emily Lau
e60393ae71 Remove the unnecssary intent call.
Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
2012-07-10 16:45:38 -07:00
James Dong
7b996d19af Fix a test case failure when there is no back-facing camera on a device
Change-Id: I427b2e03b266ff2d92c6fe64f732a256d285020e
related-to-bug: 6538628
2012-05-30 20:36:12 -07:00
Dave Burke
ec3f31f621 Added support for HE-AAC recording.
Not unhiding HE-AACv2 since that requires stereo mics.

Bug: 6275957

Change-Id: I953a6d21e615c8fd23f9390e3c86d63089f5fb75
2012-04-30 09:24:01 -07:00
James Dong
7a9734d769 Unhide APIs for timed text and multiple audio track switch APIs
o made all the member variables in helper classes for TimedText to be public and final
  since they are read-only
o removed Text and TextPos helper classes
o added two public methods in TimedText class: getText() and getBounds()
o cleaned up the javadoc of related methods in MediaPlayer.java and TimedText.java classes
o make the inner classes of TimedText static and final
o change invoke and let it throw RuntimeException on failure (thus a test class needs to be
  modified also).

o related-to-bug: 6110705,5542712

Change-Id: Ia1dd1fd5eb8e9fd1b61c6c0d67405edb627a3002
2012-04-27 15:48:46 -07:00
Yu Shan Emily Lau
e35b3e052d Fix the test cases which fail to launch the camera
in the device which only has one camera.

Change-Id: Ia34087715e49f1aa3e86f3f85cb4e77168323321
2012-04-26 17:10:29 -07:00
Jean-Michel Trivi
997592b3ce Add functional tests for Visualizer volume scaling mode
Add test to set/get the volume scaling mode.

Add test to verify that volume decreases diminish the commputed
  energy.

Change-Id: I0a5d45d064a46a18e5c4b9d7a304c9572f100cdf
2012-04-19 09:13:22 -07:00
Yu Shan Emily Lau
8fa23393e9 Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface." 2012-04-04 21:20:54 -07:00
Yu Shan Emily Lau
a79edb7233 Insert the 2 seconds before test start to
workaround the race conditon for requesting
the surface.

Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
2012-04-04 21:17:04 -07:00
Jason Noguchi
c0c4a20c0f am a72a06f3: am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit 'a72a06f37ecdd615fb2a29faed99c7f128196211':
  Fix build break introduced by missing parenthesis in camera stress test.
2012-04-03 17:37:10 -07:00
Jason Noguchi
f5693a6a50 am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
2012-04-03 17:31:00 -07:00
Jason Noguchi
a784b3dea1 Fix build break introduced by missing parenthesis in camera stress test.
Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
2012-04-03 17:01:50 -07:00
Jason Noguchi
b7cc80d8f3 am a5408a8c: am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit 'a5408a8c75a2839f1b0704f024cc4e523830c128':
  Adding camera zoom test to mediaframework stress suite.
2012-04-03 16:32:40 -07:00
Jason Noguchi
34a4e519b2 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
2012-04-03 15:32:34 -07:00
James Dong
209cfdf4f6 Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.
o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
2012-03-24 10:59:14 -07:00
Yu Shan Emily Lau
003a756974 Insert 2 seconds wait in each test case setup.
This is the work around for the surface request race
condition.

Change-Id: Iaf8be12cfe4eb70d0a309ad875f38427181ac4b4
2012-03-23 17:58:49 -07:00
Jason Noguchi
41d88d5f58 Adding camera zoom test to mediaframework stress suite.
Change-Id: I3ee72156f42cf189ff1d0bd469f83b938a6b87ff
2012-03-22 17:52:03 -07:00
James Dong
e1dea48f92 Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base

o related-to-bug: 6044887

Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
2012-03-12 21:28:57 -07:00
Yu Shan Emily Lau
8790b57588 am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '353b61a87d9eb0ee223bdda76c30a1364441d962':
  Set the video encoding bit rate for the media recorder stress test.
2012-03-01 15:35:43 -08:00
Yu Shan Emily Lau
0ddfe24a19 am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:00:08 -08:00
Yu Shan Emily Lau
eb4f3256b7 Set the video encoding bit rate for the media
recorder stress test.

Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
2012-02-29 15:57:21 -08:00
Jason Noguchi
eb5698a6b9 am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:55:13 -08:00
Jason Noguchi
743aceec42 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:50:14 -08:00
Jason Noguchi
27c8d9ba16 Adding time lapse test to mediaframework stress suite.
Change-Id: Ia244352cd16f77c090c4f1dad6f9b09a8b3e8f47
2012-02-22 16:46:37 -08:00
James Dong
d5ade1364b Removed out-of-date TODO in video editor performance/stress test cases
o also fixed a typo

Change-Id: I4f11265da77658f642e382cdfe76862d90a3b548
2012-02-22 11:53:51 -08:00