OSDN Git Service

android-x86/system-media.git
5 years agoMerge "TimestampVerifier: Add discontinuity modes"
Andy Hung [Tue, 10 Jul 2018 20:55:43 +0000 (20:55 +0000)]
Merge "TimestampVerifier: Add discontinuity modes"

5 years agoMerge "audio: add patch-related utilities"
TreeHugger Robot [Mon, 9 Jul 2018 23:31:25 +0000 (23:31 +0000)]
Merge "audio: add patch-related utilities"

5 years agoaudio: add patch-related utilities
Mikhail Naganov [Fri, 15 Jun 2018 20:12:23 +0000 (13:12 -0700)]
audio: add patch-related utilities

Add the following functions:
  audio_patch_is_valid
  audio_patches_are_equal
  audio_port_configs_are_equal

And helper functions.

Bug: 63901775
Test: systemaudio_tests
Change-Id: I2884e36bd2dc18513afcfb4512559a5231275b5b

5 years agoTimestampVerifier: Add discontinuity modes
Andy Hung [Tue, 3 Jul 2018 23:18:11 +0000 (16:18 -0700)]
TimestampVerifier: Add discontinuity modes

DISCONTINUITY_MODE_ZERO is where frame position is reset to
zero on discontinuity, used for offload and direct playback.

Test: audioflinger dumpsys with offload playback
Bug: 80502521
Change-Id: I5244e733bf1d45c4c168d0d087dc01af9ec436ff

5 years agoStatistics: Add benchmarking
Andy Hung [Tue, 3 Jul 2018 21:02:35 +0000 (14:02 -0700)]
Statistics: Add benchmarking

Also add related usage comments into Statistics.h.

Test: this is the statistics_benchmark test.
Bug: 110830515
Change-Id: I5c3a39118fcca647301ef292d496c9e73a1c22db

5 years agoMerge "Include test files in Android.bp"
TreeHugger Robot [Fri, 6 Jul 2018 20:37:05 +0000 (20:37 +0000)]
Merge "Include test files in Android.bp"

5 years agoInclude test files in Android.bp
Eric Tan [Mon, 2 Jul 2018 17:45:35 +0000 (10:45 -0700)]
Include test files in Android.bp

Test: build
Bug: 110794851
Change-Id: I45c36fcdbb70556147c3d2adebeb7bc920135c32

5 years agoMerge "Statistics: fix return type of getMin getMax"
Andy Hung [Fri, 6 Jul 2018 16:22:55 +0000 (16:22 +0000)]
Merge "Statistics: fix return type of getMin getMax"

5 years agoMerge "audio policy: remove special notifications handling in call"
Eric Laurent [Wed, 4 Jul 2018 00:47:14 +0000 (00:47 +0000)]
Merge "audio policy: remove special notifications handling in call"

5 years agoStatistics: fix return type of getMin getMax
Andy Hung [Tue, 3 Jul 2018 23:21:39 +0000 (16:21 -0700)]
Statistics: fix return type of getMin getMax

Should be the sample type not the accumulated type.

Test: statistics_tests native test
Change-Id: I73c640a7ac5c4810d0b7740b90afe20ea11db286

5 years agoASCII art string of signal power history
Eric Tan [Fri, 22 Jun 2018 16:24:22 +0000 (09:24 -0700)]
ASCII art string of signal power history

Add autoscale and width limit to power log graph
Change PowerLogGraph API and name (now LogPlot).
Plot now shows most recent data when cutting off.

Test: play music through audio headset while adjusting volume, dumpsys media.audio_flinger
Bug: 110794851
Change-Id: I3e046c0a29260dbefbebffb1125ed05c9b60c475

5 years agoaudio policy: remove special notifications handling in call
Eric Laurent [Sat, 30 Jun 2018 00:44:35 +0000 (17:44 -0700)]
audio policy: remove special notifications handling in call

Not needed anymore as this is handled by NotificationManager

Test: make
Change-Id: Iab89d0a3784adda5c00489505e9c3de60a3cb393

5 years agoMerge "Timestamp: Add cold state when coming out of discontinuity."
Andy Hung [Tue, 26 Jun 2018 19:00:12 +0000 (19:00 +0000)]
Merge "Timestamp: Add cold state when coming out of discontinuity."

5 years agoMerge "audio_utils: Add timestamp verification"
Andy Hung [Tue, 26 Jun 2018 18:10:12 +0000 (18:10 +0000)]
Merge "audio_utils: Add timestamp verification"

5 years agoMerge "audio_utils: Add statistics class"
Andy Hung [Tue, 26 Jun 2018 16:35:17 +0000 (16:35 +0000)]
Merge "audio_utils: Add statistics class"

5 years agoTimestamp: Add cold state when coming out of discontinuity.
Andy Hung [Tue, 19 Jun 2018 17:12:01 +0000 (10:12 -0700)]
Timestamp: Add cold state when coming out of discontinuity.

Compensates for timestamp start up lag.

Test: adb shell dumpsys media.audio_flinger (after standby)
Bug: 80502521
Change-Id: I518d30bba1c3cb1c04c48faff8201692276b77df

5 years agoaudio_utils: Add timestamp verification
Andy Hung [Wed, 13 Jun 2018 23:58:32 +0000 (16:58 -0700)]
audio_utils: Add timestamp verification

Test: adb shell dumpsys media.audio_flinger
Bug: 80502521
Change-Id: Ifa152853b78ad6adf3d441a3c7434a929814d4b9

5 years agoaudio_utils: Add statistics class
Andy Hung [Wed, 13 Jun 2018 23:38:41 +0000 (16:38 -0700)]
audio_utils: Add statistics class

Computes (weighted) running mean, variance, stddev.

Test: statistics_tests
Bug: 110172665
Change-Id: Ia7b763e9943bc328659021d951a31eb9adca6d80

5 years agoMerge "<camera/NdkCameraMetadataTags.h>: remove #if __ANDROID_API__"
TreeHugger Robot [Wed, 20 Jun 2018 21:49:51 +0000 (21:49 +0000)]
Merge "<camera/NdkCameraMetadataTags.h>: remove #if __ANDROID_API__"

5 years ago<camera/NdkCameraMetadataTags.h>: remove #if __ANDROID_API__
Elliott Hughes [Wed, 20 Jun 2018 20:13:35 +0000 (13:13 -0700)]
<camera/NdkCameraMetadataTags.h>: remove #if __ANDROID_API__

Bug: https://github.com/android-ndk/ndk/issues/706
Test: builds
Change-Id: I9854439b3dae0d1de32e36bb5bc6604c52f7f742

5 years agoCamera: update coordinate semantics w.r.t. distortion correction am: 69bce26dd2
Yin-Chia Yeh [Tue, 19 Jun 2018 20:57:25 +0000 (13:57 -0700)]
Camera: update coordinate semantics w.r.t. distortion correction am: 69bce26dd2
am: 03c5f0cc95

Change-Id: Ia2ceadbe16eeb227708e6f76bdd2b13272340f58

5 years ago[automerger] Camera: update coordinate semantics w.r.t. distortion correction am...
Android Build Merger (Role) [Tue, 19 Jun 2018 20:38:39 +0000 (20:38 +0000)]
[automerger] Camera: update coordinate semantics w.r.t. distortion correction am: 69bce26dd2 am: a4f1d3e0e9

Change-Id: Ibf01467216c7373eb5c23d17bb5d06692ca79b22

5 years agoCamera: update coordinate semantics w.r.t. distortion correction
Yin-Chia Yeh [Tue, 19 Jun 2018 20:36:11 +0000 (13:36 -0700)]
Camera: update coordinate semantics w.r.t. distortion correction
am: 69bce26dd2

Change-Id: Ia249e79dac6eb7f351bb9202f71acb1185bc1c98

5 years agoCamera: update coordinate semantics w.r.t. distortion correction
Yin-Chia Yeh [Tue, 19 Jun 2018 20:36:09 +0000 (13:36 -0700)]
Camera: update coordinate semantics w.r.t. distortion correction
am: 69bce26dd2

Change-Id: I312be434ba4947f9f20d60fb25db44fcd181287b

