summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* AV Android make files changesJames Dong2012-03-2836-303/+153
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* stagefright: compile without chromium for pdk buildsColin Cross2012-03-262-5/+10
| | | | Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-2617-27/+745
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-2617-27/+745
| | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | Merge "Removed code related to simulator build in TimedEventQueue to get rid ↵James Dong2012-03-261-21/+0
|\ \ | | | | | | | | | of the dependency on jni.h"
| * | Removed code related to simulator build in TimedEventQueue to get rid of the ↵James Dong2012-03-261-21/+0
| |/ | | | | | | | | | | | | | | dependency on jni.h o related-to-bug: 6214141 Change-Id: I548d84a9888be884d3903dc9dea9235258792165
* | Merge "fix visualizer inactivity detection"Eric Laurent2012-03-261-9/+24
|\ \
| * | fix visualizer inactivity detectionEric Laurent2012-03-261-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current method implemented by the visualizer to detect that audioflinger has stopped providing audio buffers does not work if the application reads pcm captures too fast. The fix consist in implementing a method based on real time measurement only. One drawback is that the new method makes use of system calls that add some overhead to the process and capture functions. Change-Id: I53bd596b856f1cc7f0f47e08413af3335227100b
* | | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-266-2/+1330
|\ \ \
| * | | reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-266-2/+1330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
* | | | Merge changes Ib4d0e0c0,Iea8f4a23Colin Cross2012-03-261-1/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * changes: libmedia: remove skia include stagefright: remove dependency on skia
| * | | libmedia: remove skia includeColin Cross2012-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | skia is not used in this file, remove the unnecessary include. Change-Id: Ib4d0e0c0090c6b37ff8cfb816c0d8ba82a9638a4
* | | | Merge "IAudioFlinger::createTrack and openRecord flags"Glenn Kasten2012-03-263-15/+14
|\ \ \ \ | |/ / / |/| | |
| * | | IAudioFlinger::createTrack and openRecord flagsGlenn Kasten2012-03-193-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createTrack and openRecord don't need the "old" flags parameter, which was either audio_policy_output_t or audio_in_acoustics_t shifted left by 16 bits. But they do need "new" flags, which are defined by the application use case. Initially, the only application use case flag is timed output, but others are planned. For output, the audio_policy_output_t flags are passed to AudioSystem::getOutput, which returns an audio_io_handle_t, and that handle is then passed to createTrack. So createTrack doesn't need the old flags parameter. For input, the audio_in_acoustics_t flags are passed to AudioSystem::getInput, which returns an audio_io_handle_t, and that handle is then passed to openRecord. So openRecord doesn't need the old flags parameter. Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
* | | | Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-2411-13/+0
| |/ / |/| | | | | | | | | | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
* | | Merge "Revert "Split libmedia into libmedia and libmedia_native""Glenn Kasten2012-03-232-44/+37
|\ \ \
| * | | Revert "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-232-44/+37
| | | | | | | | | | | | This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb
* | | | Fix the file mimetype reported by the mpeg4 extractor.Andreas Huber2012-03-232-2/+3
| |_|/ |/| | | | | | | | | | | Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b related-to-bug: 6217289
* | | Merge "Use NuPlayer for media playback everywhere"Andreas Huber2012-03-2210-9/+415
|\ \ \
| * | | Use NuPlayer for media playback everywhereAndreas Huber2012-03-2210-9/+415
| | | | | | | | | | | | | | | | | | | | | | | | if media.stagefright.use-nuplayer is set to true. Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
* | | | Merge "Remove enforceFrameCount"Glenn Kasten2012-03-221-7/+5
|\ \ \ \
| * | | | Remove enforceFrameCountGlenn Kasten2012-03-211-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used to decide whether to issue a warning. The warning was issued the first time track was created but not at re-creation. Now it is a verbose message every time, not a warning since it happens all the time with key clicks on A2DP. Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
* | | | | Support gapless playback for mp3 and m4aMarco Nelissen2012-03-225-6/+191
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* | | | Merge "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-222-37/+44
|\ \ \ \ | | |/ / | |/| |
| * | | Split libmedia into libmedia and libmedia_nativeGlenn Kasten2012-03-212-37/+44
| |/ / | | | | | | | | | | | | | | | This is still in the old location Change-Id: Ic1be549b5b607cfd519cb4cecc581624510a4ee1
* | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-211-0/+59
|\ \ \
| * | | Add MetaData::dumpToLogMarco Nelissen2012-03-211-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | Utility method for dumping the content of a MetaData object to the log. Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
* | | | Merge "Parse gapless info from mp4 files"Marco Nelissen2012-03-212-0/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Parse gapless info from mp4 filesMarco Nelissen2012-03-212-0/+49
| |/ / | | | | | | | | | Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
* | | Merge "Update comments"Glenn Kasten2012-03-214-7/+8
|\ \ \
| * | | Update commentsGlenn Kasten2012-03-194-7/+8
| | |/ | |/| | | | | | | Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
* | | Merge "Whitespace"Glenn Kasten2012-03-211-0/+3
|\ \ \
| * | | WhitespaceGlenn Kasten2012-03-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix indentation, and add blank lines in key places for clarity Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
* | | | Merge "Handling end times of subtitles."James Dong2012-03-207-20/+46
|\ \ \ \ | |_|_|/ |/| | |
| * | | Handling end times of subtitles.Insun Kang2012-03-217-20/+46
| | | | | | | | | | | | | | | | Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
* | | | Merge "Move COM tag parsing to constructor"Marco Nelissen2012-03-201-27/+31
|\ \ \ \
| * | | | Move COM tag parsing to constructorMarco Nelissen2012-03-201-27/+31
| | | | | | | | | | | | | | | | | | | | Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
* | | | | Merge "Parse mp3 encoder padding/delay"Marco Nelissen2012-03-205-17/+109
|\ \ \ \ \ | |/ / / /
| * | | | Parse mp3 encoder padding/delayMarco Nelissen2012-03-205-17/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag. Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
* | | | | Merge "Do not set camera preview display if the surface is null."Wu-cheng Li2012-03-191-3/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not set camera preview display if the surface is null.Wu-cheng Li2012-03-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaRecorder.setPreviewDisplay() is not required if applications use MediaRecorder.setCamera(). Besides, this causes a problem when apps use Camera.setPreviewTexture. Camera service thinks the surface texture from Camera.setPreviewTexture and the surface from MediaRecorder.setPreviewDisplay are different. bug:5988937 Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
* | | | | Merge "Add libmedia_native"Glenn Kasten2012-03-194-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add libmedia_nativeGlenn Kasten2012-03-164-2/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
* | | | | Merge "audio_channel_in/out_mask_from_count"Glenn Kasten2012-03-197-16/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | audio_channel_in/out_mask_from_countGlenn Kasten2012-03-157-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoid ambiguous term "channels" where it might be confusing as to whether it is a channel mask or channel count Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
* | | | | Merge "ACodec is a little more aggressive in its error checking now."Andreas Huber2012-03-164-8/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ACodec is a little more aggressive in its error checking now.Andreas Huber2012-03-164-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update components to do the right thing. Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
* | | | | Merge "Remove obsolete software codec header files and amr encoders."Andreas Huber2012-03-1615-1298/+0
|\ \ \ \ \
| * | | | | Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-1615-1298/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
* | | | | Merge "Skip XING/VBRI frame when decoding"Marco Nelissen2012-03-163-107/+59
|\ \ \ \ \ | | |_|_|/ | |/| | |
generated by cgit v1.1 at 2024-05-28 20:48:10 +0000