Mike Lockwood
b7bd88a3b6
Don't allow changing master volume when muted
...
Bug: 5793021
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:07 -08:00
Mike Lockwood
5c55a051ad
Defer persisting master data to avoid excessive database writes
...
Bug: 5705192
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:07 -08:00
Mike Lockwood
3194ea9434
Remove reference counting and client death notification for master mute
...
The use case for master mute is to toggle it on and off from a
KEYCODE_VOLUME_MUTE event, so this was unnecessary and prevented unmuting
in certain cases
Bug: 5724755
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:06 -08:00
Mike Lockwood
0dc37cce9d
AudioService: Send broadcasts when master volume and mute state change
...
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:06 -08:00
Mike Lockwood
fa7b06147c
AudioManager: Add wrapper methods for master volume support
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 14:44:05 -08:00
Mike Lockwood
ce952c8e13
AudioManager: Add support for master mute
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 14:44:05 -08:00
Mike Lockwood
4767690f09
AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
...
This allows Music2 and other media apps to control master volume without changing their code
Bug: 5567694
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 14:44:04 -08:00
James Dong
385f1cafa6
Merge "Move away from MediaDebug and use ADebug instead"
2012-02-10 14:17:06 -08:00
Glenn Kasten
1137be1a68
Follow raw pointer and sp<> conventions
...
Unconditional delete for raw pointers.
Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)".
Use "if (raw != NULL)" not "if (raw)".
Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
2012-02-10 13:48:44 -08:00
Glenn Kasten
5dd4754f58
Merge "No newline or space at end of ALOG format string"
2012-02-10 13:36:24 -08:00
James Dong
8e9d67a135
Move away from MediaDebug and use ADebug instead
...
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
2012-02-10 11:43:09 -08:00
Mike Lockwood
8dc1dabd25
VolumePanel: Add support for master volume
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 09:05:49 -08:00
Mike Lockwood
8517e46f3d
Save and restore master volume in the settings provider
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 09:05:39 -08:00
Mike Lockwood
cbdb49dc5e
Simple master volume support
...
Still needs integration with Settings (for persistence) and VolumePanel UI.
Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 09:01:28 -08:00
James Dong
459f40dfb3
move away from MediaDebug and use ADebug instead for video editor engine
...
Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
2012-02-09 23:52:19 -08:00
James Dong
23cc716cc5
Change the signature of method addTextSource() in AwesomePlayer
...
o avoid a unnecessary copy constructor call
Change-Id: Ib598bbe42d42a835549e2d29502c6f196f859874
2012-02-09 17:32:57 -08:00
James Dong
9975229a73
Finish up B frame support in MPEG4Writer
...
o optimize to reduce the size of the size of the ctts box
o change the type for the time offset field in ctts table entry from int32_t to uint32_t according to the mp4 file spec
o also moved away from MediaDebug and used ADebug instead.
o related-to-bug: 4232183
Change-Id: I19364303728da64359c63169eec7487508c1d0f8
2012-02-09 15:02:08 -08:00
Andreas Huber
8f0f10a80a
Merge "Experiment with seeking to closest frame instead of closest syncframe"
2012-02-09 14:52:58 -08:00
Andreas Huber
713f90f3ca
Experiment with seeking to closest frame instead of closest syncframe
...
Also supports SEEK_CLOSEST mode in the Matroska/Webm extractor.
Change-Id: I257771648dfe41392a4cf8932f625489dcb9f234
2012-02-09 14:32:08 -08:00
Scott Main
e7eeace594
am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
...
* commit 'ec12ae9933e463181338834387caa7c58b330635':
docs: fix misc doc bugs from external issue tracker
2012-02-09 12:53:12 -08:00
Scott Main
79cfde69fd
am 52bfc243: docs: fix misc doc bugs from external issue tracker
...
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
2012-02-09 12:48:08 -08:00
Scott Main
52bfc24368
docs: fix misc doc bugs from external issue tracker
...
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
2012-02-09 12:45:16 -08:00
Glenn Kasten
0765c448ab
No newline or space at end of ALOG format string
...
Change-Id: I0bef580cbc818cb7c87aea23919d26f1446cec32
2012-02-08 17:21:49 -08:00
Glenn Kasten
6c9ddd2cbb
Remove dead code AudioTrack::getLoop
...
Change-Id: I868329c52f31bc20125f068500d8f892b4ec9796
2012-02-08 14:12:12 -08:00
James Dong
e1a409ba68
Merge "Enable B frame support in MPEG4Writer"
2012-02-08 10:42:35 -08:00
Glenn Kasten
8e0cc398e3
Merge "Use audio_io_handle_t consistently instead of int"
2012-02-08 10:22:11 -08:00
Marco Nelissen
b3f04a6569
Merge "Delete entries in bulk"
2012-02-08 10:15:01 -08:00
Marco Nelissen
9ff4774cac
Delete entries in bulk
...
Deleting entries from the database in bulk greatly speeds up the media
scanner in some cases; removing 31k entries used to take about 2 hours,
now it takes about 15 minutes.
Change-Id: Ia8f3fd6d828289e3d67178e9ad10399ded8d70d2
2012-02-08 10:13:11 -08:00
Glenn Kasten
39d00cb442
Use audio_io_handle_t consistently instead of int
...
Other:
- add a comment to nextUniqueId
- made ThreadBase::mId const, since it is only assigned in constructor.
Change-Id: I4e8b7bec4e45badcde6274d574b8a9aabd046837
2012-02-08 10:06:32 -08:00
Glenn Kasten
6731333584
Effect UUID inputs passed by pointer are const
...
Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8
2012-02-08 09:21:39 -08:00
Glenn Kasten
1e3a8d3090
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
2012-02-08 08:34:33 -08:00
Glenn Kasten
09b9ba0db2
Merge "AudioTrack declare more methods const"
2012-02-08 07:42:40 -08:00
Glenn Kasten
16d64ad699
Merge "Declare more IAudioFlinger methods const"
2012-02-08 07:39:27 -08:00
James Dong
7251673821
Enable B frame support in MPEG4Writer
...
This patch allows us to automatically detect whether ctts box is needed in MPEG4Writer.
MPEG4Writer uses ctts version 0 (non-negative offset value) store the composition time
offset on a needed basis.
Currently, the size of the ctts box is not optimized. Optimization will be addressed
in a subsequent patch.
o also changed the private method retrieveDecodingTime(bool) in OMXCodec
to getDecodingTime()
o related-to-bug: 4232183
Change-Id: Ic6dc7b25ecd258c2506ca4b9c25156e922456e51
2012-02-07 18:32:29 -08:00
Andreas Huber
8320e70fbe
Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
2012-02-07 10:43:08 -08:00
Marco Nelissen
f047c14f23
Merge "Make media scanner use new delete-parameter"
2012-02-07 08:28:02 -08:00
Marco Nelissen
ac259f17a0
Make media scanner use new delete-parameter
...
This speeds up the media scan case where many files were deleted or moved.
Change-Id: I86e6fc6d0968eebf24923c0b5587b90d309721bb
2012-02-07 07:54:39 -08:00
Eric Laurent
c857958e8a
Fix audio preprocessing library wrapper
...
Fixed bug in EFFECT_CMD_GET_CONFIG command handler in
webRTC audio processing library wrapper.
Change-Id: I1d2cefa00930e549607af8dc2cf27555da8d313f
2012-02-06 14:51:57 -08:00
James Dong
f5a9f439b6
Don't call virtual function in destructor of SurfaceMediaSource
...
Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
2012-02-06 12:17:44 -08:00
James Dong
cea2c396c5
Merge "Don't call virtual functions in the destructor for audio and camera source classes"
2012-02-04 05:54:54 -08:00
Glenn Kasten
7c2e37dd32
AudioTrack declare more methods const
...
Change-Id: I4999e984460893961d0d8092cff17f3cf07d7214
2012-02-03 15:48:25 -08:00
Glenn Kasten
3f6d83a68a
Declare more IAudioFlinger methods const
...
This is just documentation, as C++ method const-ness doesn't mean anything
for a binder API. Instead, here const means "no side effects".
Change-Id: Iaa9cd2fe477db10ae9a40cac4f79f0faa9b4e5e6
2012-02-03 15:40:56 -08:00
James Dong
4651c0ea80
Merge "Don't call virtual functions in destructors for the writer classes"
2012-02-03 15:37:40 -08:00
James Dong
6004df9408
Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"
2012-02-03 11:29:59 -08:00
James Dong
9989f3cfbb
Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine
...
o this should be reverted after the problem is fixed.
o related-to-bug: 5947347
Change-Id: Iaec4b59d2c99c975e83f0588a813e9a4bfcb7ee2
2012-02-03 11:20:03 -08:00
Glenn Kasten
f55bc56490
Merge "Use audio_in_acoustics_t consistently"
2012-02-03 08:31:01 -08:00
Glenn Kasten
191c849283
Merge "Use ToneGenerator::tone_type consistently"
2012-02-03 08:00:52 -08:00
Glenn Kasten
3694ec1f19
Use NULL not 0 for raw pointers
...
Use if (p != NULL) instead of if (ptr)
Change-Id: Iaec3413a59ccbf233c98fcd918cc7d70ac5da9fa
2012-02-03 07:57:01 -08:00
Glenn Kasten
08d5eb9885
Merge "Make AudioTrack control block volume field private"
2012-02-03 07:18:06 -08:00
James Dong
946ab0ff30
Don't call virtual functions in the destructor for audio and camera source classes
...
Change-Id: Ia74ffc1c0cbd7971697f5e3c476e340ec5c7727a
2012-02-02 18:11:53 -08:00