summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* am e580006c: Encoder input buffers don\'t need HW_TEXTURE usageJesse Hall2014-07-141-2/+1
|\ | | | | | | | | * commit 'e580006cd0067109189975c56395d29309d49883': Encoder input buffers don't need HW_TEXTURE usage
| * Encoder input buffers don't need HW_TEXTURE usageJesse Hall2014-07-141-2/+1
| | | | | | | | Change-Id: Ibb1be86ae99439ccbce3fc2b38d92115083ef7ff
* | am 24a5a7c3: am b7a88e31: Merge "h264_enc: Use free() to release memory ↵Narayan Kamath2014-07-141-2/+2
|\ \ | |/ |/| | | | | | | | | allocated with malloc()" * commit '24a5a7c30ad041971ca511f4c7f784936090dfc6': h264_enc: Use free() to release memory allocated with malloc()
| * am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with ↵Narayan Kamath2014-07-141-2/+2
| |\ | | | | | | | | | | | | | | | | | | malloc()" * commit 'b7a88e3101d2d871f1d90c08806577a859f1ea12': h264_enc: Use free() to release memory allocated with malloc()
| | * Merge "h264_enc: Use free() to release memory allocated with malloc()"Narayan Kamath2014-07-101-2/+2
| | |\
| | | * h264_enc: Use free() to release memory allocated with malloc()Ashok Bhat2014-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mInputFrameData and mSliceGroup are allocated memory with malloc() but released using delete. Changed this to use free() instead. Change-Id: Iecf6684d97fabb2229d9abd94279a24faf9ac2d7 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | Resolution reinitialization changesNaveen Kumar Ponnusamy2014-07-122-107/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decoder initialized to 320x240. When higher resolution comes, the decoder reinitialized to the resolution. Bug: 14571712 Change-Id: I6b6ad17dd87f0112ce7ccf4f6c17bb4c65b5d8af
* | | | Merge "MediaCodec: change onError cb to return CodecException"Chong Zhang2014-07-111-4/+8
|\ \ \ \
| * | | | MediaCodec: change onError cb to return CodecExceptionChong Zhang2014-07-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11990118 Change-Id: I3278aecb20df88c42fa2709a66e6166eb3cbe56f
* | | | | Use a better and more direct API to mark a socket as if it were a user's.Sreeram Ramachandran2014-07-112-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
* | | | | stagefright: Return correct play position after EOSaarti jadhav-gaikwad2014-07-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of offload getOutputPlayPositionUs_l returns zero on reaching EOS. Return duration as position. Bug: 15770459 Change-Id: I7aeafdc315a86ccd197d555d604e1069eead3153
* | | | | Merge "MediaCodec async callbacks"Chong Zhang2014-07-101-91/+173
|\ \ \ \ \ | |/ / / /
| * | | | MediaCodec async callbacksChong Zhang2014-07-111-91/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11990118 Change-Id: I6fe4b407d9c85cddec8d958620d5d356735273cf
* | | | | stagefright: Pass audio aac sub formats in offloadinfoaarti jadhav-gaikwad2014-07-112-7/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass audio aac sub formats in offloadinfo according to aac profile. Audio HAL can take decision about offload using DSP capabilities Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
* | | | stagefright: add indexed buffer and format getters to MediaCodecLajos Molnar2014-07-111-5/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are designed to be called from the same thread as the one calling dequeue?Buffer, and use a mutex to avoid switching context. All other calls of MediaCodec are designed to be blocking and synchronous. Bug: 14297827 Change-Id: If341c6e4407ca6f10f5e0d47008dddc0e20b0a50
* | | | Check meta before dereferencing it.Wei Jia2014-07-101-0/+3
| | | | | | | | | | | | | | | | Change-Id: Ic8153b33413a34d75a3053dbfb9530a639e0ec12
* | | | Add support of audio offloading for NuPlayer.Wei Jia2014-07-091-0/+5
| | | | | | | | | | | | | | | | Change-Id: Ic83973339fb46a83b48382e6097925f45d200867
* | | | am 782be1ec: am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ↵Narayan Kamath2014-07-094-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ULong" * commit '782be1ecf1022d4e2da714b5aebe51ab616e9975': m4v_h263_enc: Use uint32_t for ULong
| * \ \ \ am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-094-7/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '1c1b5e51cb1acd43984ce2e82a27e61b4943186a': m4v_h263_enc: Use uint32_t for ULong
| | * | | am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-094-7/+7
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'c37eaa320437b7d65d1c3f704d7b7c61d4ccd8f1': m4v_h263_enc: Use uint32_t for ULong
| | | * | m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ULong is used in the encoder code as 32-bit unsigned integer type. But it has been defined as an unsigned long, which will be 64-bit on 64-bit platforms. This causes many problems including output mismatch between 32-bit and 64-bit code and crash in certain cases. This patch defines ULong as uint32_t. In addition, it uses uintptr_t at places where an address is cast to an integer to check for alignment. Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| | | * | DO NOT MERGE: Fix for SW video decoder OMX profile/level queryXiaosong Wei2014-06-241-3/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get the correct profile index from the input param and pass it to profileLevel array to get the corresponding profile/level Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com>
| * | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-138-88/+183
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| | * | Update OMX messages for 64 bitAndy Hung2014-06-128-84/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | | | Merge "Restore the LOOPING flag in onAudioTearDownEvent"Sungsoo Lim2014-07-021-0/+4
|\ \ \ \
| * | | | Restore the LOOPING flag in onAudioTearDownEventSungsoo Lim2014-06-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15728572 Change-Id: Ib8d118a148a7bb74531c8c025dae479c0a86efcb
* | | | | Merge "HLS: do not discard packets when queuing explicit discontinuity"Chong Zhang2014-07-074-28/+31
|\ \ \ \ \
| * | | | | HLS: do not discard packets when queuing explicit discontinuityChong Zhang2014-06-264-28/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case of explicit discontinuity (#EXT-X-DISCONTINUITY tag in the playlist), do not discard packets that's already queued. (when seeking, the old fetcher will be discarded so this won't affect seeking case.) Bug: 15020526 Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
* | | | | Merge "handle emulation_prevention_three_bytes for AVC"Chong Zhang2014-07-081-0/+68
|\ \ \ \ \
| * | | | | handle emulation_prevention_three_bytes for AVCChong Zhang2014-07-081-0/+68
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug: 15917805 Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
* | | | | Merge "AString: add startsWithIgnoreCase and endsWithIgnoreCase"Lajos Molnar2014-07-081-0/+14
|\ \ \ \ \
| * | | | | AString: add startsWithIgnoreCase and endsWithIgnoreCaseLajos Molnar2014-06-181-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I340159aa14d4d3d28ea675c6c5b8a82f7e731069
* | | | | | stagefright: update ACodec to use CodecBase enumerations directlyLajos Molnar2014-07-071-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11784825 Change-Id: I9f322b78b52bfcc5040fda951486df4354cdba4f
* | | | | | stagefright: update MediaCodec to use CodecBase instead of ACodecLajos Molnar2014-07-071-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec still creates an ACodec instance in init() Bug: 11784825 Change-Id: Ifba1e1582c788056c0e59afdf68cd3a504ab3679
* | | | | | stagefright: create CodecBase interface (abstract class)Lajos Molnar2014-07-073-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This abstracts out the ACodec dependency in MediaCodec. Bug: 11784825 Change-Id: I0aa8b56c6414865fd4b0646e2c5bd1b62d030682
* | | | | | Merge "MatroskaExtractor: track specific seeking"Robert Shih2014-07-023-26/+96
|\ \ \ \ \ \
| * | | | | | MatroskaExtractor: track specific seekingRobert Shih2014-06-193-26/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Divide cues based on tracks to support track specific seeking. Bug: 15595215 Change-Id: Ibb853b0955c62af72243ed29253f939d07628ae4
* | | | | | | Merge "Add HEVC encoder support to ACodec"Rachad2014-06-271-0/+60
|\ \ \ \ \ \ \
| * | | | | | | Add HEVC encoder support to ACodecRachad2014-06-261-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
* | | | | | | | Fix AAC timestampsMarco Nelissen2014-06-262-13/+29
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When playing an mpeg-2 transport stream with AAC audio, there will be more than one packet per input buffer, resulting in multiple output buffers for each input buffers. Additional timestamps needs to be generated in that case. b/15755476 Change-Id: I2df50b0cb3690eb36d56871daa1263de0028db06
* | | | | | | Merge "HLS: only queue discontinuity for first block"Chong Zhang2014-06-261-0/+3
|\ \ \ \ \ \ \
| * | | | | | | HLS: only queue discontinuity for first blockChong Zhang2014-06-251-0/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15020526 Change-Id: I15f9ab0f38dc510e584c668eea73ece61844d413
* | | | | | | libstagefright: 64-bit compile warningsMark Salyzyn2014-06-2628-136/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
* | | | | | | Parse trex and mehd boxesMarco Nelissen2014-06-233-16/+133
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also get duration from mvhd if available, use that in addition to track durations to determine total length of file, clear track header struct so we don't read uninitialized garbage from it, and take composition time offset into account for proper ordering when B frames are used. b/15669839 Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
* | | | | | Merge "Fail more gracefully on allocation failure"Marco Nelissen2014-06-171-7/+26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fail more gracefully on allocation failureMarco Nelissen2014-06-171-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check allocations when the size is read from a file and might therefore be invalid. b/14388161 Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
* | | | | | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix loggingMarco Nelissen2014-06-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the log message specify whether it was an encoder or a decoder that failed to instantiate. Change-Id: Ie357775114c8dea722d87381c13affdfb19dcde4
* | | | | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-142-0/+7
|\ \ \ \ \ \
| * | | | | | support for CEA-608 closed captionChong Zhang2014-06-132-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
generated by cgit v1.1 at 2024-05-29 00:40:20 +0000