summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/matroska
Commit message (Collapse)AuthorAgeFilesLines
* am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-151-1/+1
|\ | | | | | | | | * commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2': media: -Werror re-enabled
| * am cd4eb72e: Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-151-1/+1
| |\ | | | | | | | | | | | | * commit 'cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed': media: -Werror re-enabled
| | * media: -Werror re-enabledMark Salyzyn2014-04-151-1/+1
| | | | | | | | | | | | Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
| * | am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"Mark Salyzyn2014-04-151-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '432ed3d66d09464778df31c73374ee897f7b8840': libstagefright: fix 64-bit warnings
| | * libstagefright: fix 64-bit warningsColin Cross2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. (cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
* | | am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build ↵Mark Salyzyn2014-04-111-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 1119326" * commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9': Fix aosp_arm64 mirror-aosp-master build 1119326
| * | am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"Mark Salyzyn2014-04-112-5/+5
| |\ \ | | |/ | | | | | | | | | * commit 'e523889332b88348e673137d272854278acbef8f': Fix aosp_arm64 mirror-aosp-master build 1119326
| | * Fix aosp_arm64 mirror-aosp-master build 1119326Mark Salyzyn2014-04-112-5/+5
| | | | | | | | | | | | | | | | | | Remove -Werror that was set in 'warnings be gone' Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
| * | am 0938c6f7: Merge "warnings be gone (4/4)"Mark Salyzyn2014-04-111-2/+4
| |\ \ | | |/ | | | | | | | | | * commit '0938c6f7a1e713030b04e32548012f0c29c94f4d': warnings be gone (4/4)
| | * warnings be gone (4/4)Mark Salyzyn2014-04-111-2/+4
| | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
| * | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-112-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * warnings be gone.Andreas Huber2014-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
| * | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |/ | | | | | | | | | | | | | | | | This change adds support for multibyte sizes in the ESDS. Previously the Matroska extractor only supported single byte sizes, so codec private data had to be less than 108 bytes, and would crash if it was bigger. b/12584090 Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
* | stagefright: handle corrupt matroska files gracefullyLajos Molnar2014-04-041-5/+13
| | | | | | | | | | | | Bug: 13693438 Bug: 13744158 Change-Id: I557595b5b5d4a20934f79e00a622b06d13378223
* | libstagefright: fix 64-bit warningsColin Cross2014-03-191-6/+8
| | | | | | | | | | | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
* | Opus Matroska support in OpenMaxVignesh Venkatasubramanian2014-03-032-2/+10
| | | | | | | | | | | | | | | | Adding Openmax component for libopus software decoder. This can decode opus audio files embedded in matroska containers. Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc Note: This CL is part of adding Opus support to Android.
* | warnings be gone.Andreas Huber2014-02-112-3/+3
| | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | Allow for larger codec private dataMarco Nelissen2014-02-031-30/+50
|/ | | | | | | | | This change adds support for multibyte sizes in the ESDS. Previously the Matroska extractor only supported single byte sizes, so codec private data had to be less than 108 bytes, and would crash if it was bigger. b/12584090 Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
* Adds VP9 decoding support for stagefright.hkuang2013-06-241-1/+3
| | | | | | | | | | | | | Also change the VP8 encoder role name from video_encoder.vpx to video_encoder.vp8 for future VP9 encoder support. Requires the change in frameworks/native and media_codecs.xml corresponding to the device. VP9 decoding test will be added to cts repo later.
* stagefright: matroska: don't crash on parsing errorLajos Molnar2013-03-271-2/+2
| | | | | | | | | | MatroskaExtractor crashed with an assertion if mkvparser::ParseNext() returned a negative number. Now handle all error values the same way as the EOF. Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 8433794
* Merge "Match new paths and organization in external/libvpx"Ying Wang2012-12-121-1/+1
|\
| * Match new paths and organization in external/libvpxJohann2012-10-291-1/+1
| | | | | | | | | | | | See I739f99d48b8d7e6354c416ef2ca79c954826307f Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
* | The length information of the chunks making up vorbis codec specific infoAndreas Huber2012-11-151-14/+60
|/ | | | | | | are "Xiph-style-lacing encoded" instead of individual bytes. Change-Id: Ic1274a5bd8f082197bae6831da04002762a920c5 related-to-bug: 7401329
* Fixed redefinition of 'i' with a different type errorTareq A. Siraj2012-08-221-2/+2
| | | | | | | | Renamed the redefinition of 'i' to 'k'. Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4 Author: Tareq A. Siraj <tareq.a.siraj@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-132-0/+190
|\ | | | | | | | | | | | | /frameworks/av/" into jb-dev * commit 'e20435de10f63af812da9d4f801b61a8817733a0': Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | libstagefright/matroska: Fix build with gcc 4.7Bernhard Rosenkraenzer2012-05-241-3/+3
|/ | | | | | | | gcc 4.7 doesn't like the redefinition of i in the same scope Change-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* Trust the Cues elementJohann2012-04-041-44/+22
| | | | | | | | With the Cue based seeking we will get the closest previous key frame. For audio, use the Cue file to find the Cluster with the video key frame then incrementally look for the audio Block. Change-Id: Idc934cca1286b1bb48ee7577b27903ca488a0610
* fix crash with cues at the beginning of the fileJohann2012-04-031-9/+4
| | | | | | | | previous implementation tried to be clever about economizing Cue loads. however, files with the cues at the beginning missed the initial load in the seek function and would crash with a null pointer. Change-Id: I49c15d6688909cd13afabf33a54d9f5896aab7cd
* Use Cues to seek Matroska filesJohann2012-04-021-13/+97
| | | | | | | | | | | | | | | On the first seek, load the Cues element. Parse it incrementally until the desired seek point can be located. This allows files to begin playing immediately. However, the Browser still seeks to 0 before playing embedded YouTube files. Because YouTube stores the cues at the end of the file, this causes it to seek, load the cues, then begin playing. It is still better than the previous behavior which blocked until the entire file was loaded. BUG=5921311 Change-Id: Iad2abc64ded3b4e2c2d2c478a969f68450754282
* Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-241-1/+0
| | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-1/+1
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* Experiment with seeking to closest frame instead of closest syncframeAndreas Huber2012-02-091-11/+60
| | | | | | Also supports SEEK_CLOSEST mode in the Matroska/Webm extractor. Change-Id: I257771648dfe41392a4cf8932f625489dcb9f234
* MatroskaExtractor: to support MPEG4 and MP3 codec.Dongwon Kang2012-01-151-12/+32
| | | | Change-Id: Ic7ffb3ed394b233336fbf2a7b2627ee27033a59e
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-1/+1
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-7/+7
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Support multiple NAL fragments per .mkv payloadAndreas Huber2011-09-281-47/+61
| | | | | | | | | Apparently the payload for an h.264 track in an .mkv file can contain multiple NAL fragments, we used to discard everything after the first one before, now we preserve them all. Change-Id: Ic7187365309f3880a3256982879a45df50db697d related-to-bug: 5337218
* Apparently keyframe status in audio tracks of .webm/.mkv files is unreliableAndreas Huber2011-09-071-5/+22
| | | | | | | | fortunately in all our supported audio encodings we can treat every frame as a keyframe. Change-Id: I32f21d0077bbae7ef9efe725dd351baf531179e2 related-to-bug: 5263837
* The MatroskaExtractor will now publish a different mime-type "video/webm" ifAndreas Huber2011-08-222-2/+11
| | | | | | | the doctype of the matroska file indicates that it is a webm file. Change-Id: I467f597690a841043ecd11d2a2cae93351820f1b related-to-bug: 5042137
* Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2Andreas Huber2011-05-041-1/+7
| | | | | Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd related-to-bug: 4381047
* Fix a webm-seek issue introduced when adding support for streaming webmAndreas Huber2011-04-011-1/+4
| | | | | Change-Id: I52ec841832077603ee035f7a648316349513e978 related-to-bug: 4199894
* Squashed commit of the following:Andreas Huber2011-03-182-195/+145
| | | | | | | | | | | | | | | | | | | | commit ed615e2803839ef28e0eab50d17844c207083ad6 Author: Andreas Huber <andih@google.com> Date: Fri Mar 18 12:38:30 2011 -0700 Support for live streaming of webm content over http. Change-Id: Ie9ebd23d2c44d192d348b9fa3f3a0f3f28ac9e4c commit 9c50b1392471a3d652b4a875c823bee854f8855b Author: Andreas Huber <andih@google.com> Date: Thu Mar 17 13:33:22 2011 -0700 Upgrade to the latest version of libwebm. Change-Id: Ic7965dda84131a38f9d3c72b6acd2025ace939ce Change-Id: I3c993a89f749f05741594ef0ea47864e17ee783b
* Remove mkvparser code from /frameworks/baseJames Dong2011-02-223-5073/+3
| | | | | | bug - 3322129 Change-Id: I94dca6234ce57c9a32290aa7ac4885b0a2f566a9
* The .mkv parser lib leaves some tracks NULL if it doesn't support them.Andreas Huber2011-01-241-0/+6
| | | | | | | But it still counts them as valid tracks... Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0 related-to-bug: 3377186
* Properly parse Matroska lacing flags and extract all frames contained in a ↵Andreas Huber2011-01-113-55/+284
| | | | | | | block. Change-Id: I1aca46b2e28b9cad88bf4a296f675e81e66ee095 related-to-bug: 3331623
* 64-bit file size/offset support for media frameworkJames Dong2010-11-181-1/+1
| | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* Proper support for variable NALsize lengths of AVC content in .mkv files.Andreas Huber2010-11-151-54/+67
| | | | | Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929 related-to-bug: 3197442
* Upgrade to the latest version of libwebm to fix YouTube webm playback.Andreas Huber2010-10-283-3533/+5067
| | | | | Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a related-to-bug: 3141937
* Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-151-1/+1
| | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
generated by cgit v1.1 at 2024-05-11 08:48:45 +0000