merge #1
Merged
merge #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Camera:CameraService: Added lock on mHIDLMemPoolId in QDataCallback.. securing mHIDLMemPoolId (unordered_map variable) from multithreading. Change-Id: I3fbe4ad836c2abbd512e3728cf49f9424b726ba0
…aCallback
Issue: Camera is getting stuck due to mHIDLMemoryMapLock when called for
QDataCallback then unregister memory from HAL.
Solution: Releasing mHIDLMemoryMapLock after reading mHIDLMemoryMap variable
Change-Id: I7239f6eb6a9dec67393e11b83d0ef6c986215940
Add new AMediaCodec_getBufferFormat api to get format of the buffer of specified index. Change-Id: Ib5d6537b601dc8ce9c5c0096485637e0cf44a16a
SKULSHADY
pushed a commit
that referenced
this pull request
Dec 3, 2019
Reporting video on upon first queue/dequeue buffer activity, off after a period of inactivity (3 sec currently). bug: 138381810 test: Manual testing for now; unit tests will come after. With BatteryStatService instrumented to print out noteVideo*: Test case #1: Camera recording (using GCA): Camera creates encoder immediately when Video tab is entered, but recording won't start until button is pressed. After recording is stopped, a new encoder is again created to prepare for next session. So under old scheme, video is on as soon as we're in Video tab, and off/on even pairs are seen when video is stopped. Video stats is basically always On when we're in video tab. With this CL one should see: - There shouldn't be videoOn when Video tab is first entered - Start recording and there should be a videoOn. - Stop recording and there should be a videoOff, AND videoOn shouldn't immediately follow. - Kill camera app during active recording, video should be restored to Off. Test case #2: Playback of video clips in Photos with pause With old scheme pausing state will be videoOn because codec instance is still there. With new scheme, videoOff should come after video is paused for 3 sec, and video On should come again when video is resumed. Change-Id: Ifa8aa5d8c2c95fa25393fcb936e6e54578716783
SKULSHADY
pushed a commit
that referenced
this pull request
Mar 21, 2023
Do not hold lock when IPC call is expected from HAL. C2SurfaceSyncObj is shared lock between framework and HAL. HAL process can have only one thread to handle IPC from HAL to framework. Therefore Holding C2SurfaceSyncObj from HAL during IPC call could trigger deadlock. The exact scenario is as follows. Thread #1:(HAL -> framework IPC) HIDL call onInputBuffersReleased() calls to feedInputBufferIfAvailable(). Since this is using HAL IPC thread, this will block Thread #3. This is waiting for mOuput mutex which is held by Thread #2. Thread #2:(framework) discardBuffer() holds mOutput mutex which blocks Thread #1. But this is waiting for C2SurfaceSyncObj which is held by Thread #3. Thread #3:(HAL) Dtor of C2BufferQueueBlockPoolData is holding C2SurfaceSyncObj, therefore this will block #2. This thread is waiting for HIDL IPC thread to be free in order for 'igbp->cancel()', but HIDL IPC thread is already occupied by Thread #1. Bug: 246707566 Test: atest android.media.decoder.cts.AdaptivePlaybackTest Test: atest android.media.decoder.cts.DecoderTest Change-Id: I6a9540d3b4d03806cd40bb4f89a234a6b77758a9 Merged-In: I6a9540d3b4d03806cd40bb4f89a234a6b77758a9
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.