summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Don't crash if no timescale was givenMarco Nelissen2013-05-291-0/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | b/9175577 Change-Id: Ie159a9c9b42e6c8d9366d0ef6a607234af569e36
* | | | Merge "Add support for MPEG editlist gapless info"Marco Nelissen2013-05-231-0/+61
|\ \ \ \
| * | | | Add support for MPEG editlist gapless infoMarco Nelissen2013-05-231-0/+61
| | | | | | | | | | | | | | | | | | | | Change-Id: I862d89c805d738db9bdf81a8f1c5b317ff968dff
* | | | | stagefright: BufferProducer updatesLajos Molnar2013-05-233-39/+42
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update BufferQueue and ConsumerBase users to new BufferQueue API, to allow BufferQueue slots to be reused. Buffer consumers generally now need to track the unique frameNumber belonging to each frame acquired if they are using BufferQueue directly. Otherwise, they can simply track the graphicBuffer. Change-Id: I30ee3158cf40fb10bbd085241646d5f1128ee480 Signed-off-by: Lajos Molnar <lajos@google.com> Related-to-bug: 7093648
* | | | stagefright: SoftVP8: Handle EOS flag on frames with content.Lajos Molnar2013-05-221-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftVP8 decoder ignored frame content if EOS flag was set on input frame. Now, decode the frame first, unless it is empty. Change-Id: Id105a9eb86103a61390af3de60cae2507028e2d1 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9091495
* | | | am 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" ↵Jamie Gennis2013-05-211-11/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '9545b6707e8c2213806c71fa9b0cae608b8bc032': Avoid a deadlock during EmptyBufferDone
| * | | am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f21daf4718bbd5662eae843f5a56e039bd34a2f4': Avoid a deadlock during EmptyBufferDone
| | * | Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-201-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deadlock happens withen in the case where we use an OMX encoder with a GraphicBufferSource. Bug: 8329090 Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
* | | | wifi-display: add support for metadata mode on encoder outputChong Zhang2013-05-1714-49/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass buffer_handle_t from encoder output to HDCP encryptor input Bug: 8968123 Change-Id: Iea8007ce568641e213fd2e3cf6947a6f7a95746c
* | | | am 074eb387: am e2dfa5a4: Merge "update to Fence::waitForever() API change" ↵Mathias Agopian2013-05-172-3/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '074eb387091ca464257601a2d23020e3e10a6915': update to Fence::waitForever() API change
| * | | am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-172-3/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e2dfa5a4ea3459b155b4b403b7dafe2116d960d4': update to Fence::waitForever() API change
| | * | Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-172-3/+2
| | |\ \
| | | * | update to Fence::waitForever() API changeMathias Agopian2013-05-162-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8988871 Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
* | | | | am b07d3c48: am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc': Adjust timestamp scale
| * | | | am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd': Adjust timestamp scale
| | * | | Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Adjust timestamp scaleAndy McFadden2013-05-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferQueue item timestamps are in nanoseconds, MediaCodec buffer timestamps are in microseconds. Adjust. Bug 8988357 Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b
* | | | | am b5b2d03f: am 99f27cdf: wifi-display: retry UDP read/write to improve ↵Chong Zhang2013-05-161-4/+25
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | connection robustness * commit 'b5b2d03fc2c154a613ba68b599cd474b3e6ccec3': wifi-display: retry UDP read/write to improve connection robustness
| * | | | am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6': wifi-display: retry UDP read/write to improve connection robustness
| | * | | wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
| | |/ / | | | | | | | | | | | | | | | | Bug: 8922753 Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8
| * | | am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into ↵Chong Zhang2013-05-144-125/+186
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876': wifi-display: misc fixes for M3 response parsing
| | * | Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-devChong Zhang2013-05-154-125/+186
| | |\ \
| | | * | wifi-display: misc fixes for M3 response parsingChong Zhang2013-05-114-125/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix wfd_video_format parsing w/ multiple H264-Codec - fix handling of CRLF at end of M3 response - fix missing wfd_client_rtp_ports Bug: 8871667 Bug: 8875749 Change-Id: Idb0b5605313bba6ff067bcd765512bbed42e5202
| * | | | am 375379a4: Merge "Fix unreleased mutex in ToneGenerator stopTone()" into ↵Eric Laurent2013-05-141-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '375379a4cb8dd7bfbd745407b5462bdf79888153': Fix unreleased mutex in ToneGenerator stopTone()
| | * | | Fix unreleased mutex in ToneGenerator stopTone()Eric Laurent2013-05-131-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 09108ade introduced a regression by not releasing the ToneGenerator mutex before exiting in case of error. Bug: 8852855 Change-Id: I8ba2755b218842e2034ed8dbd54b18bf2a5fc571
| * | | am 0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into ↵Marco Nelissen2013-05-101-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '0d24eb5e89963663150d38a320ec17244d39edf2': Don't purge effects we're about to start using
| | * | Don't purge effects we're about to start usingMarco Nelissen2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By acquiring the new session id before releasing the old, we prevent purging existing effects with the new session id that aren't currently attached but will be once the player is switched to the new session id. b/8767565 Change-Id: I703881b69c5accd8832ac834246925a20ada4c21
| * | | am 519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-devMarco Nelissen2013-05-102-2/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '519f7624696cf43a7fafe21fd2108deaad0bfe4a': Don't render buffers that have size 0
| | * | Don't render buffers that have size 0Marco Nelissen2013-05-102-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | b/8857451 Change-Id: I12a31a2f85af76602db9e6f0ec80632954b3f7ed
| * | | am 4170f515: Merge "Remove timing jitter during startup of audio" into ↵Eric Laurent2013-05-031-0/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '4170f515cd6148b952a07fcbe23364f5c76a2d9c': Remove timing jitter during startup of audio
| | * | Merge "Remove timing jitter during startup of audio" into jb-mr2-devEric Laurent2013-05-031-0/+21
| | |\ \
| | | * | Remove timing jitter during startup of audioGlenn Kasten2013-04-231-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced recently, that increased timing jitter during the startup of the FastMixer and AudioTrack callback threads. The regression was to make requestPriority() asynchronous as a way to avoid an apparent priority inversion in system_server. This means that the target thread could run briefly with the initial priority, before the new priority takes effect. This change removes the startup jitter for FastMixer, by making the requestPriority() synchronous again for that case. It doesn't matter that this restores the priority inversion involving normal mixer thread, because it happens during startup of both threads. The change also removes the startup jitter for the AudioTrack callback thread, by having the target thread check whether the requestPriority() has completed yet. If not, the target thread blocks with a timeout until the priority boost finishes. Finally, we now log an error message if the expected priority boost doesn't happen. Bug: 8698989 Change-Id: Id590e9a274b70ec1ba85b44a585ee37a22e41cbc
| * | | | am f2ae7606: A reference to the psi section data could become invalid if moreAndreas Huber2013-05-021-3/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f2ae760602a948598a168ad43673bfbd9d50fc6b': A reference to the psi section data could become invalid if more
| | * | | A reference to the psi section data could become invalid if moreAndreas Huber2013-05-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sections were added to the KeyedVector. Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3 related-to-bug: 8754565
| * | | | am 09f842b0: Merge "The software FLAC encoder now properly signals an error ↵Andreas Huber2013-05-022-2/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | if client" into jb-mr2-dev * commit '09f842b03d8f9c0ab5e4541937f8061a7d1bf53d': The software FLAC encoder now properly signals an error if client
| | * | | Merge "The software FLAC encoder now properly signals an error if client" ↵Andreas Huber2013-05-022-2/+20
| | |\ \ \ | | | | | | | | | | | | | | | | | | into jb-mr2-dev
| | | * | | The software FLAC encoder now properly signals an error if clientAndreas Huber2013-05-012-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempts to configure it with too large an input buffer size. Previously this would lead to memory corruption during encoding due to a typo. Change-Id: I229b07b7dbe87fb8424419706671b66a8d58ec6b related-to-bug: 8778893
| * | | | | am 00bbca96: Merge "Don\'t even try to verify the native resolution validity ↵Andreas Huber2013-05-021-2/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a" into jb-mr2-dev * commit '00bbca96684cb995458fedd2e1f9dec5f047100b': Don't even try to verify the native resolution validity a
| | * | | | Merge "Don't even try to verify the native resolution validity a" into ↵Andreas Huber2013-05-021-2/+11
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | | | Don't even try to verify the native resolution validity aAndreas Huber2013-05-011-2/+11
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | miracast sink advertises, even if it were valid we couldn't use it since it's not consistently implemented by sinks. Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af related-to-bug: 8772006
| * | | | | am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output ↵Andreas Huber2013-05-021-0/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format change" into jb-mr2-dev * commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454': Fix miracast source code to ignore the encoder output format change
| | * | | | Merge "Fix miracast source code to ignore the encoder output format change" ↵Andreas Huber2013-05-021-0/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev
| | | * | | | Fix miracast source code to ignore the encoder output format changeAndreas Huber2013-05-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it doesn't care about. Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805 related-to-bug: 8616651
| * | | | | | am bf2bb00e: Merge "Fix reverb at 48kHz" into jb-mr2-devEric Laurent2013-05-011-6/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bf2bb00e29f69b0de1cde8d31a6f1431d984388b': Fix reverb at 48kHz
| | * | | | | Merge "Fix reverb at 48kHz" into jb-mr2-devEric Laurent2013-05-011-6/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix reverb at 48kHzEric Laurent2013-05-011-6/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LVM reverb wrapper had a test to only accept input sampling rate of 44.1 kHz. As the LVM reberb engine supports multiple sampling rate we can remove this test. The fix for issue 8512027 (commit 2a9c5cd4) caused a regression because the framework now checks the return code of the effect configure command and ignores subsequent commands in case of error. Bug: 8630044 Change-Id: I3146871f1ad8f7945a2e63ea763dd7b87368337d
| * | | | | am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into ↵Andreas Huber2013-05-012-85/+261
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'deff69107566cfe76dc33eff1b4250893956a244': Support MediaCodec::getOutputFormat for encoders
| | * | | | Support MediaCodec::getOutputFormat for encodersAndreas Huber2013-04-302-85/+261
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codec specific data is provided as part of the MediaFormat if available. Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e related-to-bug: 8616651
| * | | | am dd309b97: Merge "Handle the case where an asynchronous prepare was ↵Andreas Huber2013-04-252-0/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | initiated and then" into jb-mr2-dev * commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86': Handle the case where an asynchronous prepare was initiated and then
| | * | | Handle the case where an asynchronous prepare was initiated and thenAndreas Huber2013-04-252-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mediaplayer was reset. Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41 related-to-bug: 8688986