summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* fix the build by fixing more warnings.Andreas Huber2014-02-113-7/+9
| | | | Change-Id: Ied0ec39eb83b101582702d1e30c21643ccf6353e
* am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the ↵Lajos Molnar2014-02-111-6/+9
|\ | | | | | | | | | | | | next byte requires it" * commit '1c178d3e7b8d037ac8d348922ba841b28eee662f': avcenc: Only do startcode escaping if the next byte requires it
| * am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte ↵Lajos Molnar2014-02-111-6/+9
| |\ | | | | | | | | | | | | | | | | | | requires it" * commit '7eacea1156a3896ee7813cd9a06c535e63c95f6a': avcenc: Only do startcode escaping if the next byte requires it
| | * Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| | |\
| | | * avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Section 7.4.1 in the H.264 standard says that the only valid bytes to follow a sequence that starts with 0x000003 are 0x00, 0x01, 0x02 or 0x03. This makes EncodeDecodeTest pass properly when decoding using OMX.google.h264.decoder, which is strict about the forbidden escape sequences. Change-Id: Ice113d9b934015003ea9cb10d0b21cee4d18d774
* | | | Merge "warnings be gone."Andreas Huber2014-02-11122-207/+446
|\ \ \ \
| * | | | warnings be gone.Andreas Huber2014-02-11122-207/+446
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | | | | Merge "Support "data:" URIs again in mediaplayer..."Andreas Huber2014-02-114-1/+118
|\ \ \ \ \
| * | | | | Support "data:" URIs again in mediaplayer...Andreas Huber2014-02-114-1/+118
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I6dac35c7e606f738a60f985f6dca977dc92c82a4 related-to-bug: 12957757
* | | | | Merge "fix delay when shutting down wifi display"Chong Zhang2014-02-112-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix delay when shutting down wifi displayChong Zhang2014-02-072-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepeaterSource needs to stop SurfaceMediaSource before stopping its looper, otherwise the stop could get queued behind the last read(), which will not return until a new frame comes. Change SurfaceMediaSource stop to signal frame avalable first, so that its read() returns EOS to reader upon stop. Bug: 11677087 Change-Id: Ie331cc8c7f4824fd3930f3e909b53db4463902fb
* | | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-1130-94/+104
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1130-95/+105
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible
| | * | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1130-95/+105
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | | | Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
| | | | | | | | | | | | | | | | Change-Id: I1cd3432c02db1600e49ade67e6a89e39e7a8d3ed
* | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path ↵Glenn Kasten2014-02-101-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | if resampling is required" * commit '4e12dadeec10993d2f77cce96600e73ca0dd86e2': AudioTrack: Never try to use the fast path if resampling is required
| * | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ↵Glenn Kasten2014-02-101-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | is required" * commit '4361749d74113069aafb0620a1189404205c58d0': AudioTrack: Never try to use the fast path if resampling is required
| | * | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-101-0/+6
| | |\ \
| | | * | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless AudioFlinger was built with FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE enabled, AudioFlinger would deny using the fast path (and internally fall back to the normal codepath) when it realized that resampling was required. Since the buffer size calculations within AudioFlinger don't take resampling into account properly (see the calculation below "AUDIO_OUTPUT_FLAG_FAST denied" in audioflinger/Threads.cpp, just below the hunk that this patch changes), make sure AudioTrack doesn't try to use the fast path if resampling is required. This removes the possibility to enable FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE in AudioFlinger since it AudioTrack now won't even try to use the fast path for content that requires resampling, regardless of the AudioFlinger configuration. Change-Id: Icf0f8ad50bf0fdb84657f518c0120aa0535f23f9
* | | | | Merge "Fix regression"Marco Nelissen2014-02-101-1/+1
|\ \ \ \ \
| * | | | | Fix regressionMarco Nelissen2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CTS DecoderTest.testBug11696552 started failing again, and this fixes that Change-Id: I422c3b249a1d5eb25422573d2106d1f142ccfab6
* | | | | | am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the ↵Lajos Molnar2014-02-101-0/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | base class" * commit 'af8a3e29422ec5de5e7f8befbc5253e68729a654': avcenc: Update video port parameters in the base class
| * | | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '7142d10a7a3941b2deb18869a7f7b79462e0aa52': avcenc: Update video port parameters in the base class
| | * | | | Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| | |\ \ \ \
| | | * | | | avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the right parameters are returned on both input and output ports if queried after setting. This also makes sure that the output MediaFormat from the MediaCodec class contains the right video size. Change-Id: I0667b3b4c6bb90331ad0ae7d51388e1bca3d1bbd
| * | | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '61bdaaa18a1d52666827e31bb7980a5784443835': ChromiumHTTPDataSource: Keep track of the redirected URL
| | * | | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| | |\ \ \ \ \
| | | * | | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the code actually match an existing comment in DrmInitialization, which claimed that mURI was the redirected URL and not the original one. Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
* | | | | | | | am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the ↵Lajos Molnar2014-02-101-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output port as well" * commit '25da2f099f657d8b778ce3c03f5d4519e04150cf': SoftVPXEncoder: Set the frame size on the output port as well
| * | | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ↵Lajos Molnar2014-02-101-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well" * commit '88e99f9a5e098ee50019ce85f2b1273b48883f37': SoftVPXEncoder: Set the frame size on the output port as well
| | * | | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure the MediaCodec output MediaFormat contains the right width and height. Change-Id: Ic97af3b5850ebaf563533c3d1cae992be3e4d074
| * | | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc': M3UParser: Fix typo in 8883a38a308
| | * | | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09f8deb40b8b34efd4bfcfab6866b7780f8bae96
* | | | | | | | Fix buildMarco Nelissen2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9196e316dcf7a58096658313bdc925b11b23a7de
* | | | | | | | am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking ↵Marco Nelissen2014-02-101-12/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | for the last slash in a URL" * commit '7cbaf3be54b956727a0c7166c57ef46b4c844b94': M3UParser: Skip query strings when looking for the last slash in a URL
| * | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last ↵Marco Nelissen2014-02-101-12/+22
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slash in a URL" * commit '8519b8a1298d80949edadce9c8f0963ef62cc3ff': M3UParser: Skip query strings when looking for the last slash in a URL
| | * | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
| | |\ \ \ \ \
| | | * | | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
* | | | | | | | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-103-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-073-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c611d1037685d52ccc84efe0fccd6413ec938e9
* | | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-103-2/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '429f2bf7527daf872a1bbdafca8ad28635b84644': frameworks/av: fix errors inside ALOGV
| * | | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2307ccbab9c32a7806f15c2572cfe6ec428f2f5': frameworks/av: fix errors inside ALOGV
| | * | | | | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
| * | | | | | | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-045-0/+253
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd432ce03eccf280d83672f95076b6fbd561047f': [DO NOT MERGE] Support TS + AC3 for ATSC standard
| | * | | | | | | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-035-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
| * | | | | | | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-042-1/+71
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9090338367bd9f3fc5678032332a44d457a4a2fe': [DO NOT MERGE] Support AC3 in stagefright
| | * | | | | | | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
* | | | | | | | | Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-072-10/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix warnings about unused parametersGlenn Kasten2014-02-072-10/+16
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27dc108e2c1f7ffd414bb7ff3d4c349651da6c26
generated by cgit v1.1 at 2024-06-08 15:27:14 +0000