summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.Andreas Huber2010-08-301-3/+11
|\ | | | | | | | | | | | | Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d' * commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d': Finetune some rtsp timeout constants.
| * am f6639c46: Finetune some rtsp timeout constants.Andreas Huber2010-08-301-3/+11
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp * commit 'f6639c46e83a1ccab7b293192c208091d17c61be': Finetune some rtsp timeout constants.
| | * Finetune some rtsp timeout constants.Andreas Huber2010-08-301-3/+11
| | | | | | | | | | | | Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
* | | am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to ↵Andreas Huber2010-08-305-4/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | distinguish threads)." into gingerbread Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27' * commit '6df6d60681be9d524ce7fc07f2511008de424d27': ALoopers can now be named (useful to distinguish threads).
| * | am df992ac9: Merge "ALoopers can now be named (useful to distinguish ↵Andreas Huber2010-08-305-4/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | threads)." into gingerbread Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp * commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b': ALoopers can now be named (useful to distinguish threads).
| | * Merge "ALoopers can now be named (useful to distinguish threads)." into ↵Andreas Huber2010-08-305-4/+13
| | |\ | | | | | | | | | | | | gingerbread
| | | * ALoopers can now be named (useful to distinguish threads).Andreas Huber2010-08-275-4/+13
| | | | | | | | | | | | | | | | Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
* | | | MTP: Move all MTP protocol constants for Java to a central location.Mike Lockwood2010-08-304-82/+457
| | | | | | | | | | | | | | | | | | | | Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | MTP: Fix build break due to misuse of "git add -i" commandMike Lockwood2010-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "MTP: Add try/finally handling to finalize overrides"Mike Lockwood2010-08-304-7/+24
|\ \ \ \
| * | | | MTP: Add try/finally handling to finalize overridesMike Lockwood2010-08-304-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23c481d6214ed5f045f903845632c07c11bb42a3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "client_id->clientId, bugfix for signaling of read abort on stop."Nipun Kwatra2010-08-271-43/+48
|\ \ \ \ \
| * | | | | client_id->clientId, bugfix for signaling of read abort on stop.Nipun Kwatra2010-08-271-43/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changed client_id->clientId, mClient_id->mClientId - there was a bug in the condition for calling signalReadComplete_lock() in stop. We should call it only when !mLastReadCompleted and also if the current client has not already completed its read (this second check was missing before). Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
* | | | | | am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the ↵James Dong2010-08-271-0/+13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc' * commit 'a5fe77d004091bd9521d087c2572f587191afbfc': Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
| * | | | | am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size ↵James Dong2010-08-271-0/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advertised by the AVC encoder is occasionally too small." into gingerbread Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp * commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad': Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
| | * | | | Workaround for a QCOM issue where the output buffer size advertised by the ↵James Dong2010-08-271-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AVC encoder is occasionally too small. bug - 2882917 Change-Id: Id59d8529084c5689a26f272e0cd3b1e955fd8a30
* | | | | | am 7d3ff384: am b86365ad: Merge "Suppress the video recording start signal - ↵James Dong2010-08-271-0/+46
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 2950297" into gingerbread Merge commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7' * commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7': Suppress the video recording start signal
| * | | | | am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" ↵James Dong2010-08-271-0/+46
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp * commit 'b86365ad74a197f2af6d70eedeb19083e31a9686': Suppress the video recording start signal
| | * | | | Merge "Suppress the video recording start signal - bug 2950297" into gingerbreadJames Dong2010-08-271-0/+46
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Suppress the video recording start signalJames Dong2010-08-261-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bug 2950297 Change-Id: I0044d07178691feb904cf81e87c1b6d4b714dc1a
* | | | | | am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time ↵Andreas Huber2010-08-2714-65/+302
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display. Better seek support, timeout if no packets arrive for too long." into gingerbread Merge commit '05c1cadaeaf272a70acc889bfccd607648058470' * commit '05c1cadaeaf272a70acc889bfccd607648058470': Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
| * | | | | am 577615c9: Merge "Better support for rtsp (normal play-)time display. ↵Andreas Huber2010-08-2714-65/+302
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better seek support, timeout if no packets arrive for too long." into gingerbread Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp * commit '577615c98e390f8417e07844d04304eac5b0e911': Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
| | * | | | Better support for rtsp (normal play-)time display. Better seek support, ↵Andreas Huber2010-08-2714-65/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout if no packets arrive for too long. Change-Id: Id491541a6ae501604cda815f8e961a3bfe26db7d related-to-bug: 2556656
* | | | | | am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 ↵Andreas Huber2010-08-271-2/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secs, even if the connection was fine." into gingerbread Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944' * commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944': We accidentally always aborted after 10 secs, even if the connection was fine.
| * | | | | am e250c220: Merge "We accidentally always aborted after 10 secs, even if ↵Andreas Huber2010-08-271-2/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the connection was fine." into gingerbread Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp * commit 'e250c220d1bb3bd117641add94ee7465a82f085c': We accidentally always aborted after 10 secs, even if the connection was fine.
| | * | | | We accidentally always aborted after 10 secs, even if the connection was fine.Andreas Huber2010-08-271-2/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I3f2ae2f46ae62b84b1e253658d7182c04ee3dfae
* | | | | Merge "Added MediaSourceSplitter to split single source to multiple ones."Nipun Kwatra2010-08-271-0/+229
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Added MediaSourceSplitter to split single source to multiple ones.Nipun Kwatra2010-08-271-0/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaSourceSplitter provides a way to split a single mediaSource into multiple sources. It takes in the real mediaSource and multiple clients can then be created which serve from the same real mediaSource. Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
* | | | | am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving ↵Andreas Huber2010-08-266-21/+216
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interleaved with RTSP responses." into gingerbread Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4' * commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4': Support for RTP packets arriving interleaved with RTSP responses.
| * | | | am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP ↵Andreas Huber2010-08-266-21/+216
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responses." into gingerbread Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp * commit '17a765a139f5a0b10768937cb11ecd9e7941b039': Support for RTP packets arriving interleaved with RTSP responses.
| | * | | Merge "Support for RTP packets arriving interleaved with RTSP responses." ↵Andreas Huber2010-08-266-21/+216
| | |\ \ \ | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | Support for RTP packets arriving interleaved with RTSP responses.Andreas Huber2010-08-266-21/+216
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
* | | | | | am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to ↵Eric Laurent2010-08-261-7/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | short" into gingerbread Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05' * commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05': Changed type of reverb presets from int to short
| * | | | | am c6d7a895: Merge "Changed type of reverb presets from int to short" into ↵Eric Laurent2010-08-261-7/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp * commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d': Changed type of reverb presets from int to short
| | * | | | Changed type of reverb presets from int to shortEric Laurent2010-08-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the type of reverb preset constants exposed by the PresetReverb API to match the type of the setPreset() method parameter. Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
* | | | | | Merge "Disable all the hardware decoders except for h.264 video decode, ↵Andreas Huber2010-08-261-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | since the software decoders are faster."
| * | | | | | Disable all the hardware decoders except for h.264 video decode, since the ↵Andreas Huber2010-08-261-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | software decoders are faster. Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
* | | | | | | am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio ↵Eric Laurent2010-08-267-141/+970
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect." into gingerbread Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305' * commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305': Added automated tests for reverb audio effect.
| * | | | | | am dfded35b: Merge "Added automated tests for reverb audio effect." into ↵Eric Laurent2010-08-267-141/+970
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp * commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a': Added automated tests for reverb audio effect.
| | * | | | | Merge "Added automated tests for reverb audio effect." into gingerbreadEric Laurent2010-08-267-141/+970
| | |\ \ \ \ \
| | | * | | | | Added automated tests for reverb audio effect.Eric Laurent2010-08-267-141/+970
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added tests for preset and environmental reverb to functional media frame work tests. - created a new class for energy probing used by all audio effect tests and corrected energy calculation. Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
* | | | | | | am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go ↵James Dong2010-08-261-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | backward in MP4 file writer" into gingerbread Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1' * commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1': Make sure that timestamp does not go backward in MP4 file writer
| * | | | | am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 ↵James Dong2010-08-261-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file writer" into gingerbread Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp * commit '318a759e3c24dd741f8959e2a433150ae88fb8d6': Make sure that timestamp does not go backward in MP4 file writer
| | * | | | Merge "Make sure that timestamp does not go backward in MP4 file writer" ↵James Dong2010-08-261-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into gingerbread
| | | * | | Make sure that timestamp does not go backward in MP4 file writerJames Dong2010-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90745b9df7f19d61f3ab826bf9d2419fe788554e
* | | | | | am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization ↵Andreas Huber2010-08-252-4/+85
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ID3V2.4 tags." into gingerbread Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96' * commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96': Fix support for per-frame unsynchronization in ID3V2.4 tags.
| * | | | | am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 ↵Andreas Huber2010-08-252-4/+85
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags." into gingerbread Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp * commit '8ac0983edafa064126c4480dd31047d1bb4ce111': Fix support for per-frame unsynchronization in ID3V2.4 tags.
| | * | | | Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into ↵Andreas Huber2010-08-252-4/+85
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | Fix support for per-frame unsynchronization in ID3V2.4 tags.Andreas Huber2010-08-252-4/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca related-to-bug: 2949149
* | | | | | | MTP: Fix build break due to integer constant too largeMike Lockwood2010-08-251-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia03ebe171d68bdfb04913abafc11dcb9c9071595 Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2025-03-09 19:16:29 +0000