summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" ↵James Dong2010-10-212-18/+39
|\ | | | | | | | | | | | | | | | | into gingerbread Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99' * commit '8ad6335d2c22900de5b46460473495b5bcea9f99': File writer size estimation improvement
| * am fa7a87fb: Merge "File writer size estimation improvement" into gingerbreadJames Dong2010-10-202-18/+39
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp * commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26': File writer size estimation improvement
| | * File writer size estimation improvementJames Dong2010-10-192-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Do not count the reserved space for moov if the meta data size is small o Do not count the extra 1KB disturbing small file estimation. o Reduce the default minimum reserved space from 4 KB to 3 KB. o Estimate the moov size based on both duration AND file size limit is set and set it to the smaller estimated value. low risk change bug - 3111983 Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
* | | Fix a copy & paste logging error.Jamie Gennis2010-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | This change corrects the name of a variable used in a logging macro, allowing AwesomePlayer.cpp to build with verbose logging enabled. Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
* | | Merge "Fix the non-ANW video decode path."Jamie Gennis2010-10-201-2/+4
|\ \ \
| * | | Fix the non-ANW video decode path.Jamie Gennis2010-10-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The BufferInfo::mOwnedByNativeWindow field was not being initialized in the non-ANativeWindow video decode path. Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
* | | | Merge "If we basically finished the preparation phase and are only buffering ↵Andreas Huber2010-10-202-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | enough data to start playback, cancel this early on reset()."
| * | | | If we basically finished the preparation phase and are only buffering enough ↵Andreas Huber2010-10-202-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data to start playback, cancel this early on reset(). Change-Id: I71a59d5e019e7b9ec3d9375d6231cc301ad3999b
* | | | | Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support ↵Andreas Huber2010-10-205-18/+297
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | for malformed packet descriptions that end lines in LF only, instead of CRLF."
| * | | | | Support for BASIC and DIGEST authentication schemes in RTSP. Support for ↵Andreas Huber2010-10-205-18/+297
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | malformed packet descriptions that end lines in LF only, instead of CRLF. Change-Id: I57eaefdc4b300a8f56bbe5cf3a34c424e8efe63a related-to-bug: 3084183
* | | | | Merge "Make sure we can encode the size of the codec specific data in a ↵Andreas Huber2010-10-201-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | single byte."
| * | | | Make sure we can encode the size of the codec specific data in a single byte.Andreas Huber2010-10-201-0/+3
| |/ / / | | | | | | | | | | | | Change-Id: If7680cbfb380180c8dd6d6019b9c6c67661e468d
* | | | Merge "Fix an issue where the video size was incorrectly retrieved from ↵James Dong2010-10-201-1/+13
|\ \ \ \ | |/ / / |/| | | | | | | preview size"
| * | | Fix an issue where the video size was incorrectly retrieved from preview sizeJames Dong2010-10-201-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3115814 Change-Id: I6aa59b3182ceee35c6d6ef54ff520f81077873f0
* | | | Add decode-to-ANativeWindow support to Stagefright.Jamie Gennis2010-10-206-26/+378
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support to Stagefright for doing OMX video decoding directly into buffers dequeued from an ANativeWindow. It does this by registering the dequeued buffers with the OMX component using an Android-specific OMX extension, and then exchanging buffers between the OMX component and the ANativeWindow. Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
* | | Merge "Make camera source ready for handling meta-data video buffers."James Dong2010-10-193-12/+105
|\ \ \
| * | | Make camera source ready for handling meta-data video buffers.James Dong2010-10-193-12/+105
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
* | | | Camera framework change required for 0-memcpy recordingJames Dong2010-10-196-1/+124
|/ / / | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
* | | Merge "Camera hal change for 0-memcpy in media recording framework"James Dong2010-10-191-51/+76
|\ \ \
| * | | Camera hal change for 0-memcpy in media recording frameworkJames Dong2010-10-191-51/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o document the camera hal to clarify the reviewer's questions. bug - 3042125 Change-Id: I3edf701d084933ee8d1e3b054d222e8c9dfc42a5
* | | | am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while ↵Andreas Huber2010-10-192-18/+37
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | seeking we may still need to seek audio." into gingerbread Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63' * commit '2d00c6050977f3e03665fbfef93f4f6aed041a63': If we encounter video stream EOS while seeking we may still need to seek audio.
| * | | am 52bea277: Merge "If we encounter video stream EOS while seeking we may ↵Andreas Huber2010-10-192-18/+37
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | still need to seek audio." into gingerbread Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp * commit '52bea277ff92a2a1780e035c82c72082434e7b16': If we encounter video stream EOS while seeking we may still need to seek audio.
| | * | If we encounter video stream EOS while seeking we may still need to seek audio.Andreas Huber2010-10-192-18/+37
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d related-to-bug: 3108724
* | | | am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no ↵Andreas Huber2010-10-191-3/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer registered should not cause an assertion. Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf' * commit '8b5161c2aed8637de9bffb1d81298d60ea237caf': An attempt to unregister a handler that's no longer registered should not cause an assertion.
| * | | am d68cda47: An attempt to unregister a handler that\'s no longer registered ↵Andreas Huber2010-10-181-3/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | should not cause an assertion. Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp * commit 'd68cda472a3646966a203338ccac04f0783293b7': An attempt to unregister a handler that's no longer registered should not cause an assertion.
| | * | An attempt to unregister a handler that's no longer registered should not ↵Andreas Huber2010-10-181-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause an assertion. There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK. Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b related-to-bug: 3101247 QA-impact: no(!!!) risk
* | | | am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we ↵Andreas Huber2010-10-193-3/+51
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2' * commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
| * | | am bc96c284: Merge "For thumbnail extraction make sure we instantiate a ↵Andreas Huber2010-10-183-3/+51
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp * commit 'bc96c2848dadaa844f95e89708d9941f73bbf400': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
| | * | Merge "For thumbnail extraction make sure we instantiate a decoder that ↵Andreas Huber2010-10-183-3/+51
| | |\ \ | | | | | | | | | | | | | | | allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
| | | * | For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-183-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
* | | | | am 8f5214eb: am 02ec432e: Merge "If the PES packet size exceeds 16-bit ↵Andreas Huber2010-10-191-0/+8
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread Merge commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17' * commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17': If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
| * | | am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a ↵Andreas Huber2010-10-181-0/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet size of 0 instead. This is valid for video content according to the specs." into gingerbread Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp * commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823': If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
| | * | If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. ↵Andreas Huber2010-10-181-0/+8
| | |/ | | | | | | | | | | | | | | | This is valid for video content according to the specs. Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
* | | Fix build (bad merge)Jean-Baptiste Queru2010-10-181-1/+1
| | | | | | | | | | | | | | | Bug: 3101573 Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
* | | Remove one more opencore include pathJean-Baptiste Queru2010-10-181-1/+1
| | | | | | | | | | | | | | | Bug: 3101573 Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
* | | Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-1816-19/+22
|\ \ \ | |/ / | | | | | | Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
| * | am b04f356d: Merge "Include the framework copy of the OpenMAX headers ↵Andreas Huber2010-10-1516-19/+22
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | instead of referencing external/opencore." into gingerbread Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp * commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678': Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
| | * Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-1516-19/+22
| | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
* | | am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX ↵Andreas Huber2010-10-1810-0/+6937
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | headers formerly included from external/opencore." into gingerbread Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4' * commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
| * | am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers ↵Andreas Huber2010-10-1510-0/+6937
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | formerly included from external/opencore." into gingerbread Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp * commit 'ff7a7a455c15077e2b691efa370619f06058f697': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
| | * Check-in of a copy of the Khronos OpenMAX headers formerly included from ↵Andreas Huber2010-10-1510-0/+6937
| | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c related-to-bug: 3101573
* | | am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if ↵Andreas Huber2010-10-161-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | using the caching datasource." into gingerbread Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611' * commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611': Make sure we cache the sampleTable again if using the caching datasource.
| * | am e1f3976b: Merge "Make sure we cache the sampleTable again if using the ↵Andreas Huber2010-10-151-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | caching datasource." into gingerbread Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp * commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c': Make sure we cache the sampleTable again if using the caching datasource.
| | * Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | | QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position. Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5 related-to-bug: 3098873
* | | am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted ↵Andreas Huber2010-10-151-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | out of sync. This change remedies that." into gingerbread Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f' * commit '27c7fb1a861776b4fdc2632697e4e25eee83617f': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
| * | am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. ↵Andreas Huber2010-10-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | This change remedies that." into gingerbread Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
| | * Metadata.cpp and Metadata.java had drifted out of sync. This change remedies ↵Andreas Huber2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | that. Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599 related-to-bug: 3073955
* | | am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the ↵Andreas Huber2010-10-152-9/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | entire stream from metadata." into gingerbread Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b' * commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b': Attempt to derive the avg. bitrate of the entire stream from metadata.
| * | am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream ↵Andreas Huber2010-10-132-9/+50
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | from metadata." into gingerbread Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp * commit '5f42391701c0657d520d00f62a4c061b18ba1280': Attempt to derive the avg. bitrate of the entire stream from metadata.
| | * Merge "Attempt to derive the avg. bitrate of the entire stream from ↵Andreas Huber2010-10-132-9/+50
| | |\ | | | | | | | | | | | | metadata." into gingerbread