OSDN Git Service
Glenn Kasten [Mon, 17 Dec 2012 20:29:06 +0000 (12:29 -0800)]
Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
Jean-Baptiste Queru [Fri, 14 Dec 2012 20:48:41 +0000 (12:48 -0800)]
Merge "Match new paths and organization in external/libvpx"
Marco Nelissen [Fri, 14 Dec 2012 20:05:02 +0000 (12:05 -0800)]
Merge "FileSource: FILE is not closed"
You Kim [Fri, 14 Dec 2012 13:22:36 +0000 (22:22 +0900)]
FileSource: FILE is not closed
Add destructor to call fclose.
Change-Id: I765c56236f8df58af998439492b0b955ab57606f
Johann [Mon, 29 Oct 2012 23:48:23 +0000 (16:48 -0700)]
Match new paths and organization in external/libvpx
See I2c0a87b0fc049e855e21f455b806287b578091de
Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
Andreas Huber [Wed, 5 Dec 2012 16:58:56 +0000 (08:58 -0800)]
Merge "Fix bad checks that causes crash when streaming H.263 content."
Andreas Huber [Mon, 3 Dec 2012 17:00:29 +0000 (09:00 -0800)]
Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
Roger1 Jonsson [Tue, 21 Dec 2010 08:57:41 +0000 (09:57 +0100)]
Fix bad checks that causes crash when streaming H.263 content.
Remove checks that causes crash for rtsp streamed h.263 content
with certain values in the RTP payload header:
Remove zero check for the five reserved bits in the payload header.
According to RFC 4629 these bits MUST be ignored by receivers.
Remove zero-check for the VRC (Video Redundancy Coding) bit,
skip packet instead.
Remove zero-check for the PLEN bits (extra picture header),
skip packet instead.
Remove zero-check for the PEBIT bits (extra picture header),
skip packet instead.
Remove corresponding zero check for the four resreved bits in the
AMR payload header. According to RFC 4867 these bits MUST be
ignored by receivers.
Change-Id: I7fc21d69a19d23da24f9267623c338d415ef1387
cong.zhou [Wed, 28 Nov 2012 23:52:28 +0000 (15:52 -0800)]
Fix bug in WAVExtractor for 24-bit per sample wav
support stereo/multichannel 24-bit format
kMaxFrameSize is fixed to 32768. When converting 24-bit to 16-bit,
number of samlpes is maxBytesToRead /3.
In this case, if the maxBytesToRead is not multiple of 3,
pcm data is messed when converting.
Bug:
7630939
Change-Id: I0ea1b53eb1272a8d83b63815fc0a05b73cef75f1
Andreas Huber [Fri, 30 Nov 2012 16:30:40 +0000 (08:30 -0800)]
Merge "Initialize and copy mRotationAngle in VideoFrame"
Christer Fletcher [Thu, 13 Sep 2012 08:28:39 +0000 (10:28 +0200)]
Initialize and copy mRotationAngle in VideoFrame
When thumbnails were generated they could be generated at random
angles as the mRotationAngle variable was not initialized to any
value. This variable would have to be explicitly overwritten to not
cause random rotation. Changed the implementation to initialize the
value to 0 (no rotation). mRotationAngle was also missing in the
copy constructor.
Change-Id: I67a5340fdd807c6ab3a3da5eecb09b5b9d5f4666
Marco Nelissen [Thu, 29 Nov 2012 19:08:16 +0000 (11:08 -0800)]
Merge "Bug fix for the MediaPlayer::prepare() api."
Andreas Huber [Thu, 29 Nov 2012 16:51:21 +0000 (08:51 -0800)]
Merge "Unsolicited server responses cause RTSP streaming to crash"
Lena Magnusson [Fri, 20 Jan 2012 08:39:38 +0000 (09:39 +0100)]
Unsolicited server responses cause RTSP streaming to crash
If the set up of the RTSP stream contains an incorrect or otherwise
problematic URL, some servers will send an unsolicited server response
that contains a negative number in the sequence number (CSeq) field.
This negative value is not returned from the function findPendingRequest(),
so the check in notifyResponseListener() will not work. Instead there will
be a crash when 0 is used as the index to find a matching request/response
pair that doesn’t exist.
The fix is to return the received sequence number also when it is an
unsolicited server-client message.
Change-Id: Iedaba8a63dece7b43bce007069baefbfd10970b8
Dylan Powers [Wed, 28 Nov 2012 00:06:38 +0000 (16:06 -0800)]
Bug fix for the MediaPlayer::prepare() api.
For an MP3 source, within the prepare command, ID3 tags are checked in search of
gapless playback info. This causes problems for streamed sources. If ID3v2 tags
aren't present, then a check is done for ID3v1 tags. This results in a read
command that asks the cache to jump to the end of the file, and subsequently
make an extra http call to request those bytes. For a streamed source, this
causes the file to not be downloaded automatically when MediaPlayer::prepare()
is called, and causes stuttering and extra buffering time to be needed when
start() is finally called.
The solution is to ignore the ID3v1 tags as the gapless info would never exist
there, and only check for ID3v2 tags.
Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
Andreas Huber [Tue, 27 Nov 2012 16:50:52 +0000 (08:50 -0800)]
Merge "Crash in android::MyHandler::parsePlayResponse"
Andreas Huber [Tue, 27 Nov 2012 16:49:34 +0000 (08:49 -0800)]
Merge "Fix of uninitialized mIsDrm variable."
Patric Frederiksen [Mon, 26 Sep 2011 08:51:35 +0000 (10:51 +0200)]
Crash in android::MyHandler::parsePlayResponse
This fix handles problems with several asynchronous calls
within streaming. This case is when the phone has sent a
request to the server and while the response is being sent
back by the server the request is aborted by the user.
The fix is an if case that checks if we have aborted while
waiting for a response from the server. If we have aborted
we should ignore the late response instead of continuing.
Change-Id: I1264bb992f6abcaee1f10a89479e08b54a95e3c2
Henrik B Andersson [Wed, 31 Oct 2012 12:02:47 +0000 (13:02 +0100)]
Fix of uninitialized mIsDrm variable.
The mIsDrm is a bool that isn't initialized.
This causes it to be true in most default cases.
Change-Id: I41b534514bf6a3ca88a9f0994b814d55fcd7453b
Andreas Huber [Mon, 26 Nov 2012 21:48:41 +0000 (13:48 -0800)]
Merge "MediaCodec: Add a method for getting the component name"
Marco Nelissen [Mon, 26 Nov 2012 16:59:50 +0000 (08:59 -0800)]
Merge "AudioTrack::dump null mCblk check test"
Zbigniew Mazur [Thu, 11 Oct 2012 11:56:41 +0000 (13:56 +0200)]
AudioTrack::dump null mCblk check test
This fix is protecting AudioTrack::dump from SIGSEGEV
when calling dumpsys shell command.
Change-Id: I30d136e195a12d6fdad41e14f557b0ad9e59b8a2
Marco Nelissen [Tue, 20 Nov 2012 20:28:27 +0000 (12:28 -0800)]
Merge "Avoid memory leaks when handling metadata strings"
David Williams [Mon, 19 Nov 2012 08:52:16 +0000 (09:52 +0100)]
Avoid memory leaks when handling metadata strings
Don't duplicate strings when retrieveing metadata from media
files. As any requests for metadata strings would pass through
the binder, this would cause the reference to the duplicate string
to be lost, causing a memory leak as the duplicate would not be
freed.
Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
Andreas Huber [Tue, 20 Nov 2012 16:52:44 +0000 (08:52 -0800)]
Merge "Handle large AVCC chunks"
Marco Nelissen [Tue, 20 Nov 2012 16:18:38 +0000 (08:18 -0800)]
Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"
Martin Storsjo [Tue, 25 Sep 2012 08:43:02 +0000 (11:43 +0300)]
MediaCodec: Add a method for getting the component name
If the codec was chosen based on mime type, the caller does
not know what component actually was chosen. This allows
getting essential information (such as supported color formats,
for a video encoder) for this component.
Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
Andreas Lillvik [Wed, 13 Oct 2010 13:37:01 +0000 (15:37 +0200)]
Changed parsing of trkn and disk from 8 bits to 16 bits
The MPEG4Extractor was parsing 8 bits instead of 16 bits when parsing
'trkn' and 'disk'. Also added support for 16 bytes size 'disk'.
Change-Id: I22b4de2ac800881884d5759776cb380917522a87
Jan Olof Svensson [Wed, 26 Sep 2012 07:08:11 +0000 (09:08 +0200)]
Handle large AVCC chunks
If enabling seq_scaling_matrix_present_flag = 1 the AVCC chunk can
be larger than the original buffer size. Changed to using ABuffer
instead.
Change-Id: Idacc14b45ea2634c5e608919f3ce567f23363135
Jens Gulin [Mon, 10 Sep 2012 13:54:40 +0000 (15:54 +0200)]
Memory leak solved in MPEG4Extractor::parseChunk for cover art
Repeated leaks detected in mediaserver context. Most chunks small but
some bigger. Adding up it was not uncommon to see 200Mb footprint.
libc memdebug allocation call stack showed the root cause in "covr"
parsing - that explains why content often was empty but sometimes big.
Change-Id: I0de6c1eeef174d2529973ff9c6a020ec3dd44c75
Marco Nelissen [Fri, 16 Nov 2012 16:59:14 +0000 (08:59 -0800)]
Merge "Add .mpga to acceptable file name extensions list."
Jan Bjernler [Fri, 16 Nov 2012 15:40:42 +0000 (16:40 +0100)]
Add .mpga to acceptable file name extensions list.
The *.mpga files are playable, but are not correctly scanned.
This is because they are prevented from being scanned in
StagefrightMediaScanner.cpp.
What this fix does is to add the extension to the list of valid
file extensions so that the scanner handles the filetype properly.
We have previously added the .mpga extension to the framework to
make it playable, but not added it so that the scanner scans it.
Change-Id: I02a44d770adb80d38e8bed77d0d76efa1b28a861
The Android Open Source Project [Tue, 6 Nov 2012 20:24:38 +0000 (12:24 -0800)]
am
78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
78b012f5bc05706d1ce412811ccfaa9385dae0ab':
The Android Open Source Project [Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993
Glenn Kasten [Tue, 6 Nov 2012 19:06:20 +0000 (11:06 -0800)]
am
1c6833af: Ignore SIGPIPE during write() to broken pipe
* commit '
1c6833afd6cfdbc6c696ed0719ceedc37ec0b534':
Ignore SIGPIPE during write() to broken pipe
Glenn Kasten [Wed, 17 Oct 2012 19:16:50 +0000 (12:16 -0700)]
Ignore SIGPIPE during write() to broken pipe
This happens occasionally when taking a bugreport.
Bug:
6447319
Change-Id: Ia6531a4a3658461f8fd3f7106e7996da7cc5933a
The Android Open Source Project [Fri, 2 Nov 2012 14:28:14 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Icad86b92debd9605c745283aeffc3f459a3549ce
The Android Automerger [Fri, 2 Nov 2012 02:05:16 +0000 (19:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Thu, 1 Nov 2012 23:02:16 +0000 (16:02 -0700)]
am
96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable
* commit '
96076964863ee6887f0bed9d0f11f424b48ab9b9':
Make video encoders' bitrate mode (constant, variable, ...) configurable
Andreas Huber [Thu, 1 Nov 2012 22:48:44 +0000 (15:48 -0700)]
Make video encoders' bitrate mode (constant, variable, ...) configurable
through the desired output format. Configure the video encoder to use
constant bitrate mode for WFD.
Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333
related-to-bug:
7459597
The Android Open Source Project [Thu, 1 Nov 2012 14:51:57 +0000 (07:51 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44
The Android Automerger [Thu, 1 Nov 2012 01:33:54 +0000 (18:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Wed, 31 Oct 2012 20:18:27 +0000 (13:18 -0700)]
am
90a92053: Various tweaks to wfd
* commit '
90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
Various tweaks to wfd
Andreas Huber [Tue, 30 Oct 2012 22:53:03 +0000 (15:53 -0700)]
Various tweaks to wfd
related-to-bug:
7426218
Squashed commit of the following:
commit
1553f1a1c66af998674168f7f7a3be23fcb0c794
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:51:27 2012 -0700
Add LPCM, AVC and AVC HRD descriptors as necessary.
Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f
commit
4e74db61d2d31ebe239acbdec8f110f88016a4ea
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:52 2012 -0700
added copyright headers to Sender.{cpp,h}
Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6
commit
7144bf8ae68c5cdb8faa6e219547aabbd750f04e
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:25 2012 -0700
Reenable suspension of the RepeaterSource
Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f
commit
812164bcfa0699821d7d8eefcc0dff96b2e2cd08
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 14:03:50 2012 -0700
Add 2 stuffing bytes to the PES headers for audio tracks.
Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b
commit
a084a741a63015d47c92d99fcd8b980fe615dc7d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:38 2012 -0700
Fix PCM audio packetization in WFD.
Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14
commit
c5cb9369585f701f34bce41534940d5f9b59248f
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:12 2012 -0700
Support extraction of PCM audio from transport streams.
Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9
commit
b0a0512300ae037d6b39c2d04952d34b5fc12b2d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 08:54:13 2012 -0700
disable suspend of the RepeaterSource
Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40
commit
4330e8b7668dc92a6d882b5622c0697cf292d04c
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 14:11:25 2012 -0700
Better handling of datagrams in ANetworkSession
reduce unnecessary copy overhead.
Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f
commit
a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 11:14:47 2012 -0700
Network traffic is now handled on a separate thread.
Audio and video are queued to ensure proper A/V interleaving.
Scheduled packet sends according to capture timestamps to reduce
send-jitter.
Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5
related-to-bug:
7426218
Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
The Android Open Source Project [Wed, 31 Oct 2012 16:16:33 +0000 (09:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I7cd153e8ccfb7d572a5796ca353ec9777de789d6
Dave Burke [Mon, 29 Oct 2012 21:21:57 +0000 (14:21 -0700)]
am
2295ce2c: Increase bitrate now that other issues have been resolved.
* commit '
2295ce2c6fcf07ffaa134440691a8cea5fe35b43':
Increase bitrate now that other issues have been resolved.
Dave Burke [Mon, 29 Oct 2012 21:21:56 +0000 (14:21 -0700)]
am
e815552c: Disable silence suppression (causes issues with dongles).
* commit '
e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b':
Disable silence suppression (causes issues with dongles).
The Android Automerger [Mon, 29 Oct 2012 18:19:49 +0000 (11:19 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Sat, 27 Oct 2012 06:49:43 +0000 (23:49 -0700)]
Increase bitrate now that other issues have been resolved.
Bug:
7426218
Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
The Android Automerger [Sat, 27 Oct 2012 01:17:33 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Fri, 26 Oct 2012 23:24:43 +0000 (16:24 -0700)]
Disable silence suppression (causes issues with dongles).
Bug:
7426218
Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
The Android Automerger [Thu, 25 Oct 2012 20:42:11 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Thu, 25 Oct 2012 02:50:19 +0000 (19:50 -0700)]
am
b8d6efba: Camera2: Don\'t hold locks while waiting to sync.
* commit '
b8d6efba8b87e6eeb049651cb67f9827198e658e':
Camera2: Don't hold locks while waiting to sync.
Eino-Ville Talvala [Thu, 25 Oct 2012 00:30:30 +0000 (17:30 -0700)]
Camera2: Don't hold locks while waiting to sync.
Bug:
7409877
Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
The Android Automerger [Tue, 23 Oct 2012 23:46:59 +0000 (16:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 23 Oct 2012 22:11:29 +0000 (15:11 -0700)]
am
ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev
* commit '
ac1a450a76c2f42f66c876200cb724d1e93ef4c7':
Don't attempt to seek audio and video separately.
Andreas Huber [Tue, 23 Oct 2012 22:06:11 +0000 (15:06 -0700)]
Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 21:37:12 +0000 (14:37 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 23 Oct 2012 20:25:05 +0000 (13:25 -0700)]
Don't attempt to seek audio and video separately.
The widevine extractor doesn't deal too well with that...
Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug:
7262386
Eino-Ville Talvala [Tue, 23 Oct 2012 17:36:05 +0000 (10:36 -0700)]
am
6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
* commit '
6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc':
Camera2: Increase mode update timeout.
Eino-Ville Talvala [Tue, 23 Oct 2012 17:31:25 +0000 (10:31 -0700)]
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
Eino-Ville Talvala [Tue, 23 Oct 2012 16:09:01 +0000 (09:09 -0700)]
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before
requests start to be dequeued by the HAL. Increase the timeout for
synchronizing mode changes and triggers so that triggers near startup
don't time out.
Bug:
6970465
Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Eric Laurent [Tue, 23 Oct 2012 15:31:29 +0000 (08:31 -0700)]
am
5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
* commit '
5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
stagefright: discard audio at start of capture
Eric Laurent [Tue, 23 Oct 2012 15:28:07 +0000 (08:28 -0700)]
Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
Glenn Kasten [Tue, 23 Oct 2012 14:32:37 +0000 (07:32 -0700)]
am
c4640c9e: Increase allowed number of VHQ resamplers to 3
* commit '
c4640c9eef850bb1c754bd6b477f1cc8350c6081':
Increase allowed number of VHQ resamplers to 3
Eric Laurent [Tue, 23 Oct 2012 00:44:24 +0000 (17:44 -0700)]
stagefright: discard audio at start of capture
The new camcorder start sound is longer than previous one and we
must discard more audio when capture starts.
Ideally, camcorder should use synchronous record start.
Bug
7394330.
Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
Glenn Kasten [Tue, 23 Oct 2012 00:09:27 +0000 (17:09 -0700)]
Increase allowed number of VHQ resamplers to 3
Bug:
7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
The Android Automerger [Mon, 22 Oct 2012 23:41:58 +0000 (16:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 22 Oct 2012 18:52:14 +0000 (11:52 -0700)]
am
e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
* commit '
e384d75b95b9db30d64a18ada93e070cf07de306':
Fix a typo that caused the high quality resampler to produce garbage
Mathias Agopian [Mon, 22 Oct 2012 18:47:39 +0000 (11:47 -0700)]
Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
Andreas Huber [Mon, 22 Oct 2012 18:06:12 +0000 (11:06 -0700)]
am
0328ec08: WFD use of HDCP is now optional.
* commit '
0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
WFD use of HDCP is now optional.
Andreas Huber [Mon, 22 Oct 2012 17:45:08 +0000 (10:45 -0700)]
WFD use of HDCP is now optional.
if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.
Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug:
7368436
Mathias Agopian [Sun, 21 Oct 2012 10:04:05 +0000 (03:04 -0700)]
Fix a typo that caused the high quality resampler to produce garbage
the problem is that if libaudio_resampler is present, it is those
coefficients that will always be selected, but the correct
meta-data.
Bug:
7385994
Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
The Android Automerger [Sun, 21 Oct 2012 06:14:02 +0000 (23:14 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Sat, 20 Oct 2012 00:26:43 +0000 (17:26 -0700)]
am
c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
* commit '
c3ed4a1c3ea71681c71de48c206a899e702864bd':
AAC DRC reference level for mobile is -16dB
Jean-Michel Trivi [Sat, 20 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
Eino-Ville Talvala [Sat, 20 Oct 2012 00:19:35 +0000 (17:19 -0700)]
am
9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
* commit '
9e760d66c5dfae4d9688e32d7a02fca09569f7ef':
Camera2: Fix potential deadlock
Eino-Ville Talvala [Fri, 19 Oct 2012 23:47:32 +0000 (16:47 -0700)]
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
The Android Automerger [Fri, 19 Oct 2012 22:46:06 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Fri, 19 Oct 2012 21:52:16 +0000 (14:52 -0700)]
AAC DRC reference level for mobile is -16dB
Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.
Bug
7370764
Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
Marco Nelissen [Fri, 19 Oct 2012 19:41:50 +0000 (12:41 -0700)]
am
3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-dev
* commit '
3c9e53c6ea2b01506addd4fb1164e6a9bbe6e16f':
Fix valgrind issues
Marco Nelissen [Fri, 19 Oct 2012 19:36:47 +0000 (12:36 -0700)]
Merge "Fix valgrind issues" into jb-mr1-dev
Glenn Kasten [Fri, 19 Oct 2012 19:35:14 +0000 (12:35 -0700)]
am
291f824e: Remove active track when thread goes to standby
* commit '
291f824e02ff517a34cfe50220b4e2b402ee998d':
Remove active track when thread goes to standby
Nick Kralevich [Fri, 19 Oct 2012 16:00:32 +0000 (09:00 -0700)]
am
1baa01a5: Merge "hardening: eliminate more .text relocations"
* commit '
1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
Nick Kralevich [Fri, 19 Oct 2012 15:40:01 +0000 (08:40 -0700)]
Merge "hardening: eliminate more .text relocations"
Glenn Kasten [Thu, 18 Oct 2012 22:51:31 +0000 (15:51 -0700)]
Remove active track when thread goes to standby
Bug:
7369232
Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1
Nick Kralevich [Thu, 18 Oct 2012 23:52:53 +0000 (16:52 -0700)]
hardening: eliminate more .text relocations
In
74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations
were cleaned up from amrwbenc. Looks like we forgot one. Fixed.
Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
The Android Automerger [Thu, 18 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 17 Oct 2012 23:32:34 +0000 (16:32 -0700)]
Camera2: Fix potential deadlock
setPreviewWindow was holding a lock during long-lasting HAL calls
which may cause deadlock if the HAL calls back into the service during
the call. Stop holding the lock during these calls, since it's not
essential to do so.
Bug:
7320517
Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
James Dong [Wed, 17 Oct 2012 23:42:10 +0000 (16:42 -0700)]
am
ccd08439: Added some extra failure logging messages
* commit '
ccd08439c7914d86264c7ad81bfd03cf39aaa9f7':
Added some extra failure logging messages
James Dong [Wed, 17 Oct 2012 21:53:16 +0000 (14:53 -0700)]
Added some extra failure logging messages
o related-to-bug:
7282066
Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
Glenn Kasten [Wed, 17 Oct 2012 22:07:05 +0000 (15:07 -0700)]
am
6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
* commit '
6a2d62c1a972da25de53b1718c165f2b7df85a0e':
Manually merge change #111620 from tc3 to mainline, to keep the
Glenn Kasten [Wed, 17 Oct 2012 22:07:04 +0000 (15:07 -0700)]
am
dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree."
* commit '
dbe1be24c9e6fb92a88a38adbd12a56aa5337f74':
Rename "Makefile" to "Android.mk" throughout the tree.
Glenn Kasten [Wed, 17 Oct 2012 22:07:03 +0000 (15:07 -0700)]
am
4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build system."
* commit '
4cd2275d93a65296e20be27422a00f9e2a78d3a9':
Rename "TARGET" to "MODULE" in the build system.
Glenn Kasten [Wed, 17 Oct 2012 22:07:02 +0000 (15:07 -0700)]
am
108e1961: Merge "Tweak the SINC resampler parameters and double the performance. It\'s using about 10% CPU in the worse case now."
* commit '
108e1961ffb858374dcb39115d1dd831a4a4a75c':
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Glenn Kasten [Wed, 17 Oct 2012 22:07:00 +0000 (15:07 -0700)]
am
a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
* commit '
a19c810289392e5733463703e865c7ae407868ad':
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Glenn Kasten [Wed, 17 Oct 2012 22:06:56 +0000 (15:06 -0700)]
am
5e8e3fc3: Merge "fix a few small typos in the FIR computation"
* commit '
5e8e3fc30111534858fbd1f52a92e5128613af0e':
fix a few small typos in the FIR computation
Glenn Kasten [Wed, 17 Oct 2012 22:06:55 +0000 (15:06 -0700)]
am
d2186701: Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
* commit '
d218670119dc19fbbc5c804ae3ab7c0a5dd985d8':
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Glenn Kasten [Wed, 17 Oct 2012 21:59:40 +0000 (14:59 -0700)]
Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
Glenn Kasten [Wed, 17 Oct 2012 21:38:05 +0000 (14:38 -0700)]
Merge "Rename "Makefile" to "Android.mk" throughout the tree."