diff options
author | Andreas Huber <andih@google.com> | 2009-11-20 09:32:46 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-11-23 10:44:30 -0800 |
commit | bfa6b2d7a1be1832ac40ed90aece1834f720b5c6 (patch) | |
tree | 5b4948c52fde583d593d088ffc4a7f772c904a86 /cmds/stagefright/record.cpp | |
parent | bf89c099fc97717e3008a481aeddc76c1ac5e00d (diff) | |
download | frameworks_av-bfa6b2d7a1be1832ac40ed90aece1834f720b5c6.zip frameworks_av-bfa6b2d7a1be1832ac40ed90aece1834f720b5c6.tar.gz frameworks_av-bfa6b2d7a1be1832ac40ed90aece1834f720b5c6.tar.bz2 |
Squashed commit of the following:
commit 1efc38dc3c33fef57b759002db3965ed07a28cb0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 19 14:36:14 2009 -0800
Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed.
Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed.
commit 51973062eb5ee63fd64b845d72bac517cc3369cf
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 14:01:43 2009 -0800
Fix one more unit test, properly send seek-complete notification only after seek actually completed.
commit cb22250b34b1fcfe1bf459723a761fd003950229
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:31:36 2009 -0800
Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails.
commit 25eb9241138ddf7bb27ce90657116c5f8a94d880
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:30:40 2009 -0800
Support seeking and duration in AMRExtractor, assuming all frames are the same size.
commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 10:21:44 2009 -0800
MediaPlayerImpl is dead, long live AwesomePlayer.
commit c5b52d3c0674f5dc94db506afbce52401cceddac
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 09:42:23 2009 -0800
New implementation of the stagefright mediaplayer.
Diffstat (limited to 'cmds/stagefright/record.cpp')
-rw-r--r-- | cmds/stagefright/record.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index 8c25d85..a31a5c0 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -19,13 +19,13 @@ #include <binder/ProcessState.h> #include <media/stagefright/AudioPlayer.h> #include <media/stagefright/CameraSource.h> +#include <media/stagefright/FileSource.h> #include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MPEG4Writer.h> -#include <media/stagefright/MmapSource.h> #include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXCodec.h> #include <media/MediaPlayerInterface.h> @@ -105,7 +105,7 @@ sp<MediaSource> createSource(const char *filename) { sp<MediaSource> source; sp<MediaExtractor> extractor = - MediaExtractor::Create(new MmapSource(filename)); + MediaExtractor::Create(new FileSource(filename)); size_t num_tracks = extractor->countTracks(); |