summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ \
| * | | | | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When seeking multiple times it is possible that some seeks are discarded in AwesomePlayer, which causes unwanted jumps to faulty positions. The reason is that a seek flag is reset twice in AwesomePlayer. At first when the video seek is completed and then again when the audio seek is completed. If a new seek is made after the previous video seek completed but before the previous audio seek completed, the new seek position is discarded by the previous audio seek completion. This fix makes sure that the seek flag is reset only when video has completed the seek. Change-Id: I8f8741d4cb8682345f1d1855bbad57c05f4e3c8d
* | | | | | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
|\ \ \ \ \ \
| * | | | | | libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change log macro define so it can't be confused for a C++11 string literal Change-Id: Idcc8085735177aa3313fdea66dc0736cca749f9b Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-114-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix c++11 narrowingsynergydev2013-10-254-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The best fix for these narrowing violations is to use static casting As an example, this change would the following for libnaio: error: non-constant-expression cannot be narrowed from type 'uint32_t' (aka 'unsigned int') to 'long' in initializer list const struct timespec req = {0, ns}; ^~ Change-Id: I04ed1de4497dc19772194afef3ebf8fe0c8b82bc
* | | | | | | | Merge "Frameworks: AudioFlinger: Fix effects memory leak"Glenn Kasten2014-01-101-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Frameworks: AudioFlinger: Fix effects memory leakYu Yezhong2013-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by: csheng@marvell.com Change-Id: I4e3032fb34643902f98e8fd7c8e894b6452324c9 Signed-off-by: Yu Yezhong <yuyezhong@gmail.com>
* | | | | | | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If segment duration is specified with decimal value only the integer value will be used, causing the stream duration to be wrong. Reported to Android public issue tracker: https://code.google.com/p/android/issues/detail?id=56223 Change-Id: I34fb7a81af6ad3d9a214228cfe3724636ebf5ab5
* | | | | | | | Merge "Change M4OSA_ERR_CREATE to return unsigned integer."Narayan Kamath2014-01-081-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Change M4OSA_ERR_CREATE to return unsigned integer.Ashok Bhat2014-01-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While M4OSA_ERR is defined as M4OSA_UInt32, MOSA_ERR_CREATE is defined to return M4OSA_Int32. This leads to signed/unsigned comparison warnings. M4OSA_ERR_CREATE has been changed to return M4OSA_UInt32 to fix this issue. Change-Id: I71a5c50a95c7f296469604b486a1d3969d302a3f Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-213-0/+15
|\ \ \ \ \ \ \
| * | | | | | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-213-0/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, do not offload LD and ELD AAC decoding because there is no way to know if it is supported by the audio DSP implementation. The longer term fix will be to have mapMimeToAudioFormat() use the audio object type in track metadata to refine the AAC format and the audio HAL list supported AAC profiles. Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
* | | | | | | Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-211-17/+23
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix HE AAC SBR sampling rate reading for explicit signaling. Bug: 11697128. Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
* | | | | | Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-12-182-14/+14
|\ \ \ \ \ \
| * | | | | | libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding the use of GCC extensions improves code portability Change-Id: I9edbedc5c8ad4aa46ca54bc2e28280441431a530
* | | | | | Merge "libstagefright: Delay release of wakelock in TimedEventQueue"Eric Laurent2013-12-172-6/+9
|\ \ \ \ \ \
| * | | | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay release of wakelock in the TimedEventQueue to after an event has been processed. This ensures AP shutdown does not happen while an event is ready but hasn't been processed yet. Bug: 11976087. Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
* | | | | | Merge "audioflinger: check for condition before waiting"Eric Laurent2013-12-171-1/+6
|\ \ \ \ \ \
| * | | | | | audioflinger: check for condition before waitingHaynes Mathew George2013-12-171-1/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncCallbackThread must check for any condition that has already been satisfied before waiting. Bug: 11824817 Change-Id: Ic8c2090d521ecd6a30b76ee75635258d35eb1eff
* | | | | | Merge "AudioTrack: fix position callback after restore"Eric Laurent2013-12-171-1/+0
|\ \ \ \ \ \
| * | | | | | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring an AudioTrack, the next position callback point should not be modified and set ahead of current buffer head. Otherwise, as frames are dropped, the new position is never reached and an application relying on position callbacks to reload the buffer would be stalled. Bug: 11868603. Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
* | | | | | Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-179-4/+53
|\ \ \ \ \ \
| * | | | | | update offloaded audio track sampling rateEric Laurent2013-12-179-4/+53
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | | | | | Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-172-11/+14
|\ \ \ \ \ \
| * | | | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-042-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I158f147295eebcea96e4047d7618069bc48bdd7d
* | | | | | | Merge changes Ia684fde5,I58fcb526Andy McFadden2013-12-115-14/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix the help text screenrecord fixes
| * | | | | | | Fix the help textAndy McFadden2013-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pesky bloggers. (cherry-pick from Ia8677b054423db292a34e28337431b57804df259) Change-Id: Ia684fde52697ea78fca79de958ef8b31a50e68ba
| * | | | | | | screenrecord fixesAndy McFadden2013-12-115-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to issues identified during code review. (cherry-pick from I2203694acb5c0544878f64f4347d29ad1a0725c4) Change-Id: I58fcb5264fc17b26fac4b03f95d35262e9e199e2
* | | | | | | | Merge "Add "--bugreport" option to screenrecord"Andy McFadden2013-12-1112-99/+8473
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add "--bugreport" option to screenrecordAndy McFadden2013-12-1112-99/+8473
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --bugreport option adds two visible features: (1) a timestamp overlay that (mostly) matches logcat, making it easier to match what appears in the video with what's in the log, and (2) an "info page" at the start of the video that shows the system configuration. Enabling this option adds an additional composition step, increasing the overhead of screenrecord. Depending on the device and circumstances, this may be unnoticeable or very pronounced. If --bugreport is not enabled, the overhead of screenrecord is unchanged. We also now track device orientation changes. This is currently detected by polling surfaceflinger, which is suboptimal. As a result, we detect the rotation too late, and get a weird mixed frame before the start of the animation for 90-degree changes. Also, allow the bit rate to be specified as e.g. "4M" for 4Mbps. Also, --rotate is now deprecated. Bug 11220305 Bug 11136964 (cherry pick from Ibb94b81d2f73547b95d7a47e027da75fab187a4f) Change-Id: I829a91aaca5ab82a07c14172d9e188ec38f14e57
* | | | | | | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0557-339/+1232
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '246053380a9f628405a29a055a3f1f4fba13ed5b': Fix metadata access
| | * \ \ \ \ \ Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| | |\ \ \ \ \ \
| | | * | | | | | Fix metadata accessMarco Nelissen2013-11-152-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metadata string pointers become invalid after setting more metadata, so don't cache them. b/11692062 Change-Id: Iaf1afb24cf53f7fa36f49ce759355693494076e5
| * | | | | | | | am d7e59228: audioflinger: do not use raw pointer for tracksEric Laurent2013-11-152-8/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7e59228caad3867794d847f6bf163c6495e9506': audioflinger: do not use raw pointer for tracks
| | * | | | | | | audioflinger: do not use raw pointer for tracksEric Laurent2013-11-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9da3d95 surfaced a problem caused by the use of a raw pointer to a track in offload thread implementation. Pointers to tracks should always be weak or strong pointers. Bug: 11708529. Change-Id: Ic48632532d186c9be8261f73cefdf824b9fbbd2b
| * | | | | | | | am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-156-5/+21
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7dae71d606ded1dbc2aa9733c3d98ffac57988f2': AwesomePlayer: correct stream type for offload
| | * | | | | | | Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-156-5/+21
| | |\ \ \ \ \ \ \
| | | * | | | | | | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-146-5/+21
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canOffloadStream() function in stagefright utils forces the stream type to AUDIO_STREAM_MUSIC when querying the audio policy manager if a particular track is offloadable or not. This causes MP3 ringtones to be offloaded which is not a validated use case. The fix consists in using the actual stream type read from the AudioSink. Bug: 11410937. Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
| * | | | | | | | am d8a62e25: Camera2: Rework the FPS range vs. FPS single setting detectionEino-Ville Talvala2013-11-142-33/+20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8a62e25ba6520c2531c7a3d32cc8066e1dab776': Camera2: Rework the FPS range vs. FPS single setting detection
| | * | | | | | | Camera2: Rework the FPS range vs. FPS single setting detectionEino-Ville Talvala2013-11-142-33/+20
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give up on current approach of writing out consistent FPS values into parameters that will be read back by the app. - Preserve app's latest set parameters exactly, and compare against them when detecting if a new FPS range or single FPS value has been selected. - Since get() returns exactly what was set(), it doesn't matter if the app calls getParameters() before its next setParameters(), in terms of retriggering FPS selection logic. Before, the behavior varied depending on whether the app re-read the parameters. - As before, if app changes both range and single FPS in a single set call, the range set wins. Otherwise, the value that has changed more recently is used. Bug: 11570973 Change-Id: I72b5e60c3f60e88d55127dd1bda87e26eaf929c6
| * | | | | | | am 4215e616: Merge "audioflinger: fix offload track transition" into klp-devEric Laurent2013-11-141-17/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4215e6166fca9f87a6e9e848b3dfd4ab0d25c954': audioflinger: fix offload track transition
| | * | | | | | Merge "audioflinger: fix offload track transition" into klp-devEric Laurent2013-11-141-17/+24
| | |\ \ \ \ \ \
| | | * | | | | | audioflinger: fix offload track transitionEric Laurent2013-11-121-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that when transitioning from one active offloaded track to the next we flush DSP content if both tracks are not on the same audio session. This happens when switching between two applications playing the same type of content (e.g MP3, stereo, 44.1). In this case, we reuse the same output thread because the track formats are compatible. Bug: 11247103. Change-Id: I2b9031591149adeb70766da5e0d21ff2933a37e8
| * | | | | | | | am 9f357f31: Merge "audioflinger: fix offload resume after drain" into klp-devEric Laurent2013-11-141-5/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f357f319205d52c04a2c8b5cc9d518ddcfdea94': audioflinger: fix offload resume after drain
| | * | | | | | | Merge "audioflinger: fix offload resume after drain" into klp-devEric Laurent2013-11-141-5/+9
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | audioflinger: fix offload resume after drainEric Laurent2013-11-121-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pausing and resuming during the drain, the drain sequence number shuold not be modified otherwise the drain callback will be ignored. This causes failure to notify end of stream to audio player and transition to next song. Bug: 11247103. Change-Id: I2a35c5cc3fd6aa667cdd257f9e9cc8715cef5159
generated by cgit v1.1 at 2024-06-27 11:46:31 +0000