OSDN Git Service
Andy McFadden [Wed, 6 Mar 2013 17:42:23 +0000 (17:42 +0000)]
Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev
Andy McFadden [Tue, 5 Mar 2013 22:31:02 +0000 (14:31 -0800)]
Correct MediaCodec + Surface behavior
Assorted tweaks:
- Allow signalEndOfInputStream() before ACodec is in Executing
state (added message to two more states).
- Return an error if signalEndOfInputStream() is called a second
time on the same stream.
- Require AndroidOpaque color format in createInputSurface().
- Disallow dequeueInputBuffer() after an input surface has been
created (boolean flag in MediaCodec tracks it).
- Discard input surface when encoder is re-configure()ed (drop
OMXNodeInstance's ref when we go back to Loaded).
Bug
7991062
Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
Glenn Kasten [Wed, 6 Mar 2013 00:18:04 +0000 (00:18 +0000)]
Merge "Add template class SingleStateQueue" into jb-mr2-dev
Andreas Huber [Tue, 5 Mar 2013 21:36:28 +0000 (21:36 +0000)]
Merge "Squashed commit of the following:" into jb-mr2-dev
Andreas Huber [Tue, 5 Mar 2013 18:56:27 +0000 (10:56 -0800)]
Squashed commit of the following:
commit
e5919b1f57ea61fa1d380dfdb4e3e832ce73d79d
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 27 16:38:48 2013 -0800
Configure TCP datagram sockets to be TCP_NODELAY.
Change-Id: Ia724a81e6e27dccd00ac84603e712d69ca77a0cd
commit
1b52b393183db8a6dc000a7c31baac544ccfc50c
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 27 14:26:01 2013 -0800
Send IDR frame requests on packet loss.
Change-Id: I53b7fb85cbd6923491113b93ec3e2175726d654a
commit
68d76b4b3a0181b30abc57cd2915273210530a6d
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 15:12:34 2013 -0800
Revive TunnelRenderer
Change-Id: I8c5a9d982793b1c5b841c828227b354f1dab618c
commit
3df28a8e9d8bcdc1430016bb088d097eca653b56
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 13:53:14 2013 -0800
Disable suspension of video updates.
Change-Id: I7e3a16b8d7dd7a55d9f962a2236388931f664106
commit
2ec7a79de019a26ec415016c1478afd762f069cd
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 08:54:40 2013 -0800
Adds an SNTP client to wfd.
Change-Id: Icd7d6104e951e1443e4c1b81ccf6b3731d79d3ec
commit
c81c3bb5725bb4079a4d7fb02151ad0bb540632f
Author: Andreas Huber <andih@google.com>
Date: Mon Feb 25 10:00:58 2013 -0800
Squashed commit of the following:
commit
b83a4ec96659ef6f6b7c2090fdd866abe3ab78ba
Author: Andreas Huber <andih@google.com>
Date: Mon Feb 25 09:28:11 2013 -0800
Some reorganization of the rtp code, renamed StreamHub -> MediaSender
Change-Id: I8cf67444960e60426bf74880af1acce41e8b2fef
commit
7769cbd739f2a67c58e0c6a7b1a21a12210c7c4d
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 16:12:18 2013 -0800
Choose a smaller MTU to avoid fragmented IPv4 packets, fix AVC assembler.
Change-Id: I274b3cc1483c4e9f4d146dbf9f3d9f7557ef7ef9
commit
1f687ee80a88b56d614c2cf408ff729114ff86a0
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 11:38:31 2013 -0800
better reporting.
Change-Id: I67f0bb51f106ea77f5cc75938b053c8e8e8f688e
commit
7950c1cd59213eb5f281fcde44a772ecffae473d
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 09:07:41 2013 -0800
stuff
Change-Id: Ib99416366d3eec6e6ad69b4d791a8a9408410f3b
commit
33c09045b0f86fcaa4619cbd679b47a074f71231
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 21 15:54:01 2013 -0800
Render frames according to their timestamps.
Change-Id: I8143a95cffe775799d6a4bb093558bd7abb1f063
commit
d8b6daae2160bf1c016d7c6251256b46bb89db42
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 21 15:01:27 2013 -0800
Better packet-lost logic.
Change-Id: I611eee5a42bd089638cf45b0e16f628ff2a955ab
commit
782c6b15717e2d062d96665a089d06c0577733d0
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 20 15:06:47 2013 -0800
Add a dedicated looper for the MediaReceiver
Change-Id: I3b79cad367fb69c9a160a8d009af8c5f5142b98e
commit
4c7b8b10861674b773270103bcabd1a99486a691
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 20 14:30:28 2013 -0800
Tweaks to RTPSender and RTPReceiver
Change-Id: Ib535552f289a26cfead6df8c63e4c63d3987d4e9
commit
39226b28177a816cda5c67b321745d396b18277d
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 19 08:48:25 2013 -0800
Playing around with non muxed delivery
Change-Id: I845375f6938d04bc30502840c2ceb7688dc9b237
commit
c16d21de75d8ecdbcd9abce14934afe484970061
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 13 14:43:35 2013 -0800
A more solid base for RTP communication.
Change-Id: I52033eeb0feba0ff029d61553a821c82f2fa1c3f
Change-Id: I57e3bcfc1c59a012b15aaaa42ed81f09c34c26bb
Change-Id: I4b09db4a44d0eeded7a1658f6dc6c97d4b8be720
Andy McFadden [Tue, 5 Mar 2013 17:41:25 +0000 (17:41 +0000)]
Merge "Implement Surface input to MediaCodec." into jb-mr2-dev
Glenn Kasten [Mon, 26 Nov 2012 18:40:24 +0000 (10:40 -0800)]
Add template class SingleStateQueue
Change-Id: If7e2bc9b2a216524ee9cbb68682e2634933b4973
Andy McFadden [Tue, 19 Feb 2013 15:28:30 +0000 (07:28 -0800)]
Implement Surface input to MediaCodec.
Also, renamed a CHECK_INTERFACE macro that was clashing with the
Binder version.
Bug
7991062
Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
Glenn Kasten [Mon, 4 Mar 2013 22:38:34 +0000 (22:38 +0000)]
Merge "Miscellaneous cleanup" into jb-mr2-dev
Glenn Kasten [Tue, 26 Feb 2013 19:32:32 +0000 (11:32 -0800)]
Miscellaneous cleanup
Abbreviation framesReady to fRdy for new systrace.
Put inline const on one line.
Use local copy of mState in state.
Improve logging.
Line length 100.
Change-Id: I8201c3ce0e53fd464fd33d02544e52c342d40b68
Glenn Kasten [Sat, 2 Mar 2013 00:04:34 +0000 (00:04 +0000)]
Merge "media.log cleanup" into jb-mr2-dev
Glenn Kasten [Wed, 27 Feb 2013 17:05:28 +0000 (09:05 -0800)]
media.log cleanup
Remove almost all of the specific logs, but leave the media.log
logging infrastructure in place for the next time we need it.
Re-apply a few good changes that were reverted earlier:
- check logf format vs. argument list compatibility
- distinguish potentially modified and actually modified tracks in FastMixer
- fix benign bug where sq->end() was called more than once
- fix a build warning
Bug:
6490974
Change-Id: I02d3e83646c738acaebb415bd0d6b548638b4ef5
Marco Nelissen [Fri, 1 Mar 2013 19:37:58 +0000 (19:37 +0000)]
am
c0048178: Merge "Avoid invalid memory access when using extractMetadata()"
* commit '
c0048178a1d312e7e05557ba99becd6a89b9e97a':
Avoid invalid memory access when using extractMetadata()
Marco Nelissen [Fri, 1 Mar 2013 19:06:22 +0000 (19:06 +0000)]
Merge "Avoid invalid memory access when using extractMetadata()"
Glenn Kasten [Fri, 1 Mar 2013 17:05:28 +0000 (17:05 +0000)]
Merge "Remove tee sink debugging at compile time" into jb-mr2-dev
Igor Murashkin [Fri, 1 Mar 2013 02:20:48 +0000 (02:20 +0000)]
Merge changes I25423a2b,I24680f1a into jb-mr2-dev
* changes:
ProCamera: Add CpuConsumer asynchronous mode support
Camera: Drop ProCamera connections when a Camera connection happens
Igor Murashkin [Fri, 1 Mar 2013 02:20:44 +0000 (02:20 +0000)]
Merge "ProCameraTest: Drop frames test move processing delay between lock/unlock" into jb-mr2-dev
Igor Murashkin [Thu, 28 Feb 2013 19:21:00 +0000 (11:21 -0800)]
ProCamera: Add CpuConsumer asynchronous mode support
Bug:
8290146
Bug:
8291751
Change-Id: I25423a2b8a70ac7169911b1c7b482aa17190fe0f
Igor Murashkin [Wed, 27 Feb 2013 20:55:20 +0000 (12:55 -0800)]
Camera: Drop ProCamera connections when a Camera connection happens
* Also adds an ICameraServiceListener with available/not available statuses
Bug:
8291653
Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
Igor Murashkin [Thu, 28 Feb 2013 18:41:51 +0000 (10:41 -0800)]
ProCameraTest: Drop frames test move processing delay between lock/unlock
* This makes it more likely to find races with the buffer being unlocked
by itself
Change-Id: I1fa7dbfb73f60664a02a35678b58bcc9b06893a2
Sangkyu Lee [Fri, 8 Feb 2013 07:26:39 +0000 (16:26 +0900)]
Avoid invalid memory access when using extractMetadata()
BpMediaMetadataRetriever::extractMetadata() returns a string
which is returned by readCString() function of the reply parcel object.
However, the parcel object is destroyed at the end of the
extractMetadata() function, and so the returned pointer is invalid.
This patch fixes this problem by storing the metadata string value.
Change-Id: I2a2ccba78246175b2845a237679d6cebe881e83b
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
Andreas Huber [Wed, 27 Feb 2013 21:14:45 +0000 (21:14 +0000)]
am
ceb83b8d: Merge "SoftAMR: Signal the right frame format"
* commit '
ceb83b8d8919dc778402bf610c073987d4f9f89b':
SoftAMR: Signal the right frame format
Andreas Huber [Wed, 27 Feb 2013 21:14:45 +0000 (21:14 +0000)]
am
ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"
* commit '
ccf51ec41652a7e2db8cbee37bca91a95908d5ff':
SoftVorbis: Set the right encoding in the port definition
Eino-Ville Talvala [Thu, 7 Feb 2013 01:20:07 +0000 (17:20 -0800)]
Camera: Start of support for version 3.0 of camera device HAL
- Refactor common CameraDevice interface out of Camera2Device
- Initial skeleton only for Camera3Device
Change-Id: I097cc76e2ad102a51712ac114235163245f5482c
Igor Murashkin [Wed, 27 Feb 2013 20:43:26 +0000 (20:43 +0000)]
Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev
Andreas Huber [Wed, 27 Feb 2013 20:13:24 +0000 (20:13 +0000)]
Merge "SoftAMR: Signal the right frame format"
Andreas Huber [Wed, 27 Feb 2013 20:12:07 +0000 (20:12 +0000)]
Merge "SoftVorbis: Set the right encoding in the port definition"
Glenn Kasten [Wed, 27 Feb 2013 18:11:04 +0000 (18:11 +0000)]
Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev
Andreas Huber [Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)]
am
801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"
* commit '
801726efb2dcc6ea19e9f55c7c43fe41f0c6643e':
MPEG4Writer: Write a zero-length compressor string
Glenn Kasten [Wed, 27 Feb 2013 17:39:39 +0000 (09:39 -0800)]
Revert "Logging to investigate a crash"
This reverts commit
f0ff908da019a44115109f1b4d1b6864b35a8a29.
Andreas Huber [Wed, 27 Feb 2013 16:53:21 +0000 (16:53 +0000)]
Merge "MPEG4Writer: Write a zero-length compressor string"
Igor Murashkin [Tue, 26 Feb 2013 22:32:34 +0000 (14:32 -0800)]
camera_client: refactor Camera/ProCamera commonalities into BasicCamera
Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
Glenn Kasten [Tue, 26 Feb 2013 17:20:22 +0000 (09:20 -0800)]
Remove tee sink debugging at compile time
Bug:
8223560
Change-Id: Iddbfb06c45d43d9f20bb428215dd4094931e19a7
Eino-Ville Talvala [Tue, 26 Feb 2013 01:40:39 +0000 (01:40 +0000)]
am
ceb388d6: CameraService and Stagefright: Support AppOps
* commit '
ceb388d6c03c38b96dc41c0ea4804b749aa077c4':
CameraService and Stagefright: Support AppOps
Eino-Ville Talvala [Tue, 19 Feb 2013 18:40:14 +0000 (10:40 -0800)]
CameraService and Stagefright: Support AppOps
Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost
Stagefright:
- Pass on client name, UID to camera as needed
Bug:
8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
Andreas Huber [Mon, 25 Feb 2013 17:02:22 +0000 (17:02 +0000)]
Merge "Handles duplicated NAL start code to fix crash on HLS streams."
Insun Kang [Fri, 23 Nov 2012 10:00:07 +0000 (19:00 +0900)]
Handles duplicated NAL start code to fix crash on HLS streams.
Some youtube live streams are encoded having duplicated NAL start code,
for instance, 00 00 01 00 00 00 01 ....
In previous code, zero NAL size causes crash by CHECK_GT(nalsize, 0)
macro. With this patch, duplicated NAL start code will be just ignored.
TESTED=Played problematic Youtube Live streams.
Change-Id: I1d76f111a34bd29cb09b037eb1b0626fe5f5b140
Glenn Kasten [Sat, 23 Feb 2013 01:19:43 +0000 (01:19 +0000)]
Merge "Update tee sink"
Glenn Kasten [Thu, 10 Jan 2013 20:31:01 +0000 (12:31 -0800)]
Update tee sink
Implement rotation to reduce long-term storage use.
Implement optional per-track tee.
Dynamically enable at runtime based on property, instead of at compile-time.
Dynamic frame count not yet implemented.
Bug:
8223560
Change-Id: I3706443c6ec0cb0c6656dc288715a02ad5fea63a
Igor Murashkin [Wed, 20 Feb 2013 21:36:17 +0000 (13:36 -0800)]
ProCamera: Fix waitForFrameBuffer not handling multiple outstanding frames
If the CpuConsumer triggered multiple onFrameAvailable callbacks in between
a single waitForFrameBuffer call, the old code would only handle 1 callback.
This meant on two subsequent waitForFrameBuffer calls the second would always
timeout when two buffers were already available to be unlocked.
Bug:
8238112
Change-Id: Ibefca35005ac5c408e5ada97ec4a4344a9e3e497
Igor Murashkin [Thu, 21 Feb 2013 22:45:03 +0000 (14:45 -0800)]
ProCamera: add waitForFrameBuffer/waitForFrameResult blocking calls
Change-Id: I851d41aeecaa15245d5b9d622132e8706d6e292c
Igor Murashkin [Thu, 21 Feb 2013 22:18:10 +0000 (14:18 -0800)]
Camera: ProCameraTests: clean up a bit, still needs more cleanup
Change-Id: Ia7e18c81002c8d98176f21553cf13cbd13cfdf5d
Igor Murashkin [Thu, 21 Feb 2013 21:49:26 +0000 (13:49 -0800)]
ProCamera: Add getInfo for getting static metadata (and a test)
Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
Igor Murashkin [Thu, 21 Feb 2013 20:02:29 +0000 (12:02 -0800)]
Camera: ProCamera - implement onResultReceived callback for metadata callbacks
Change-Id: I46775402b007244bc383d6343a620eebbd492aad
Igor Murashkin [Thu, 21 Feb 2013 19:43:14 +0000 (11:43 -0800)]
Camera: ProCameraTests - add CpuConsumer tests for dual streams
Change-Id: Ia010450dc79ac2841645b8c2e1553c9ec74ee5e3
Igor Murashkin [Thu, 21 Feb 2013 03:29:53 +0000 (19:29 -0800)]
Camera: ProCamera - add createStreamCpu and unit test
Change-Id: I468172dbfdd78510b273bf9d119c950cbeda7ea3
Igor Murashkin [Thu, 21 Feb 2013 03:15:15 +0000 (19:15 -0800)]
Camera: Change ProCamera to take IGraphicBufferProducer
Change-Id: Iec62eead6d179aa5486f7719143340976bb76e7d
Igor Murashkin [Thu, 21 Feb 2013 03:02:36 +0000 (19:02 -0800)]
Camera: ProCamera2Client implement createStream,createDefaultRequest
The StreamingImage unit test should now work when TEST_DISPLAY_SECS is set.
Change-Id: I9cf3ad5bd5a76096ab21bd39e631d636c4ff3d3f
Igor Murashkin [Thu, 21 Feb 2013 02:24:43 +0000 (18:24 -0800)]
Camera: ProCamera2Client - add createStream (service is stubbed) and unit test
Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
Igor Murashkin [Thu, 21 Feb 2013 01:57:31 +0000 (17:57 -0800)]
Camera: ProCamera - add createStream stub and unit test for it
Change-Id: Ic05130e63f4f2c0c3278ba348b192992169f105f
Igor Murashkin [Wed, 30 Jan 2013 18:14:24 +0000 (10:14 -0800)]
Camera: ProCameraTests - add asynchronous locking unit test
Change-Id: Ib79eb84046c9ed898bfb086a6600265fc351924c
Igor Murashkin [Thu, 21 Feb 2013 01:41:57 +0000 (17:41 -0800)]
Camera: ProClient add asynchronous locks and such
Change-Id: I551e5e5e76d9be733fab5224beaa7309268c0f38
Igor Murashkin [Thu, 21 Feb 2013 01:15:11 +0000 (17:15 -0800)]
Camera: Add ProCamera private binder interface for an API2-light functionality
Change-Id: I2af7a807c99df75ea659e6e6acc9c4fca6a56274
Igor Murashkin [Thu, 21 Feb 2013 00:50:13 +0000 (16:50 -0800)]
Camera: Add unit test infrastructure for libcameraclient
Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c
Igor Murashkin [Thu, 14 Feb 2013 02:23:39 +0000 (18:23 -0800)]
Camera: Add exists function to CameraMetadata
Change-Id: I081f61417fca7c8408e9e767129647ddce5364ab
Igor Murashkin [Wed, 13 Feb 2013 23:53:56 +0000 (15:53 -0800)]
Camera: Move CameraMetadata.h from service to client library
Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
Mathias Agopian [Thu, 21 Feb 2013 23:21:20 +0000 (23:21 +0000)]
Merge "replace getISurfaceTexture by getIGraphicBufferProducer"
Glenn Kasten [Thu, 21 Feb 2013 20:57:15 +0000 (20:57 +0000)]
Merge "Permit conditional registry of mediaserver extensions"
Glenn Kasten [Thu, 21 Feb 2013 00:47:28 +0000 (16:47 -0800)]
Permit conditional registry of mediaserver extensions
Change-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057
Alex Ray [Wed, 20 Feb 2013 23:52:12 +0000 (23:52 +0000)]
Merge "CameraService: Log camera module name"
Alex Ray [Wed, 20 Feb 2013 21:39:37 +0000 (13:39 -0800)]
CameraService: Log camera module name
Explicitly logs camera module loaded. This is useful on systems with
multiple camera modules installed. Also this make the camera service
match audioflinger, which logs hardware module names as well.
Change-Id: I280bf12df2d517f936916b8ba3cb662e671d0216
Ed Heyl [Wed, 20 Feb 2013 21:47:28 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'
Mathias Agopian [Wed, 20 Feb 2013 02:25:33 +0000 (18:25 -0800)]
replace getISurfaceTexture by getIGraphicBufferProducer
Change-Id: I723a3863558126f2635a544a39bb3ec88d499c60
Glenn Kasten [Mon, 18 Feb 2013 20:47:49 +0000 (12:47 -0800)]
A reference cannot be re-bound
Bug:
8213067
Bug:
6490974
Change-Id: If546215641fbc9a0fb1e8af8b85cc01f0a4b26ab
Glenn Kasten [Mon, 18 Feb 2013 20:47:49 +0000 (12:47 -0800)]
A reference cannot be re-bound
Bug:
8213067
Bug:
6490974
Change-Id: If546215641fbc9a0fb1e8af8b85cc01f0a4b26ab
The Android Automerger [Tue, 19 Feb 2013 17:51:09 +0000 (09:51 -0800)]
merge in jb-mr2-release history after reset to master
Martin Storsjo [Sun, 17 Feb 2013 18:36:45 +0000 (20:36 +0200)]
SoftAMR: Signal the right frame format
The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF,
which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp,
amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec.
The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file
format only used for conformance tests, not used in the wild.
Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
Glenn Kasten [Fri, 15 Feb 2013 23:55:26 +0000 (23:55 +0000)]
Merge "Revert "Temporary additional logging to investigate bug""
Glenn Kasten [Fri, 15 Feb 2013 23:55:04 +0000 (23:55 +0000)]
Revert "Temporary additional logging to investigate bug"
This reverts commit
32584a7d672864b20ab8b83a3cb23c1858e908b7
Change-Id: I9dc680578b955b1af462eeb7a49d61a0d45eb81b
Glenn Kasten [Fri, 15 Feb 2013 23:54:53 +0000 (23:54 +0000)]
Merge "Temporary additional logging to investigate bug"
Glenn Kasten [Wed, 13 Feb 2013 22:46:45 +0000 (14:46 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
- log mFastIndex when AudioMixer sees an invalid bufferProvider.
- log both potentially modified and actually modified tracks in FastMixer.
- fix benign bug where sq->end() was called more than once.
- log StateQueue push() call and return.
- increase StateQueue size from 4 to 8 entries
- log mixer->enable(), bufferProvider, and currentTrackMask
- log buffer provider addresses
- increase fast mixer log buffer again
- check logf format vs. argument list compatibility
- add logging to AudioMixer
- add checking of magic field in AudioMixer to detect overwrites
- add bool AudioMixer::enabled()
- increase log buffer sizes yet again
- enable assertion checking without ALOGV
- improve a few log messages
- check for corruption in more places
- log in all the process hooks
- add new mixer APIs so we can check for corruption of mixer state
- fix a build warning
Bug:
6490974
Change-Id: Ib0c4a73dcf606ef9bd898313b3b40ef61ab42f51
Mathias Agopian [Fri, 15 Feb 2013 22:05:59 +0000 (22:05 +0000)]
Merge "Refactoring: Rename SurfaceTextureClient to Surface"
Mathias Agopian [Fri, 15 Feb 2013 01:11:27 +0000 (17:11 -0800)]
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
Marco Nelissen [Fri, 15 Feb 2013 16:26:24 +0000 (08:26 -0800)]
Remove FragmentedMP4Extractor
MPEG4Extractor now supports fragmented mp4 files.
Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
Marco Nelissen [Wed, 13 Feb 2013 17:27:28 +0000 (09:27 -0800)]
Add support for fragmented mp4 to MPEG4Extractor
This makes FragmentedMP4Extractor obsolete. It will be removed in a
separate change.
Change-Id: Ida74c07ccf84983e20a1320ee24ffc7a5c083859
Glenn Kasten [Wed, 13 Feb 2013 22:46:45 +0000 (14:46 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
- log mFastIndex when AudioMixer sees an invalid bufferProvider.
- log both potentially modified and actually modified tracks in FastMixer.
- fix benign bug where sq->end() was called more than once.
- log StateQueue push() call and return.
- increase StateQueue size from 4 to 8 entries
- log mixer->enable(), bufferProvider, and currentTrackMask
- log buffer provider addresses
- increase fast mixer log buffer again
- check logf format vs. argument list compatibility
- add logging to AudioMixer
- add checking of magic field in AudioMixer to detect overwrites
- add bool AudioMixer::enabled()
Bug:
6490974
Change-Id: I1f3f18aa62d9fbd35bc32285b669f5ba40efe28e
Glenn Kasten [Thu, 14 Feb 2013 23:57:13 +0000 (23:57 +0000)]
Merge "Revert "Temporary additional logging to investigate bug""
Glenn Kasten [Thu, 14 Feb 2013 23:57:02 +0000 (23:57 +0000)]
Revert "Temporary additional logging to investigate bug"
This reverts commit
639482c24c911b125398b31883ba6d55faebe28b
Change-Id: I11f2829072ab11e18b0663024f27bf31192f1d39
Glenn Kasten [Thu, 14 Feb 2013 23:56:52 +0000 (23:56 +0000)]
Merge "Temporary additional logging to investigate bug"
Glenn Kasten [Wed, 13 Feb 2013 22:46:45 +0000 (14:46 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
- log mFastIndex when AudioMixer sees an invalid bufferProvider.
- log both potentially modified and actually modified tracks in FastMixer.
- fix benign bug where sq->end() was called more than once.
- log StateQueue push() call and return.
- increase StateQueue size from 4 to 8 entries
- log mixer->enable(), bufferProvider, and currentTrackMask
- log buffer provider addresses
- increase fast mixer log buffer again
- check logf format vs. argument list compatibility
- add logging to AudioMixer
- add checking of magic field in AudioMixer to detect overwrites
- add bool AudioMixer::enabled()
Bug:
6490974
Change-Id: I1f3f18aa62d9fbd35bc32285b669f5ba40efe28e
ztenghui [Thu, 14 Feb 2013 20:42:53 +0000 (20:42 +0000)]
Merge "Add a test utility for MediaMuxer."
The Android Automerger [Thu, 14 Feb 2013 13:55:39 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to master
Glenn Kasten [Wed, 13 Feb 2013 22:46:45 +0000 (14:46 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
- log mFastIndex when AudioMixer sees an invalid bufferProvider.
- log both potentially modified and actually modified tracks in FastMixer.
- fix benign bug where sq->end() was called more than once.
- log StateQueue push() call and return.
Bug:
6490974
Change-Id: Iee7c8f40e20b6000cd8286c0ec6a14fff4a37af1
Glenn Kasten [Thu, 14 Feb 2013 00:02:53 +0000 (00:02 +0000)]
Merge "Revert "Temporary additional logging to investigate bug""
Glenn Kasten [Thu, 14 Feb 2013 00:02:36 +0000 (00:02 +0000)]
Revert "Temporary additional logging to investigate bug"
This reverts commit
0ddd56316262ac74a95e9edb595697c163136d6d
Change-Id: I180a928af6f5a38d15a5efe44cd1fe927b5d961c
Glenn Kasten [Thu, 14 Feb 2013 00:02:22 +0000 (00:02 +0000)]
Merge "Temporary additional logging to investigate bug"
Glenn Kasten [Wed, 13 Feb 2013 22:46:45 +0000 (14:46 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
- log mFastIndex when AudioMixer sees an invalid bufferProvider.
- log both potentially modified and actually modified tracks in FastMixer.
- fix benign bug where sq->end() was called more than once.
- log StateQueue push() call and return.
Bug:
6490974
Change-Id: Iee7c8f40e20b6000cd8286c0ec6a14fff4a37af1
ztenghui [Thu, 7 Feb 2013 23:12:10 +0000 (15:12 -0800)]
Add a test utility for MediaMuxer.
This test/utility copy samples from one video and mux into another video.
It support trimming, cutting audio or video track.
It can run simply as command line like:
adb shell muxer -a -v -s 1000 -e 8000 "/sdcard/DCIM/Camera/VID_*.mp4"
bug:
7991013
Change-Id: I8a2eeff3cabd001b6b2a7062d991dd076edbf22e
James Dong [Wed, 13 Feb 2013 18:18:22 +0000 (18:18 +0000)]
Merge "Add OMX.google.vpx.encoder"
The Android Automerger [Wed, 13 Feb 2013 13:55:41 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to master
James Dong [Tue, 12 Feb 2013 18:36:01 +0000 (10:36 -0800)]
Add OMX.google.vpx.encoder
Change-Id: I843e6e542533884a94e105e1cb56f16f0440af61
Kunter Gultekin [Fri, 1 Feb 2013 15:01:15 +0000 (17:01 +0200)]
Adds VPX encoding support for stagefright.
Only following encoder settings are available
- target bitrate
- rate control (constant / variable)
- frame rate
- token partitioning
- error resilience
- reconstruction & loop filters
Only following color formats are recognized
- YUV420Planar
- YUV420SemiPlanar
- AndroidOpaque
Following settings are not configurable by the client
- encoding deadline is realtime
- the algorithm interface for encoder is vp8
- fractional bits of frame rate is discarded
- timebase is fixed to 1/
1000000
Requires libvpx to be built with encoder support enabled.
Requires openmax 1.1.2 extension headers.
Relevant tests exist in cts repo.
Change-Id: I650f1aca83e7dc93f79d7e6cba7ac24f26e66d40
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
Glenn Kasten [Tue, 12 Feb 2013 20:12:42 +0000 (12:12 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
Bug:
6490974
Change-Id: I4c030f171343fe4b483eae0ddea4427118d8d4b1
Glenn Kasten [Tue, 12 Feb 2013 20:44:09 +0000 (20:44 +0000)]
Merge "Revert "Temporary additional logging to investigate bug""
Glenn Kasten [Tue, 12 Feb 2013 20:43:58 +0000 (20:43 +0000)]
Revert "Temporary additional logging to investigate bug"
This reverts commit
3051df27261e9952c0e642dec548515250e85f6a
Change-Id: I8bf5c3e91b65bd20de26f480c367c2854b62373c
Glenn Kasten [Tue, 12 Feb 2013 20:43:45 +0000 (20:43 +0000)]
Merge "Temporary additional logging to investigate bug"
Glenn Kasten [Tue, 12 Feb 2013 20:12:42 +0000 (12:12 -0800)]
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider
in fast mixer after track destruction, so focus the added logs in that area.
Also includes a bug fix: was calling log in an unsafe place
near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.
Details:
- include caller pid or client pid where appropriate
- increase log buffer size
Bug:
6490974
Change-Id: I4c030f171343fe4b483eae0ddea4427118d8d4b1
ztenghui [Mon, 4 Feb 2013 23:59:38 +0000 (15:59 -0800)]
Add the native MediaMuxer support.
MediaAdapter: a helper class to convert the push model to pull model.
MediaMuxer: the real muxer.
bug:
7991013
Change-Id: If3b79551bc6332bc81f5c2740885e579a5c4abf9
The Android Automerger [Tue, 12 Feb 2013 15:10:36 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Jean-Michel Trivi [Tue, 5 Feb 2013 00:26:02 +0000 (16:26 -0800)]
Add support for querying if a stream is active remotely
Bug
7485803
Change-Id: I0744374f130fd2dd0714102354cffed2fa915361