summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Parse RTP-Info even for live streams."Andreas Huber2011-06-232-2/+7
|\
| * Parse RTP-Info even for live streams.Andreas Huber2011-06-202-2/+7
| | | | | | | | Change-Id: Ib2c39ce8d5366f5ea350e71b7a54f5f7c2b510b9
* | Merge "Reconstruct sync frame indication for content served by the ↵Andreas Huber2011-06-231-9/+38
|\ \ | | | | | | | | | MPEG2TSExtractor"
| * | Reconstruct sync frame indication for content served by the MPEG2TSExtractorAndreas Huber2011-06-221-9/+38
| | | | | | | | | | | | | | | | | | Strip data up to the first IDR frame if necessary. Change-Id: I4a096785eb1a17b7484983788e223d188454771d
* | | Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the ↵Gloria Wang2011-06-233-1/+5
|\ \ \ | | | | | | | | | | | | extendedData vector in DecryptHandle."
| * | | - Add two sanity checks.Gloria Wang2011-06-223-1/+5
| |/ / | | | | | | | | | | | | | | | | | | - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
* | | Merge "Fix warnings for uninitialized local variables"Glenn Kasten2011-06-232-3/+3
|\ \ \
| * | | Fix warnings for uninitialized local variablesGlenn Kasten2011-06-222-3/+3
| | |/ | |/| | | | | | | Change-Id: Ic9b03b0fd215444e76c7b7bebb385f7831c557e0
* | | Merge "Added audio_bytes_per_sample() helper function"Eric Laurent2011-06-233-4/+4
|\ \ \
| * | | Added audio_bytes_per_sample() helper functionEric Laurent2011-06-173-4/+4
| | | | | | | | | | | | | | | | Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
* | | | Merge "Timed text display format support: 1. Extract 3GPP global format ↵Gloria Wang2011-06-227-47/+641
|\ \ \ \ | | | | | | | | | | | | | | | descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata"
| * | | | Timed text display format support:Gloria Wang2011-06-227-47/+641
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
* | | | Add some error log messages to indicate the failure of a recording sessionJames Dong2011-06-221-4/+22
|/ / / | | | | | | | | | Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
* | | Merge "Timestamp adjustment will not work well if we ask video encoder to ↵James Dong2011-06-211-197/+1
|\ \ \ | | | | | | | | | | | | produce B frames"
| * | | Timestamp adjustment will not work well if we ask video encoder to produce B ↵James Dong2011-06-211-197/+1
| | | | | | | | | | | | | | | | | | | | | | | | frames Change-Id: Ic6a2235fefb6f15081091e1f2c1b12ee92fba5e0
* | | | Log an error instead of asserting if the OMX plugin reports an error.Andreas Huber2011-06-211-1/+5
|/ / / | | | | | | | | | Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
* | | Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."Gloria Wang2011-06-211-0/+13
|\ \ \
| * | | Fix a memory leak in the Forward Lock plugin.Gloria Wang2011-06-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | For bug 4770217. Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
* | | | Merge "Don't assert on malformed .mp4 content that contains fewer samples than"Andreas Huber2011-06-211-4/+8
|\ \ \ \
| * | | | Don't assert on malformed .mp4 content that contains fewer samples thanAndreas Huber2011-06-211-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | described in the time-to-sample box. Change-Id: Ic6f973212c15012a25f6e849759fd4f14d97e30f related-to-bug: 4779053
* | | | | Merge "Boost software vp8 decoder performance using multi-threaded decoding ↵James Dong2011-06-211-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | if possible"
| * | | | | Boost software vp8 decoder performance using multi-threaded decoding if possibleJames Dong2011-06-201-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7258c7d0cf91aa7c62444d03ed8bce96fb23d8ef related-to-bug: 4539653
* | | | | | Parse the individual segment's duration as a floating point number which is nowAndreas Huber2011-06-213-3/+47
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed in later HLS specs. Change-Id: I7c8296acb4e9b0f80022f3057769de0eea9ee0c6 related-to-bug: 4779022
* | | | | Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on ↵Andreas Huber2011-06-211-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | decode error."
| * | | | | Restore legacy soft-aac decoder behaviour. Substitute silence on decode error.Andreas Huber2011-06-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I680ccaabef32b1319819f723260cb3789585f09e related-to-bug: 4579486
* | | | | | MTP: Add support for PTP variant of GetDeviceInfo result.Mike Lockwood2011-06-212-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09f86fda768b7697665e401adb9516588859bf59 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and ↵Andreas Huber2011-06-201-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | more guarding in getMetaData()."
| * | | | | OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more ↵Dongwon Kang2011-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guarding in getMetaData(). BUG:4689872 Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
* | | | | | Merge "When a recording session is stopped, no outstanding input video ↵James Dong2011-06-201-6/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | frames exist for the output buffers returned from OMX component to SF."
| * | | | | When a recording session is stopped, no outstanding input video frames exist ↵James Dong2011-06-201-6/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the output buffers returned from OMX component to SF. When this happens, default value of 0 will be used for the "decoding" time for these output buffers. These buffers do not contain valid media data anyway. related-to-bug: 4725803 Change-Id: I0eaf248bb2ac022ff072eaffd0ed3f21171f824e
* | | | | Merge "Remove unneeded #include <sys/resource.h>"Glenn Kasten2011-06-207-7/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unneeded #include <sys/resource.h>Glenn Kasten2011-06-157-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested in code review for previous change. Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
* | | | | Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands"Mike Lockwood2011-06-171-6/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | MTP: Fix some problems with GetObjectHandles and GetNumObjects commandsMike Lockwood2011-06-171-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These calls did not correctly handle some variants of the arguments, which showed up when running in PTP mode. Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "Use system property to control whether we will enable B frame support ↵James Dong2011-06-171-1/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | in MPEG4Writer"
| * | | | Use system property to control whether we will enable B frame support in ↵James Dong2011-06-171-1/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Writer o This is to work around a bug in crespo's video encoder output timestamp related-to-bug: 4600191,4724339 Change-Id: I485c1e044bd2f604b318692efd6433345cfc6487
* | | | Merge "Fix regression in audio effect factory"Eric Laurent2011-06-171-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix regression in audio effect factoryEric Laurent2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0fb66c2 introduced a bug in EffectCreate() that prevents detection of problems reported by the engine library upon effect creation. Change-Id: I5bd2d42505ac29ab4a5768fd7f0c2ced135cf3e3
* | | | Merge "-Fix some typo -Remove one unnecessary memory allocation"Gloria Wang2011-06-162-17/+15
|\ \ \ \ | |/ / / |/| | |
| * | | -Fix some typoGloria Wang2011-06-152-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | -Remove one unnecessary memory allocation Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
* | | | Merge "Allow camera to be disabled via Device Policy Manager"Wu-cheng Li2011-06-161-0/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow camera to be disabled via Device Policy ManagerWu-cheng Li2011-05-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | bug:4185309 Change-Id: I8be89d892b8f540fd05913c93f97b92346a0a282
* | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-150-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6
| * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-090-0/+0
| |\ \ \
| | * \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-060-0/+0
| | |\ \ \
* | | \ \ \ Merge "Merge chromium to r11.0.672.0: Compile fix"Kristian Monsen2011-06-142-4/+4
|\ \ \ \ \ \
| * | | | | | Merge chromium to r11.0.672.0: Compile fixKristian Monsen2011-06-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cause by upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924 Change-Id: Iada1639b7a38cee963644437e8e3f4f5708d6136
* | | | | | | Merge "Bug 4608375"Glenn Kasten2011-06-143-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Bug 4608375Glenn Kasten2011-06-143-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update priority and policy together for audio threads Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
* | | | | | | | Merge "Enforce the rule that the timestamp from timelapse video source ↵James Dong2011-06-141-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | monotically increases"
generated by cgit v1.1 at 2024-08-20 05:21:08 +0000