summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 8d9846c0: Merge "Tell surface flinger that we want to protect output buffe...Andreas Huber2012-05-222-0/+180
|\
| * Tell surface flinger that we want to protect output buffers from beingAndreas Huber2012-05-222-0/+180
* | am a6490c65: Only mark the audio player as started if it did so successfully.Andreas Huber2012-05-221-2/+2
|\ \ | |/
| * Only mark the audio player as started if it did so successfully.Andreas Huber2012-05-221-2/+2
* | am 4575beb3: Revert "Stop audio source if AudioPlayer could not be started"Andreas Huber2012-05-221-7/+6
|\ \ | |/
| * Revert "Stop audio source if AudioPlayer could not be started"Andreas Huber2012-05-221-7/+6
* | am c9ef89cd: Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-212-4/+4
|\ \ | |/
| * Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-212-4/+4
* | am d7d79a2b: Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-212-4/+4
|\ \ | |/
| * Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-212-4/+4
* | stagefright avcenc: Use intptr_t for casting pointers to integersMartin Storsjo2012-05-213-9/+9
* | stagefright avcenc: Switch tmp variables to use the right type, to avoid castingMartin Storsjo2012-05-212-53/+50
* | am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL po...James Dong2012-05-211-5/+5
|\ \ | |/
| * Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into ...James Dong2012-05-211-5/+5
| |\
| | * Fix a mediaserver crash caused by dereferencing a NULL pointer.James Dong2012-05-211-5/+5
* | | am 9ec3547e: Merge "For an RTSP live stream we won\'t map rtp time to normal ...Andreas Huber2012-05-211-8/+3
|\ \ \ | |/ /
| * | Merge "For an RTSP live stream we won't map rtp time to normal play time," in...Andreas Huber2012-05-211-8/+3
| |\ \
| | * | For an RTSP live stream we won't map rtp time to normal play time,Andreas Huber2012-05-211-8/+3
* | | | am cd8a36fd: Merge "Add more verbose ADTS error logging to SoftAAC." into jb-devAndreas Huber2012-05-212-20/+46
|\ \ \ \ | |/ / /
| * | | Merge "Add more verbose ADTS error logging to SoftAAC." into jb-devAndreas Huber2012-05-212-20/+46
| |\ \ \
| | * | | Add more verbose ADTS error logging to SoftAAC.Andreas Huber2012-05-212-20/+46
| | |/ /
* | | | am 91bfadb4: If we encounter an error during buffer allocation change state backAndreas Huber2012-05-211-0/+2
|\ \ \ \ | |/ / /
| * | | If we encounter an error during buffer allocation change state backAndreas Huber2012-05-211-0/+2
| |/ /
* | | am 8370c7ad: Instead of asserting on malformed ADTS headers or insufficient d...Andreas Huber2012-05-181-18/+43
|\ \ \ | |/ /
| * | Instead of asserting on malformed ADTS headers or insufficient data,Andreas Huber2012-05-181-18/+43
| |/
* | am bf2461ec: Don\'t reconfigure stream after outputing data.Dave Burke2012-05-181-17/+40
|\ \ | |/
| * Don't reconfigure stream after outputing data.Dave Burke2012-05-181-17/+40
* | am 441fbdea: Robustness - use defaults if we see bogus sample rate / channels...Dave Burke2012-05-181-5/+6
|\ \ | |/
| * Robustness - use defaults if we see bogus sample rate / channels from decoder.Dave Burke2012-05-171-5/+6
* | am 3748b71a: Handle stream changes at any point in the stream.Dave Burke2012-05-172-34/+15
|\ \ | |/
| * Handle stream changes at any point in the stream.Dave Burke2012-05-172-34/+15
* | am 3eda271f: Merge "Clear the decoder input buffer after it signalled an erro...Dave Burke2012-05-171-1/+3
|\ \ | |/
| * Merge "Clear the decoder input buffer after it signalled an error to be able ...Dave Burke2012-05-171-1/+3
| |\
| | * Clear the decoder input buffer after it signalled an error to be able to cont...Andreas Huber2012-05-171-1/+3
* | | am 8dfa2282: Fixes parsing of PSI sections in MPEG2 transport streamsAndreas Huber2012-05-172-13/+160
|\ \ \ | |/ /
| * | Fixes parsing of PSI sections in MPEG2 transport streamsAndreas Huber2012-05-172-13/+160
| |/
* | am e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after ...Andreas Huber2012-05-174-0/+80
|\ \ | |/
| * Merge "Buffer at least 2 secs worth of data at startup of after a seek before...Andreas Huber2012-05-174-0/+80
| |\
| | * Buffer at least 2 secs worth of data at startup of after a seek beforeAndreas Huber2012-05-174-0/+80
* | | am b33eaec7: Merge "Prefix MPEG4-generic audio data with ADTS headers" into j...Andreas Huber2012-05-176-35/+128
|\ \ \ | |/ /
| * | Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-devAndreas Huber2012-05-176-35/+128
| |\ \
| | * | Prefix MPEG4-generic audio data with ADTS headersAndreas Huber2012-05-176-35/+128
| | |/
* | | am 35c53ccd: Merge "Add informational logging to track 0 channel issue." into...Dave Burke2012-05-171-3/+3
|\ \ \ | |/ /
| * | Merge "Add informational logging to track 0 channel issue." into jb-devDave Burke2012-05-171-3/+3
| |\ \
| | * | Add informational logging to track 0 channel issue.Dave Burke2012-05-171-3/+3
* | | | am 022048e9: Stop audio source if AudioPlayer could not be startedJames Dong2012-05-171-6/+7
|\ \ \ \ | |/ / /
| * | | Stop audio source if AudioPlayer could not be startedJames Dong2012-05-171-6/+7
| |/ /
* | | am 88ba895b: Merge "Stop extrapolating audio time from the anchor if we\'re p...Andreas Huber2012-05-171-2/+19
|\ \ \ | |/ /
| * | Merge "Stop extrapolating audio time from the anchor if we're paused or reach...Andreas Huber2012-05-171-2/+19
| |\ \ | | |/ | |/|
| | * Stop extrapolating audio time from the anchor if we're paused or reached eos.Andreas Huber2012-05-151-2/+19