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

4824 Commits

Author SHA1 Message Date
Gloria Wang
1e1b13e62e - Public part of the Metadata API. 
- Modify the media framework test for Metadata.

Change-Id: Ib8fa4991f114e1bb88a17ca662844b9b8e1d0faf
 2011-06-23 15:28:36 -07:00
Andreas Huber
5ecc4601ea Merge "Parse RTP-Info even for live streams." 2011-06-23 10:12:22 -07:00
Glenn Kasten
db262e6cf0 Merge "Fix warnings for uninitialized local variables" 2011-06-23 09:00:03 -07:00
Eric Laurent
e2ac799dfc Merge "Added audio_bytes_per_sample() helper function" 2011-06-23 08:08:20 -07:00
Martin Storsjo
21fc9ad28e stagefright amrwbenc: Remove a duplicate, unused file 
This file is identical to common/cmnMemory.c, and that's the
file that is used by all the makefiles, not this one.

Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
 2011-06-23 12:20:12 +03:00
Glenn Kasten
028ab996e5 Fix warnings for uninitialized local variables 
Change-Id: Ic9b03b0fd215444e76c7b7bebb385f7831c557e0
 2011-06-22 16:18:04 -07:00
Shailendra
31f8b62855 Merge "Fix for kenBurn Effect for PNG image is crashing (4861071 )" 2011-06-22 14:13:21 -07:00
Gloria Wang
019caf42c0 Merge "Timed text display format support: 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata" 2011-06-22 13:47:45 -07:00
Shailendra
d7ed599263 Fix for kenBurn Effect for PNG image is crashing (4861071 ) 
Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
 2011-06-22 12:15:56 -07:00
Martin Storsjo
842679beea stagefright: Only use __int64 on MSVC, not on all win32 compilers 
Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
 2011-06-22 21:55:13 +03:00
Martin Storsjo
a9de2b598d stagefright aacenc: Make the mem_malloc function 64-bit safe 
Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
 2011-06-22 21:54:25 +03:00
Martin Storsjo
5c8247f730 stagefright: Include stdlib.h for malloc/free 
According to ANSI C, malloc/free are provided by stdlib.h.

Also, string.h is always available according to ANSI C, and provides
the memset function, so there's no need to include it conditionally
for linux only.

This makes the code buildable on OS X, too.

Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
 2011-06-22 21:54:06 +03:00
Gloria Wang
eaa5d8f9c0 Timed text display format support: 
1. Extract 3GPP global format descriptions
2. Extract 3GPP local format descriptions
3. Define data structure (TimedText) for applications to
retrieve the format metadata

Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
 2011-06-22 11:32:19 -07:00
James Dong
032897470a Merge "Add some error log messages to indicate the failure of a recording session" 2011-06-22 11:07:52 -07:00
James Dong
0f5d8441ef Merge "Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem" 2011-06-22 10:33:25 -07:00
James Dong
839ba2c183 Add some error log messages to indicate the failure of a recording session 
Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
 2011-06-22 10:09:03 -07:00
James Dong
e413899097 Merge "Timestamp adjustment will not work well if we ask video encoder to produce B frames" 2011-06-21 17:13:57 -07:00
James Dong
e67bb48b66 Timestamp adjustment will not work well if we ask video encoder to produce B frames 
Change-Id: Ic6a2235fefb6f15081091e1f2c1b12ee92fba5e0
 2011-06-21 17:05:42 -07:00
Andreas Huber
274626469b Log an error instead of asserting if the OMX plugin reports an error. 
Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
 2011-06-21 14:43:27 -07:00
James Dong
24a38f1ab9 Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem 
o This patch allows us to use the logic from MediaMetadataRetriever to extract a thumbnail instead of extracting
  the thumbnail from a fixed position (@500 ms).

Change-Id: I81e8378d9bed80894cc622479679021dce3d52e5
related-to-bug: 3485609
 2011-06-21 13:50:51 -07:00
Andreas Huber
157c74e7ac Merge "Don't assert on malformed .mp4 content that contains fewer samples than" 2011-06-21 12:13:41 -07:00
James Dong
bbf7c449e1 Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible" 2011-06-21 12:12:06 -07:00
Andreas Huber
467bc25755 Parse the individual segment's duration as a floating point number which is now 
allowed in later HLS specs.

Change-Id: I7c8296acb4e9b0f80022f3057769de0eea9ee0c6
related-to-bug: 4779022
 2011-06-21 11:55:34 -07:00
Andreas Huber
727863d2de Don't assert on malformed .mp4 content that contains fewer samples than 
described in the time-to-sample box.

Change-Id: Ic6f973212c15012a25f6e849759fd4f14d97e30f
related-to-bug: 4779053
 2011-06-21 11:38:01 -07:00
Andreas Huber
e2b801e5a4 Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error." 2011-06-21 08:36:51 -07:00
Mike Lockwood
7d40d42a36 MTP: Add support for PTP variant of GetDeviceInfo result. 
Change-Id: I09f86fda768b7697665e401adb9516588859bf59
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-21 08:27:06 -04:00
Andreas Huber
dabf22181d Restore legacy soft-aac decoder behaviour. Substitute silence on decode error. 
Change-Id: I680ccaabef32b1319819f723260cb3789585f09e
related-to-bug: 4579486
 2011-06-20 16:19:09 -07:00
Andreas Huber
02392b41de Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData()." 2011-06-20 16:08:06 -07:00
James Dong
b2af97e9a1 Merge "When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF." 2011-06-20 13:23:14 -07:00
James Dong
32bb368a51 When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF. 
When this happens, default value of 0 will be used for the "decoding" time for these output buffers.
These buffers do not contain valid media data anyway.

related-to-bug: 4725803

Change-Id: I0eaf248bb2ac022ff072eaffd0ed3f21171f824e
 2011-06-20 12:09:49 -07:00
James Dong
c03f08e5c7 Boost software vp8 decoder performance using multi-threaded decoding if possible 
Change-Id: I7258c7d0cf91aa7c62444d03ed8bce96fb23d8ef
related-to-bug: 4539653
 2011-06-20 11:53:39 -07:00
Andreas Huber
d873413ff9 Parse RTP-Info even for live streams. 
Change-Id: Ib2c39ce8d5366f5ea350e71b7a54f5f7c2b510b9
 2011-06-20 10:34:43 -07:00
Glenn Kasten
df02afe835 Merge "Remove unneeded #include <sys/resource.h>" 2011-06-20 07:47:51 -07:00
Dongwon Kang
48810fdda5 OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData(). 
BUG:4689872
Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
 2011-06-20 17:35:19 +09:00
Mike Lockwood
f4c043c2a8 Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands" 2011-06-17 20:54:53 -07:00
Mike Lockwood
6acc90fc21 MTP: Fix some problems with GetObjectHandles and GetNumObjects commands 
These calls did not correctly handle some variants of the arguments,
which showed up when running in PTP mode.

Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-17 19:49:05 -04:00
James Dong
d11f591b45 Merge "Use system property to control whether we will enable B frame support in MPEG4Writer" 2011-06-17 15:50:19 -07:00
James Dong
bf8116f28d Use system property to control whether we will enable B frame support in MPEG4Writer 
o This is to work around a bug in crespo's video encoder output timestamp

related-to-bug: 4600191,4724339

Change-Id: I485c1e044bd2f604b318692efd6433345cfc6487
 2011-06-17 15:28:07 -07:00
Eric Laurent
c310dcbed6 Added audio_bytes_per_sample() helper function 
Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
 2011-06-17 14:19:55 -07:00
Eric Laurent
759c5b3d49 Fix regression in audio effect factory 
commit 0fb66c2 introduced a bug in EffectCreate() that prevents detection
of problems reported by the engine library upon effect creation.

Change-Id: I5bd2d42505ac29ab4a5768fd7f0c2ced135cf3e3
 2011-06-16 18:28:54 -07:00
Yu Shan Emily Lau
0a4d51d581 Merge "Add new open source test contents. Removed old test files. Updated the tests with new test contents." 2011-06-15 18:47:55 -07:00
Yu Shan Emily Lau
c4fe54a238 Add new open source test contents. 
Removed old test files.
Updated the tests with new test contents.

Change-Id: Id74f1aae391ef868843ab4058ae9a9328d98f868
 2011-06-15 18:45:54 -07:00
Glenn Kasten
79cd8ba46b Remove unneeded #include <sys/resource.h> 
Suggested in code review for previous change.

Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
 2011-06-15 07:30:19 -07:00
Kristian Monsen
30d71a05aa Merge "Merge chromium to r11.0.672.0: Compile fix" 2011-06-14 20:57:57 -07:00
James Dong
05be9531b6 Second attempt to fix the broken build 
o due to a link to a hidden method

Change-Id: Ia488743e9bff6854253696cc368facbd50d2d8f4
 2011-06-14 18:51:24 -07:00
James Dong
d52ad9ca8d Fix broken build 
Change-Id: Icf7e33a3a4d9b430cd8cbc97801df24a94f9e079
 2011-06-14 18:21:59 -07:00
Glenn Kasten
370a71bcaf Merge "Bug 4608375" 2011-06-14 17:54:25 -07:00
James Dong
113543c909 Merge "Enforce the rule that the timestamp from timelapse video source monotically increases" 2011-06-14 17:01:11 -07:00
James Dong
9ddb7888b4 Update MediaPlayer and MediaRecorder javadoc 
o Adding some description to the Looper requirement for receiving callbacks

Change-Id: I79e7014c521f2286e6c2ccea1097d7e7467eb9ee
 2011-06-14 16:38:08 -07:00
tedbo
114420f531 Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00