summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | 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 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>
* | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-141-1/+1
| | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | 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
* | | 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
* | | 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
* | stagefright: return failure on malformed TS streamsDavid Yeh2014-10-211-9/+23
|/ | | | | Bug: 18075193 Change-Id: I7bd97dea263e972a8de3429ed000cbd4913164bf
* 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
* httplive: timestamp reporting, track selectionRobert Shih2014-08-053-5/+26
| | | | | | | Bug: 15153976 Bug: 15763638 Bug: 16351654 Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d
* GenericSource: support track (de)selectionRobert Shih2014-07-312-2/+11
| | | | | | Bug: 15153976 Change-Id: Idfce856b4ca5fa7853da857757490798bc3ffe1e
* Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-devChong Zhang2014-07-252-7/+5
|\
| * ATSParser: treat stream type 0x83 as TrueHD AC3Chong Zhang2014-07-302-7/+5
| | | | | | | | | | Bug: 16668055 Change-Id: I11fd3f795bbb50113e1a1e28e682edd76f11e146
* | Revert GenericSource track selection changesWei Jia2014-07-302-11/+2
|/ | | | | | | | This reverts commit bace25b0fbcd5101d2db288b0c70c4a239f0e815. This reverts commit eb1735e343a93830df259ae8882160bb0d79dcb5. This reverts commit 05312bc7478feec11d9ae88e951c0857a7a3f28d. Bug: 16660839
* GenericSource: support track (de)selectionRobert Shih2014-07-222-2/+11
| | | | | Bug: 15153976 Change-Id: I522b1f9f0ffedf4edbea03a6654a6dbc0262860a
* Free MediaBuffer when ABuffer is discarded.Wei Jia2014-07-181-0/+5
| | | | | BUG: 15699665 Change-Id: Ie7da017cf32ccc08094fe4b01a2b07d2739770d2
* HLS: do not discard packets when queuing explicit discontinuityChong Zhang2014-06-263-14/+19
| | | | | | | | | | | in case of explicit discontinuity (#EXT-X-DISCONTINUITY tag in the playlist), do not discard packets that's already queued. (when seeking, the old fetcher will be discarded so this won't affect seeking case.) Bug: 15020526 Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
* support for CEA-608 closed captionChong Zhang2014-06-131-0/+6
| | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
* do not drop TS packet on discontinuity at payload startChong Zhang2014-06-061-1/+3
| | | | | | Bug: 15470543 Change-Id: Ia96a295fbc7e9f1b1d5c0d9091ac62184d44dcfa
* libstagefright: fix 64-bit warningsColin Cross2014-03-194-23/+30
| | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
* am 49b2e310: am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, ↵Robert Shih2014-03-191-2/+3
|\ | | | | | | | | | | | | decrypt, and parse ts files. * commit '49b2e310f62c590a1af9f921cd8a134cdf589263': httplive: block-by-block fetch, decrypt, and parse ts files.
| * am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ↵Robert Shih2014-03-191-2/+3
| |\ | | | | | | | | | | | | | | | | | | ts files. * commit 'a1f0c62c189f2d162cca4af736c3d440f1eff53c': httplive: block-by-block fetch, decrypt, and parse ts files.
| | * am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-191-2/+3
| | |\ | | | | | | | | | | | | | | | | * commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8': httplive: block-by-block fetch, decrypt, and parse ts files.
| | | * httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-191-2/+3
| | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
| * | | am 04352de2: am e0c3058a: Merge "AnotherPacketSource support to get latest ↵Lajos Molnar2014-03-072-2/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | buffered MetaData." into klp-dev * commit '04352de2e32d6dc0901436951f69357f5cd8655c': AnotherPacketSource support to get latest buffered MetaData.
| | * | am e0c3058a: Merge "AnotherPacketSource support to get latest buffered ↵Lajos Molnar2014-03-072-2/+25
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | MetaData." into klp-dev * commit 'e0c3058a1d0953f4c85bfc964926cf5babb7dbac': AnotherPacketSource support to get latest buffered MetaData.
| | | * AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-03-062-2/+25
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
| * | | am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media ↵Lajos Molnar2014-03-071-9/+39
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | format in packet source" into klp-dev * commit 'e389b1bdd13e768baa2532f537236b2c5e6243fa': stagefright: Fix issue with tracking media format in packet source
| | * | am ad21a81a: Merge "stagefright: Fix issue with tracking media format in ↵Lajos Molnar2014-03-071-9/+39
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | packet source" into klp-dev * commit 'ad21a81af3e7d6b58002c9dce9c3278b6323e4a9': stagefright: Fix issue with tracking media format in packet source
| | | * stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-061-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media format in AnotherPacketSource is now tracked across discontinuities. This fixes a bug where format was set on queueAccessUnit and cleared on dequeueAccessUnit, thereby allowing it to remain cleared. Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 12060952
* | | | Merge "AnotherPacketSource support to get latest buffered MetaData."Robert Shih2014-02-152-2/+25
|\ \ \ \
| * | | | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-02-032-2/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
* | | | | am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to ↵Dongwon Kang2014-02-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | the A/52 table 5.8 * commit '499608075bce8a8bc649519687b28c99a0523839': Fix wrong channel table in ESQueue according to the A/52 table 5.8
| * | | | am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-131-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '0105027f2a385ecb29a64b055f3046fb01ca2803': Fix wrong channel table in ESQueue according to the A/52 table 5.8
| | * | | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: http://www.atsc.org/cms/standards/A52-2012(12-17).pdf Bug: 12950777 Change-Id: Ic60033170b21e67408a3b3444507f6528946bdd0
* | | | | warnings be gone.Andreas Huber2014-02-115-6/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-0/+2
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '429f2bf7527daf872a1bbdafca8ad28635b84644': frameworks/av: fix errors inside ALOGV
| * | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-071-0/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit 'e2307ccbab9c32a7806f15c2572cfe6ec428f2f5': frameworks/av: fix errors inside ALOGV
| | * | frameworks/av: fix errors inside ALOGVColin Cross2014-02-061-0/+2
| | |/ | | | | | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
| * | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-034-0/+202
| |/ | | | | | | Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa