4521 Commits

Author SHA1 Message Date
James Dong
bfb6791934 Merge "Add support for platform-specific recording start time offset" 2011-05-13 16:31:10 -07:00
James Dong
987ab4833e Support for storing geo information in the recorded mp4/3gpp file.
o Geo data (latitude and longitude) is stored in udta box

Change-Id: I76e4aeb741c4b339f3753d3d28190151f3ea4919
related-to-bug: 4260295
2011-05-13 16:29:19 -07:00
Gloria Wang
331de5dd58 DO NOT MERGE
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
2011-05-13 15:09:24 -07:00
James Dong
d295296a96 Track id really starts with 1, not 0
Change-Id: I55dcfdc2dc2a64285dfa93024f7b885210cc827e
2011-05-13 14:41:21 -07:00
Kristian Monsen
5694907e7f Merge Chromium at 10.0.621.0: Fixes for libstagefreight
URLRequest is now a member of the net namespace.
HttpCache constructor has a new argument, which is a CertVerifier()

Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606
2011-05-13 20:18:36 +01:00
Dima Zavin
34bb419e59 update for new audio.h header location
Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 14:09:57 -07:00
Andreas Huber
dbbb28d719 Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes." 2011-05-12 13:40:37 -07:00
Andreas Huber
0a6f09e445 A fix to the MPEG4Extractor to support 16-bit sample sizes.
Change-Id: Ic531f1ff0dd171f6f14aaad56aacbf3952a3aeae
2011-05-12 13:38:20 -07:00
Andreas Huber
93c612e2e7 The decoder wrapper is no longer needed. Also disable building old-style decoders.
Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
2011-05-12 11:24:13 -07:00
Andreas Huber
e4ba346f0f Merge "Squashed commit of the following:" 2011-05-12 09:29:20 -07:00
James Dong
f605a5aae5 Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)" 2011-05-11 17:52:32 -07:00
Andreas Huber
e4e7b48e33 Fix setDataSource(Context, Uri, Map<String,String> headers)
must not throw an exception if headers == null.

Change-Id: Ic8ddac597707129693874222fb2ebc5a84b8fff6
2011-05-11 16:54:41 -07:00
Andreas Huber
4b3913a3e4 Squashed commit of the following:
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
2011-05-11 14:24:58 -07:00
James Dong
9e836a7d2e Expose the track informational event for testing
Change-Id: I0f12d62d4a36dde76823f7f39e075184c1916504
2011-05-11 12:00:21 -07:00
Andreas Huber
4fbb313830 Merge "Leave the number of output buffers up to surface flinger and friends." 2011-05-11 08:11:11 -07:00
Andreas Huber
45179fae8d Leave the number of output buffers up to surface flinger and friends.
Change-Id: Iebb90f45793793aeb08d1cf9706e29a7cefae792
2011-05-10 16:17:44 -07:00
Andreas Huber
f5c9995ddd Make sure the ogg extractor returns appropriate error codes.
Change-Id: I36cbf58aa6fa9195e1cc052f91e1183f57069d03
2011-05-10 16:16:27 -07:00
Andreas Huber
77d8dc2b95 Using widevine:// to stream adaptive bitrate wvm content no longer
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
2011-05-10 15:49:47 -07:00
Andreas Huber
5fd43e3051 Properly honour any pending seek request when reading the first buffer after
starting the audio player.

Change-Id: Ibedc1804a8c444e4d0f5be4eb87b22ed5d2c367d
2011-05-10 14:05:02 -07:00
James Dong
a403a938e9 Add support for platform-specific recording start time offset
o This start time offset is used in the media framework to eliminate
  the recording sound in the recorded file.

Change-Id: I97926a74f0743b8a4f985d51334e8d1486a318ea
related-to-bug: 4390777
2011-05-10 10:32:19 -07:00
James Dong
3aea037dd8 Add send session recording summary report to application
Change-Id: I9c63ddae432f0c93486c39776ed0a058a8649602
2011-05-09 17:03:35 -07:00
James Dong
78fed171d9 Add const to the finders method in MetaData.cpp
o also fixed the MPEG4Writer writeFtypBox() to take a const pointer to MetaData

Change-Id: Iaecdbe6aeab345f6dc72aac0d19f9704b6e0d28a
2011-05-09 11:36:53 -07:00
James Dong
ed742306b3 Add end of recording summary track info
Change-Id: I2fcf589e70db225776ef7c8d0f28505ceb824c45
related-to-bug: 1854633
2011-05-09 11:31:33 -07:00
James Dong
7a6cea40b2 Refactor MPEG4Writer::writeTrackHeader() method
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
2011-05-09 10:49:17 -07:00
The Android Automerger
158e3582c0 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 2011-05-08 22:11:52 -07:00
Scott Main
256764c92f am 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
* commit '9603fdeecdf5417041aa68cc61a0373f33b74daa':
  docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 09:01:13 -07:00
Scott Main
9603fdeecd am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
* commit '0d560d454b88d52a3b48cbc3c3be27e563b7f098':
  docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 08:50:50 -07:00
Scott Main
0d560d454b am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
* commit '9f7054fea28e65ae1bf8bc1114090306979ba657':
  docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 08:41:57 -07:00
Scott Main
0cdd9f7def docs: add package description for mtp and a little more info to MtpDevice
Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
2011-05-05 15:53:44 -07:00
Andreas Huber
bf0420ccd6 Merge "Color conversion now supports YUV420p->RGB565 conversion even if the width is odd." 2011-05-05 15:51:25 -07:00
Andreas Huber
07309bc0f0 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
2011-05-05 15:43:32 -07:00
Andreas Huber
a161af9d1e Color conversion now supports YUV420p->RGB565 conversion even if the width is odd.
Change-Id: I1ef3ead94eab3811ead8830e104a9dad211ae3fd
related-to-bug: 4363071
2011-05-05 15:40:55 -07:00
James Dong
79f407cc6c Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI
Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
2011-05-05 15:11:23 -07:00
James Dong
17524dc0d2 Clean up JNI code
o Move the Set/Map/Iterator calls from JNI to Java
o The JNI function receives arrays instead of Maps
o Removed Set/Iterator calls from the Java code as suggested

Change-Id: I34068bf24b61abaf2833dad1f65abc733ed760dd
2011-05-05 11:20:55 -07:00
Andreas Huber
b1071331c0 DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1
related-to-bug: 4381047
2011-05-04 15:12:02 -07:00
James Dong
325039ec5c Merge "Initial check-in for AACWriter" 2011-05-04 13:56:36 -07:00
James Dong
f84bfabe0d Initial check-in for AACWriter
Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623

related-to-bug: 4211046
2011-05-04 13:38:31 -07:00
Andreas Huber
19127e7162 Signal an error if aac decoding fails early.
Change-Id: I8b886a7642aaf83fa008fefb38cb4f92267ca948
related-to-bug: 4272179
2011-05-04 13:09:35 -07:00
Andreas Huber
c016e0f8eb Merge "Fix potential memory corruption in NuCachedSource2." 2011-05-04 11:50:48 -07:00
Andreas Huber
13aa6c2d8a Fix potential memory corruption in NuCachedSource2.
Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb
related-to-bug: 4354845
2011-05-04 11:43:43 -07:00
Andreas Huber
65b9605976 Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd
related-to-bug: 4381047
2011-05-04 09:48:46 -07:00
Gloria Wang
4f55af7ba6 Merge "Initial CL for the timed text support: - 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" 2011-05-04 09:00:15 -07:00
Mike Lockwood
63de615ddb am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
* commit '36132a488b2974db9a90da809c2f3eeab99a4427':
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
2011-05-04 08:57:59 -07:00
Mike Lockwood
0faefb72fb am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
* commit '8b1c74f96f93195326907db1bb07a3787a1c1b45':
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
2011-05-04 08:57:56 -07:00
Mike Lockwood
df8894486c am a792c804: DO NOT MERGE MTP: Implement GetThumb command
* commit 'a792c804025e25eb8a110d1db63f26bbd09e0e6b':
  DO NOT MERGE MTP: Implement GetThumb command
2011-05-04 08:57:47 -07:00
Mike Lockwood
af964a632d am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
* commit 'af50821bace87aa83c7faba7bf139cfcaccf317a':
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
2011-05-04 08:57:44 -07:00
Mike Lockwood
eeaf48ca85 am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files
* commit 'fdb50e6f8eaac31010b64fc79a60dacb5f776613':
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
2011-05-04 08:57:41 -07:00
Mike Lockwood
f6df5b41e1 am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
2011-05-04 08:57:37 -07:00
Marco Nelissen
863ee40964 am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
  DO NOT MERGE Fix media scanner uri handling.
2011-05-04 08:57:33 -07:00
Mike Lockwood
21c0800f71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
2011-05-04 08:57:23 -07:00