summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
| | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ↵Gloria Wang2011-05-201-0/+7
|\ | | | | | | | | | | | | for container based DRM file. For bug 4392094. * commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| * am a6f1104b: Use pread() to get the decrypted data for container based DRM ↵Gloria Wang2011-05-201-0/+7
| |\ | | | | | | | | | | | | | | | | | | file. For bug 4392094. * commit 'a6f1104b9d829c636b60b9387e379f9667b5df09': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| | * Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| | | | | | | | | | | | | | | | | | For bug 4392094. Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
* | | Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"Kristian Monsen2011-05-202-21/+23
|\ \ \
| * | | Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequest is now a member of the net namespace. HttpCache constructor has a new argument, which is a CertVerifier() Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606
* | | | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-194-30/+162
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
| * | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ↵James Dong2011-05-184-29/+155
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | no longer" into honeycomb-mr2 * commit 'd148a499c27145e0473f89ece0500ebed38f875f': Using widevine:// to stream adaptive bitrate wvm content no longer
| | * | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-184-29/+155
| | |\ \ | | | | | | | | | | | | | | | into honeycomb-mr2
| | | * | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
| * | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the ↵Gloria Wang2011-05-182-8/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | following:" into honeycomb-mr2 * commit '07e9267d33bb199d0a2b8de221c64541bdf2465a': DO NOT MERGE For bug 4422428 Squashed commit of the following:
| | * | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into ↵Gloria Wang2011-05-182-8/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | honeycomb-mr2
| | | * | | DO NOT MERGEGloria Wang2011-05-132-8/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
| * | | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even ↵Andreas Huber2011-05-171-1/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | if sizeof(codec-specific-data) != 2" into honeycomb-mr2 * commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
| | * | | DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-041-1/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | sizeof(codec-specific-data) != 2 Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1 related-to-bug: 4381047
| * | | am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-292-0/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ec78f551b575b0274cbe796f8e08a9df1a706680': Add avg bandwidth estimate every 2 seconds - do not merge.
| | * | Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is meant for testing only. We will remove this patch once we tracked down all those spinning issues. related-to-bug: 4339075 Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
* | | | Properly forward rotation information from input format to output format.Andreas Huber2011-05-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The software renderer would otherwise never rotate videos as it only has access to the decoder's output format. Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
* | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-172-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e. Conflicts: include/media/stagefright/MPEG4Writer.h Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
* | | | Make track informational event optional, depending on system propertyJames Dong2011-05-171-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | o also add a track informational event to return the encoded data in kilo-bytes Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
* | | | Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8 related-to-bug: 4406745
* | | | Disable yuv->yuv mode and external display support until various driver ↵Andreas Huber2011-05-162-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | fixes are in. Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
* | | | Merge "Instead of using an RGB surface and conversion yuv420->rgb565"Andreas Huber2011-05-161-7/+58
|\ \ \ \
| * | | | Instead of using an RGB surface and conversion yuv420->rgb565Andreas Huber2011-05-051-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead. Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5 related-to-bug: 4394005
* | | | | Merge "Fix module tags on stagefright software decoders."Andreas Huber2011-05-168-8/+8
|\ \ \ \ \
| * | | | | Fix module tags on stagefright software decoders.Andreas Huber2011-05-168-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb related-to-bug: 4427361
* | | | | | Support platform and camera dependent recording start time offsetJames Dong2011-05-141-10/+24
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 4390777 Change-Id: Icb52973ad4ac716f04fb103ef527915a966d06d5
* | | | | Support for storing geo information in the recorded mp4/3gpp file.James Dong2011-05-131-2/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Geo data (latitude and longitude) is stored in udta box Change-Id: I76e4aeb741c4b339f3753d3d28190151f3ea4919 related-to-bug: 4260295
* | | | | Track id really starts with 1, not 0James Dong2011-05-131-1/+1
| |_|_|/ |/| | | | | | | | | | | Change-Id: I55dcfdc2dc2a64285dfa93024f7b885210cc827e
* | | | Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."Andreas Huber2011-05-121-1/+1
|\ \ \ \
| * | | | A fix to the MPEG4Extractor to support 16-bit sample sizes.Andreas Huber2011-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic531f1ff0dd171f6f14aaad56aacbf3952a3aeae
* | | | | The decoder wrapper is no longer needed. Also disable building old-style ↵Andreas Huber2011-05-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | decoders. Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
* | | | Squashed commit of the following:Andreas Huber2011-05-1144-218/+6060
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c80992e419ed567abef451042f09c4958534b90d Author: Andreas Huber <andih@google.com> Date: Wed May 11 14:00:07 2011 -0700 Support for the mp3 audio decoder as a software OMX component. Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807 commit a358d0e1bf2a88897887445f42ccdda0f5f2f528 Author: Andreas Huber <andih@google.com> Date: Wed May 11 13:11:23 2011 -0700 Support for G.711 alaw and mulaw decoders as software OMX components Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03 commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553 Author: Andreas Huber <andih@google.com> Date: Thu May 5 15:43:32 2011 -0700 Instead of using an RGB surface and conversion yuv420->rgb565 convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead. Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5 related-to-bug: 4394005 commit 69469d3bd84425777b11b9fc938c5e0c61af26a7 Author: Andreas Huber <andih@google.com> Date: Tue May 10 15:46:42 2011 -0700 voip mustn't link against libstagefright.so Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3 Author: Andreas Huber <andih@google.com> Date: Tue May 10 14:37:10 2011 -0700 Remove most non-OMX software decoders by default Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0 commit a4de62c37b335c318217765403a9fb282b20a216 Author: Andreas Huber <andih@google.com> Date: Mon May 9 16:50:02 2011 -0700 Conditionally build the old-style software decoders. Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846 Author: Andreas Huber <andih@google.com> Date: Mon May 9 16:13:12 2011 -0700 Support for MPEG4 and H.263 video decoders as soft OMX components. Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0 Author: Andreas Huber <andih@google.com> Date: Mon May 9 11:49:10 2011 -0700 Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder. Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8 commit c0574362f8dc3319ce84d981097867062a698527 Author: Andreas Huber <andih@google.com> Date: Mon May 9 11:28:53 2011 -0700 Support for the AMR decoders (NB and WB) as Soft OMX components. Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754 commit 3e5575a8f0e27a490cb7bde77bd9456087837f08 Author: Andreas Huber <andih@google.com> Date: Wed May 4 13:41:25 2011 -0700 Signal an error if the aac decoder failed to initialize from codec specific data. Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209 related-to-bug: 4272179 commit f94aeaa9886e772ff4823e671ed237096649f4af Author: Andreas Huber <andih@google.com> Date: Tue May 3 13:07:38 2011 -0700 Software OMX nodes don't (yet?) support native_window mode. Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d commit eefdfabac8dc659e00daa56da69aea705c49cb67 Author: Andreas Huber <andih@google.com> Date: Tue May 3 12:57:16 2011 -0700 Fixing the OMX tests to refer to appropriate files from test content. Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff commit f31b7326aef14b6a1b7946520a9688f092e844d5 Author: Andreas Huber <andih@google.com> Date: Tue May 3 11:08:38 2011 -0700 Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against. Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9 commit b7f0343879e4df06f0a1c9bfece24df557954e2f Author: Andreas Huber <andih@google.com> Date: Mon May 2 15:58:36 2011 -0700 Support for the AVC software decoder as an OMX component. Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2 commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:05:37 2011 -0700 Fix Vorbis OMX decoder's component role. Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5 commit 089c91f2333062e196c7afd5fb0ca914878aa474 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:05:18 2011 -0700 Support vorbis_decoder OMX testing. Change-Id: I1985be178a12ae3f8768bc72067d9236238be170 commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:01:46 2011 -0700 SoftVorbis OMX component now respects the number of valid frames per page. Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03 commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 10:59:38 2011 -0700 Support for the vorbis audio decoder as a soft OMX component. Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492 commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 10:07:50 2011 -0700 VPX decoder now properly resizes buffers after a port settings change. Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831 commit 35c7168243cb69849d88911144a2c7fdfed5c54e Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 13:23:34 2011 -0700 Support for the VPX video decoder as a Software OMX component. Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71 commit 923b2534b4211fc5405377b5190bfa6f2dd27f32 Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 11:34:40 2011 -0700 Table-based registration of soft omx components. Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937 commit 04a88f3edb2266a463da9c4481b80178be460902 Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 11:22:31 2011 -0700 Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port. Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb commit 9d70ca68445e7c40f5c9b2d12466e468f514de88 Author: Andreas Huber <andih@google.com> Date: Wed Apr 27 15:03:18 2011 -0700 Use the new soft OMX aac decoder for HTTP live playback. Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f commit 213fe4a10ea93cce08e8622dc3908053f29878a1 Author: Andreas Huber <andih@google.com> Date: Tue Apr 12 16:39:45 2011 -0700 Foundation for supporting software decoders as OMX components Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816 Change-Id: I83e9236beed4af985d10333c203f065df9e09a42
* | | | Merge "Leave the number of output buffers up to surface flinger and friends."Andreas Huber2011-05-111-2/+0
|\ \ \ \
| * | | | Leave the number of output buffers up to surface flinger and friends.Andreas Huber2011-05-101-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iebb90f45793793aeb08d1cf9706e29a7cefae792
* | | | | Make sure the ogg extractor returns appropriate error codes.Andreas Huber2011-05-101-6/+13
|/ / / / | | | | | | | | | | | | Change-Id: I36cbf58aa6fa9195e1cc052f91e1183f57069d03
* | | | Properly honour any pending seek request when reading the first buffer afterAndreas Huber2011-05-103-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | starting the audio player. Change-Id: Ibedc1804a8c444e4d0f5be4eb87b22ed5d2c367d
* | | | Add send session recording summary report to applicationJames Dong2011-05-091-15/+51
| | | | | | | | | | | | | | | | Change-Id: I9c63ddae432f0c93486c39776ed0a058a8649602
* | | | Add const to the finders method in MetaData.cppJames Dong2011-05-092-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | o also fixed the MPEG4Writer writeFtypBox() to take a const pointer to MetaData Change-Id: Iaecdbe6aeab345f6dc72aac0d19f9704b6e0d28a
* | | | Add end of recording summary track infoJames Dong2011-05-091-3/+36
| | | | | | | | | | | | | | | | | | | | Change-Id: I2fcf589e70db225776ef7c8d0f28505ceb824c45 related-to-bug: 1854633
* | | | Refactor MPEG4Writer::writeTrackHeader() methodJames Dong2011-05-091-420/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | o most of the mp4 file boxes has its own method now TODO: remove some of the duplicated code for esds box, for instance. Change-Id: Iae3dbb2410b79bc79aaee081b80569d339993c47
* | | | Color conversion now supports YUV420p->RGB565 conversion even if the width ↵Andreas Huber2011-05-051-6/+9
|/ / / | | | | | | | | | | | | | | | | | | is odd. Change-Id: I1ef3ead94eab3811ead8830e104a9dad211ae3fd related-to-bug: 4363071
* | | Merge "Initial check-in for AACWriter"James Dong2011-05-043-1/+384
|\ \ \
| * | | Initial check-in for AACWriterJames Dong2011-05-043-1/+384
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623 related-to-bug: 4211046
* | | | Signal an error if aac decoding fails early.Andreas Huber2011-05-041-0/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: I8b886a7642aaf83fa008fefb38cb4f92267ca948 related-to-bug: 4272179
* | | | Merge "Fix potential memory corruption in NuCachedSource2."Andreas Huber2011-05-041-0/+5
|\ \ \ \
| * | | | Fix potential memory corruption in NuCachedSource2.Andreas Huber2011-05-041-0/+5
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb related-to-bug: 4354845
* | | | Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2Andreas Huber2011-05-041-1/+7
|/ / / | | | | | | | | | | | | Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd related-to-bug: 4381047
* | | Merge "Initial CL for the timed text support: - Add support for MP4 timed ↵Gloria Wang2011-05-048-23/+487
|\ \ \ | | | | | | | | | | | | text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever"
| * | | Initial CL for the timed text support:Gloria Wang2011-05-038-23/+487
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94