summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am 0dbe5a93: Added optional intra macroblock refresh support for encodingJames Dong2012-11-291-1/+49
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5': Added optional intra macroblock refresh support for encoding
| | * | | | | Added optional intra macroblock refresh support for encodingJames Dong2012-11-281-1/+49
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 7524791 Change-Id: I95ac4ee925e2dbeb00b3cfb2e29c611698c5cc9f
* | | | | | Merge "Clear the sticky EOS flags when transitioning to LOADED state"Andreas Huber2012-11-291-5/+5
|\ \ \ \ \ \
| * | | | | | Clear the sticky EOS flags when transitioning to LOADED stateAndreas Huber2012-11-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of transitioning _from_ UNINITIALIZED state. This makes codec instances reusable. Change-Id: I8f0c11923978ffee58b553a5ac59c740b0223c54
* | | | | | | am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca': Bug fix for the MediaPlayer::prepare() api.
| * | | | | | am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '031c93df74621dc2149876dc377aedee8930547f': Bug fix for the MediaPlayer::prepare() api.
| | * | | | | Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
| | |\ \ \ \ \
| | | * | | | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-273-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an MP3 source, within the prepare command, ID3 tags are checked in search of gapless playback info. This causes problems for streamed sources. If ID3v2 tags aren't present, then a check is done for ID3v1 tags. This results in a read command that asks the cache to jump to the end of the file, and subsequently make an extra http call to request those bytes. For a streamed source, this causes the file to not be downloaded automatically when MediaPlayer::prepare() is called, and causes stuttering and extra buffering time to be needed when start() is finally called. The solution is to ignore the ID3v1 tags as the gapless info would never exist there, and only check for ID3v2 tags. Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
* | | | | | | | am 37ddc8fc: am 251c04b1: Merge "Unsolicited server responses cause RTSP ↵Andreas Huber2012-11-291-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming to crash" * commit '37ddc8fc0f78234b5b3b58886113560cdf98aadf': Unsolicited server responses cause RTSP streaming to crash
| * | | | | | | am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"Andreas Huber2012-11-291-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '251c04b1f3d048f541832c93347c6604b314e0ea': Unsolicited server responses cause RTSP streaming to crash
| | * | | | | | Unsolicited server responses cause RTSP streaming to crashLena Magnusson2012-11-291-0/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the set up of the RTSP stream contains an incorrect or otherwise problematic URL, some servers will send an unsolicited server response that contains a negative number in the sequence number (CSeq) field. This negative value is not returned from the function findPendingRequest(), so the check in notifyResponseListener() will not work. Instead there will be a crash when 0 is used as the index to find a matching request/response pair that doesn’t exist. The fix is to return the received sequence number also when it is an unsolicited server-client message. Change-Id: Iedaba8a63dece7b43bce007069baefbfd10970b8
* | | | | | | am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2821-45/+271
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7': Add support for HLS playlists of type 'event'.
| * | | | | | am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2821-45/+271
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'b7c8e91880463ff4981e3e53e98e45d68e2fe374': Add support for HLS playlists of type 'event'.
| | * | | | | Add support for HLS playlists of type 'event'.Andreas Huber2012-11-2721-45/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 6870049 Squashed commit of the following: commit eee2f3ba6bb7335f4e285632726db85645669929 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 15:02:01 2012 -0800 Make everything a lot less verbose by default. Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3 commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:34:46 2012 -0800 HLS now properly signals media time changes at discontinuities including the start of playback (which may not necessarily be at time 0 if the playlist is of type 'event' and hasn't completed yet). Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e commit 1555589832b1878a144a976a643e1af4d61f877c Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:32:28 2012 -0800 As part of a time discontinuity, clients of IStreamListener can now signal the corresponding media time after the discontinuity, i.e. the first PTS timestamp following the discontinuity will be considered equivalent to the specified media time and media buffers timestamped accordingly. Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92 commit 5c24c605c073a11c426d025b1e7478fc1ad8365a Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 13:00:56 2012 -0800 NuPlayer sources now expose flags() and can announce that duration may change (increase) dynamically, in which case duration will be polled at 1 second intervals and communicated to the upper layers. Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea commit ecb71de8e281e61971a2cd73e7161a97540bc357 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 12:57:47 2012 -0800 Stop caching duration in MediaPlayer, duration could increase dynamically. Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791 commit 544aec5823e6d7a3e97e15b6b23546616bcd343e Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 08:46:28 2012 -0800 An attempt to add support for "event" style HLS playlists. Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60 Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
* | | | | | | am 8b5985d9: am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8b5985d99becc2d5126b8a26afb6f5798b560007': Crash in android::MyHandler::parsePlayResponse
| * | | | | | am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '5768fa034ede834656697d3612c525595ff85ef9': Crash in android::MyHandler::parsePlayResponse
| | * | | | | Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
| | |\ \ \ \ \
| | | * | | | | Crash in android::MyHandler::parsePlayResponsePatric Frederiksen2012-11-271-0/+4
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix handles problems with several asynchronous calls within streaming. This case is when the phone has sent a request to the server and while the response is being sent back by the server the request is aborted by the user. The fix is an if case that checks if we have aborted while waiting for a response from the server. If we have aborted we should ignore the late response instead of continuing. Change-Id: I1264bb992f6abcaee1f10a89479e08b54a95e3c2
* | | | | | | am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the ↵Andreas Huber2012-11-261-4/+40
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | component name" * commit '5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e': MediaCodec: Add a method for getting the component name
| * | | | | | am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-261-4/+40
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '79fd685323e34e0fde22d17fd6848d33f171f4ae': MediaCodec: Add a method for getting the component name
| | * | | | | Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-261-4/+40
| | |\ \ \ \ \
| | | * | | | | MediaCodec: Add a method for getting the component nameMartin Storsjo2012-11-191-4/+40
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the codec was chosen based on mime type, the caller does not know what component actually was chosen. This allows getting essential information (such as supported color formats, for a video encoder) for this component. Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
| * | | | | | am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5865ddf769d368d714af630aba18392ea1387bc7': AudioTrack::dump null mCblk check test
| | * | | | | Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
| | |\ \ \ \ \
| | | * | | | | AudioTrack::dump null mCblk check testZbigniew Mazur2012-11-231-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is protecting AudioTrack::dump from SIGSEGEV when calling dumpsys shell command. Change-Id: I30d136e195a12d6fdad41e14f557b0ad9e59b8a2
* | | | | | | am b96c4b4c: am 2da6e4ae: Merge "Avoid memory leaks when handling metadata ↵Marco Nelissen2012-11-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings" * commit 'b96c4b4ce8eb90a6bdb162681affe1e50fe6aafc': Avoid memory leaks when handling metadata strings
| * | | | | | am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"Marco Nelissen2012-11-201-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2da6e4ae488896df10b22166b0aa0b2cc15492f1': Avoid memory leaks when handling metadata strings
| | * | | | | Avoid memory leaks when handling metadata stringsDavid Williams2012-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't duplicate strings when retrieveing metadata from media files. As any requests for metadata strings would pass through the binder, this would cause the reference to the duplicate string to be lost, causing a memory leak as the duplicate would not be freed. Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
* | | | | | | am 14dda623: am 7013209c: Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '14dda623c8db5f991b8a22dce4f19f8d8b47fea2': Handle large AVCC chunks
| * | | | | | am 7013209c: Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7013209cdf393b3d958ddd46ed50394349378826': Handle large AVCC chunks
| | * | | | | Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
| | |\ \ \ \ \
| | | * | | | | Handle large AVCC chunksJan Olof Svensson2012-11-191-6/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If enabling seq_scaling_matrix_present_flag = 1 the AVCC chunk can be larger than the original buffer size. Changed to using ABuffer instead. Change-Id: Idacc14b45ea2634c5e608919f3ce567f23363135
* | | | | | | am 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 ↵Marco Nelissen2012-11-201-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bits to 16 bits" * commit '343f9c81f293f56e09b1cc1921844ecd3372e435': Changed parsing of trkn and disk from 8 bits to 16 bits
| * | | | | | am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'dca2b5d7c29ee06f3c82527dd7264fcc21cac9a6': Changed parsing of trkn and disk from 8 bits to 16 bits
| | * | | | | Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
| | |\ \ \ \ \
| | | * | | | | Changed parsing of trkn and disk from 8 bits to 16 bitsAndreas Lillvik2012-11-191-5/+7
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPEG4Extractor was parsing 8 bits instead of 16 bits when parsing 'trkn' and 'disk'. Also added support for 16 bytes size 'disk'. Change-Id: I22b4de2ac800881884d5759776cb380917522a87
* | | | | | | Merge "Clean up channel count and channel mask"Glenn Kasten2012-11-192-26/+18
|\ \ \ \ \ \ \
| * | | | | | | Clean up channel count and channel maskGlenn Kasten2012-11-192-26/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Channel count is uint32_t. Remove redundant mask parameter to AudioTrack::createTrack_l() and AudioRecord::openRecord_l(). Change-Id: I5dc2b18eb609b2c0dc3091994cbaa4628062c17f
* | | | | | | | delete -> freeMarco Nelissen2012-11-191-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strings duplicated with strdup() should be free()d, not deleted. Change-Id: I42bb3df9625bb8d35f80b02d15364b94c36496f8
* | | | | | | Merge ""if" statements use curly braces per media style"Glenn Kasten2012-11-162-20/+56
|\ \ \ \ \ \ \
| * | | | | | | "if" statements use curly braces per media styleGlenn Kasten2012-11-162-20/+56
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I130e7849fd1da7a0b7fe56c3c53919d26e3843b8
* | | | | | | Merge "Fix time vs. bytes units bug in getRenderPosition"Glenn Kasten2012-11-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix time vs. bytes units bug in getRenderPositionGlenn Kasten2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename correctLatency since it requires thread to be locked. Use size_t for byte and frame counts. Change-Id: I178fdd18bdb823813b9563927bdff8c0d28ca5a5
* | | | | | | | Merge "Don't use control block frame count after create"Glenn Kasten2012-11-162-51/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't use control block frame count after createGlenn Kasten2012-11-162-51/+59
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: I7f4cb05aef63053f8e2ab05b286d302260ef4758
* | | | | | | | Merge "Don't explicitly log tid"Glenn Kasten2012-11-161-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't explicitly log tidGlenn Kasten2012-11-161-3/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If needed, it can be obtained with adb logcat -v threadtime Change-Id: I91b3911d20f7bcfc3361db4052db21ff9181f1cf
* | | | | | | | Fix a crash when the stop might be called due to some error before start in ↵James Dong2012-11-161-3/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTSPSource o related-to-bug: 7507224 Change-Id: Ic8bfec13097b824ba337a01c9b00c98af2a33f43
* | | | | | | resolved conflicts for merge of 205d7249 to masterMarco Nelissen2012-11-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
| * | | | | am da33d66e: Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'da33d66e68791d0bfeccebc8253a59467b5ef670': Add .mpga to acceptable file name extensions list.