summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
Commit message (Collapse)AuthorAgeFilesLines
* Fix print format error.Chih-Hung Hsieh2015-03-121-1/+1
| | | | Change-Id: Ie3b754e22a4f858a35159abc8eaf00aa4949ab24
* 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
* | AnotherPacketSource: return format of first non-discontinuity packetChong Zhang2015-03-091-7/+5
|/ | | | | bug: 19656539 Change-Id: I41a36a48274616c3a65a79bf8446eeadb5595915
* handle mpeg2ts PTS wraparoundChong Zhang2015-03-031-1/+21
| | | | | bug: 19587682 Change-Id: I805ed6aa330bda3dc0ec8bd3519fb1ffeaa81ca9
* process all SEI messages for CC extractionChong Zhang2015-02-121-9/+16
| | | | | bug: 19297083 Change-Id: I5b89e35cc2bd5fb2f332872941e7978f15a6f403
* am 46246e5b: resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aospLajos Molnar2015-01-291-0/+7
|\ | | | | | | | | * commit '46246e5b1725a8a1868dbd9f37fffe33c19672fc': httplive: Dont resume if we have almost fetched till stop time
| * resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aospLajos Molnar2015-01-291-0/+7
| |\ | | | | | | | | | Change-Id: I52e17685b3aa058d6c6b0c023659231fa00a8f71
| | * httplive: Dont resume if we have almost fetched till stop timeApurupa Pattapu2015-01-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use the last enqueued instead of last dequeued time in ResumeUntil. - Set duration in access unit meta as timestamp difference between the last two queued access units. Bug: 18821145 Change-Id: If53ddee1d87775905a6d4f11a6219fe66f498450
* | | am 980ca102: am b2f95a1f: am 2a66207f: httplive: Create a copy of last ↵Apurupa Pattapu2015-01-291-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | enqueued metadata * commit '980ca102913dce40e213fe7c501f0adca615e146': httplive: Create a copy of last enqueued metadata
| * | am b2f95a1f: am 2a66207f: httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-291-2/+2
| |\ \ | | |/ | | | | | | | | | * commit 'b2f95a1fa129ca0b5a1fdac64c203c2159b3947e': httplive: Create a copy of last enqueued metadata
| | * httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create duplicate of metadata in queueAccessUnit so that it is available even after all the buffers are erased from packet source. During a bandwidth switch httplive streaming Source uses last enqueued timestamp as the start time for the new streams, and this switch can occur at a time when all the packets are dequeued from the current packet source. This is one of the scenarios when the last enqueued time was showing a invalid timestamp. Creating a copy will retain the timestamp value until the packet source is active. Bug: 18821145 Change-Id: I4d4ee700705cee58773da4660f8769f56018f9e4
* | | am ea5c0286: resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aospLajos Molnar2015-01-291-9/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'ea5c0286e8a18e71608e6c6e5758b167fe0d6c26': Revert "HLS: QCom enhancements"
| * | resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aospLajos Molnar2015-01-291-9/+2
| |\ \ | | |/ | | | | | | Change-Id: I39fdc2e8895e1e943749b9a2628656a8fa5bb72b
| | * Revert "HLS: QCom enhancements"Lajos Molnar2015-01-281-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is to restore patch attributions This reverts commit f580806d893c4631f5324ff0af5c2db68a40ef42. Bug: 18821145 Change-Id: Idc49385fffccfde2a3915388fe3fe4e2b740d787
* | | am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-291-2/+9
|\ \ \ | |/ / | | | | | | | | | * commit '8564e13b37d372da78bce08f34a3610795ae173c': HLS: QCom enhancements
| * | resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-291-2/+9
| |\ \ | | |/ | | | | | | Change-Id: I4313941f3561176ce9f6ab055678fb626e570107
| | * HLS: QCom enhancementsRobert Shih2014-12-221-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit consists of: http://go/pag/c/188753 Add NULL check for empty playlist http://go/pag/c/188754 Fix deadlock for low duration clips http://go/pag/c/188757 Create a copy of last enqueued metadata http://go/pag/c/188755 Propagate target duration to LiveSession http://go/pag/c/188762 Decouple block size from bandwidth estimate http://go/pag/c/188756 Reduce memcpy calls for chunked content http://go/pag/c/188758 Dont resume if we have almost fetched till stop time Bug: 18821145 Change-Id: I7fd650999c6c50bbadffd65adee9020e669dfe62
* | | am 3feb7bd0: am 5c82407e: am 184e63ff: Merge "ESQueue: change warning ↵Wei Jia2014-12-161-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | message of one buffer containing multiple ADTS frames into verbose." into lmp-mr1-dev * commit '3feb7bd0670b6e85d6eec25309d8606a99f1af31': ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose.
| * | am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message of one ↵Wei Jia2014-12-161-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | buffer containing multiple ADTS frames into verbose." into lmp-mr1-dev * commit '5c82407e3bb202c20c01107a4549f0d80d719ad8': ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose.
| | * ESQueue: change warning message of one buffer containing multiple ADTS ↵Wei Jia2014-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | frames into verbose. Bug: 18741580 Change-Id: I35b38e106c3ca5421e0985d5e7feeaafe773ed6d
* | | am 5185c956: am 25bad49c: am 852dc963: Merge "avc_util: try to find the ↵Wei Jia2014-12-091-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '5185c95673f7c6facd6d57fdc9fc53f52e44eed8': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| * | am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code ↵Wei Jia2014-12-081-2/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '25bad49ce75758b2f68b278f54d7272b1cf4d08c': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| | * avc_util: try to find the first start code prefix 0x000001 even though there ↵Wei Jia2014-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | is non-zero byte at the beginning of the buffer. ESQueue: allow one PES playload contains multiple ADTS AAC frames. Bug: 18532335 Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
* | | am 4d82c2f0: am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length ↵Wei Jia2014-12-051-4/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | checking in validation of ADTS header." into lmp-mr1-dev * commit '4d82c2f0d0361cd0062c3454d557bb1064e92020': ESQueue: add frame length checking in validation of ADTS header.
| * | am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in ↵Wei Jia2014-12-051-4/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | validation of ADTS header." into lmp-mr1-dev * commit '848b4c676c3295508b74f85947fc5243ce9466f4': ESQueue: add frame length checking in validation of ADTS header.
| | * ESQueue: add frame length checking in validation of ADTS header.Wei Jia2014-12-031-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | This allows an invalid ADTS buffer to be abandoned when frame length in the header exceeds buffer size. Bug: 18532335 Change-Id: I8057db525d06ff00ca24afd075a7c6c17b87eaa8
* | | am 5a88501c: resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-272-11/+7
|\ \ \ | |/ / | | | | | | | | | * commit '5a88501c8f677e34afb2043d7e81d8e09d6fa5f4': Stagefright: Fix unused variables, functions, values
| * | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-272-11/+7
| |\ \ | | | | | | | | | | | | Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
| | * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-252-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | | am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-172-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8c5ee61a057e3b87e8f0800b284642bf3b107fd0': Fix struct vs. class mismatches
| * | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-172-2/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b': Fix struct vs. class mismatches
| | * Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | am 1ea52d5f: am addfc718: Merge "NuPlayer: tunnel decoder with renderer for ↵Wei Jia2014-11-151-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | data buffer passing." into lmp-mr1-dev automerge: b915eeb * commit '1ea52d5ff0465f9353fcf14ed64246c1b9bf4439': NuPlayer: tunnel decoder with renderer for data buffer passing.
| * | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | | am 3c17893c: am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need ↵Wei Jia2014-11-141-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev * commit '3c17893c75bfa050c4e422cff417c428d74429e7': AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
| * | Merge "AnotherPacketSource: need reset some members before returning from ↵Wei Jia2014-11-131-4/+4
| |\ \ | | | | | | | | | | | | queueDiscontinuity()." into lmp-mr1-dev
| | * | AnotherPacketSource: need reset some members before returning from ↵Wei Jia2014-11-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queueDiscontinuity(). Bug: 18355014 Bug: 17511837 Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
* | | | am 811c3ad2: am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts ↵Robert Shih2014-11-142-3/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | program streams before disabling a/v" into lmp-mr1-dev * commit '811c3ad2eb02a169c22bd269d5d82e26174be349': PlaylistFetcher: check ts program streams before disabling a/v
| * | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into ↵Robert Shih2014-11-132-3/+29
| |\ \ \ | | |/ / | |/| | | | | | lmp-mr1-dev
| | * | PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-122-3/+29
| | | | | | | | | | | | | | | | | | | | Bug: 14648838 Change-Id: Ibf2b2cbb235f3d80bc33013e2afc053f13b9035f
* | | | am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue ↵Wei Jia2014-11-072-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | discontinity signal buffer resulted from seek." into lmp-mr1-dev automerge: e86c6d5 * commit '6200e7f43d977ad6698f018ee55e2f423ff8a87c': AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
| * | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted ↵Wei Jia2014-11-062-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | from seek. This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
* | | am 705a3077: am aa92298d: am 6f907217: Merge "stagefright: return failure on ↵Chong Zhang2014-10-231-9/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | malformed TS streams" into lmp-mr1-dev * commit '705a3077c3a9e6fc029895813e591358c0157207': stagefright: return failure on malformed TS streams
| * | stagefright: return failure on malformed TS streamsDavid Yeh2014-10-211-9/+23
| |/ | | | | | | | | Bug: 18075193 Change-Id: I7bd97dea263e972a8de3429ed000cbd4913164bf
* | am 0973af24: am 0079b331: Merge "MediaBuffer: ABuffer will release ↵Wei Jia2014-09-231-5/+0
|\ \ | |/ | | | | | | | | | | MediaBuffer when it\'s destructed." into lmp-dev * commit '0973af247786ff1be980390cc274364fca6b2d6e': MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
| * MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-191-5/+0
| | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
| * Merge "ESQueue: do not merge aac packets" into lmp-devRobert Shih2014-09-162-1/+46
| |\ |/ /
| * ESQueue: do not merge aac packetsRobert Shih2014-09-152-1/+46
| | | | | | | | | | Bug: 17310061 Change-Id: Ie0fb0702b0af1c4094415190fdfdf132d5fcd511
* | LiveSession: added onSwitchDownRobert Shih2014-09-112-4/+66
|/ | | | | | | | | | | | additionally in this change - AnotherPacketSource: added getEstimatedDurationUs that avoids looping through buffered access units in most cases; this method is called by LiveSession before triggering onSwitchDown. Also fix the original getBufferedDurationUs to accumulate durations across discontinuities. Bug: 13742612 Change-Id: I135932ea0c74671b7019a3c7054844926c18bc14