summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-134-21/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935149 Change-Id: I6bb5dd654e498a7153410afc052c2c8f7f35e44d
| * | | | | | | | | am e760de61: Merge "NuPlayerDriver: request seek notification when ↵Wei Jia2014-10-131-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare*() is called in STOPPED state." into lmp-dev * commit 'e760de61d9a662b1fbfda96ac34aaa246c2711bb': NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
| | * | | | | | | | Merge "NuPlayerDriver: request seek notification when prepare*() is called ↵Wei Jia2014-10-131-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in STOPPED state." into lmp-dev
| | | * | | | | | | | NuPlayerDriver: request seek notification when prepare*() is called in ↵Wei Jia2014-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STOPPED state. Bug: 17596535 Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8
| * | | | | | | | | | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-132-1/+34
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| | * | | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-132-1/+34
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-132-1/+34
| | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
| * | | | | | | | | | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded ↵Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state." into lmp-dev * commit '7225187b5126b921e40f0221db158a16c366344e': ACodec: process deferred messages when entering Loaded state.
| | * | | | | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into ↵Wei Jia2014-10-131-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | | | | | | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17792260 Change-Id: Ie8154cf41be5672fc8a9f3a2a82b7ede0a8b828f
| * | | | | | | | | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ↵Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat"" into lmp-dev * commit '380757ba5c927015d403e3b97cc418413330453e': Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
| | * | | | | | | | Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" ↵Guang Zhu2014-10-131-21/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 fix 64-bit builds This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b. Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68
| * | | | | | | | | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| | * | | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-101-0/+21
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
| * | | | | | | | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ↵Lajos Molnar2014-10-101-9/+15
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'a4c3d8f0f9aab53b106d95e6139e0465908909f4': MediaCodec: fix onError and onInputBufferAvailable
| | * | | | | | | | Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-devLajos Molnar2014-10-101-9/+15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MediaCodec: fix onError and onInputBufferAvailableLajos Molnar2014-10-091-9/+15
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't call onInputBufferAvailable if we created an input surface - keep component name alive if an error occurs Bug: 17934966 Change-Id: I396c6e6cfd9fa589a1a95c6169492089255e6993
| * | | | | | | | | am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video ↵Wei Jia2014-10-102-1/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only case." into lmp-dev * commit '185a295d4518878d5e2bca7b7c3e51df44492df1': NuPlayerRenderer: adjust anchor time correctly for video only case.
| | * | | | | | | | Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." ↵Wei Jia2014-10-102-1/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | | | | NuPlayerRenderer: adjust anchor time correctly for video only case.Wei Jia2014-10-092-1/+19
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17922171 Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
| * | | | | | | | am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into ↵Eric Laurent2014-10-081-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'ce26e9d13da7a4a4443b9be775bb12fb3ac97d23': AudioTrack: fix AudioTrackThread crash upon exit
| | * | | | | | | Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-devEric Laurent2014-10-081-0/+3
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | AudioTrack: fix AudioTrackThread crash upon exitEric Laurent2014-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of error during createTrack_l(), there is a possibility that a newly created AudioTrackThread is resumed by requestExit() just after entering the Thread class _threadLoop() but before entering the class threadLoop(). In this case, processAudioBuffer() is executed once with mCblk == 0 and we assert. Bug: 17894033. Change-Id: I93d0d0d4dbf14bcb88dad23e6ad49d2ecd47badd
| * | | | | | | | am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder ↵Andy Hung2014-10-073-52/+64
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shutdown" into lmp-dev * commit '73d0a798747c8d022e8a9c8cf4e284ac97508b1e': NuPlayer: wait for renderer flush before decoder shutdown
| | * | | | | | | 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
| * | | | | | | | am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5002d02e545dafbcf129b2e5bccf087e765019e5': Recover from errors
| | * | | | | | | 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
| * | | | | | | | | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ↵Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback" into lmp-dev * commit '584c14c370f141685b7e8963a13ed91584383ca1': stagefright: do not allocate output buffers for tunneled playback
| | * | | | | | | | 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
| * | | | | | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '566a6fba127771c752fd40db84f1e7aafa520ea6': Add -no-integrated-as at local level.
| | * | | | | | | | | am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae38d425fdb3e3fea015c161d635d631172350c3': Add -no-integrated-as at local level.
| * | \ \ \ \ \ \ \ \ \ am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 ↵Chong Zhang2014-10-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hardware encoder." into lmp-dev * commit 'e48b90d634f9e6190a788e6225927d418b11d162': StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
| | * | | | | | | | | | 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
| * | | | | | | | | | | am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4da004d4baef8cc4a631058549216c8d2383824': NuPlayer: add audioDecoderStillNeeded.
| | * | | | | | | | | | 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
| * | | | | | | | | | am f0011d49: Merge "MediaRecorder: only dequeue available buffers from ↵Chong Zhang2014-10-041-5/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec" into lmp-dev * commit 'f0011d49c0f08753dc2dc254c5a70885a9986602': MediaRecorder: only dequeue available buffers from MediaCodec
| | * | | | | | | | | 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
| * | | | | | | | | am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to ↵Ronghua Wu2014-10-033-5/+21
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pause timeout." into lmp-dev * commit 'af1a4dc989d6707116eaefab300ad55124aace66': NuPlayer: don't restart AudioSink when torn down due to pause timeout.
| | * | | | | | | | 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
| * | | | | | | | | am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW ↵Ronghua Wu2014-10-032-3/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder" into lmp-dev * commit 'b220fe0e40bc3752b62a9576fc824634a16fc3ab': stagefright: fix fake-stride handling for H263 SW decoder
| | * | | | | | | | Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-devRonghua Wu2014-10-032-3/+11
| | |\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-06-09 11:42:13 +0000