OSDN Git Service
Andreas Huber [Thu, 18 Jul 2013 21:36:18 +0000 (14:36 -0700)]
ANetworkSession and ParsedMessage are now part of stagefright foundation.
Also fixes some bugs in ParseMessage and adds "WebSocket" mode to
ANetworkSession, something that's opt-in and should not affect existing clients
of the API.
Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
Glenn Kasten [Thu, 18 Jul 2013 14:59:36 +0000 (14:59 +0000)]
Merge "Fix theoretical memory leak in mConfigEvents"
Glenn Kasten [Wed, 17 Jul 2013 16:08:51 +0000 (09:08 -0700)]
Fix theoretical memory leak in mConfigEvents
Change-Id: I137f70676c8919661e716c33e0dd9c25c2b6285c
Glenn Kasten [Wed, 17 Jul 2013 23:26:33 +0000 (23:26 +0000)]
Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"
Andreas Huber [Wed, 17 Jul 2013 22:29:43 +0000 (22:29 +0000)]
Merge "Support "suspension" of a video encoder in "surface-input" mode."
Andreas Huber [Wed, 17 Jul 2013 20:55:26 +0000 (13:55 -0700)]
Support "suspension" of a video encoder in "surface-input" mode.
i.e. feed no more input frames to the encoder while suspended.
Change-Id: I51391e18c1517548e869f8ddece19f4af37e78f9
Andreas Huber [Wed, 17 Jul 2013 22:13:17 +0000 (22:13 +0000)]
Merge "Experimental support for enabling the use of "surface input" mode"
Andreas Huber [Wed, 17 Jul 2013 21:02:31 +0000 (14:02 -0700)]
Experimental support for enabling the use of "surface input" mode
even with the software VP8 encoder.
This relies heavily on the fact that the "Nexus" devices use ARGB32 as
the colorspace for the data underlying a surface provided by SurfaceFlinger
(mirroring). Generally there are no such guarantees.
Change-Id: I1de32f591a3bb935ca76151816b3a02665bec40b
leozwang@google.com [Wed, 17 Jul 2013 21:14:37 +0000 (21:14 +0000)]
Merge "Output more detailed error message if loading library fails"
leozwang@google.com [Sun, 14 Jul 2013 04:52:50 +0000 (21:52 -0700)]
Output more detailed error message if loading library fails
Bug:
9805979
Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658
Glenn Kasten [Wed, 17 Jul 2013 15:14:16 +0000 (15:14 +0000)]
Merge "Fix indentation"
Glenn Kasten [Wed, 17 Jul 2013 14:44:50 +0000 (14:44 +0000)]
Merge "Add comments"
Glenn Kasten [Wed, 17 Jul 2013 14:24:14 +0000 (14:24 +0000)]
Merge "Fix typo in logs"
Mathias Agopian [Tue, 16 Jul 2013 02:17:39 +0000 (02:17 +0000)]
Merge "always pass the BufferQueue explicitely to consumers"
Igor Murashkin [Sat, 13 Jul 2013 00:52:16 +0000 (17:52 -0700)]
camera2: Implement ICameraDeviceUser::getCameraInfo
Bug:
9529161
Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
Mathias Agopian [Sat, 13 Jul 2013 05:06:20 +0000 (22:06 -0700)]
always pass the BufferQueue explicitely to consumers
Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
Glenn Kasten [Thu, 11 Jul 2013 20:11:55 +0000 (20:11 +0000)]
Merge "AudioTrackShared cleanup"
Glenn Kasten [Thu, 11 Jul 2013 20:07:50 +0000 (20:07 +0000)]
Merge "Fix AudioTrack::flush()"
Glenn Kasten [Thu, 11 Jul 2013 17:35:38 +0000 (10:35 -0700)]
Fix AudioTrack::flush()
It was only flushing at a surface level, and even then only the first time
the server observed the client's flush request. Now it flushes at a
deeper level, but there may be even deeper device-specific flushing.
Bug:
9770947
Change-Id: I687cc3410ff9e5e5d4a5dcb9e3b129501e53d247
The Android Open Source Project [Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)]
am
1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
1bb59258458350af518170558120783bc2f9e61d':
The Android Open Source Project [Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)]
am
0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':
Andy McFadden [Thu, 11 Jul 2013 14:40:58 +0000 (14:40 +0000)]
Merge "Pass additional arg to acquireBuffer calls."
Zhijun He [Thu, 11 Jul 2013 08:54:37 +0000 (01:54 -0700)]
am
adaa78c9: am
a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit '
adaa78c901a2f2509965b7acc1cde848dfc6bafe':
camera2/3: set preview callback oneshot flag during still capture
Glenn Kasten [Thu, 11 Jul 2013 00:20:54 +0000 (17:20 -0700)]
Fix indentation
Change-Id: Ia28720a7d0fad8cf110c2448b967d5648d42e017
Glenn Kasten [Thu, 11 Jul 2013 00:03:19 +0000 (17:03 -0700)]
Add comments
Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
Glenn Kasten [Wed, 10 Jul 2013 23:52:47 +0000 (16:52 -0700)]
Fix type error in AudioTrack::processAudioBuffer
It returned a bool instead of nsecs_t
Change-Id: If0c096dac411afc0a4142ec1e59c1fdd36d4867c
Glenn Kasten [Tue, 18 Jun 2013 18:46:28 +0000 (11:46 -0700)]
Clean up references to AUDIO_FORMAT_PCM_8_24_BIT
Change-Id: I08771eb2664b7082561a40937218c7f4414e2cce
The Android Open Source Project [Wed, 10 Jul 2013 15:34:46 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04
The Android Automerger [Wed, 10 Jul 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 9 Jul 2013 16:37:21 +0000 (09:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b
Zhijun He [Tue, 9 Jul 2013 15:00:35 +0000 (08:00 -0700)]
am
a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit '
a2520db02bead68d4980783c41500ae96511bdf8':
camera2/3: set preview callback oneshot flag during still capture
The Android Automerger [Tue, 9 Jul 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andy McFadden [Fri, 28 Jun 2013 21:03:03 +0000 (14:03 -0700)]
Pass additional arg to acquireBuffer calls.
Bug
7900302
Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
Zhijun He [Mon, 8 Jul 2013 23:12:32 +0000 (16:12 -0700)]
camera2/3: set preview callback oneshot flag during still capture
Preview callback oneshot flag need set when a still picture is being captured
and preview callback oneshot is enabled, otherwise, the callback enabling status
could be lost when preview is restarted after still catpure.
Bug
9742091
Change-Id: If9562369013e53727edfdd16f3d00d6a9392e70d
Eino-Ville Talvala [Mon, 8 Jul 2013 23:49:36 +0000 (16:49 -0700)]
am
06a4604e: am
4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers
* commit '
06a4604e77b5872857ef95fe712b6ce00c7aa506':
Camera2/3: As a fallback, unilaterally free old recording buffers
Eino-Ville Talvala [Mon, 8 Jul 2013 23:47:27 +0000 (16:47 -0700)]
am
4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers
* commit '
4a5c009bc2389304cf078c270bceb656479367d2':
Camera2/3: As a fallback, unilaterally free old recording buffers
The Android Open Source Project [Mon, 8 Jul 2013 22:37:11 +0000 (15:37 -0700)]
am
29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
291967728b02ad9a7d5545b0eb1ec0c4c3d664af':
The Android Open Source Project [Mon, 8 Jul 2013 22:33:11 +0000 (15:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:43:29 +0000 (13:43 -0700)]
am
1468dd9c: am
c582fde9: resolved conflicts for merge of
c158971f to stage-aosp-master
* commit '
1468dd9cefe11d5938a5497688f99701b6b14706':
Store rtsp accessunit until PLAY response parsed
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:42:25 +0000 (13:42 -0700)]
am
c582fde9: resolved conflicts for merge of
c158971f to stage-aosp-master
* commit '
c582fde93ded7219107157333a9e46d780adcf9c':
Store rtsp accessunit until PLAY response parsed
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:36:08 +0000 (13:36 -0700)]
resolved conflicts for merge of
c158971f to stage-aosp-master
Change-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158
Eino-Ville Talvala [Wed, 3 Jul 2013 23:56:11 +0000 (16:56 -0700)]
Camera2/3: As a fallback, unilaterally free old recording buffers
When starting a recording session, check for and clear out recording
buffers still owned by stagefright from a previous recording session,
if any. There should never be any, but in case they are due to a bug
elsewhere in the system, clearing out the buffers makes recovery
possible.
Bug:
9591080
Change-Id: I3a2a1256860bd174381cd525948419f985c9b415
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:35:13 +0000 (19:35 +0000)]
Merge "Store rtsp accessunit until PLAY response parsed"
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:23:00 +0000 (12:23 -0700)]
am
8ebdfa8b: am
5de9ef20: am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
8ebdfa8b021ed338f9916a1f30d756b989afa3bd':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:20:16 +0000 (12:20 -0700)]
am
5de9ef20: am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
5de9ef20d596bc20f53cba664f1ac7e358910ea2':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:15:36 +0000 (12:15 -0700)]
am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
365ed394c4135d9d42082c85638c076aed4bd156':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:00:51 +0000 (19:00 +0000)]
Merge "Typo in CameraParameters::set"
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:31:25 +0000 (11:31 -0700)]
am
c26ab375: am
5d2ab2a6: am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
c26ab375ebb1bce6c3a99a46a72d8369170255ca':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:29:15 +0000 (11:29 -0700)]
am
5d2ab2a6: am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:27:53 +0000 (11:27 -0700)]
am
046d9c8d: am
06197925: am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
046d9c8dad97118535778cf93efc662ceb5fec8d':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:27:52 +0000 (11:27 -0700)]
am
9f0e0597: am
7266bc80: am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
9f0e05978e236352fd2a4a7c6dce909755c36ead':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:40 +0000 (11:25 -0700)]
am
06197925: am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
061979253985e59c4fcb82ede232717736e633b1':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:39 +0000 (11:25 -0700)]
am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
8eef093c213094c7efb655ef4d9e31439646bd7f':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:34 +0000 (11:25 -0700)]
am
7266bc80: am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
7266bc80850dc327e9f18c27b81613f959399630':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:23:45 +0000 (18:23 +0000)]
Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:21:48 +0000 (11:21 -0700)]
am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
267363ee2836ff9bc18d7fdd93aaedf19de546ad':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:21:45 +0000 (11:21 -0700)]
am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
ca7f160921a4a1a5da32ebe8fab1067bd8998a1f':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:17:43 +0000 (18:17 +0000)]
Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:17:02 +0000 (18:17 +0000)]
Merge "Prevent double disconnects in RTSPSource"
Glenn Kasten [Mon, 8 Jul 2013 16:38:40 +0000 (16:38 +0000)]
Merge "Explicitly compare raw pointers to NULL"
Glenn Kasten [Mon, 8 Jul 2013 15:40:30 +0000 (15:40 +0000)]
Merge "mv libcpustats from frameworks/native to frameworks/av"
The Android Automerger [Mon, 8 Jul 2013 12:55:23 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Tinker [Sun, 7 Jul 2013 19:28:46 +0000 (12:28 -0700)]
am
9a25c012: am
eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
* commit '
9a25c012915f2209fff1479b246ae8eba38c3eff':
Part of fix for TEE resource leaks when app crashes
Jeff Tinker [Sun, 7 Jul 2013 19:26:16 +0000 (12:26 -0700)]
am
eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
* commit '
eced745af7d2d27a8c45e04eb071d4fb30cd3e48':
Part of fix for TEE resource leaks when app crashes
Jeff Tinker [Sun, 7 Jul 2013 19:21:55 +0000 (19:21 +0000)]
Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
Jeff Tinker [Wed, 3 Jul 2013 22:38:58 +0000 (15:38 -0700)]
Part of fix for TEE resource leaks when app crashes
bug:
9672606
Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
Eric Laurent [Wed, 3 Jul 2013 15:40:51 +0000 (08:40 -0700)]
am
ace2378c: am
f59a4b39: fix scheduling policy service death detection
* commit '
ace2378c934b61fbd865b5ade9ff7d0df81dabe3':
fix scheduling policy service death detection
Eric Laurent [Wed, 3 Jul 2013 15:16:46 +0000 (08:16 -0700)]
am
f59a4b39: fix scheduling policy service death detection
* commit '
f59a4b393f4844c5bbc8d6212364bdddea33d232':
fix scheduling policy service death detection
hovanchen [Tue, 2 Jul 2013 07:07:44 +0000 (15:07 +0800)]
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
[Cause]
- getBitrate(int64_t *bitrate) will return true if mBitrate = 0.
- Then, in getCachedDuration_l(int64_t *durationUs, bool *eos),
we might execute the following function when
getBitrate(&bitrate) = true and bitrate = 0.
*durationUs = cachedDataRemaining * 8000000ll / bitrate;
- Mediaserver will be crashed when divided by zero.
- The mediaserver crash often occur when DLNA IOP tests on Golden DMS
with AAC_ADTS_320 audio.
[Solution]
- Prevent the divide function executing when bitrate is zero.
Change-Id: I4439d92cee5faec95df2109e9186c33b3fff6c66
Glenn Kasten [Tue, 2 Jul 2013 21:17:22 +0000 (14:17 -0700)]
Explicitly compare raw pointers to NULL
Change-Id: Id2c7828a36a6912333465475b21fa87e294c83c7
Glenn Kasten [Tue, 25 Jun 2013 23:13:23 +0000 (16:13 -0700)]
AudioTrackShared cleanup
Maintain unreleased frame count on client side also (was already there on server side).
Assertion failure instead of BAD_VALUE status for incorrect usage of APIs.
Clean up error handling code.
Change-Id: I23ca2f6f8a7c18645309ee5d64fbc844429bcba8
Glenn Kasten [Tue, 13 Nov 2012 23:06:37 +0000 (15:06 -0800)]
Fix typo in logs
Change-Id: I889e31ea3a45a3d8d34fdfb54ebc3947de51d2be
Glenn Kasten [Fri, 31 May 2013 16:18:43 +0000 (09:18 -0700)]
Include what is needed
Remove old includes.
Header files only include other header files that they directly need themselves.
Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
Eric Laurent [Tue, 2 Jul 2013 18:15:41 +0000 (11:15 -0700)]
fix scheduling policy service death detection
Check status of transactions to scheduling policy service
and re-acquire a binder interface in case of DEAD_OBJECT.
Bug:
8875559.
Change-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a
Eino-Ville Talvala [Mon, 1 Jul 2013 18:20:02 +0000 (18:20 +0000)]
Merge "Camera2Api: Creating a JPEG stream needs to use the right size"
Eino-Ville Talvala [Mon, 1 Jul 2013 16:23:55 +0000 (09:23 -0700)]
Camera2Api: Creating a JPEG stream needs to use the right size
JPEG streams have variable size, so use the HAL-provided max size
to size the stream buffers.
Change-Id: Ie6900bc9ece6e972eae93fca6aca779224c9bfc6
The Android Open Source Project [Mon, 1 Jul 2013 14:47:50 +0000 (07:47 -0700)]
am
f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
f64bd473e4c500dc54923baac7261e6d2d72daa6':
Update HTTP proxy configuration for all media playback inside stagefright.
The Android Open Source Project [Mon, 1 Jul 2013 14:42:56 +0000 (07:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf
Fredrik Rosin [Wed, 6 Mar 2013 12:42:53 +0000 (13:42 +0100)]
Prevent double disconnects in RTSPSource
Prevent a null pointer from occuring by checking that we are not
already disconnected before performing a disconnect, in case
multiple disconnects have been issued.
Change-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084
The Android Automerger [Sun, 30 Jun 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andreas Huber [Fri, 28 Jun 2013 22:33:44 +0000 (15:33 -0700)]
am
0eefffd8: am
47a1fe04: am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
0eefffd8fc8abfbe694814fcec397aeac3f545b8':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:31:37 +0000 (15:31 -0700)]
am
47a1fe04: am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
47a1fe04637793f48d808261b1fac47acc3de1e1':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:29:01 +0000 (15:29 -0700)]
am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:26:42 +0000 (22:26 +0000)]
Merge "Set u.ext_data to null after it has been freed"
Andreas Huber [Wed, 29 May 2013 21:20:52 +0000 (14:20 -0700)]
Update HTTP proxy configuration for all media playback inside stagefright.
Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug:
8873723
(cherry picked from commit
2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
Glenn Kasten [Fri, 28 Jun 2013 17:48:43 +0000 (10:48 -0700)]
am
903871da: am
83790fcc: am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
903871da7a7c71b8718133e60e2f0835837b5f3f':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Eric Laurent [Fri, 28 Jun 2013 17:48:21 +0000 (17:48 +0000)]
Merge "Public API changes for audio offload support."
Eino-Ville Talvala [Fri, 28 Jun 2013 16:47:36 +0000 (09:47 -0700)]
resolved conflicts for merge of
364a2677 to master
Change-Id: I21f23c1c5e4408c24c359bef6270dffce47a988d
Glenn Kasten [Fri, 28 Jun 2013 16:33:15 +0000 (09:33 -0700)]
am
83790fcc: am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
83790fcce4f5cda1e7c89f1cbed452426502f227':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Glenn Kasten [Fri, 28 Jun 2013 16:30:58 +0000 (09:30 -0700)]
am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
bdf33c98912090176183d3e9b9a9217dbbdca6da':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Glenn Kasten [Fri, 28 Jun 2013 16:28:48 +0000 (16:28 +0000)]
Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."
Eino-Ville Talvala [Fri, 28 Jun 2013 14:07:29 +0000 (07:07 -0700)]
am
a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist.
* commit '
a691ff3c03e38e148bbefed35ebb15e552a12613':
Camera2/3: Don't allow recording and callbacks to coexist.
Christer Fletcher [Tue, 18 Jun 2013 06:55:09 +0000 (08:55 +0200)]
Set u.ext_data to null after it has been freed
SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage.
The faulty address could be both random pointers and
deadbaad. It
seems like free could be called more than once on u.ext_data. Set
u.ext_data to null after it has been freed as there already is a
null check before trying to free it.
Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e
Richard Fitzgerald [Mon, 25 Mar 2013 16:54:37 +0000 (16:54 +0000)]
Public API changes for audio offload support.
NOTE: this does _not_ include all private member variables added
to classes as part of offload support. Only public/protected functions
and stubs functions/variables needed to make the changes buildable.
- isOffloadSupported() added to audio policy service
A stub implementation is required to build, this always returns false
- setParameters() added to IAudioTrack
A stub implementation is required to build, this always returns
INVALID_OPERATION
- CBlk flag for stream end
- Change AudioSystem::getRenderPosition() to take an audio_output_t
so caller can specify which output to query
- Add AudioSystem::isOffloadSupported()
This is fully implemented down to the AudioFlinger function
AudioPolicyServer::isOffloadSupported() which is just a stub
that always returns false.
- Add EVENT_STREAM_END to AudioTrack interface.
STREAM_END is used to signal when the hardware has actually finished
playing all the data it was sent.
- Add event type enumeration to media player interface AudioSink callbacks
so that the same callback can be used to handle multiple types of
event. For offloaded tracks we also have to handle STREAM_END and
TEAR_DOWN events
- Pass audio_offload_info_t to various functions used for opening outputs,
tracks and audio players. This passes additional information about the
compressed stream down to the HAL when using offload.
For publicly-available APIs this is an optional parameter (for some of
the internal and low-level APIs around the HAL interface it is mandatory)
- Add getParameters() and setParameters() API to AudioTrack
Currently dummy implementations.
- Change AudioPlayer contructor so that it takes a set of bitflags defining what
options are required. This replaces the original bool which only specified
whether to use deep buffering.
- Changes to StageFright class definition related to handling tearing-down of
an offloaded track when we need to switch back to software decode
- Define new StageFright utility functions used for offloaded tracks
Currently dummy implementations.
- AudioFlinger changes to use extended audio_config_t.
Fills in audio_offload_info_t member if this info is passed in when
opening an output.
- libvideoeditor changes required to add the new event type parameter
to AudioSink callback functions
- libmediaplayerservice changes required to add the new event type parameter
to AudioSink callback functions
Change-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
Eino-Ville Talvala [Thu, 27 Jun 2013 01:23:23 +0000 (18:23 -0700)]
Camera2/3: Don't allow recording and callbacks to coexist.
- Tear down conflicting streams when necessary.
- Shut down callbacks if recording starts
- Do not allow callbacks to start if recording is active
Per the current camera API, recording and preview callbacks cannot be
active simultaneously. However, the framework did not explicitly
disallow this, and in fact left the streams configured once they were
created, even if switching between the two operational modes.
In addition, no guards existed for trying to enable both recording and
callbacks at the same time.
Bug:
9423825
Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
Scott Fan [Sun, 28 Apr 2013 02:13:54 +0000 (10:13 +0800)]
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
warning: format '%ld' expects argument of type 'long int',
but argument 7 has type 'ssize_t {aka int}' [-Wformat]
Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556
Signed-off-by: Scott Fan <fancp2007@gmail.com>
The Android Open Source Project [Wed, 26 Jun 2013 00:02:16 +0000 (17:02 -0700)]
am
bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
bdebd4817cfe49fafedfe8f9c65930e03f9b508b':
Jean-Baptiste Queru [Tue, 25 Jun 2013 23:30:54 +0000 (16:30 -0700)]
am
1aee0be6: am
3a4ff0b8: am
d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link"
* commit '
1aee0be6cc9ecb4ff3d86228bb68c295c12bde9c':
libstagefright: fix the duration "00:00" for some httplive link
The Android Open Source Project [Tue, 25 Jun 2013 23:12:03 +0000 (16:12 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I4de46f3bfcfb80867bbeb52a76d383f5870e74f4
Lajos Molnar [Tue, 25 Jun 2013 22:07:56 +0000 (22:07 +0000)]
Merge "Adds VP9 decoding support for stagefright."