summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-devAndy Hung2014-10-073-52/+64
|\
| * NuPlayer: wait for renderer flush before decoder shutdownAndy Hung2014-10-063-52/+64
| | | | | | | | | | Bug: 17679341 Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
* | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \
| * | Recover from errorsMarco Nelissen2014-10-061-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the AAC decoder encounters an error, the lists of submitted and consumed sizes need to be resynchronized, to prevent timestamp drift. Bug: 17638652 Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8
* | | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-071-1/+28
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." ↵Chong Zhang2014-10-061-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | into lmp-dev
| * | | StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.Praveen Chavan2014-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meta-data mode for input is preferred (rather required) for recording with camera v1. This capability is queried and enabled per codec; enable it for VP8 hardware encoder. Bug: 17664960 Change-Id: I4735c61670ebe0a555002cc25ef3ed823ab02f1f
* | | | Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
|\ \ \ \
| * | | | NuPlayer: add audioDecoderStillNeeded.Ronghua Wu2014-10-032-3/+10
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 17752358 Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af
* | | | Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into ↵Chong Zhang2014-10-041-5/+14
|\ \ \ \ | |/ / / |/| | | | | | | lmp-dev
| * | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-5/+14
| |/ / | | | | | | | | | | | | Bug: 17514968 Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
* | | Merge "NuPlayer: don't restart AudioSink when torn down due to pause ↵Ronghua Wu2014-10-033-5/+21
|\ \ \ | |/ / |/| | | | | timeout." into lmp-dev
| * | NuPlayer: don't restart AudioSink when torn down due to pause timeout.Ronghua Wu2014-10-033-5/+21
| | | | | | | | | | | | | | | Bug: 17752358 Change-Id: I232d105480139bfc0b991bcd8e001930e577cf30
* | | Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-devRonghua Wu2014-10-032-3/+11
|\ \ \
| * | | stagefright: fix fake-stride handling for H263 SW decoderRonghua Wu2014-10-022-3/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - Use outputBufferWidth/Height to init H263 decoder. - Handle stride change when using fake stride. Bug: 17773094 Bug: 17326758 Change-Id: I66ce7b9c650383456923d75417c590e3a8a814e7
* | | Merge "send available codec buffer count with codec notification" into lmp-devChong Zhang2014-10-032-6/+27
|\ \ \
| * | | send available codec buffer count with codec notificationChong Zhang2014-10-022-6/+27
| | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
* | | | Merge "mediarecorder: set level if setting default profile" into lmp-devLajos Molnar2014-10-022-0/+58
|\ \ \ \
| * | | | mediarecorder: set level if setting default profileLajos Molnar2014-10-022-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
* | | | | Merge "NuPlayerDecoder: postpone input message processing when it's not ↵Wei Jia2014-10-022-8/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | dequeued." into lmp-dev
| * | | | | NuPlayerDecoder: postpone input message processing when it's not dequeued.Wei Jia2014-10-022-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17622642 Change-Id: I67608121bf70d6acb152e4aa64892b11bf167e8c
* | | | | | Merge "stagefright: move math templates into AUtils.h" into lmp-devLajos Molnar2014-10-023-35/+142
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | stagefright: move math templates into AUtils.hLajos Molnar2014-10-013-35/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add unit test for math templates Bug: 17676461 Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319
* | | | | Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-devAndy Hung2014-10-026-28/+103
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NuPlayer: Fix flush mode decoder error handlingAndy Hung2014-10-016-28/+103
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly handle each flush mode upon decoder error. Do not clear out affected decoder immediately. Alter logcat messages for better diagnostics. Bug: 17638878 Bug: 17679341 Change-Id: I219796c04d65d7c4dd61c0d4f99f9f580241a68b
* | | | Merge "camera2: Force DNG previews to render with LSC map." into lmp-devRuben Brunk2014-10-021-1/+3
|\ \ \ \
| * | | | camera2: Force DNG previews to render with LSC map.Ruben Brunk2014-10-011-1/+3
| |/ / / | | | | | | | | | | | | | | | | Bug: 17688063 Change-Id: I7f60a3465ab608a6b68d1e38493895cbd40bd7ae
* | | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-012-2/+14
|\ \ \ \
| * | | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-012-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17470065 Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
* | | | | Merge "GenericSource: support disconnect before NuCachedSource2 is created" ↵Robert Shih2014-10-013-9/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-013-9/+43
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 17672488 Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
* | | | | Merge "NuCachedSource2: fix disconnect process" into lmp-devRobert Shih2014-10-011-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | NuCachedSource2: fix disconnect processRobert Shih2014-09-301-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - clear mAsyncResult - return early from reads if mDisconnecting is set Bug: 17696761 Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2
* | | | Merge "Check if info for uri is available" into lmp-devMarco Nelissen2014-09-301-0/+4
|\ \ \ \
| * | | | Check if info for uri is availableMarco Nelissen2014-09-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before retrieving it. Bug: 17683986 Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
* | | | | mediaplayer: make frame-accurate avsync configurableLajos Molnar2014-09-291-0/+20
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | disable by default Bug: 17686015 Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
* | | | Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-263-2/+36
|\ \ \ \ | |/ / / |/| | |
| * | | audio: fix stream type for accessibility usageEric Laurent2014-09-253-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that accessibility prompts are heard when a ringtone is active by forcing stream type to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE. Bug: 17558149. Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
* | | | Merge "NuPlayer: use format obtained from source to tell if video exists." ↵Wei Jia2014-09-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17374216 Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
* | | | | Fix SoftAAC2 flushMarco Nelissen2014-09-251-4/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there were less than a full frame worth of samples in the ring buffer, then flush would loop forever trying to empty the ring buffer. Bug: 17646525 Change-Id: I68ec87352a91ce3a96d05e9b3f60a6e7975f9156
* | | | Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
|\ \ \ \
| * | | | NuPlayer: Fix decoder error handlingAndy Hung2014-09-243-15/+40
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon error, release MediaCodec after flushing data. Report errors when they occur with ALOGE. Fix onInputBufferFilled mInputBufferIsDequeued check. Bug: 17423087 Bug: 17622642 Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
* | | | Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-devLajos Molnar2014-09-251-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix Widevine classic playback errors with NuPlayerJeff Tinker2014-09-241-1/+8
| | | | | | | | | | | | | | | | | | | | bug: 17589961 Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
* | | | stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-241-6/+6
| | | | | | | | | | | | | | | | | | | | Bug: 17648616 Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
* | | | Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-devLajos Molnar2014-09-252-4/+17
|\ \ \ \
| * | | | mediaplayer: handle bad input in VideoFrameSchedulerLajos Molnar2014-09-242-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17626098 Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
* | | | | Merge "stagefright: use frame height if slice height is 0" into lmp-devLajos Molnar2014-09-251-7/+14
|\ \ \ \ \