OSDN Git Service
Robert Shih [Wed, 5 Apr 2017 23:33:53 +0000 (23:33 +0000)]
omx node: patch err code to preserve API contract am:
2c8fec1080
am:
e4425cce27
Change-Id: I760838435059ace17664905bb28098c1fcfe7008
Robert Shih [Wed, 5 Apr 2017 23:28:07 +0000 (23:28 +0000)]
omx node: patch err code to preserve API contract
am:
2c8fec1080
Change-Id: Idcdcaef307aa34703e831c06f6d04e3cc14e2179
Robert Shih [Wed, 5 Apr 2017 18:19:28 +0000 (11:19 -0700)]
omx node: patch err code to preserve API contract
Bug:
36789323
Change-Id: Ie1d8dde5e4df8f5f4061cba7b20e1732b1466235
Test: adb shell am instrument -e size small \
-w android.media.cts/android.support.test.runner.AndroidJUnitRunner
Ray Essick [Wed, 5 Apr 2017 21:49:06 +0000 (21:49 +0000)]
Merge "Implement metrics 'summarizers'"
rago [Wed, 5 Apr 2017 03:09:50 +0000 (03:09 +0000)]
Merge "Show in dumpsys effect libraries that failed to load" into oc-dev am:
98e11c12e6
am:
322c3e5faa
Change-Id: I1cd973ae133af2430a17e0f9429d90afcf4cc8ae
rago [Wed, 5 Apr 2017 03:07:21 +0000 (03:07 +0000)]
Merge "Show in dumpsys effect libraries that failed to load" into oc-dev
am:
98e11c12e6
Change-Id: Idbe004e5c521a64b360e07ff34d0f27e98fb1aec
TreeHugger Robot [Wed, 5 Apr 2017 03:01:52 +0000 (03:01 +0000)]
Merge "Show in dumpsys effect libraries that failed to load" into oc-dev
Mathias Agopian [Wed, 5 Apr 2017 00:58:25 +0000 (00:58 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev am:
549f208855
am:
28d1254947
Change-Id: Ie3c1b548af13945c9dbee40d0a6e6ed5d8f4bf8d
rago [Tue, 4 Apr 2017 23:48:16 +0000 (16:48 -0700)]
Show in dumpsys effect libraries that failed to load
Bug:
36525163
Bug:
36864417
Change-Id: I120129cb43e9593cc94ba361fe76ade86448e46a
Test: run and use dumpsys audio_flinger
Mathias Agopian [Wed, 5 Apr 2017 00:49:40 +0000 (00:49 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
am:
549f208855
Change-Id: Ib5a76d2237b5f2f8b1e43984287ae9bd4faf8231
Mathias Agopian [Wed, 5 Apr 2017 00:42:52 +0000 (00:42 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
Dhananjay Kumar [Tue, 4 Apr 2017 23:14:03 +0000 (23:14 +0000)]
Merge "NuPlayer : send the correct streaming info while opening audio sink" into oc-dev am:
fe3471f63b
am:
3e06f3fd58
Change-Id: I0895a137410ef3818a18a949d672c89841af7e6d
Dhananjay Kumar [Tue, 4 Apr 2017 23:12:04 +0000 (23:12 +0000)]
Merge "NuPlayer : send the correct streaming info while opening audio sink" into oc-dev
am:
fe3471f63b
Change-Id: I30fcfc85d8f3106f1e58212e272d2d6a182ca850
TreeHugger Robot [Tue, 4 Apr 2017 23:06:23 +0000 (23:06 +0000)]
Merge "NuPlayer : send the correct streaming info while opening audio sink" into oc-dev
Wei Jia [Tue, 4 Apr 2017 23:05:41 +0000 (23:05 +0000)]
Merge "MPEG4Source: fix fragmented read." into oc-dev am:
e786547c7e
am:
b0e4789e66
Change-Id: I8c2916c61baeb808f81d13c9d11e1caa1de778e6
Wei Jia [Tue, 4 Apr 2017 23:03:34 +0000 (23:03 +0000)]
Merge "MPEG4Source: fix fragmented read." into oc-dev
am:
e786547c7e
Change-Id: Ia72dea4348478fe55543e6a2f810f6824a5c9a2b
Wei Jia [Tue, 4 Apr 2017 22:57:53 +0000 (22:57 +0000)]
Merge "MPEG4Source: fix fragmented read." into oc-dev
Yin-Chia Yeh [Tue, 4 Apr 2017 22:31:02 +0000 (22:31 +0000)]
Merge "Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"" into oc-dev am:
75160fb493
am:
053f4453be
Change-Id: I6e639b2c8fe77cfad40dd32bc8b1ad9d6919a97d
Yin-Chia Yeh [Tue, 4 Apr 2017 22:27:52 +0000 (22:27 +0000)]
Merge "Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"" into oc-dev
am:
75160fb493
Change-Id: I5f8faa0aaaed05136a645a3315f884788e39d8af
Yin-Chia Yeh [Tue, 4 Apr 2017 22:22:02 +0000 (22:22 +0000)]
Merge "Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"" into oc-dev
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.
Test: passed CTS test DecoderTest#testDecodeFragmented
Bug:
36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit
ba9af7792dfed6e9b1b216aab91a97e713eec891)
Yin-Chia Yeh [Tue, 4 Apr 2017 20:00:03 +0000 (13:00 -0700)]
Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"
This reverts commit
1a2f15daf13552e86324025cf6d31d887cd8fa02.
Test: fix b/
36876770
Bug: b/
36876770
Change-Id: Ie7b8c9ee444e3e8667154b396e3e6a556b54739a
Jerry Zhang [Tue, 4 Apr 2017 19:46:16 +0000 (19:46 +0000)]
Merge "Add timeout to lock in MtpServer configure" into oc-dev am:
f97ade3242
am:
e88401953e
Change-Id: I2ffa24b3b06bfbe58ac42d10f51dc4ead6743c42
Jerry Zhang [Tue, 4 Apr 2017 19:37:00 +0000 (19:37 +0000)]
Merge "Add timeout to lock in MtpServer configure" into oc-dev
am:
f97ade3242
Change-Id: Ib6f2cd6072826b3d25f0304760023ec2ab0eef75
TreeHugger Robot [Tue, 4 Apr 2017 19:23:50 +0000 (19:23 +0000)]
Merge "Add timeout to lock in MtpServer configure" into oc-dev
Dhananjay Kumar [Thu, 6 Aug 2015 05:13:16 +0000 (10:43 +0530)]
NuPlayer : send the correct streaming info while opening audio sink
-For any offload playback NuPlayerRenderer always open the audio sink
with isStreaming info as true.
-Pass the streaming info to the NuPlayerRenderer while opening audio
sink
Test: cts tests
Bug:
36051644
Author: Preetam Singh Ranawat <apranawat@codeaurora.org>
Change-Id: I249e6769ef4587917a13b0225d049a3923544d16
(cherry picked from commit
b2444b392d0d5de4118d37a24f4351f9de5c215d)
Andy Hung [Tue, 4 Apr 2017 16:31:27 +0000 (16:31 +0000)]
Merge "NuPlayer: Use deep buffer AudioTrack for video playback" into oc-dev am:
80158939f9
am:
05d698d950
Change-Id: Idb4339477c1656a87f76a7949b077e0714549e68
Andy Hung [Tue, 4 Apr 2017 16:25:52 +0000 (16:25 +0000)]
Merge "NuPlayer: Use deep buffer AudioTrack for video playback" into oc-dev
am:
80158939f9
Change-Id: Ica687a11fa6d7e01fec158bee7df7024b7ff7492
TreeHugger Robot [Tue, 4 Apr 2017 16:17:16 +0000 (16:17 +0000)]
Merge "NuPlayer: Use deep buffer AudioTrack for video playback" into oc-dev
Emilian Peev [Tue, 4 Apr 2017 10:04:27 +0000 (10:04 +0000)]
Merge "Camera: Try to remove inflight requests during error notifications" into oc-dev am:
ac3e2cce87
am:
6d875c51f2
Change-Id: Ic1eaa896e2ee40fe78ff9ce3e872632c2f4f31b7
Emilian Peev [Tue, 4 Apr 2017 09:59:56 +0000 (09:59 +0000)]
Merge "Camera: Try to remove inflight requests during error notifications" into oc-dev
am:
ac3e2cce87
Change-Id: I19f4376ed1269e5a91600c1000367cf60727ddcc
TreeHugger Robot [Tue, 4 Apr 2017 09:55:22 +0000 (09:55 +0000)]
Merge "Camera: Try to remove inflight requests during error notifications" into oc-dev
Mathias Agopian [Tue, 4 Apr 2017 00:52:26 +0000 (17:52 -0700)]
Remove useless GraphicBuffer() constructor
Test: compiled & run
Bug:
36869708
Change-Id: I777701b8f47929d2b669d2a990649e58eef528fc
Yin-Chia Yeh [Tue, 4 Apr 2017 00:42:31 +0000 (00:42 +0000)]
Merge "Camera: add buffer freed notification for output streams" into oc-dev am:
03857c4b5a
am:
7c6e1d8279
Change-Id: Id568378cc1e944bf40f13080cd7b2b5c9672afb4
Yin-Chia Yeh [Tue, 4 Apr 2017 00:39:10 +0000 (00:39 +0000)]
Merge "Camera: add buffer freed notification for output streams" into oc-dev
am:
03857c4b5a
Change-Id: Ie90859d22d1aa991f98892117c252b607cf28ef4
Yin-Chia Yeh [Tue, 4 Apr 2017 00:38:40 +0000 (00:38 +0000)]
Merge "Camera: add buffer freed notification interface" into oc-dev am:
654be2e635
am:
81d1ec5994
Change-Id: If745618f72a0dae98e625cb3646e25a2be39151f
Yin-Chia Yeh [Tue, 4 Apr 2017 00:34:41 +0000 (00:34 +0000)]
Merge "Camera: add buffer freed notification interface" into oc-dev
am:
654be2e635
Change-Id: I50e4526cc47021ffc3e90f4782fb223bf97b57e4
TreeHugger Robot [Tue, 4 Apr 2017 00:33:14 +0000 (00:33 +0000)]
Merge "Camera: add buffer freed notification for output streams" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:31:00 +0000 (00:31 +0000)]
Merge "Camera: add buffer freed notification interface" into oc-dev
Andy Hung [Mon, 3 Apr 2017 22:50:27 +0000 (15:50 -0700)]
NuPlayer: Use deep buffer AudioTrack for video playback
This reduces power requirements and increases robustness against
audio glitches.
Test: Photos
Bug:
36867565
Change-Id: I200728cfc1bfd01301441c8759816415abe58d48
Eino-Ville Talvala [Mon, 3 Apr 2017 22:12:31 +0000 (22:12 +0000)]
Merge "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages" into oc-dev am:
ff4e56e96d
am:
fe81b6cdfb
Change-Id: I05a02718107f2b5770681e30811a79e904a758ce
Jiwen 'Steve' Cai [Mon, 3 Apr 2017 22:12:14 +0000 (22:12 +0000)]
Use gralloc0 usage to init BufferItemConsumer am:
755ca9b427
am:
99ac4320f2
Change-Id: Id3a9ddfc5b359de40d6506746b00d02e3e8acbf2
Eino-Ville Talvala [Mon, 3 Apr 2017 22:07:31 +0000 (22:07 +0000)]
Merge "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages" into oc-dev
am:
ff4e56e96d
Change-Id: I959e1f0324d079ac7816840cc29977582e59acb5
Jiwen 'Steve' Cai [Mon, 3 Apr 2017 22:07:03 +0000 (22:07 +0000)]
Use gralloc0 usage to init BufferItemConsumer
am:
755ca9b427
Change-Id: I6e00202d7b3a01cf2f5f2e35ceff99b35076b300
Yin-Chia Yeh [Sat, 1 Apr 2017 02:11:00 +0000 (19:11 -0700)]
Camera: add buffer freed notification for output streams
Test: ReprocessCaptureTest fixed
Bug:
34461678
Change-Id: Icd5af79a8f7fc35b0a040c57a639ae6777e71024
Eino-Ville Talvala [Mon, 3 Apr 2017 22:03:13 +0000 (22:03 +0000)]
Merge "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages" into oc-dev
Yin-Chia Yeh [Thu, 30 Mar 2017 20:35:36 +0000 (13:35 -0700)]
Camera: add buffer freed notification interface
To cleanup caches of obsolete buffers.
This CL addressed the input stream bit, the output
stream hook will be a followup CL.
Also cleanup some dead API in CameraDeviceBase.h
Test: fix CTS ReprocessCaptureTest
Bug:
34461678
Change-Id: I801cd81c29becaa45630ed0a5c2dab8df1278a6a
Jerry Zhang [Mon, 3 Apr 2017 18:24:48 +0000 (11:24 -0700)]
Add timeout to lock in MtpServer configure
In situations where MtpServer is in a bad state, this will prevent
the configure call from blocking indefinitely, which will prevent
a few visible problems and allow the state to recover on the next
config change.
Bug:
34873000
Test: Connect to AA test sled
Change-Id: I5daf9cfcec69c967bde6bf3f6fd90e1c434e18bb
Jiwen 'Steve' Cai [Fri, 31 Mar 2017 23:59:50 +0000 (16:59 -0700)]
Use gralloc0 usage to init BufferItemConsumer
BufferItemConsumer is expecting gralloc0 usage, use
android_convertGralloc1To0Usage.
Also one minor log change: during acquireImageLocked, turn off the
warning when accquired buffer has different dimension than originally
configured on ImageReader. It is actually a legal operation for
IGraphicBufferProducer to change buffers dimension dynamically.
Bug:
35114769
Test: AImageReaderCts now passes with CPU_READ_OFTEN case.
Change-Id: I32015148437be56242a46c8e20ca33497e182ac2
Phil Burk [Mon, 3 Apr 2017 18:35:47 +0000 (18:35 +0000)]
Merge "libaaudio: implement getTimestamp for legacy path" into oc-dev am:
58a220fe06
am:
d846b9b434
Change-Id: I31ef34365e5deb3ac9109800cd111da8875199f4
Phil Burk [Mon, 3 Apr 2017 18:23:21 +0000 (18:23 +0000)]
Merge "libaaudio: implement getTimestamp for legacy path" into oc-dev
am:
58a220fe06
Change-Id: I01e5463e9f3c3d95117051fb7bf5b95e45221341
Yin-Chia Yeh [Mon, 3 Apr 2017 17:33:05 +0000 (17:33 +0000)]
Merge "Camera: HAL1 recording batching support" into oc-dev am:
32a81b6095
am:
aa62b52a6c
Change-Id: I0edd8008aea0a66b3339d1e0ab607276d1c951f2
Yin-Chia Yeh [Mon, 3 Apr 2017 17:24:59 +0000 (17:24 +0000)]
Merge "Camera: HAL1 recording batching support" into oc-dev
am:
32a81b6095
Change-Id: Iecfa1bf4892e3b81f0b02514a75fc42361af6f7d
Phil Burk [Mon, 3 Apr 2017 16:09:46 +0000 (16:09 +0000)]
Merge "libaaudio: implement getTimestamp for legacy path" into oc-dev
Emilian Peev [Thu, 30 Mar 2017 08:05:34 +0000 (09:05 +0100)]
Camera: Try to remove inflight requests during error notifications
Make it possible for clients to clear the internal inflight queue
as part of error result notifications. For this to work all pending
buffers must be returned previously with the exception of the
result metadata.
Bug:
35652756
Test: Complete Camera/Camera2 CTS without any regressions.
Change-Id: I9d8a6b63364fd254311cda2f8c836b99ee05cacb
TreeHugger Robot [Mon, 3 Apr 2017 07:34:01 +0000 (07:34 +0000)]
Merge "Camera: HAL1 recording batching support" into oc-dev
Wonsik Kim [Sun, 2 Apr 2017 07:42:57 +0000 (07:42 +0000)]
Merge "MediaRecorder: Handle 24-hour timelapse duration" into oc-dev am:
6847989333
am:
8d6017966c
Change-Id: I6782e8546a4bb0d5296a947f39dfecfa08392ad2
Wonsik Kim [Sun, 2 Apr 2017 07:36:45 +0000 (07:36 +0000)]
Merge "MediaRecorder: Handle 24-hour timelapse duration" into oc-dev
am:
6847989333
Change-Id: I0e1c97bbbd1d1606424bdff5c3f57e1802693a4b
TreeHugger Robot [Sun, 2 Apr 2017 07:28:35 +0000 (07:28 +0000)]
Merge "MediaRecorder: Handle 24-hour timelapse duration" into oc-dev
John W. Bruce [Sun, 2 Apr 2017 04:08:51 +0000 (04:08 +0000)]
Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev am:
2fdf283c82
am:
522be45eff
Change-Id: Iacc50444162e7164706c0741a8e7d73581e43008
John W. Bruce [Sun, 2 Apr 2017 04:05:50 +0000 (04:05 +0000)]
Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev
am:
2fdf283c82
Change-Id: I33908703a3af73f91fdd0e135c15cd7800bed39a
TreeHugger Robot [Sun, 2 Apr 2017 04:01:32 +0000 (04:01 +0000)]
Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev
Wei Jia [Sun, 2 Apr 2017 01:09:10 +0000 (01:09 +0000)]
NuPlayer: handle source error correctly. am:
1cbe62c82a
am:
f097f6f475
Change-Id: Ic177f3126961707aee7a153451c253b661e13c3e
Wei Jia [Sun, 2 Apr 2017 01:06:10 +0000 (01:06 +0000)]
NuPlayer: handle source error correctly.
am:
1cbe62c82a
Change-Id: I652f4c7c2748d4b9587d6209411c2cdc3c8df094
Wei Jia [Fri, 31 Mar 2017 00:57:02 +0000 (17:57 -0700)]
NuPlayer: handle source error correctly.
Test: source error is sent to app.
Bug:
35025627
Change-Id: I668bab0de20cf24def028a6a467efceaed54af2b
(cherry picked from commit
231fd353518502e3a05021473ae60e7addd9a46c)
Nicolas Roulet [Sat, 1 Apr 2017 20:48:54 +0000 (20:48 +0000)]
Merge changes I19384478,I71c4df28,I2e0b48c6,I7fb9b899
* changes:
NBLog change timespec to int64_t nanoseconds
NBLog: add buffer hex dump
Add histogram entries (timestamp and flush)
Add unique IDs to log entry
Yin-Chia Yeh [Tue, 21 Mar 2017 02:32:19 +0000 (19:32 -0700)]
Camera: HAL1 recording batching support
Test: Angler HAL1 + batching normal recording mode
Bug:
35997432
Change-Id: If088715ccdb40163f44150c16deed62432692c07
TreeHugger Robot [Sat, 1 Apr 2017 03:03:53 +0000 (03:03 +0000)]
Merge "NuPlayer: handle source error correctly."
Nicolas Roulet [Fri, 31 Mar 2017 02:16:22 +0000 (19:16 -0700)]
NBLog change timespec to int64_t nanoseconds
Bug:
36794556
Test: No change in functionality, everything keeps working
Change-Id: I19384478d94243a9d2a6fb48950963d8b9ec1efa
Ray Essick [Sat, 1 Apr 2017 00:26:30 +0000 (00:26 +0000)]
Merge "Nuplayer logging empty records to media.metrics" into oc-dev am:
32efa2fd44
am:
990edc2f16
Change-Id: I382c44aefd27ea33d46d316b343c769380e66678
Ray Essick [Sat, 1 Apr 2017 00:20:52 +0000 (00:20 +0000)]
Merge "Nuplayer logging empty records to media.metrics" into oc-dev
am:
32efa2fd44
Change-Id: I3546502201086644c02080b029dfcf223761753a
Ray Essick [Sat, 1 Apr 2017 00:09:33 +0000 (00:09 +0000)]
Merge "Nuplayer logging empty records to media.metrics" into oc-dev
Wonsik Kim [Tue, 28 Mar 2017 20:03:53 +0000 (13:03 -0700)]
MediaRecorder: Handle 24-hour timelapse duration
Handle FPS in double / 64-bit integer and allow room for error.
Bug:
34870132
Test: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.MediaRecorderTest
Change-Id: I371d22d9ae70e2d77b08bd6c501e8b34a71592d1
Nicolas Roulet [Wed, 29 Mar 2017 18:27:03 +0000 (11:27 -0700)]
NBLog: add buffer hex dump
Bug:
36724290
Test: create and print entries, check dump matches expected content
Change-Id: I71c4df287535b460838afc2d3ce651744850bf49
Nicolas Roulet [Tue, 21 Mar 2017 23:24:30 +0000 (16:24 -0700)]
Add histogram entries (timestamp and flush)
Add functions to write these entries into log
Add functionality to dump them in dumpsys
Bug:
36490717
Test: Write format entries and histogram entries in the log.
Verify that format entries and histograms are dumped correctly
Change-Id: I2e0b48c63031e62875c08461b98653ecfe1442be
Nicolas Roulet [Thu, 16 Mar 2017 20:54:23 +0000 (13:54 -0700)]
Add unique IDs to log entry
Bug:
36366838
Test: add hash entry to logs and display it in dump
Change-Id: I7fb9b8997e46456331a946e03bfe040c47fa20b8
TreeHugger Robot [Fri, 31 Mar 2017 17:04:10 +0000 (17:04 +0000)]
Merge "Add test config to mtp_ffs_handle_test"
Jeff Tinker [Fri, 31 Mar 2017 05:35:43 +0000 (05:35 +0000)]
Merge "Clearkey plugin didn't handle negative test cases" into oc-dev am:
565a0ed7f8
am:
509850e7eb
Change-Id: Ib0f5e773f661e0b2794add844ea96fe2b8c96212
Jeff Tinker [Fri, 31 Mar 2017 05:33:13 +0000 (05:33 +0000)]
Merge "Clearkey plugin didn't handle negative test cases" into oc-dev
am:
565a0ed7f8
Change-Id: I4833af56de6da7a800215064534c9a9a8b428978
TreeHugger Robot [Fri, 31 Mar 2017 05:29:53 +0000 (05:29 +0000)]
Merge "Clearkey plugin didn't handle negative test cases" into oc-dev
Pawin Vongmasa [Fri, 31 Mar 2017 03:13:20 +0000 (03:13 +0000)]
Merge "Remove dependency on persist.hal.binderization." into oc-dev am:
4d5f24ab62
am:
531f520b37
Change-Id: Icc669dde8a77de202e8623de0ab4613f7148b231
Pawin Vongmasa [Fri, 31 Mar 2017 03:08:26 +0000 (03:08 +0000)]
Merge "Remove dependency on persist.hal.binderization." into oc-dev
am:
4d5f24ab62
Change-Id: Id7ffcbf4782ef588d90e5befb59294048fd5dcfb
TreeHugger Robot [Fri, 31 Mar 2017 03:01:48 +0000 (03:01 +0000)]
Merge "Remove dependency on persist.hal.binderization." into oc-dev
Hangyu Kuang [Fri, 31 Mar 2017 01:26:24 +0000 (01:26 +0000)]
Merge "media: Handle STOP action properly." into oc-dev am:
02b96f062a
am:
50c746b820
Change-Id: I4d356bb6e8c81d95a37038f27fe364218e217fbe
Hangyu Kuang [Fri, 31 Mar 2017 01:19:53 +0000 (01:19 +0000)]
Merge "media: Handle STOP action properly." into oc-dev
am:
02b96f062a
Change-Id: If9aa281a7725685fdc60b75bb50020f3a3ec61e3
TreeHugger Robot [Fri, 31 Mar 2017 01:15:09 +0000 (01:15 +0000)]
Merge "media: Handle STOP action properly." into oc-dev
Praveen Chavan [Fri, 31 Mar 2017 01:06:43 +0000 (01:06 +0000)]
Merge "libstagefright: Add error handling in mediacodecsource" into oc-dev am:
23e3ef3497
am:
3454781419
Change-Id: I4e58059ac348f93d1e1f103a6bf5679d7cb2dc0c
Wei Jia [Fri, 31 Mar 2017 00:57:02 +0000 (17:57 -0700)]
NuPlayer: handle source error correctly.
Test: source error is sent to app.
Bug:
35025627
Change-Id: I668bab0de20cf24def028a6a467efceaed54af2b
Praveen Chavan [Fri, 31 Mar 2017 00:49:32 +0000 (00:49 +0000)]
Merge "libstagefright: Add error handling in mediacodecsource" into oc-dev
am:
23e3ef3497
Change-Id: I0d4c203b7b6ffc3290ca97af3dfdbe36cd6de197
TreeHugger Robot [Fri, 31 Mar 2017 00:40:34 +0000 (00:40 +0000)]
Merge "libstagefright: Add error handling in mediacodecsource" into oc-dev
Ray Essick [Wed, 29 Mar 2017 22:16:44 +0000 (15:16 -0700)]
Implement metrics 'summarizers'
The summarizers collet similar records and bunch them to save space.
So a string of extractor operations that crack the same format audio
will be combined into a single record with a new "count=#" attribute.
Summarizers will sum appropriately. The current example is in the
Player summarizer -- it knows to sum the frame counts and times
(duration and playing) as part of the summarization.
Bug:
36736083
Test: lots of 'dumpsys -summary' manual examination
Change-Id: I325c2d2b25720d384bcc75b73c97e5b3d8fa9731
Phil Burk [Tue, 28 Mar 2017 17:25:21 +0000 (10:25 -0700)]
libaaudio: implement getTimestamp for legacy path
Fix:
36659408
Test: CTS test_aaudio.cpp
Signed-off-by: Phil Burk <philburk@google.com>
Change-Id: Ic73e69a3747b2daa1df5757650f897a58511e571
TreeHugger Robot [Thu, 30 Mar 2017 23:25:09 +0000 (23:25 +0000)]
Merge "media: Support setting stopTime in MediaSource"
Jeff Tinker [Thu, 30 Mar 2017 03:42:37 +0000 (20:42 -0700)]
Clearkey plugin didn't handle negative test cases
Part of VTS tests for drm
Change-Id: Ia89aa51ec9018e633fd8b04bfeceb5fe4e631daa
related-to-bug:
32815560
Phil Burk [Thu, 30 Mar 2017 22:33:34 +0000 (22:33 +0000)]
Merge "libaaudio: change aaudio_audio_format_t to aaudio_format_t" into oc-dev am:
eb12e8bd16
am:
1826e6751f
Change-Id: Ib17575c4932d5f87c57a79d8eaa893d6154d313b
Phil Burk [Thu, 30 Mar 2017 22:31:13 +0000 (22:31 +0000)]
Merge "libaaudio: change aaudio_audio_format_t to aaudio_format_t" into oc-dev
am:
eb12e8bd16
Change-Id: Iff4593bcb4dd3874d896ba74b76fed8198a4b906
Phil Burk [Thu, 30 Mar 2017 22:23:48 +0000 (22:23 +0000)]
Merge "libaaudio: change aaudio_audio_format_t to aaudio_format_t" into oc-dev
Praveen Chavan [Wed, 24 Aug 2016 07:17:28 +0000 (00:17 -0700)]
libstagefright: Add error handling in mediacodecsource
During camcorder recording, if encoder throws an error,
it intimates error to media codec source.
In such error cases, added functionality to stop puller
and clean up the graph to avoid memory leaks.
Bug:
34870133
Test: Video Recording.
Author: Uma Mehta <umamehta@codeaurora.org>
Change-Id: I487d96f855f541033e8ec7872e86d00bafb96daf
Hangyu Kuang [Mon, 27 Mar 2017 22:12:52 +0000 (15:12 -0700)]
media: Support setting stopTime in MediaSource
Also, add the support to CameraSource and AudioSource to stop accurately.
Bug:
35925528
Test: CTS test and normal camera recording.
Change-Id: I817a9fa285134929faec389c0364d0d9fb6208f6
Hangyu Kuang [Thu, 30 Mar 2017 19:39:38 +0000 (12:39 -0700)]
media: Handle STOP action properly.
Release all buffers and set mEndOfStream when handling STOP action.
Bug:
36682265
Test: Video Recording and MediaRecorder CTS test.
Change-Id: I2f40f0dca4e0b062ab43bfc5e6a646f649fdc524
OSDN Git Service
