summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | am e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets...Andreas Huber2011-01-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry...James Dong2011-01-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7c615360: Fail to parse duration instead of asserting, if the server respo...Andreas Huber2011-01-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7e2f9cc8: (-s ours) DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e7fbfb6b: (-s ours) Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response...Andreas Huber2011-01-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 13d1cb56: (-s ours) Merge "Avoid deadlock in OMX::freeNode by making sure ...James Dong2011-01-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ba77a3f9: (-s ours) Add support for the "compilation" tag in mp3, mp4 and ...Marco Nelissen2011-01-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c2bee3ae: (-s ours) am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More...Andreas Huber2011-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT ...Andreas Huber2011-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am 4eeb1047: Merge 13212f83 from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge 13212f83 from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am 0ef57993: Merge "Fix issue 2988031." into gingerbreadEric Laurent2011-01-271-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Fix issue 2988031.Eric Laurent2011-01-271-1/+2
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process ...Andreas Huber2011-01-281-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose ...Andreas Huber2011-01-281-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (a...Andreas Huber2011-01-281-13/+0
* | | | | | | | | | | | | | | | | | | | | am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RT...Andreas Huber2011-01-283-20/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into hon...Andreas Huber2011-01-283-20/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
* | | | | | | | | | | | | | | | | | | | Add support for synchronous bulk USB transfersMike Lockwood2011-01-271-5/+5
* | | | | | | | | | | | | | | | | | | | am c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This...Andreas Huber2011-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server...Andreas Huber2011-01-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM aud...Andreas Huber2011-01-261-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra...Andreas Huber2011-01-261-1/+4
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LA...Andreas Huber2011-01-261-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with...Andreas Huber2011-01-261-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "This particular RTSP server streams MPEG4-LATM audio with extra traili...Andreas Huber2011-01-261-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.Andreas Huber2011-01-261-1/+4
* | | | | | | | | | | | | | | | | | | | am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date pars...Mike Lockwood2011-01-261-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am a13732e1: Merge "MTP: Fix month off by one error in date parsing and forma...Mike Lockwood2011-01-261-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "MTP: Fix month off by one error in date parsing and formatting code" i...Mike Lockwood2011-01-261-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | MTP: Fix month off by one error in date parsing and formatting codeMike Lockwood2011-01-261-2/+4
* | | | | | | | | | | | | | | | | | | | am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for ti...James Dong2011-01-266-4/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video...James Dong2011-01-266-4/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Make sure that key frame is generated for timelapse video recording if there ...James Dong2011-01-266-4/+35
| | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3...Jean-Michel Trivi2011-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from ...Jean-Michel Trivi2011-01-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-267-27/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-267-27/+49
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardw...Andreas Huber2011-01-262-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 373d357a: Merge "More instrumentation to track down the hardware decoder n...Andreas Huber2011-01-262-2/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "More instrumentation to track down the hardware decoder not shutting d...Andreas Huber2011-01-262-2/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | More instrumentation to track down the hardware decoder not shutting down bug.Andreas Huber2011-01-262-2/+20
* | | | | | | | | | | | | | | | | | | am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_se...Andreas Huber2011-01-261-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into...Andreas Huber2011-01-261-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Ignore errors returned from native_window_set_crop." into honeycombAndreas Huber2011-01-261-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Ignore errors returned from native_window_set_crop.Andreas Huber2011-01-261-2/+3
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters wit...Andreas Huber2011-01-261-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /