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

3353 Commits

Author SHA1 Message Date
Mike Lockwood
250528e5b2 MediaScanner: Fix mismatch between internal and external file paths. 
Change-Id: If2fac90a466c4d63fc90f96e91733c9e9ca14680
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-05 17:31:03 -04:00
Gil Dobjanschi
c006e8ef64 Added an export method without codec parameters. 
Change-Id: If0a1c34f2266c441cd16c46da5c07ab1a509314b
 2010-11-05 11:59:15 -07:00
James Dong
32af3a2f56 Merge "Use meta data in the media recording framework" 2010-11-05 18:18:30 +00:00
Gloria Wang
91460d7f49 Merge "Add support for WV DRM" 2010-11-05 17:45:26 +00:00
Gloria Wang
c2c22e7e20 Add support for WV DRM 
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
 2010-11-05 10:33:58 -07:00
Ray Chen
4414eb4b29 Add more EXIF tags. 
Change-Id: I77a02a6de6bb4c364bb9718f7bed15468a38a279
 2010-11-05 16:18:29 +08:00
James Dong
05c2fd50d2 Use meta data in the media recording framework 
o This patch allows us to do 720p video recording

Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
 2010-11-04 17:40:02 -07:00
Gil Dobjanschi
a7ccd13083 Merge "Added audio and video codec parameters to the export method." 2010-11-04 15:43:54 -07:00
Gil Dobjanschi
289f08990c Added audio and video codec parameters to the export method. 
Change-Id: I1badd08ce7148da540bf91df0e19c3da59287756
 2010-11-04 15:35:42 -07:00
Jamie Gennis
960423d46f Merge "Fix a MediaBuffer leak in Stagefright." 2010-11-04 11:18:14 -07:00
James Dong
c25c28a496 am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread 
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
  Revert "Support rotation in media recorder"
 2010-11-03 19:44:45 -07:00
James Dong
c80c28801d Revert "Support rotation in media recorder" 
This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
 2010-11-03 19:22:47 -07:00
Hiroshi Lockheimer
0ce42c9d31 am c181a082: Merge "Support rotation in media recorder" into gingerbread 
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
 2010-11-03 17:59:43 -07:00
James Dong
f1febe470a Support rotation in media recorder 
o needs to be tested with camera hal and camcorder application

Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
 2010-11-03 17:49:55 -07:00
Jamie Gennis
f0c5c1e8ce Fix a MediaBuffer leak in Stagefright. 
Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
 2010-11-03 16:15:10 -07:00
Praveen Bharathi
26e3734983 frameworks/base: switch audio to hdmi when cable is plugged in 
Change-Id: I01c4ee968bc0ffbb6ce75370935571cc1ff6f8c7
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2010-11-03 15:38:12 -07:00
Jaikumar Ganesh
de04e5242a Merge "Add STATE_AUDIO_CONNECTING state." 2010-11-03 14:58:00 -07:00
Andreas Huber
fd96799958 Merge "Experimentally reenable mpeg4 and h.263 hardware decoders." 2010-11-03 14:40:27 -07:00
Andreas Huber
9f9ae60ace Experimentally reenable mpeg4 and h.263 hardware decoders. 
Change-Id: I1be266bd4534004a08e8836b48cc6c09ca890ccc
 2010-11-03 14:21:15 -07:00
Jaikumar Ganesh
30d181690e Add STATE_AUDIO_CONNECTING state. 
Why is it needed: SCO audio connections can fail.
Currently no indication is given to clients which are waiting
for SCO connections. This was working fine before because
SCO connections where blocking calls, which was wrong in itself.

Change-Id: Ic449b2db8506a7a5ae6be6c68715f1a7343f9e40
 2010-11-03 11:05:12 -07:00
Gloria Wang
8f7a0275f2 am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
  - Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
 2010-11-03 10:59:23 -07:00
James Dong
a3f5b615d7 am f3847e87: Merge "DO NOT MERGE" into gingerbread 
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
 2010-11-03 09:25:08 -07:00
Gil Dobjanschi
82415bed34 Merge "Use SoftReference for WaveformData" 2010-11-02 20:26:22 -07:00
James Dong
6786fccf5a DO NOT MERGE 
Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
 2010-11-02 19:30:01 -07:00
Gil Dobjanschi
db963e9c64 Use SoftReference for WaveformData 
Change-Id: I801a4eb4f55e0c6244f868bf8b474a2a79d81642
 2010-11-02 19:19:04 -07:00
Gloria Wang
1f89c4f9f8 Use SystemProperties.get() instead of System.getProperty() 
Change-Id: I92571fa217e6623345bbd84cf87ab939fbe63b0a
 2010-11-02 16:56:42 -07:00
Gloria Wang
35a4f21bd6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp 
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
 2010-11-02 14:02:59 -07:00
Marco Nelissen
e4eb4d9de3 In java, System.getProperty returns null when the property doesn't exist, 
rather than an empty string like it does in native code.
b/3157546

Change-Id: I7985a405e4d2d1f20be0a151aa2cf2e5a83b380b
 2010-11-02 13:47:20 -07:00
Praveen Bharathi
21e941bf43 Added support for dock headset observer 
Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
 2010-11-01 18:41:19 -07:00
Jamie Gennis
044ace6bde Stop using OMX_COLOR_FormatAndroidPrivateStart. 
This removes the use (and definition) of the Android-private range of
OMX color formats from Stagefright.  Instead we will just be
interpreting the video color format of an OMX port as an Android pixel
format if the port is in native buffer mode.

Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
 2010-11-01 16:54:01 -07:00
Andreas Huber
df75f8b319 Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder." 2010-11-01 16:25:08 -07:00
Mike Lockwood
2b5f9ad1ea MTP: Changes to support /mnt/sdcard paths from MediaProvider. 
Change-Id: I337f0514c20ed31738c73e1f7ab6fb71cc744057
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-01 19:15:55 -04:00
Gloria Wang
eab18ea34d - Move the business rule management down to DRM agents. 
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
 2010-11-01 16:12:16 -07:00
Andreas Huber
5145d67e77 Notify surfaceflinger about (changes to) the crop rectangle output by the decoder. 
Change-Id: I9c33618dd3351be1ecadcc7d0329654ea50bad3f
related-to-bug: 3153626
 2010-11-01 16:01:05 -07:00
Gloria Wang
5d143ad4a8 Media scanner support for FL(Forward Lock) DRM file types 
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
 2010-11-01 14:08:39 -07:00
Andreas Huber
614d22c7f6 After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user. 
related-to-bug: 3152363
Change-Id: Ia097bf61ca05e01365357cb23ff83e2ad417f3fd
 2010-11-01 09:35:36 -07:00
Chia-chi Yeh
67f41771d5 Visualizer: Fix the conversion from 8-bit sample to 16-bit sample. 
Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
 2010-11-01 10:56:45 +08:00
James Dong
1219ea3b71 Merge "Added some debugging log messages at stop()" 2010-10-29 16:16:39 -07:00
Gloria Wang
e7a9c90103 Merge "- register DRM sniffer only when drmserver is up - notify DRM agents the status after seeking" 2010-10-29 16:15:46 -07:00
Gloria Wang
3f9a819a94 - register DRM sniffer only when drmserver is up 
- notify DRM agents the status after seeking

Change-Id: Id77977fc7548970559dc8974461b0bd1d2aa9514
 2010-10-29 16:09:48 -07:00
James Dong
42338ff07f Added some debugging log messages at stop() 
There are so many cases where the codecs just could not stopped ...

Change-Id: If9ff261fcd4726c2ee21ec7c9336ca9c2917d399
 2010-10-29 16:07:44 -07:00
Andreas Huber
69b8d69aad Squashed commit of the following: 
commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:59:23 2010 -0700

    suspend() and resume() methods on VideoView are back but don't do anything.

    They need to be back because they were public before.

    Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425

commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:47:05 2010 -0700

    Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."

    This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.

    Conflicts:

    	api/current.xml

    Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5

commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:44:16 2010 -0700

    Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."

    This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.

commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:44:08 2010 -0700

    Revert "Release MediaPlayer if suspend() returns false."

    This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.

commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:40:46 2010 -0700

    manually.

    Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87

Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
 2010-10-29 13:20:06 -07:00
James Dong
9085a2441d Merge "Added profile and level translation in SW video encoders" 2010-10-29 09:19:48 -07:00
Andreas Huber
6e9f6d1e03 Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback." 2010-10-29 08:04:13 -07:00
Gil Dobjanschi
393b2f9b8d Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations." 2010-10-28 18:03:58 -07:00
Gil Dobjanschi
6ea92ecabb Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations. 
Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
 2010-10-28 16:24:41 -07:00
Andreas Huber
4b84445788 Upgrade to the latest version of libwebm to fix YouTube webm playback. 
Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a
related-to-bug: 3141937
 2010-10-28 10:50:47 -07:00
Eric Laurent
03a4090b4d Update java doc for visualizer FFT capture. 
The java doc for visualizer FFT capture was not describing
correctly the layout of the data returned by getFft() method.

Change-Id: Idec09538490ea73b211db253b1b8b733ca4d4a72
 2010-10-28 10:14:07 -07:00
James Dong
af50969f07 Added profile and level translation in SW video encoders 
Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
 2010-10-27 23:47:37 -07:00
Andreas Huber
b0d25a00fe Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries. 
Change-Id: I20e3b86f52b7f0f41663ffe8bc1f4db92280e884
 2010-10-27 14:33:18 -07:00