OSDN Git Service
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:19 +0000 (15:31 -0700)]
am
0df213ba: am
dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '
0df213babc4fb41b7daa05cb3c08071f2b60f6a5':
hardening: eliminate text relocations from mp3
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:18 +0000 (15:31 -0700)]
am
a109e9d5: am
b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit '
a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99':
avcenc: Clarify the ifdefs surrounding inline assembly
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:16 +0000 (15:31 -0700)]
am
fba9d50d: am
4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '
fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe':
hardening: eliminate text relocations from amrwb
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:16 +0000 (15:31 -0700)]
am
1191287b: am
c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '
1191287bc438c164a89cf86704936aeddbefb136':
aacenc/amrwbenc: Remove the now unused LINUX define
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:15 +0000 (15:31 -0700)]
am
eeb9fde0: am
3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '
eeb9fde0cb8e0ace44eb720bcac272ee70282d4d':
aacenc/amrwbenc: Remove unused and dubious typedefs
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:28 +0000 (15:29 -0700)]
am
dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '
dde79acfb97083d690e3cceabff78931b10d1539':
hardening: eliminate text relocations from mp3
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:26 +0000 (15:29 -0700)]
am
b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit '
b7ca7dc9652456181080bf28ec376bc5a36cf6a2':
avcenc: Clarify the ifdefs surrounding inline assembly
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:25 +0000 (15:29 -0700)]
am
4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '
4f981882da8080e1d41d000bfbad92df61adcfba':
hardening: eliminate text relocations from amrwb
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:24 +0000 (15:29 -0700)]
am
c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '
c3bfa0260a530af3e9c091c1c9d90d1283021dd6':
aacenc/amrwbenc: Remove the now unused LINUX define
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:23 +0000 (15:29 -0700)]
am
3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '
3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49':
aacenc/amrwbenc: Remove unused and dubious typedefs
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:45:30 +0000 (14:45 -0700)]
Merge "hardening: eliminate text relocations from mp3"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:44:54 +0000 (14:44 -0700)]
Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:44:39 +0000 (14:44 -0700)]
Merge "hardening: eliminate text relocations from amrwb"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:42:35 +0000 (14:42 -0700)]
Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:42:16 +0000 (14:42 -0700)]
Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
Martin Storsjo [Wed, 7 Mar 2012 11:17:52 +0000 (13:17 +0200)]
aacenc/amrwbenc: Remove the now unused LINUX define
This is no longer used by the codec code (except for the
amrwbenc sample).
Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
Martin Storsjo [Thu, 23 Jun 2011 07:53:55 +0000 (10:53 +0300)]
aacenc/amrwbenc: Remove unused and dubious typedefs
These typedefs aren't used anywhere, and their description
doesn't really match their actual definition. The VO_TCHAR
type is even defined as pointer for one configuration and
as non-pointer for another configuration.
This gets rid of the last use of the LINUX define in the
VO codecs (except for the amrwbenc sample application).
Within the codecs, the use of this define is unclear - does it
indicate code specific to android but not normal linux, linux
but not other unixes, unix but not windows, or gcc but not
other compilers, etc.
Originally, prior to cleanup, the define has meant many
different of these - these uses has now been cleaned up to
use the proper feature detection macros (e.g. looking for
defines automatically set by the compiler, instead of
relying on manually setting this define).
Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
Jean-Baptiste Queru [Wed, 15 Aug 2012 18:25:49 +0000 (11:25 -0700)]
am
add9f820: am
2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
* commit '
add9f820eaeb180b5e72a4420995a54062cfabd7':
MPEG2TSWriter: Correctly add padding using the adaptation field
Jean-Baptiste Queru [Wed, 15 Aug 2012 18:24:36 +0000 (11:24 -0700)]
am
2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
* commit '
2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
MPEG2TSWriter: Correctly add padding using the adaptation field
Jean-Baptiste Queru [Wed, 15 Aug 2012 17:14:29 +0000 (10:14 -0700)]
Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
Paul Fariello [Mon, 23 Jan 2012 16:32:06 +0000 (17:32 +0100)]
MPEG2TSWriter: Correctly add padding using the adaptation field
Change-Id: I268cce36ada910ba168c4c9dcedab0b20f6e6ebb
Eino-Ville Talvala [Tue, 14 Aug 2012 18:55:50 +0000 (11:55 -0700)]
Merge "Camera2: Skeleton for output frame processing, plus face detect" into jb-mr1-dev
Eino-Ville Talvala [Fri, 10 Aug 2012 15:40:26 +0000 (08:40 -0700)]
Camera2: Skeleton for output frame processing, plus face detect
- Plumbing for processing output metadata frames from the HAL
- Support for passing face detection metadata from said frames
to the application.
- Switch calls on ICameraClient interface to use separate mutex to
avoid deadlock scenarios with messages being communicated from the
HAL to the camera user while calls from the user to the service are
active.
Bug:
6243944
Change-Id: Id4cf821d9c5c3c0069be4c0f669874b6ff0d1ecd
Jean-Michel Trivi [Tue, 14 Aug 2012 00:46:40 +0000 (17:46 -0700)]
Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev
Jean-Michel Trivi [Fri, 10 Aug 2012 19:24:59 +0000 (12:24 -0700)]
Fix AAC DRC metadata being ignored
The decoder will bypass all DRC processing during decode unless
any of the DRC parameters is set.
The fix consists in setting the DRC reference level to its
default value when after the decoder is initialized.
Change-Id: Ibb8355ab8c3c65020c5eef0752957040f7316c2a
Jean-Baptiste Queru [Mon, 13 Aug 2012 23:03:31 +0000 (16:03 -0700)]
am
979df012: am
98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '
979df012eb0588ac7f87d5f6e8bff77e2049ee46':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
Jean-Baptiste Queru [Mon, 13 Aug 2012 22:19:13 +0000 (15:19 -0700)]
am
98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '
98159acd68307bf0fcec40ae0fffc1a715517d1d':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
Jean-Baptiste Queru [Mon, 13 Aug 2012 21:37:57 +0000 (14:37 -0700)]
Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
Ard Biesheuvel [Mon, 13 Aug 2012 20:47:33 +0000 (22:47 +0200)]
hardening: eliminate text relocations from mp3
Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
Ard Biesheuvel [Mon, 13 Aug 2012 20:44:43 +0000 (22:44 +0200)]
hardening: eliminate text relocations from amrwb
Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
Glenn Kasten [Thu, 2 Aug 2012 20:37:12 +0000 (13:37 -0700)]
const methods
Change-Id: I92e32ee16274c032c9d0ce910676be2a7fa52471
Glenn Kasten [Thu, 2 Aug 2012 23:36:50 +0000 (16:36 -0700)]
Simplify AudioFlinger::PlaybackThread::isValidSyncEvent()
Change-Id: I3e4af69b929d4ca04afaac26c7e41c89fce25b9c
Glenn Kasten [Thu, 2 Aug 2012 20:35:47 +0000 (13:35 -0700)]
Discard setSyncEvent() return value
setSyncEvent() returns a status_t which is sometimes ignored.
Emphasize this is intentional by casting to void.
Change-Id: Ic614988347cba36bd2504d7ad321594a355b0d9d
Glenn Kasten [Mon, 13 Aug 2012 18:30:17 +0000 (11:30 -0700)]
Merge "Replace hard-coded "2" by a constant and comment" into jb-mr1-dev
Andreas Huber [Mon, 13 Aug 2012 17:59:48 +0000 (10:59 -0700)]
Use the correct data offset by remembering the offset of the enclosing 'moof'
container.
Change-Id: I2f0f92dabe31341a6a91d435943e4a65e34884ba
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:56:58 +0000 (10:56 -0700)]
am
10004fe6: am
5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '
10004fe612bc38bedc258fd1c380ebccacfa0c1e':
amrnb: Fix audio distortion in an AMR-NB clip
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:53:51 +0000 (10:53 -0700)]
am
5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '
5efa7bf945f53c419501b0a4f9718962f24f0df5':
amrnb: Fix audio distortion in an AMR-NB clip
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:37:03 +0000 (10:37 -0700)]
Merge "amrnb: Fix audio distortion in an AMR-NB clip"
John Grossman [Mon, 13 Aug 2012 16:52:14 +0000 (09:52 -0700)]
Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev
* changes:
Move the AAH RTP code out of framework and into vendor.
Add the ability to dynamicaly register MediaPlayer types.
Andreas Huber [Mon, 13 Aug 2012 16:03:06 +0000 (09:03 -0700)]
Merge "Signal end of stream if no more fragments are going to be available." into jb-mr1-dev
John Grossman [Mon, 6 Aug 2012 20:50:00 +0000 (13:50 -0700)]
Move the AAH RTP code out of framework and into vendor.
Relocate the AAH RTP code from framework/av into
vendor/google_devices/phantasm. This change is the deletion, there
will be a separate CL which re-introduces on the vendor side of
things.
Change-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c
Signed-off-by: John Grossman <johngro@google.com>
John Grossman [Fri, 22 Jun 2012 00:29:24 +0000 (17:29 -0700)]
Add the ability to dynamicaly register MediaPlayer types.
Add the ability to dynamically register low level MediaPlayer
factories which will be probed at setDataSource time to determine the
proper MediaPlayerBase to instantiate.
This change is in preparation for moving libaah_rtp out of
frameworks/base and into phantasm platform directory.
Change-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076
Signed-off-by: John Grossman <johngro@google.com>
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:34:06 +0000 (15:34 -0700)]
am
3ca352c4: am
24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
* commit '
3ca352c4cd01f6df3b691f835efc68a5771e724e':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:32:40 +0000 (15:32 -0700)]
am
24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
* commit '
24893fef8e0f816a8a21749fa3eb9eed9173a0fd':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:26:43 +0000 (15:26 -0700)]
Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:44:04 +0000 (12:44 -0700)]
am
31a593b9: am
2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
* commit '
31a593b901eeb924ae5214962c628397dd0197f2':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:44:02 +0000 (12:44 -0700)]
am
ff4c64d6: am
c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."
* commit '
ff4c64d6b1b58494a1b15f1a664e5c421d095d15':
Fix initialization of audio mixer track resources for MIPS.
James Dong [Fri, 10 Aug 2012 17:25:51 +0000 (10:25 -0700)]
Merge "Handle malformed raw AAC/AMR writer better" into jb-mr1-dev
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:26:41 +0000 (09:26 -0700)]
am
2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
* commit '
2001d2ac01e36c13c1abda5f73b6404cba2648e1':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:26:40 +0000 (09:26 -0700)]
am
c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."
* commit '
c64a178711bf7bb9b71d65a47156b34083311392':
Fix initialization of audio mixer track resources for MIPS.
Eino-Ville Talvala [Wed, 8 Aug 2012 16:25:58 +0000 (09:25 -0700)]
Camera2: Swap AF notification order, minor bug fix.
In continuous AF modes, when an AF trigger/cancel is received in the
middle of a passive AF scan, we want to send both an AF move stop
callback and an AF done callback. Swap the order of sending to
simplify life when the app just wants to pay attention to the AF done
callback during an active AF trigger.
Bug:
6243944
Change-Id: I127d1675bc37ef828ef89c70b8cfab75f9428a2f
Eino-Ville Talvala [Fri, 3 Aug 2012 20:53:39 +0000 (13:53 -0700)]
Camera2: Add trigger support, and implement autofocus
- Add skeletons for all triggering actions into Camera2Device
- Add support for AF triggers to HAL
- Add support for AF notifications from HAL
Bug:
6243944
Change-Id: I21025440849ae41f7083e1dcb72c99f8e5b2d5f7
James Dong [Fri, 10 Aug 2012 16:13:32 +0000 (09:13 -0700)]
Merge "Update state only if calls to native window are successful" into jb-mr1-dev
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:54 +0000 (09:03 -0700)]
Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:15 +0000 (09:03 -0700)]
Merge "Fix initialization of audio mixer track resources for MIPS."
James Dong [Fri, 10 Aug 2012 01:58:01 +0000 (18:58 -0700)]
Handle malformed raw AAC/AMR writer better
Change-Id: I196fe196c26b83be09fcd54174ceb4e135073c2b
James Dong [Fri, 10 Aug 2012 00:43:46 +0000 (17:43 -0700)]
Update state only if calls to native window are successful
Change-Id: I7a20f3ca787e11ca9c8c904b257e3c8a4e529136
Andreas Huber [Thu, 9 Aug 2012 23:24:54 +0000 (16:24 -0700)]
Signal end of stream if no more fragments are going to be available.
Change-Id: I16696740d3551aa8a5ba904ec757c64b0ecd1307
Glenn Kasten [Tue, 7 Aug 2012 22:24:44 +0000 (15:24 -0700)]
Replace hard-coded "2" by a constant and comment
Bug:
6679403
Change-Id: I6c2701f9afedc26540dfad0b4e23348bbc4cb01a
Andreas Huber [Thu, 9 Aug 2012 20:48:49 +0000 (13:48 -0700)]
Merge "Fix static sample table processing, add support for h.263 video." into jb-mr1-dev
Andreas Huber [Thu, 9 Aug 2012 16:15:48 +0000 (09:15 -0700)]
Fix static sample table processing, add support for h.263 video.
Change-Id: I5628d3437b5e6f8836d78557fd07ab87e5a914e3
James Dong [Thu, 9 Aug 2012 00:19:18 +0000 (17:19 -0700)]
Remove some unused forward lock code
Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
Glenn Kasten [Tue, 7 Aug 2012 17:38:59 +0000 (10:38 -0700)]
Tune the overrun correction
The new overrun correction is: if the previous write() cycle time is <
50% of expected, then sleep enough extra to make the total cycle time =
95% of expected. This should help compensate for HAL implementations
that have uneven cycle times due to sample rate conversion.
Bug:
6881638
Change-Id: I5ab58afdfceee7ac523177f021fbf62d743d571a
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:08:28 +0000 (14:08 -0700)]
am
51af4af2: am
e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit '
51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4':
Store correct time stamps in recorded mp4 files
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:18 +0000 (14:04 -0700)]
am
e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit '
e28df5b996af3480b457c7a9908dbb9d52ad8d7c':
Store correct time stamps in recorded mp4 files
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:33 +0000 (13:40 -0700)]
Merge "Store correct time stamps in recorded mp4 files"
John Grossman [Wed, 8 Aug 2012 20:12:25 +0000 (13:12 -0700)]
Merge "AudioFlinger: fix timed audio" into jb-mr1-dev
John Grossman [Wed, 8 Aug 2012 20:12:09 +0000 (13:12 -0700)]
Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev
John Grossman [Wed, 8 Aug 2012 20:11:55 +0000 (13:11 -0700)]
Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:20 +0000 (13:11 -0700)]
am
ef620093: am
efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit '
ef62009372d050b431939835d4e2c5ee77da8831':
Correct ID3::StringSize calculation for UCS-2 data.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:19 +0000 (13:11 -0700)]
am
662b15c3: am
a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"
* commit '
662b15c377e1ebe6aed8ff5cf82c684f0c8894dc':
avcenc: Remove redundant zero-initialization of allocated memory
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:18 +0000 (13:11 -0700)]
am
44237a8d: am
b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
* commit '
44237a8d58dc218257687f2cbe8fd33d73a713e8':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:17 +0000 (13:11 -0700)]
am
68d44b06: am
0ab18f85: Merge "avcenc: Remove useless casts"
* commit '
68d44b061e92fb6832240457d4f683635bf5328f':
avcenc: Remove useless casts
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:16 +0000 (13:11 -0700)]
am
4348cbce: am
67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '
4348cbcec6c3aec02af722d633ebda24f94dfcc8':
Initialize pool's buffer pointers to null.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:15 +0000 (13:11 -0700)]
am
96d18cca: am
0822156c: Merge "avcenc: Fix indentation"
* commit '
96d18cca4546045df118660017e74ddd751dfbb4':
avcenc: Fix indentation
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:13 +0000 (13:11 -0700)]
am
80c46255: am
874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
* commit '
80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:11:12 +0000 (13:11 -0700)]
am
17fa4ab4: am
b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
* commit '
17fa4ab45a87e042a0503356e641fa6ff72ef572':
mediacodec: Return an error on getOutputFormat if there is no output format yet
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:17 +0000 (13:08 -0700)]
am
efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit '
efee009528f446542d51f1ce50e2189e8a2f71dd':
Correct ID3::StringSize calculation for UCS-2 data.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:16 +0000 (13:08 -0700)]
am
a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"
* commit '
a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f':
avcenc: Remove redundant zero-initialization of allocated memory
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:15 +0000 (13:08 -0700)]
am
b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
* commit '
b71298eeeb16d942dd5144e550731e6e29b6436e':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:14 +0000 (13:08 -0700)]
am
0ab18f85: Merge "avcenc: Remove useless casts"
* commit '
0ab18f853571149de700930fbb783ecd6b2c5582':
avcenc: Remove useless casts
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:13 +0000 (13:08 -0700)]
am
67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '
67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9':
Initialize pool's buffer pointers to null.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:12 +0000 (13:08 -0700)]
am
0822156c: Merge "avcenc: Fix indentation"
* commit '
0822156cfd25c111cd33932ee9a89b3100d0350c':
avcenc: Fix indentation
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:11 +0000 (13:08 -0700)]
am
874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
* commit '
874a074ad88117d9fabf178b5b4a1c885dc512f5':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:10 +0000 (13:08 -0700)]
am
b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
* commit '
b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92':
mediacodec: Return an error on getOutputFormat if there is no output format yet
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:42 +0000 (12:58 -0700)]
Merge "Correct ID3::StringSize calculation for UCS-2 data."
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:09:01 +0000 (12:09 -0700)]
Merge "avcenc: Remove redundant zero-initialization of allocated memory"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:44 +0000 (12:08 -0700)]
Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:19 +0000 (12:08 -0700)]
Merge "avcenc: Remove useless casts"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:04 +0000 (12:08 -0700)]
Merge "Initialize pool's buffer pointers to null."
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:07:47 +0000 (12:07 -0700)]
Merge "avcenc: Fix indentation"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:07:27 +0000 (12:07 -0700)]
Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:06:48 +0000 (12:06 -0700)]
Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
John Grossman [Fri, 3 Aug 2012 00:08:54 +0000 (17:08 -0700)]
AudioFlinger: fix timed audio
(cherry picked from commit
e20ac92c564a2f4e8123885807abdf0a78de0dd7)
> AudioFlinger: fix timed audio
>
> Addresses Bug
6900517.
>
> Finish up support for timed audio in the new FastMixer world. Pay special
> attention to remaining lock-less and voluntary yield free on the FastMixer
> thread. This fixes audio playback for Q on JB.
>
> Change-Id: Iaf815e58a1b1d0a0190051794bec8dc5c9231785
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I9bd687acc345a05867af48e71116690fdb0ce1b5
Signed-off-by: John Grossman <johngro@google.com>
John Grossman [Tue, 24 Jul 2012 00:05:46 +0000 (17:05 -0700)]
AudioFlinger: Better handling for master volume/mute
(cherry picked from commit
93d906837e0e89aa1d9c913ab2b531b809f9bb9e)
> AudioFlinger: Better handling for master volume/mute
>
> Changes to address bug
6842827.
>
> When a HAL is loaded, cache whether or not the HAL supports
> set_master_volume/mute in the AudioHwDevice structure. Store an
> AudioHwDevice in AudioStream(In|Out) structures instead of just an
> audio_he_device_t. This give threads (PlaybackThreads in
> particular) access to the cached capabilities.
>
> When setting master volume/mute, change the system to always set the
> setting on all HAL which support it and also to set the setting on all
> PlaybackThreads. Change PlaybackThreads to apply the setting at the
> in SW mix stage of the pipeline if its assigned HAL does not support
> the setting, or to ignore the setting of the assigned HAL does support
> it.
>
> Change-Id: Ia14137a30b4c3ee6f2d7ddcc8cba87bf5eec87f4
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: Icb6bc13764e100a2003eb1dee2231132ab287d98
Signed-off-by: John Grossman <johngro@google.com>
John Grossman [Fri, 20 Jul 2012 21:51:35 +0000 (14:51 -0700)]
Change audio flinger to user HAL master mute if available
(cherry picked from commit
91de9b56282d126ffb36344266af5fee3cefcfdd)
> Change audio flinger to user HAL master mute if available
>
> Hand merge from ics-aah
>
> > Change audio flinger to user HAL master mute if available: DO NOT MERGE
> >
> > Replicate the pattern used for HAL master volume support to make use
> > of master mute support if the HAL supports it. This is part of the
> > change needed to address bug
6828363. Because of the divergences
> > between ICS and master, this change will need to be merged by hand.
> >
> > Signed-off-by: John Grossman <johngro@google.com>
> > Change-Id: I6d83be524021d273d093bcb117b8f2fe57c23685
>
> Change-Id: I32280582905c969aaec2bb166ec5c61df82d737a
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I5cd709187221d307fe25c5117ccaadca5f6b197b
Signed-off-by: John Grossman <johngro@google.com>
John Grossman [Wed, 8 Aug 2012 18:18:56 +0000 (11:18 -0700)]
Fix a small build warning.
Change-Id: I2b228db8f11a829399cdc6efe67d7b6e0a1917ba
James Dong [Wed, 8 Aug 2012 18:05:15 +0000 (11:05 -0700)]
Merge "Make sure that the trackId starts from 1" into jb-mr1-dev
Marco Nelissen [Wed, 8 Aug 2012 16:43:26 +0000 (09:43 -0700)]
Merge "Handle empty stsc box" into jb-mr1-dev
Marco Nelissen [Wed, 8 Aug 2012 16:19:05 +0000 (09:19 -0700)]
Handle empty stsc box
Change-Id: I867e2499fac3045075654aaaecf44327753327fd