summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
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 "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
* | | | 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-205-5/+0
|\ \ | |/ |/|
| * Remove unneeded #include <sys/resource.h>Glenn Kasten2011-06-155-5/+0
| | | | | | | | | | | | Suggested in code review for previous change. Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
* | 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 "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
* | | 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
* | 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
* | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on ↵James Dong2011-06-101-9/+10
|\ \ | | | | | | | | | index OMX_IndexParamPortDefinition"
| * | Call storeMetaDataInVideoBuffers() before get/setParameters() on index ↵James Dong2011-06-081-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_IndexParamPortDefinition This can potentially save lot of memory for video recording use case since the video encoder can advertise a much smaller size of the input buffers which are allocated by SF by default. Change-Id: I582a356cd02c7852e13f2713d90ad5f1eb43177d
* | | Merge "Correctly handle crop rect event in SoftAVC.cpp"James Dong2011-06-102-8/+11
|\ \ \
| * | | Correctly handle crop rect event in SoftAVC.cppJames Dong2011-06-092-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Width and height of the video frame was incorrectly overwritten when a cropping need was detected. Using a separate crop width and crop height resolves the problem. Change-Id: I8a371c7fe7f8417a7995d7a7fe231120274ea0c8 related-to-bug: 4575591
* | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer ↵Andreas Huber2011-06-102-44/+242
|\ \ \ \ | | | | | | | | | | | | | | | populate it."
| * | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-082-44/+242
| | |/ / | |/| | | | | | | | | | Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
* | | | am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac': Make sure we don't read from invalid fds
| * \ \ \ am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f': Make sure we don't read from invalid fds
| | * \ \ \ am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e': Make sure we don't read from invalid fds
| | | * | | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/4580570 Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
| | * | | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket ↵Andreas Huber2011-06-021-17/+79
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptor does not abort pending recv/send calls. * commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d': DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
| | | * | | | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not ↵Andreas Huber2011-06-011-17/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abort pending recv/send calls. Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619 related-to-bug: 3362836, 4439092
| | * | | | | am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately ↵Andreas Huber2011-04-183-12/+26
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when trying to satisfy a read. * commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5': DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
| | | * | | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ↵Andreas Huber2011-04-143-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | satisfy a read. Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247 related-to-bug: 4286618
| | * | | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative ↵James Dong2011-04-041-2/+3
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value, report an error to application. DO NOT MERGE." into gingerbread * commit 'ea5d2c584490424be6bbc27dec58b4f9868d631e': When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
| | | * | | | When read() from AudioRecord returns 0 or negative value, report an error to ↵James Dong2011-03-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application. DO NOT MERGE. Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32 related-to-bug: 4195127
| | * | | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into ↵James Dong2011-03-112-8/+47
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '68f66b945e7a69549689becd2e656d9056f1e7f5': MP3Extractor and MP3 decoder fixes - DO NOT MERGE
| | | * | | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-picked the following patches from HC branch: o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode o When the temp buffer wraps around, the next read position should start from what have been read to avoid reading the same remaining bytes in the buffer again. o Speed up MP3Extractor using cached reads bug - 4083532 Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
* | | | | | | Fix an issue in MPEG4Writer where the write of outstanding chunks in the ↵James Dong2011-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | last batch was missing Change-Id: I93c9f6ae7ed098cdf828b2b11a9273c9e0c244e3
* | | | | | | Merge "Add timestamp and data pointer checks in CameraSource"James Dong2011-06-091-5/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |