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
Glenn Kasten
1d24aaa4b4
Bug 4608375
...
Update priority and policy together for audio threads
Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
2011-06-14 10:41:50 -07:00
Dima Zavin
922261deab
Merge "audio: update for audio/audio_policy header names/locations"
2011-06-13 19:43:59 -07:00
James Dong
21663e5dc7
Enforce the rule that the timestamp from timelapse video source monotically increases
...
Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
2011-06-13 18:42:24 -07:00
Dima Zavin
290029d19a
audio: update for audio/audio_policy header names/locations
...
Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
2011-06-13 18:16:26 -07:00
James Dong
4108b1edc6
Add B frame support for MPEG4Writer
...
o requires the support of negative ctts duration values (ctts version 1)
Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
2011-06-13 17:06:29 -07:00
tedbo
cc5278a3e2
Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.
...
This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.
Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
2011-06-13 14:27:39 -07:00
James Dong
8aec83eb15
Merge "Avoid duplicated code calculating the stts sample duration"
2011-06-10 16:23:41 -07:00
Dianne Hackborn
4bb506afeb
am 15e9d474: am 88748e6d: am d86302df: Quiet the log.
...
* commit '15e9d474d1033adbedc8632309df26c3d6dfaee3':
Quiet the log.
2011-06-10 14:08:45 -07:00
James Dong
a7ea9f935e
Avoid duplicated code calculating the stts sample duration
...
o This also speeds up the MediaRecorder.stop() call.
o Also fix incorrect start time compensation in stts box
Change-Id: I6392b8b980e0f786ddeeec0fe2c341de67208c6f
2011-06-10 11:55:40 -07:00
James Dong
be674b1864
Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"
2011-06-10 09:57:01 -07:00
James Dong
d24f94989f
Merge "Correctly handle crop rect event in SoftAVC.cpp"
2011-06-10 09:56:44 -07:00
Andreas Huber
c8841e2ef4
Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it."
2011-06-10 08:02:18 -07:00
Dianne Hackborn
15e9d474d1
am 88748e6d: am d86302df: Quiet the log.
...
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
Quiet the log.
2011-06-10 07:46:27 -07:00
Marco Nelissen
6b6091a140
am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
...
* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
Make sure we don't read from invalid fds
2011-06-09 18:56:02 -07:00