summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Event driven wake for AudioRecordThread notification changesAndy Hung2015-03-181-2/+21
| | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: Iedd1be8725dea32bdba6908b78c5166780a66fec
* Merge "Fix periodic notification timing error for AudioRecord"Andy Hung2015-03-171-2/+5
|\
| * Fix periodic notification timing error for AudioRecordAndy Hung2015-03-131-2/+5
| | | | | | | | Change-Id: I768d8a30c6845372ad7c306ed1bc0ec030ae1804
* | Fix 64-bit build break caused by print typeChong Zhang2015-03-172-4/+4
| | | | | | | | Change-Id: I2239d875420f6926918c1a0dcab31b71c8329d1f
* | Merge "HLS: some fixes for seek with discontinuity."Chong Zhang2015-03-176-104/+173
|\ \
| * | HLS: some fixes for seek with discontinuity.Chong Zhang2015-03-176-104/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - keep old fetcher when seeking, unless the URI is changing. - when restarting after a seek, check discontinuity seq, and queue format change if it's changed. - add a simple kill switch to abort when stop (or pause for seek). - when seeking, if searching for start time goes into 2nd segment, do not signal time discontinuity or reset first PTS. - use setFormat() to set format in AnotherPacketSource, otherwise video/audio flags are not updated and format are not cleared on discontinuities. - do not start queueing video access unit until first IDR after start bug: 19656539 Change-Id: I79108d26964f59ea00d2eeac8f5f9318747f8541
* | | Merge "Update comments"Glenn Kasten2015-03-161-1/+0
|\ \ \
| * | | Update commentsGlenn Kasten2015-03-131-1/+0
| |/ / | | | | | | | | | Change-Id: I37d3c4ce22b74fe8581a886fe5a7f9fef8266dad
* | | Merge "libstagefright: add ProcessInfo to get process priority."Ronghua Wu2015-03-165-66/+56
|\ \ \
| * | | libstagefright: add ProcessInfo to get process priority.Ronghua Wu2015-03-165-66/+56
| | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
* | | | Merge "radio service initial implementation"Eric Laurent2015-03-162-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | radio service initial implementationEric Laurent2015-03-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First implementation of broadcast radio service. This native service runs in mediaserver process and controls broadcast radio hardware modules. There is one ihardware module per broadcast radio class. The service allows serveral clients to control tuners on hardware modules and manages resource conflicts. Change-Id: I21469a084c7ccd65042b8ac5f724d060044c45ab
* | | | Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-161-0/+21
|\ \ \ \
| * | | | libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I73675c7cc3d742b9a1a98d6c0f48dcf17557e2ad
* | | | | Merge "libstagefright: Stop using IGBC::BufferItem"Dan Stoza2015-03-166-21/+25
|\ \ \ \ \
| * | | | | libstagefright: Stop using IGBC::BufferItemDan Stoza2015-03-126-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Depends on frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. This is a member of I187b3a7d05196b6289596afac8fb9a9d4aebff76, but since it was split out from the camera change in frameworks/av, they have to have different change IDs. Change-Id: I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc
* | | | | | avc_util: fix aspect_ratio_idc 14~16Chong Zhang2015-03-131-9/+24
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | bug: 19702519 Change-Id: I00772fe70be27f6a6a051fc0d18ebca64bbac43e
* | | | | Merge "nuplayer: remove prefill cache code"Chong Zhang2015-03-122-104/+27
|\ \ \ \ \
| * | | | | nuplayer: remove prefill cache codeChong Zhang2015-03-122-104/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's only needed if we post Reset to GenericSource's looper, but we now do reset outside NuPlayer or GenericSource's looper. also don't allow buffering percentage to go backward unless there's seek or pause. Change-Id: I1a39df4bc0a685f76d8558c368db1bac92b490c2
* | | | | | Merge "NuPlayer: play out pending frames on discontinuity"Chong Zhang2015-03-126-59/+102
|\ \ \ \ \ \
| * | | | | | NuPlayer: play out pending frames on discontinuityChong Zhang2015-03-106-59/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19567254 Change-Id: Iff689e1eea54283095068d68bcdff4c2674af554
* | | | | | | Fix print format error.Chih-Hung Hsieh2015-03-121-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | Change-Id: Ie3b754e22a4f858a35159abc8eaf00aa4949ab24
* | | | | | Merge "libmediaplayerservice: fix deadlock in dump()"Vineeta Srivastava2015-03-111-0/+5
|\ \ \ \ \ \
| * | | | | | libmediaplayerservice: fix deadlock in dump()Ravi Kumar Alamanda2015-03-111-0/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: Calling dump function while the media clients (sessions) are created and destroyed will result in a deadlock. Description: MediaPlayerService::dump() takes Mutex while calling client::dump() and right after that the strong reference to client is cleared. If there are no references to client object at this moment (which is the case if multiple audio sessions are created and destroyed) then the client destructor gets called which tries to take the same Mutex resulting in a deadlock. Fix: Take a strong reference to client objects and release them only after releasing the Mutex. Bug: 18700631 Author: Sidipotu Ashok<sashok@codeaurora.org> Change-Id: I82c89771de352d2f0d914eb0a3b9fc7bfb6116b0
* | | | | | Merge "mediaplayer: update mAnchorNumFramesWritten when anchor time is updated."Wei Jia2015-03-111-0/+1
|\ \ \ \ \ \
| * | | | | | mediaplayer: update mAnchorNumFramesWritten when anchor time is updated.Wei Jia2015-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the max duration for anchor time. Bug: 19196501 Change-Id: I9b8e0775105e31d47d919afaf49ca1e3d608a2f6
* | | | | | | Merge "ATSParser: handle PID change"Chong Zhang2015-03-111-47/+96
|\ \ \ \ \ \ \
| * | | | | | | ATSParser: handle PID changeChong Zhang2015-03-091-47/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also use original 33bit PTS on first frame, only do wrap around starting from second frame. bug: 19656539 Change-Id: I3733e0f60fe4b9275bef4aef819777852c112710
* | | | | | | | Merge "HLS: misc changes in LiveSession buffering logic"Chong Zhang2015-03-104-264/+181
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | HLS: misc changes in LiveSession buffering logicChong Zhang2015-03-104-264/+181
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary time discontinuity move fetcher to separate looper so that download won't block LiveSession poll buffering at 1 sec interval in LiveSession, and switch bandwidth if necessary use fixed 100ms threshold for resumeUntil bug: 19567254 Change-Id: I911e5041364f0858b43f2312756e173db5870a1e
* | | | | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-1017-91/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change replyID-s from uint32_t to an object Move reply handling into the loopers (to reuse a common mutex) Bug: 19607784 Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
* | | | | | | Merge "fix flush on HW A/V sync tracks"Eric Laurent2015-03-101-0/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix flush on HW A/V sync tracksEric Laurent2015-03-091-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mismatch between track flags on client and server side when HW A/V sync is requested. The audio track was connected to a direct output by the audio policy manager but the client failed to set the direct flag when creating the track resulting in the direct flag not being set in audio flinger. Bug: 19665934. Change-Id: I0a5257b20bf76c9c4d89bc2ad9b44777b81f13bf
* | | | | | Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."Wei Jia2015-03-105-81/+3
|\ \ \ \ \ \
| * | | | | | mediaplayer: move MediaClock from NuPlayer to libstagefright.Wei Jia2015-03-095-81/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I86865e594226419bbbbee217098f96434e43afbe
* | | | | | | Merge "do not do bandwidth estimation if total data downloaded is too small"Chong Zhang2015-03-101-1/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | do not do bandwidth estimation if total data downloaded is too smallChong Zhang2015-03-091-1/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19656539 Change-Id: I0ab9baad31e8953224a37d5aaf816e44780191c0
* | | | | | Merge "drm: use DrmSessionManager for session resource managing."Ronghua Wu2015-03-096-23/+135
|\ \ \ \ \ \
| * | | | | | drm: use DrmSessionManager for session resource managing.Ronghua Wu2015-03-066-23/+135
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ie35184f99c51e7bd94d7c826ffb8e89040a81905
* | | | | | Merge "AnotherPacketSource: return format of first non-discontinuity packet"Chong Zhang2015-03-091-7/+5
|\ \ \ \ \ \
| * | | | | | AnotherPacketSource: return format of first non-discontinuity packetChong Zhang2015-03-091-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19656539 Change-Id: I41a36a48274616c3a65a79bf8446eeadb5595915
* | | | | | | SoftAAC2: reset EOS status after a flushChong Zhang2015-03-091-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:19656539 Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
* | | | | | Merge "Allow TRANSFER_OBTAIN to be used for fast tracks"Glenn Kasten2015-03-091-1/+3
|\ \ \ \ \ \
| * | | | | | Allow TRANSFER_OBTAIN to be used for fast tracksGlenn Kasten2015-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8fa20c26f076567b38210af4a680fe1cb2eacee4
* | | | | | | Merge "AudioTrack::obtainBuffer() now returns number of non-contiguous frames"Glenn Kasten2015-03-091-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioTrack::obtainBuffer() now returns number of non-contiguous framesGlenn Kasten2015-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f61d7e3d057c3254babe456b4aa0f6a1809da55
* | | | | | | Merge "AudioTrack::releaseBuffer parameter is const *"Glenn Kasten2015-03-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioTrack::releaseBuffer parameter is const *Glenn Kasten2015-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31ac20863107de05b83cd7f8cd7dd61bed98e456
* | | | | | | Merge "AudioTrack obtain/release buffer comments"Glenn Kasten2015-03-091-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioTrack obtain/release buffer commentsGlenn Kasten2015-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0eb178d1ab4eea7f72f4c55852c19b216ca55f5f