summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Added audio_bytes_per_sample() helper functionEric Laurent2011-06-172-3/+3
| | | | | | | | | | | | Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
* | | Merge "Timed text display format support: 1. Extract 3GPP global format ↵Gloria Wang2011-06-226-47/+638
|\ \ \ | | | | | | | | | | | | 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-226-47/+638
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "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
* | 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 "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"
| * | | Enforce the rule that the timestamp from timelapse video source monotically ↵James Dong2011-06-131-1/+2
| |/ / | | | | | | | | | | | | | | | increases Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
* | | Merge "audio: update for audio/audio_policy header names/locations"Dima Zavin2011-06-131-1/+1
|\ \ \
| * | | audio: update for audio/audio_policy header names/locationsDima Zavin2011-06-131-1/+1
| |/ / | | | | | | | | | | | | Change-Id: I36c49352eee57559403cd1597f56a8485a360289 Signed-off-by: Dima Zavin <dima@android.com>
* | | Add B frame support for MPEG4WriterJames Dong2011-06-132-9/+142
|/ / | | | | | | | | | | o requires the support of negative ctts duration values (ctts version 1) Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
* | Merge "Avoid duplicated code calculating the stts sample duration"James Dong2011-06-101-22/+21
|\ \
| * | Avoid duplicated code calculating the stts sample durationJames Dong2011-06-101-22/+21
| | | | | | | | | | | | | | | | | | | | | o This also speeds up the MediaRecorder.stop() call. o Also fix incorrect start time compensation in stts box Change-Id: I6392b8b980e0f786ddeeec0fe2c341de67208c6f
* | | am 15e9d474: am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
|\ \ \ | |/ / |/| | | | | | | | * commit '15e9d474d1033adbedc8632309df26c3d6dfaee3': Quiet the log.
| * | am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87': Quiet the log.
| | * \ am d86302df: Quiet the log.Dianne Hackborn2011-06-091-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867': Quiet the log.
| | | * | Quiet the log.Dianne Hackborn2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
| * | | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 ↵James Dong2011-06-092-12/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | seconds - do not merge."" into honeycomb-mr2 * commit '2488a94350e0c0b088da2646557c9a0f3a0e9847': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| | * | | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do ↵James Dong2011-06-092-12/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | not merge."" into honeycomb-mr2 * commit 'e3b80c838753fe8c9049950216c6379098465810': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| | | * | Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" ↵James Dong2011-06-092-12/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | | * | Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
| * | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line ↵Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaks to Unix style" * commit '644f36eab4eb9911ad897c9caae68b9c5a72388f': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| | * \ \ \ \ am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ↵Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style" * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| | | * \ \ \ \ Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | | |\ \ \ \ \
| | | | * | | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on ↵James Dong2011-06-101-9/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index OMX_IndexParamPortDefinition"