summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 9843e8c9: am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before...Chong Zhang2013-09-251-17/+23
|\
| * am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first access...Chong Zhang2013-09-251-17/+23
| |\
| | * Send kWhatConnected in onTimeUpdate() before first access unitChong Zhang2013-09-241-17/+23
* | | am a35b4278: am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect ...Lajos Molnar2013-09-251-0/+6
|\ \ \ | |/ /
| * | am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRe...Lajos Molnar2013-09-251-0/+6
| |\ \
| | * | MediaCodec: Pass the crop rect to SoftwareRendererMartin Storsjo2013-09-251-0/+6
* | | | Merge "Fix aac decoder flush"Marco Nelissen2013-09-231-0/+6
|\ \ \ \
| * | | | Fix aac decoder flushMarco Nelissen2013-09-201-0/+6
* | | | | Merge "Fully reset SkipCutBuffer state in clear()"Marco Nelissen2013-09-181-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fully reset SkipCutBuffer state in clear()Marco Nelissen2013-09-181-1/+2
* | | | | am ec467110: am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_B...Lajos Molnar2013-09-182-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value"...Lajos Molnar2013-09-182-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE valueLajos Molnar2013-09-172-2/+2
* | | | am 49d62d66: am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-...Lajos Molnar2013-09-121-2/+5
|\ \ \ \ | |/ / /
| * | | am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data mod...Lajos Molnar2013-09-121-2/+5
| |\ \ \ | | |/ /
| | * | ACodec: fix flush/resume for decoder-output-meta-data modeLajos Molnar2013-09-121-2/+5
* | | | am 33010b80: am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
|\ \ \ \ | |/ / /
| * | | am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| |\ \ \ | | |/ /
| | * | Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
* | | | am 1024ffd7: am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
|\ \ \ \ | |/ / /
| * | | am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
| |\ \ \ | | |/ /
| | * | MediaMuxer: Hook up setLocation methodZhijun He2013-09-091-0/+10
* | | | am e0fdfdd5: am c23981d9: Merge "Better workaround for slow decoders." into k...Marco Nelissen2013-09-061-4/+19
|\ \ \ \ | |/ / /
| * | | am c23981d9: Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| |\ \ \ | | |/ /
| | * | Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| | |\ \
| | | * | Better workaround for slow decoders.Marco Nelissen2013-09-041-4/+19
* | | | | Merge "Fix decoder EOS handling"Marco Nelissen2013-09-056-203/+213
|\ \ \ \ \
| * | | | | Fix decoder EOS handlingMarco Nelissen2013-09-046-203/+213
* | | | | | am c74630bc: am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNati...Chong Zhang2013-09-041-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if ...Chong Zhang2013-09-041-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "wifi-display: do not use HDCP's encryptNative method if its unsupporte...Chong Zhang2013-09-041-1/+2
| | |\ \ \
| | | * | | wifi-display: do not use HDCP's encryptNative method if its unsupportedChong Zhang2013-09-031-1/+2
* | | | | | am 86df9e10: am c85d6196: Merge " Fixed timestamp handling in ESQueue Access...Rachad2013-09-041-6/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c85d6196: Merge " Fixed timestamp handling in ESQueue Access Unit parser....Rachad2013-09-041-6/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes...Rachad2013-09-041-6/+1
| | |\ \ \ \
| | | * | | | Fixed timestamp handling in ESQueue Access Unit parser.Rachad2013-08-301-6/+1
* | | | | | | am b9ab60c0: am df60eff8: Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-031-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am df60eff8: Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-031-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-041-0/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Work around decoder slownessMarco Nelissen2013-09-031-0/+2
| | | |/ / /
* | | | | | am dfa989d2: am 572864b9: Merge "AAC encoder: handle missing object types" in...Jean-Michel Trivi2013-09-031-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 572864b9: Merge "AAC encoder: handle missing object types" into klp-devJean-Michel Trivi2013-09-031-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AAC encoder: handle missing object types" into klp-devJean-Michel Trivi2013-09-031-0/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | AAC encoder: handle missing object typesJean-Michel Trivi2013-08-291-0/+4
* | | | | | am 1f8d1397: am e45a767e: Merge "Revert "Fix decoder EOS handling"" into klp-devEric Laurent2013-08-316-208/+202
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e45a767e: Merge "Revert "Fix decoder EOS handling"" into klp-devEric Laurent2013-08-316-208/+202
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "Fix decoder EOS handling"Eric Laurent2013-08-306-208/+202
| | | |/ / | | |/| |
* | | | | am b87a8152: am 9404fa6a: Merge "Fix decoder EOS handling" into klp-devMarco Nelissen2013-08-306-202/+208
|\ \ \ \ \ | |/ / / /
| * | | | am 9404fa6a: Merge "Fix decoder EOS handling" into klp-devMarco Nelissen2013-08-306-202/+208
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix decoder EOS handling" into klp-devMarco Nelissen2013-08-306-202/+208
| | |\ \ \