5 years agoCamera: update coordinate semantics w.r.t. distortion correction
Yin-Chia Yeh [Fri, 15 Jun 2018 22:35:05 +0000 (15:35 -0700)]
Camera: update coordinate semantics w.r.t. distortion correction

Also fix a NDK doucment error on semantics of face rectangle.

Test: Compile
Bug: 109666939
Change-Id: I79c48d3a24b3dccb49720d9bcd0fdce978602139

5 years agoaudio: Add framework-only AUDIO_INPUT_FLAG_DIRECT flag
Mikhail Naganov [Thu, 14 Jun 2018 17:59:48 +0000 (10:59 -0700)]
audio: Add framework-only AUDIO_INPUT_FLAG_DIRECT flag

This is used for software patch record track to indicate that
no buffer conversion need to be performed.

Bug: 63901775
Test: make
Change-Id: I3091fca0b78fd6e6159044f382e31410e302dcc2

6 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: e55165c8c6
Xin Li [Sat, 9 Jun 2018 14:32:00 +0000 (07:32 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: e55165c8c6
am: fa51d4e24c

Change-Id: I68c93af90a0b599543c302b8713b0c1d4aee58d5

6 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Xin Li [Sat, 9 Jun 2018 11:05:55 +0000 (04:05 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: e55165c8c6

Change-Id: Idbcc06cd3d627a3276aabd0a09ef48fb60156d1e

6 years agoMerge "audio: fix audio_patch_has_hw_av_sync function"
TreeHugger Robot [Fri, 8 Jun 2018 19:07:45 +0000 (19:07 +0000)]
Merge "audio: fix audio_patch_has_hw_av_sync function"

6 years agoaudio: fix audio_patch_has_hw_av_sync function
Mikhail Naganov [Mon, 4 Jun 2018 20:32:43 +0000 (13:32 -0700)]
audio: fix audio_patch_has_hw_av_sync function

The direction of the flags depends on the port type.
For device ports, 'source' is INPUT direction, 'sink'
is OUTPUT. For mix ports, it's the opposite.

Bug: 63901775
Test: make
Change-Id: Ie54d7a9354929f6c0d57ff605ea32daee11a7a93

6 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Xin Li [Fri, 8 Jun 2018 18:09:26 +0000 (11:09 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: Ia684aedfa59c7716ac04c71b4e2cbc0456a7789d

6 years ago[automerger skipped] Camera: update tonemap images am: 00d504d2d3
Yin-Chia Yeh [Fri, 8 Jun 2018 01:10:01 +0000 (18:10 -0700)]
[automerger skipped] Camera: update tonemap images am: 00d504d2d3
am: 75e0294b2f  -s ours

Change-Id: Iea1c79be939794137a83d4586a93843d373de466

6 years agoCamera: update tonemap images
Yin-Chia Yeh [Thu, 7 Jun 2018 22:55:21 +0000 (15:55 -0700)]
Camera: update tonemap images
am: 00d504d2d3

Change-Id: Ib33cf53fa5e72d34e0c07646b21271a95699b043

6 years agoCamera: update tonemap images
Yin-Chia Yeh [Thu, 7 Jun 2018 22:28:25 +0000 (15:28 -0700)]
Camera: update tonemap images
am: 00d504d2d3

Change-Id: I3120d35442b707c2c38648246c2732982b806bdb

6 years agoCamera: update tonemap images
Yin-Chia Yeh [Thu, 15 Mar 2018 18:08:49 +0000 (11:08 -0700)]
Camera: update tonemap images

Also check in the plot script.

Bug: 74942037
Merged-In: If3cf99c83470f146f5e68714274b74d8e719e372
Change-Id: If3cf99c83470f146f5e68714274b74d8e719e372

6 years agoCamera: Fix a typo in android.scaler.cropRegion am: 4db8bb86f2
Shuzhen Wang [Thu, 7 Jun 2018 07:31:24 +0000 (00:31 -0700)]
Camera: Fix a typo in android.scaler.cropRegion am: 4db8bb86f2
am: 51c640234c

Change-Id: I0b8a30c4c9c990e3a3b5b06d3525adc5f1da6a63

6 years agoCamera: Fix a typo in android.scaler.cropRegion
Shuzhen Wang [Thu, 7 Jun 2018 07:14:14 +0000 (00:14 -0700)]
Camera: Fix a typo in android.scaler.cropRegion
am: 4db8bb86f2

Change-Id: Ibc028595da840a1e091da3852d2d500511ffbdfa

6 years agoCamera: Fix a typo in android.scaler.cropRegion
Shuzhen Wang [Thu, 7 Jun 2018 07:14:14 +0000 (00:14 -0700)]
Camera: Fix a typo in android.scaler.cropRegion
am: 4db8bb86f2

Change-Id: I6647640873060501658e409492141c42adcb8982

6 years agoCamera: Fix a typo in android.scaler.cropRegion
Shuzhen Wang [Thu, 7 Jun 2018 00:21:54 +0000 (17:21 -0700)]
Camera: Fix a typo in android.scaler.cropRegion

Test: Compile
Bug: 109839186
Change-Id: Iddbf41ee4dff363510ffc27f3ec4140bac0324c0

6 years agoMerge "alsa: add proxy_get_capture_position"
Andy Hung [Tue, 5 Jun 2018 21:46:14 +0000 (21:46 +0000)]
Merge "alsa: add proxy_get_capture_position"

6 years agoalsa: add proxy_get_capture_position
Andy Hung [Tue, 5 Jun 2018 02:13:01 +0000 (19:13 -0700)]
alsa: add proxy_get_capture_position

Test: adb shell dumpsys media.audio_flinger latency
Bug: 80503176
Change-Id: I2fe2aa6218b5dd70094566615729517f086139f2

6 years agoaudio: add utility function audio_patch_has_hw_av_sync
Mikhail Naganov [Fri, 1 Jun 2018 20:33:21 +0000 (13:33 -0700)]
audio: add utility function audio_patch_has_hw_av_sync

This is a framework-only function for checking whether any of
patch's sources or sinks has FLAG_HW_AV_SYNC set.

Bug: 63901775
Test: make
Change-Id: If1ab7627549d0f79124b240104774c36c1c38d78

6 years agoAdd audio_port_config.flags field
Mikhail Naganov [Thu, 24 May 2018 19:57:21 +0000 (12:57 -0700)]
Add audio_port_config.flags field

This is only used by the framework, not revealed to HALs.

The main use case is for passing flags for software patch threads
from AudioPolicyManager to AudioFlinger.

Bug: 63901775
Test: make
Change-Id: Ic536fdcb333136fd7d7781d64e833085bc324a68

6 years agoCamera: Clarify camera ID selection logic for logical camera am: 1a5092e964
Shuzhen Wang [Fri, 25 May 2018 15:52:56 +0000 (08:52 -0700)]
Camera: Clarify camera ID selection logic for logical camera am: 1a5092e964
am: 1eee97779a

Change-Id: I663efd7e0bf0a7884ccdb21fe46ac90e4b99a1a5

6 years agoCamera: Clarify camera ID selection logic for logical camera
Shuzhen Wang [Fri, 25 May 2018 15:41:01 +0000 (08:41 -0700)]
Camera: Clarify camera ID selection logic for logical camera
am: 1a5092e964

Change-Id: Ifda594d989fe083a6711fec65fec4d3fa67267b5

6 years ago[automerger skipped] Fix incorrect cflags value
Jiyong Park [Fri, 25 May 2018 11:52:58 +0000 (04:52 -0700)]
[automerger skipped] Fix incorrect cflags value
am: dc6ccf776b  -s ours

Change-Id: Id28473f85f7d7e1fbdf6690fc7c3b4f1ecc61c0b

6 years agoFix incorrect cflags value
Jiyong Park [Fri, 25 May 2018 01:10:01 +0000 (10:10 +0900)]
Fix incorrect cflags value

Prepending -D for macro definition

Test: m -j
Merged-In: Iefc1dbe6f48e31736aecd4e042672e6dca6aff47
Change-Id: Iefc1dbe6f48e31736aecd4e042672e6dca6aff47
(cherry picked from commit 69a06b02040434c58acdf8c74015697790623534)

6 years agoFix incorrect cflags value
Jiyong Park [Fri, 25 May 2018 01:10:01 +0000 (10:10 +0900)]
Fix incorrect cflags value

Prepending -D for macro definition

Test: m -j
Change-Id: Iefc1dbe6f48e31736aecd4e042672e6dca6aff47

6 years agoCamera: Clarify camera ID selection logic for logical camera
Shuzhen Wang [Wed, 23 May 2018 16:07:11 +0000 (09:07 -0700)]
Camera: Clarify camera ID selection logic for logical camera

- Clarify the assumption camera app can make on camera ids.
- Document that camera service only advertises one camera id out of every
logical camera id combination for API1.

Test: Build
Bug: 80075565
Change-Id: Idc3c600983ef36f24cdc7f4ca0f25e41451ff8ab

6 years agoMerge "Camera: Describe framerate session parameter corner case" into pi-dev am:...
Emilian Peev [Fri, 18 May 2018 09:27:43 +0000 (02:27 -0700)]
Merge "Camera: Describe framerate session parameter corner case" into pi-dev am: 3fd8ae99b4
am: 6b92f7f3b9

Change-Id: I13c4b741b277270d33329b704f88f04214eaa200

6 years agoMerge "Camera: Describe framerate session parameter corner case" into pi-dev
Emilian Peev [Fri, 18 May 2018 09:21:47 +0000 (02:21 -0700)]
Merge "Camera: Describe framerate session parameter corner case" into pi-dev
am: 3fd8ae99b4

Change-Id: I90d47fa08afbcf2f9894a5c743e06e420d9d97b8

6 years agoMerge "Camera: Describe framerate session parameter corner case" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 09:12:16 +0000 (09:12 +0000)]
Merge "Camera: Describe framerate session parameter corner case" into pi-dev

6 years agoMerge "Add output to input channel mask conversion"
TreeHugger Robot [Fri, 18 May 2018 01:12:20 +0000 (01:12 +0000)]
Merge "Add output to input channel mask conversion"

6 years agoAdd output to input channel mask conversion
Mikhail Naganov [Thu, 10 May 2018 20:21:17 +0000 (13:21 -0700)]
Add output to input channel mask conversion

Adding audio_channel_mask_out_to_in function, complementary
to audio_channel_mask_in_to_out.

This is needed because otherwise equivalent input and
output masks have different representations.

Bug: 63901775
Test: MSD patch creation
Change-Id: If4f1c5d6b8104edbf82ec104506eca0ba13f7068

6 years agomedia: Add A2DP codec reconfiguration parameters am: 6c03e73128
Aniket Kumar Lata [Thu, 17 May 2018 22:03:53 +0000 (15:03 -0700)]
media: Add A2DP codec reconfiguration parameters am: 6c03e73128
am: 242bf8acdf

Change-Id: Idb0a9254b03ae58ef6bf42562bebc98148843aad

6 years agomedia: Add A2DP codec reconfiguration parameters
Aniket Kumar Lata [Thu, 17 May 2018 21:58:47 +0000 (14:58 -0700)]
media: Add A2DP codec reconfiguration parameters
am: 6c03e73128

Change-Id: I7897bed4be893a995d85b81c31d98ebbe4e0c86c

6 years agomedia: Add A2DP codec reconfiguration parameters
Aniket Kumar Lata [Fri, 4 May 2018 22:56:58 +0000 (15:56 -0700)]
media: Add A2DP codec reconfiguration parameters

Add A2DP codec reconfiguration parameters for hardware offload.

Bug: 79476124
Test: music playback over BT A2DP

Change-Id: I0f445b2b508b6b930bf8d58efbb4dba851ca3165

6 years agoMerge "Add const value for manually set surround formats." into pi-dev am: 74961a7910
Jiabin Huang [Tue, 15 May 2018 21:52:12 +0000 (14:52 -0700)]
Merge "Add const value for manually set surround formats." into pi-dev am: 74961a7910
am: fa2352d687

Change-Id: If5df25de80c7e8af61e12f738460776a2f9575a4

6 years agoMerge "Add const value for manually set surround formats." into pi-dev
Jiabin Huang [Tue, 15 May 2018 21:00:56 +0000 (14:00 -0700)]
Merge "Add const value for manually set surround formats." into pi-dev
am: 74961a7910

Change-Id: Ie8c58fbe3e70be6ab65f0f845833c12e48ecee42

6 years agoMerge "Add const value for manually set surround formats." into pi-dev
Jiabin Huang [Tue, 15 May 2018 20:54:28 +0000 (20:54 +0000)]
Merge "Add const value for manually set surround formats." into pi-dev

6 years agoCamera: Describe framerate session parameter corner case
Emilian Peev [Tue, 15 May 2018 10:18:04 +0000 (11:18 +0100)]
Camera: Describe framerate session parameter corner case

A corner case exists during framerate session parameter
updates in constrained HFR mode. The framework will only
monitor for fps upper range modifications.

Bug: 78494729
Test: Camera CTS
Change-Id: I88d59163c060f6e19b3d9f30925b2c5b03077d71

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:27:27 +0000 (03:27 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8 am: 6837fddebd am: 4b350d5472 am: a90677991f am: e5a5cfb39f
am: fadef4238b

Change-Id: I040fd324de2197c533542a51f574125b03148ea5

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:23:00 +0000 (03:23 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8 am: 6837fddebd am: 4b350d5472 am: a90677991f
am: e5a5cfb39f

Change-Id: I866309cf850d99600941718f98915c486b6e064b

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:17:56 +0000 (03:17 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8 am: 6837fddebd am: 4b350d5472
am: a90677991f

Change-Id: I1ab47ca738094c00d962cf014c0f4e020a4f0ec9

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:12:22 +0000 (03:12 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8 am: 6837fddebd
am: 4b350d5472

Change-Id: Ie9158972fd863bba1ac99a4437f29487106bcae7

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:06:07 +0000 (03:06 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8
am: 6837fddebd

Change-Id: I80ae81e9fdcdac5dad4a35641ab2ee7aa17bc9f3

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 08:53:13 +0000 (09:53 +0100)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8

* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':
  Camera: Initialize metadata padding field

Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:34 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d am: e09df97fbe am: d0d0d54c51 am: 4feb98a933

Change-Id: Ia67374cd29031a7754fc88f2d571b37e27efe9d5

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:31 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d am: e09df97fbe am: d0d0d54c51

Change-Id: I9f265f2ad023a2c55907d2b029d8629428155353

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:29 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d am: e09df97fbe

Change-Id: I302f48a487b61353f120dbae83304777b20fde5a

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:26 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d

Change-Id: If33362ba096af1c11226021147f671ce0936455a

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:24 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10

Change-Id: I529ab232eab8b02fdcaf6df9eaa28366c978d36e

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:21 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113

Change-Id: Ic4237032dc357905cde458219a42a2fece3636bc

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8
Android Build Merger (Role) [Fri, 11 May 2018 08:47:18 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8

Change-Id: I2b38ba060b9398b616ac7adb24816655b7b46384

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263
Android Build Merger (Role) [Fri, 11 May 2018 08:47:16 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263

Change-Id: Ic1b147fbf96aa567af9ea10533d0012a8765eca4

6 years agoCamera: Initialize metadata padding field
Emilian Peev [Tue, 10 Apr 2018 12:11:43 +0000 (13:11 +0100)]
Camera: Initialize metadata padding field

'padding' field in internal camera metadata structure should be
initialized.

Bug: 77238656
Test: Camera CTS
Change-Id: I57919ec6d6834b5e830be7cbe871558a5da3f266
Merged-In: I57919ec6d6834b5e830be7cbe871558a5da3f266

6 years agoRemove valid_mask from audio.h am: 534cf9df97
jiabin [Wed, 9 May 2018 19:40:33 +0000 (12:40 -0700)]
Remove valid_mask from audio.h am: 534cf9df97
am: 40833e11c9

Change-Id: I8880f0abe92b426602f028dd5f26dc9d8c20a373

6 years agoRemove valid_mask from audio.h
jiabin [Wed, 9 May 2018 19:22:24 +0000 (12:22 -0700)]
Remove valid_mask from audio.h
am: 534cf9df97

Change-Id: I2758bd5adaeab0f76eefc5012aaf88c20effedc5

6 years agoMerge "Deprecate <cutils/log.h> and <utils/Log.h>" am: a8cff157ff am: c0bec34fb6
Logan Chien [Wed, 9 May 2018 03:59:27 +0000 (20:59 -0700)]
Merge "Deprecate <cutils/log.h> and <utils/Log.h>" am: a8cff157ff am: c0bec34fb6
am: b4b0545acc

Change-Id: I790122640e171679837489a0db8dc9bfb3c037a7

6 years agoMerge "Deprecate <cutils/log.h> and <utils/Log.h>" am: a8cff157ff
Logan Chien [Wed, 9 May 2018 03:38:22 +0000 (20:38 -0700)]
Merge "Deprecate <cutils/log.h> and <utils/Log.h>" am: a8cff157ff
am: c0bec34fb6

Change-Id: I94008b9929aee0d4f927be745c01943fb4347cdd

6 years agoMerge "Deprecate <cutils/log.h> and <utils/Log.h>"
Logan Chien [Wed, 9 May 2018 03:27:54 +0000 (20:27 -0700)]
Merge "Deprecate <cutils/log.h> and <utils/Log.h>"
am: a8cff157ff

Change-Id: I7a35153f3092eb0e6814e33ec68bcda90b7613b9

6 years agoMerge "Deprecate <cutils/log.h> and <utils/Log.h>"
Logan Chien [Wed, 9 May 2018 03:15:34 +0000 (03:15 +0000)]
Merge "Deprecate <cutils/log.h> and <utils/Log.h>"

6 years agoRemove valid_mask from audio.h
jiabin [Mon, 7 May 2018 17:55:12 +0000 (10:55 -0700)]
Remove valid_mask from audio.h

As valid mask only using in hal to indicate which fields of microphone
characteristics is available and it is not used in other case, we can
only keep it in hal layer instead of audio.h.

Bug: 79272216
Test: run cts
Change-Id: I2f41c382551eff105f321a7d3639ac5d5557305c

6 years agoMerge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev am: 66e7745898
android-build-team Robot [Mon, 30 Apr 2018 23:50:17 +0000 (16:50 -0700)]
Merge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev am: 66e7745898
am: bff8b10825

Change-Id: Ica24b5195afcdecbbbc95cf2b049a4a00a6624ca

6 years agoMerge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 23:23:54 +0000 (16:23 -0700)]
Merge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev
am: 66e7745898

Change-Id: I2d8b1b226569b8ff6c238ece55e964e17a9c6563

6 years agoMerge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 23:05:33 +0000 (23:05 +0000)]
Merge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev

6 years agoAdd AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT.
jiabin [Fri, 27 Apr 2018 23:03:29 +0000 (16:03 -0700)]
Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT.

Bug: 75041465
Test: make
Change-Id: I2cd6a5cdcd497bd9723d058a71737da67fa9810a

6 years agoMerge "Fix in-place audio format conversion issues" into pi-dev am: 614439ed8b
Andy Hung [Fri, 27 Apr 2018 17:11:26 +0000 (10:11 -0700)]
Merge "Fix in-place audio format conversion issues" into pi-dev am: 614439ed8b
am: 259874614f

Change-Id: I70567ed0889177cee577ba2fa655d889284d3ea6

6 years agoMerge "Fix in-place audio format conversion issues" into pi-dev
Andy Hung [Fri, 27 Apr 2018 17:06:43 +0000 (10:06 -0700)]
Merge "Fix in-place audio format conversion issues" into pi-dev
am: 614439ed8b

Change-Id: I6ea44c0afaeafb3ab7095a30b4ad6b632a2829f0

6 years agoMerge "Fix in-place audio format conversion issues" into pi-dev
Andy Hung [Fri, 27 Apr 2018 16:58:10 +0000 (16:58 +0000)]
Merge "Fix in-place audio format conversion issues" into pi-dev

6 years agoFix in-place audio format conversion issues
Andy Hung [Thu, 26 Apr 2018 00:59:24 +0000 (17:59 -0700)]
Fix in-place audio format conversion issues

memcpy_by_audio_format() corner case of same format in-place.
memcpy_to_p24_from_i16() for the first sample in buffer for in-place.

Update memcpy_by_audio_format() documentation.

Test: added native unit test format_tests
Bug: 78598192
Change-Id: I9e538ed4ef233b319b846f4a91c27a86eb605a20

6 years agoDeprecate <cutils/log.h> and <utils/Log.h>
Logan Chien [Mon, 23 Apr 2018 06:42:50 +0000 (14:42 +0800)]
Deprecate <cutils/log.h> and <utils/Log.h>

This commit replaces <cutils/log.h> and <utils/Log.h> with <log/log.h>.

Background:
<cutils/log.h> has been moved to <log/log.h> for a while.  Both
<cutils/log.h> and <utils/Log.h> simply includes <log/log.h> for
backward compatibility.  This commit is a part of the effort to remove
<cutils/log.h> and <utils/Log.h> from the source tree eventually.

Bug: 78370064
Test: lunch aosp_walleye-userdebug && cd system/media && mma
Change-Id: I50e2df4ebd75b3c3b7a8ddba2e496803210aca4c

6 years agoMerge "audio-base.h number in hex" into pi-dev am: d267471813
Kevin Rocard [Wed, 25 Apr 2018 23:32:37 +0000 (16:32 -0700)]
Merge "audio-base.h number in hex" into pi-dev am: d267471813
am: 373cba56d3

Change-Id: I7307cdf63fb756f39c7abb7004a1a7f75b953ac0

6 years agoMerge "audio-base.h number in hex" into pi-dev
Kevin Rocard [Wed, 25 Apr 2018 23:27:35 +0000 (16:27 -0700)]
Merge "audio-base.h number in hex" into pi-dev
am: d267471813

Change-Id: Id70abff0e5e08e1b743f9120bf072a1d20a4b7c5

6 years agoMerge "audio-base.h number in hex" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 23:16:31 +0000 (23:16 +0000)]
Merge "audio-base.h number in hex" into pi-dev

6 years agoaudio-base.h number in hex
Kevin Rocard [Wed, 25 Apr 2018 03:04:15 +0000 (20:04 -0700)]
audio-base.h number in hex

Make audio.h great again.
All values expressed in hex in types.hal are now also hex in
audio-base.h

Generated by running on each enum body:
sed -E 's/(.* )= ([0-9]*)u?,(.*)/echo "\1@= 0x$(printf \%x \2),@\3"/e' |
  column -ts@ | sed 's/  =/=/;s/,  /,/;s/[()]//g' |
  sed -E 's/0x([a-zA-Z0-9]+)/0x\U\1/'

And then a few manual removal of whitespace for vertical alignments.

Test: check that some numbers are correctly converted
Bug: 38184704
Change-Id: I6740e00285b8d301320dd8ae408d3f1fd46511c3
Signed-off-by: Kevin Rocard <krocard@google.com>
6 years agoMake maximum number of frequency response larger. am: 5c9c78f952
jiabin [Wed, 25 Apr 2018 01:56:15 +0000 (18:56 -0700)]
Make maximum number of frequency response larger. am: 5c9c78f952
am: 02f2d2dfaa

Change-Id: I4af4e8c78b804deee844c1a54aaea41886f9d7e3

6 years agoMake maximum number of frequency response larger.
jiabin [Wed, 25 Apr 2018 01:52:28 +0000 (18:52 -0700)]
Make maximum number of frequency response larger.
am: 5c9c78f952

Change-Id: Ie63452f94666a7aa427d547db3356109f06b81db

6 years agoMake maximum number of frequency response larger.
jiabin [Tue, 24 Apr 2018 22:20:05 +0000 (15:20 -0700)]
Make maximum number of frequency response larger.

Bug: 64038649
Test: make
Change-Id: Ic41b9e48d5c4e33718cd8f1d7233e29daf0659fe

6 years agoAdd const value for manually set surround formats.
jiabin [Tue, 3 Apr 2018 01:20:37 +0000 (18:20 -0700)]
Add const value for manually set surround formats.

To make surround sound setting more clear to users, we are changing
surround setting from ALWAYS to MANUAL. With MANUAL, users could enable
surround formats according to their need.

Bug: 67479735
Test: Try creating AudioTrack with enable/disable surround formats.
Change-Id: I32c5a766300fc0ed294150f703e46602970a76d3