summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Signal an error when encountering a malformed .ts stream.Andreas Huber2011-09-011-13/+33
| | | | | Change-Id: I3ab0215419214b652573945403eb45eb09d41aff related-to-bug: 5114811
* Merge "I have one HLS stream that switches stream PIDs from one bandwidth to ↵Andreas Huber2011-08-315-27/+101
|\ | | | | | | the next"
| * I have one HLS stream that switches stream PIDs from one bandwidth to the nextAndreas Huber2011-08-315-27/+101
| | | | | | | | | | | | | | this change intends to support its very limited case and signals an error in all other cases of unexpected PID changes that we cannot recover from. Change-Id: Icbfdf9fe7461969e2a8781ed416f54d891dd789a
* | Merge "Discontinuities are only signalled on streams that have been ↵Andreas Huber2011-08-312-32/+26
|\ \ | |/ | | | | identified, i.e."
| * Discontinuities are only signalled on streams that have been identified, i.e.Andreas Huber2011-08-312-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | those that have a queue. This ensures that the player doesn't observe discontinuities that don't match up across streams. Also, make sure output buffers arriving from the decoder to be rendered are sent back to the decoder if we started flushing. Finally, don't parse TS packets for streams we don't support. And don't allocate memory for them. Change-Id: I708e0de4cba8110a62e4c8ceb1e5702430d5d2bb
* | Merge "Update SurfaceMediaSource_test to not use pbuffer configs"Pannag Sanketi2011-08-311-30/+16
|\ \
| * | Update SurfaceMediaSource_test to not use pbuffer configsPannag Sanketi2011-08-301-30/+16
| | | | | | | | | | | | | | | | | | | | | | | | SurfaceMediaSource_test now does not use pbuffer configs to create a surface. Always uses a window config. Also, cleaned up the test a bit. Change-Id: Idda40dcb8474249eccaa8d2dad20ee840d2dd484
* | | Merge "Fix a crash where the EOS was signalled but some output buffer were ↵James Dong2011-08-311-1/+1
|\ \ \ | | | | | | | | | | | | still pending."
| * | | Fix a crash where the EOS was signalled but some output buffer were still ↵James Dong2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pending. Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5 related-to-bug: 5234126
* | | | Merge "Fix SurfaceMediaSource timestamp handling."Eino-Ville Talvala2011-08-311-2/+26
|\ \ \ \
| * | | | Fix SurfaceMediaSource timestamp handling.Eino-Ville Talvala2011-08-301-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was not basing timestamps on startTimeUs. Now synchronizes properly with audio. Bug: 4510826 Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43
* | | | | Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is ↵Gloria Wang2011-08-311-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | not NULL and AudioPlayer was not started. Fix for 5236419."
| * | | | Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULLGloria Wang2011-08-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and AudioPlayer was not started. Fix for 5236419. Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
* | | | | Merge "ATSParser now supports a mode in which PTS is considered to be ↵Andreas Huber2011-08-313-11/+24
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | absolute time"
| * | | | ATSParser now supports a mode in which PTS is considered to be absolute timeAndreas Huber2011-08-303-11/+24
| | |/ / | |/| | | | | | | | | | | | | | | | | | i.e. PTS 0 <=> media time 0 Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e
* | | | Merge "226483: A2DP connected, but music out to speaker"Eric Laurent2011-08-302-0/+12
|\ \ \ \
| * | | | 226483: A2DP connected, but music out to speakerEric Laurent2011-08-302-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the A2DP headset is connected, there is a possible race condition when the audio tracks are moved from the mixer thread attached to the speaker output to the thread attached to A2DP output. As the request to clear the stream type to output mapping cache in the client process is asynchronous, it is possible that the flag indicating to the client audio track to re-create the IAudioTrack on the new thread is processed before the cache is invalidated. In this case, the track will be attached to the old thread and music will continue playing over the device speaker instead of being redirected to A2DP headset. Change-Id: Ib2ce1eb5320eaff83287b93779061bf4e7a330df
* | | | | Merge "Bug 5156756 Fix AAC ADTS header size computation"Jean-Michel Trivi2011-08-301-9/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bug 5156756 Fix AAC ADTS header size computationJean-Michel Trivi2011-08-291-9/+24
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This previous frame size computation code had two incorrect assumptions: 1/ the ADTS frame length value already contains the header size 2/ the ADTS header is not of fixed size: it is 2 bytes bigger if it contains the CRC value. For 1/, the code worked because when the header size was added to the frame size, the + operator is of stronger precedence than the ? operator, so the size added was always 0 (instead of ADTS_HEADER_LENGTH. For 2/, the code worked as long as there was no CRC in the ADTS data. The fix consists in: - documenting what the frame length computation code returns - fixing the frame length computation - when computing the frame length, also returning the header size so the correct data can be sent to the decoder. Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
* | | | Return an error to the client instead of asserting if decoder instantiation ↵Andreas Huber2011-08-293-15/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | fails after a surface change. Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b related-to-bug: 5212725
* | | Merge "Signal errors to the client instead of asserting in ACodec."Andreas Huber2011-08-293-22/+55
|\ \ \
| * | | Signal errors to the client instead of asserting in ACodec.Andreas Huber2011-08-263-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | Also make sure NuPlayer can properly shutdown in certain edge cases. Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
* | | | Merge "Default W, H allowed in SurfaceMediaSource dequeue"Pannag Sanketi2011-08-281-3/+5
|\ \ \ \
| * | | | Default W, H allowed in SurfaceMediaSource dequeuePannag Sanketi2011-08-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client does not have to send (w, h) = (0,0) in dequeuebuffer. It can set the same w, h as the default width and height. Change-Id: I8202f90261ccaebbd35ea28c153a7472f01912f1
* | | | | Merge "Fixing small syntax error in MPEG4 logging"Pannag Sanketi2011-08-261-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixing small syntax error in MPEG4 loggingPannag Sanketi2011-08-261-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Found that the build was breaking when the logging was enabled in MPEG4Writer. Fixed. Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223
* | | | Merge "Support for posting messages and synchronously waiting for a response."Andreas Huber2011-08-262-6/+68
|\ \ \ \ | |/ / / |/| | |
| * | | Support for posting messages and synchronously waiting for a response.Andreas Huber2011-08-252-6/+68
| | | | | | | | | | | | | | | | Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
* | | | Properly reset the number of frames we think we've written to the audio sinkAndreas Huber2011-08-261-0/+2
| |_|/ |/| | | | | | | | | | | | | | | | | in order to compute the final delay before posting end-of-stream correctly. Change-Id: I4ff6d7142fdf1ea2d19d12ec78c1e84322d22e5f related-to-bug: 5216930
* | | Merge "Bug 4364249 Play position is 0 after flushing AudioTrack"Jean-Michel Trivi2011-08-251-1/+4
|\ \ \ | |/ / |/| |
| * | Bug 4364249 Play position is 0 after flushing AudioTrackJean-Michel Trivi2011-08-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::stop() is not synchronous, so a stop() followed by flush(), which is synchronous, will not always report a playhead position of 0 after being called. This CL adds a flag to mark a track as flushed, and report the correct playhead position in this state. Bug 5217011 has been created to address the real issue in the future, where flush could be made synchronous, to properly address bug 4364249. Change-Id: Icf989d41a6bcd5985bb87764c287f3edb7e26d12
* | | Merge "When encountering a discontinuity, flush(clear) all content enqueued ↵Andreas Huber2011-08-251-14/+18
|\ \ \ | | | | | | | | | | | | up to that"
| * | | When encountering a discontinuity, flush(clear) all content enqueued up to thatAndreas Huber2011-08-251-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | point except previously enqueued discontinuities. Change-Id: Id04a559dc062fa4a5c80c599ad74bf81a543de01 related-to-bug: 5201378
* | | | Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug ↵Gloria Wang2011-08-251-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | 5208736."
| * | | Set mSeekNotificationSent as false for RTSP seeking.Gloria Wang2011-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 5208736. Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
* | | | Merge "When Camera is launched by media recording framework, stagefright ↵James Dong2011-08-251-0/+9
|\ \ \ \ | |_|/ / |/| | | | | | | controls the stop and release."
| * | | When Camera is launched by media recording framework, stagefright controls ↵James Dong2011-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the stop and release. Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3 related-to-bug: 5205804
* | | | Merge "Port setting change should happen before receiving any filled frame."Chih-Chung Chang2011-08-241-0/+1
|\ \ \ \
| * | | | Port setting change should happen before receiving any filled frame.Chih-Chung Chang2011-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439
* | | | | Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"Pannag Sanketi2011-08-244-163/+806
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Testing the GL/ CPU encoding w/ Gralloc buffersPannag Sanketi2011-08-244-163/+806
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the test for Gralloc buffers based encoding. contains a combination of two main changes: 1. GL based encoding tests added to SurfaceMediaSource_test 2. SurfaceMediaSource ::read() colorformat The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque. The omx encoder needs to interpret that colorformat and reads the format from the Gralloc buffers directly Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
* | | | Merge "To make SniffMP3() more concrete so that we can remove false-positve ↵James Dong2011-08-231-15/+16
|\ \ \ \ | |/ / / |/| | | | | | | responses from MPEG-PS streams."
| * | | To make SniffMP3() more concrete so that we can remove false-positve ↵Dongwon Kang2011-08-181-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responses from MPEG-PS streams. Note: current resync logic keeps searching mp3 frames until it meets a valid one. This resync logic works well with seek() operation, but in SniffMP3(), this may cause false-positive classification for the following MPEG-PS file format. A possible MPEG-PS video file: [PS header]...[mp3 frame][mp3 frame] ... MP3 files: [ID3 tag][mp3 frame][mp3 frame] ... BUG: 5104562 Change-Id: Idd5020723f7bdb2fefc2a63fc8651580fd644399
* | | | We were accidentally sending out an output buffer before the final port ↵Andreas Huber2011-08-231-19/+25
| |/ / |/| | | | | | | | | | | | | | | | | settings change Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6 related-to-bug: 5122512
* | | 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
* | | Merge "Remove useAndroidNativeBuffer(2) warning message."Chih-Chung Chang2011-08-211-3/+0
|\ \ \
| * | | Remove useAndroidNativeBuffer(2) warning message.Chih-Chung Chang2011-08-181-3/+0
| |/ / | | | | | | | | | Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
* | | Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ ↵Rajneesh Chowdury2011-08-191-0/+59
|\ \ \ | | | | | | | | | | | | Java)"
| * | | Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)Rajneesh Chowdury2011-08-191-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes 5118207 add other video codec support for video editor export. Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
* | | | Merge "Stagefright: fix a compiler warning"Jamie Gennis2011-08-191-1/+1
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.1 at 2025-11-04 06:24:01 +0000