Commit e46b7be8 authored Jul 14, 2009 by Andreas Huber

Squashed commit of the following:

commit 8d179995654c19d9094e51989dc84ed0deba6e04
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 14 16:30:40 2009 -0700

    Protect stagefright code with BUILD_WITH_STAGEFRIGHT build-define.

commit 99b41acb58c34e8f024c30c833a09fd7b31c4e1f
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 14 14:06:00 2009 -0700

    OMX::list_nodes API, stagefright --list now lists all available OMX components.

commit 94a74c5b24aae6d7e446fff83d62ae3a57dc351b
Author: Andreas Huber <andih@google.com>
Date:   Mon Jul 13 16:04:29 2009 -0700

    Reenabled "record" commandline application to test encoding, support for h263 codec specific data when writing to .mp4.

commit d363dd74f611577567c66d25900d6264c306468c
Author: Andreas Huber <andih@google.com>
Date:   Mon Jul 13 10:59:58 2009 -0700

    Make non-socket communication in IOMX the default.

commit e89fc82c4fd138c88339887baf72f1d0e67f8660
Author: Andreas Huber <andih@google.com>
Date:   Mon Jul 13 10:32:33 2009 -0700

    The OMX interface now optionally supports communication through the binder only (no sockets involved)

commit 28611de11223fba65299787cdd33f7fdbd6a60a3
Author: Andreas Huber <andih@google.com>
Date:   Fri Jul 10 15:09:13 2009 -0700

    Split off the logic to render to a Surface (not ISurface!) into SurfaceRender.{cpp,h}

commit c0cfa885faaeb17d3fc5436f6447b61708bd6fe1
Author: Andreas Huber <andih@google.com>
Date:   Fri Jul 10 12:21:46 2009 -0700

    Fix display dimensions vs. decoded dimensions display issues, unfortunately breaks software rendering a bit...

commit ae209a2b5d09caed5dd383c910f238926aaa8fc6
Author: Andreas Huber <andih@google.com>
Date:   Fri Jul 10 09:33:29 2009 -0700

    Simple video decoder performance test in "stagefright" commandline tool.

commit 59fe7840111d6f46dd3c48f4950146aed962dbd2
Author: Andreas Huber <andih@google.com>
Date:   Thu Jul 9 16:05:12 2009 -0700

    StagefrightPlayer: Properly publish video dimensions by notifying the listener.

commit 51b6598f0e47be5e12d77f1d14e111e71c593638
Author: Andreas Huber <andih@google.com>
Date:   Thu Jul 9 11:38:15 2009 -0700

    MediaPlayerInterface::AudioSink now supports the specification of a callback for pull-based audio.

commit 31ce53375d748da3e7d30e993ce89dae97fd65ea
Author: Andreas Huber <andih@google.com>
Date:   Wed Jul 8 17:23:37 2009 -0700

    Proper support for pushing audio to a specified AudioSink interface. Still not bulletproof: video falls behind frequently.

commit a23e312b10631a5d47f5c9831205beac6b84ab36
Author: Andreas Huber <andih@google.com>
Date:   Wed Jul 8 15:10:13 2009 -0700

    IGenesisPlayer and friends are no more, java interface now uses local playback instead
    of playing inside the media server process.

commit 42ee5c06ab5ba1c16f50472b0b26a0526635c73c
Author: Andreas Huber <andih@google.com>
Date:   Wed Jul 8 13:17:03 2009 -0700

    MP3 extractor now supports seeking (only fixed bitrate files currently supported)

commit 96a790405763bfa738d1c6845c99a9fdf579b66f
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 7 10:53:54 2009 -0700

    Keeping up-to-date with new master-gl changes, removing CameraSource for now, removing unnecessary commandline utilities from the build.

commit 6c9dcb7c628c0347154dd7f37913a3a5f04deb99
Author: Andreas Huber <andih@google.com>
Date:   Mon Jul 6 16:40:02 2009 -0700

    Finally take advantage of the fact that the Qcom OMX decoders already place the output buffers into memory accessible by the hardware yuv converter and avoid extra allocations and memcpys in that case. Split of the render logic into subclasses of VideoRenderer.

commit e8d46e81cffc15ffb0bdf03f511e4a4497ca7621
Author: Andreas Huber <andih@google.com>
Date:   Mon Jul 6 12:18:29 2009 -0700

    Added a few more cases of valid MPEG4 files to the sniffer, fixed end of stream notifications in MPEG4 files.

commit 88bffc5ed4033a607080f8777a1c0ec9e3e079de
Author: Andreas Huber <andih@google.com>
Date:   Thu Jul 2 12:25:03 2009 -0700

    MediaPlayerImpl now properly pauses/resumes instead of tearing down the decoder chains and starting back up from the beginning.

commit 732aa0a87c7e8d8a10776b275712649954962414
Author: Andreas Huber <andih@google.com>
Date:   Wed Jul 1 14:58:56 2009 -0700

    Remove pthread_mutex_* and pthread_cond_* in favour of Mutex and Condition.

commit 669e5944b2fe0542a3b8dba0c441a94503e99fb0
Author: Andreas Huber <andih@google.com>
Date:   Wed Jul 1 14:43:02 2009 -0700

    Proper support for end-of-stream signalling of MediaSources.

commit afb038f2dc594c742e554b2d42b86ffc7434e3fc
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 30 16:48:03 2009 -0700

    Support for the "sniffing" of datasources to determine their probable mime type (along with confidence). Slightly refactored the MP3Extractor to share common code with the sniffer.

commit ed3644b8bd56807e1db4b32433a93a2467f1f3c5
Author: Andreas Huber <andih@google.com>
Date:   Fri Jun 26 13:27:52 2009 -0700

    I don't think prepare should automatically start the player.

commit 11eb9b49dc4a0819d366682817cba68613f4fe12
Author: Andreas Huber <andih@google.com>
Date:   Fri Jun 26 11:09:22 2009 -0700

    Somewhat better timing information implemented in the MP3Extractor.

commit cab023a1751735c0ed26c8493498a91d8644c6c9
Author: Andreas Huber <andih@google.com>
Date:   Thu Jun 25 15:41:56 2009 -0700

    Initial checkin for support of mp3 content, extraction and playback. Media extractors now abstracted in MediaExtractor baseclass.

commit 40f4146bb3c647e56690dd9b0fa3ffdea60030dc
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 24 10:41:12 2009 -0700

    Make sure we only allocate surface buffers if there is video to be played.

commit 7f85e7d92fe81740e102e09905b19354f4ac178e
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 24 10:19:32 2009 -0700

    Clean up a failed merge and implement stub for new API in MediaPlayerBase.

commit f0e9d494a4c03402ea7b54891848ca5a50c421b2
Author: Andreas Huber <andih@google.com>
Date:   Fri Jun 12 15:38:03 2009 -0700

    Support yuv420->rgb565 conversion if hardware color conversion is unavailable.

commit 87223248b3099cd5261b94169f84cfd1eba56a8f
Author: Andreas Huber <andih@google.com>
Date:   Fri Jun 12 09:35:56 2009 -0700

    Remove unimplemented and currently unnecessary blocking option from MediaSource::ReadOptions.

commit e07e651f0325892b797f3eb64dbeca0f317afdfd
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 10 16:26:42 2009 -0700

    Enable assertions in HTTPDataSource.

commit 0dc97adebea1721156880f4b3d5c70f8d50c53b2
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 10 12:34:39 2009 -0700

    delete foo.

commit 7f05845dda496e7defee284d32509d127e785784
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 10 12:34:08 2009 -0700

    added foo.

commit e432970c51eeec4e5d549bdb3e2d3e48ffb4f0e7
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 10 11:44:31 2009 -0700

    Make sure to initialize all fields in _all_ constructors... Use a Mutex instead of the raw pthread_mutex_t.

commit d6286a6bbca639952491448fa3e609b775a8a814
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 9 17:11:49 2009 -0700

    send_command is now implemented twice... ugly hack to get both shutdown working correctly and startup as well... playback now "works" on the emulator, too.

commit 8d657e004677a7c5dae4479e8519bcaa94c18aad
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 9 11:58:55 2009 -0700

    Instead of erasing codec specific data once it's been output to the omx node, retain the data and just rewind after a stop.

commit 279fede6ba35cbc37c35616c53406bf2c9720202
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 9 10:58:11 2009 -0700

    Various fixes related to play/pause. Decoder now properly frees OMXMediaBuffers, made MemoryDealer destructor protected instead of public to prevent accidental stack-allocation of MemoryDealer objects.

commit 0f717f15a6328efd3f34082929cd8ad2351095a9
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 9 08:44:12 2009 -0700

    Make sure to rewind codec specific data on OMXDecoder::stop and reset AudioPlayer's notion of time mapping.

commit 0cfb63e33270daf9b215214608ab383f93a31823
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 8 14:25:48 2009 -0700

    Massive rename.

commit 30ed8f476c4431a5275538958b3e281bd17d5eab
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 8 13:52:41 2009 -0700

    send_command and fill/empty buffer commands must be executed in sequence, send_command is now dispatched over the socket instead of through the binder interface to ensure this.

commit b832d04011b2dd8a9632eb7e575bfe1addd1270d
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 8 10:21:17 2009 -0700

    MediaBuffers can now be "clone()", they sit on top of the same data but have their own range and metadata. Once a clone's refcount drops to 0 it decrements the refcount on the original buffer.

commit 4e944672808bdf1ed40a69f3f602f93ebf7b4049
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 8 10:01:01 2009 -0700

    Split MediaBuffer.h into MediaBufferGroup.h and MediaBuffer.h, same with their respective source files.

commit ddb7529b4de4828db51432bd405fddd76cfa3b6a
Author: Andreas Huber <andih@google.com>
Date:   Fri Jun 5 16:30:25 2009 -0700

    More fudging with A/V sync...

commit 1e5a4d8df08237b58c06c6527a33152ae931addf
Author: Andreas Huber <andih@google.com>
Date:   Fri Jun 5 11:54:20 2009 -0700

    API cleanup of MediaSource. Got rid of MediaRing as it really doesn't serve a purpose if OMX decoders are used.

commit 0953c65232aa9753d17d2e25c5f5526eb810cf13
Author: Andreas Huber <andih@google.com>
Date:   Thu Jun 4 16:59:19 2009 -0700

    Experimental TimedEventQueue and an attempt at a cleaner player implementation using it, OMXDecoder is now a little less verbose.

commit 2085b8ea9484a21fa11f94194a27405d413aeecc
Author: Andreas Huber <andih@google.com>
Date:   Thu Jun 4 10:17:01 2009 -0700

    Properly bail out of the AV sync loop if the MediaPlayerImpl is stopped.

commit 471f143458a8a0d93cb1bf9568c63c3967279dc6
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 3 17:32:27 2009 -0700

    Now this is much better AV sync, defer seeking the audio source until we know where the video source synced to.

commit 4010d371dbe62ce4971e13437776cba32cb0bb3d
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 3 16:01:07 2009 -0700

    Tweaked some of the heuristics in AV sync, OMXDecoder is now a little less verbose, seek to a sync sample at or _after_ the requested position.

commit f3d4af1d5a4ac31fa02271b000f6c7ec593f0da9
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 3 15:33:58 2009 -0700

    Change the TimeSource interface's APIs, prefer microseconds over milliseconds now, changed the way MediaPlayerImpl does AV sync.

commit 08bb46fa61d12e852a424698ddb0c90700328f6e
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 3 11:57:24 2009 -0700

    Using framework's Mutex and Condition classes instead of pthread functions, much saner locking in OMXDecoder.

commit 4d77b4e09e59bbf8c1af009ae7dc62b10af52fd6
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 2 17:12:03 2009 -0700

    MediaSources now publish their format.

commit 7e429a26c57bf936e1a08035d2d11839f9f00310
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 2 16:38:29 2009 -0700

    MetaData is now implemented in terms of KeyedVector, MetaData is now reference counted.

commit 0fa957aa5c9bcb6ec122ed7b5b97430039be6797
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 1 14:39:55 2009 -0700

    Sync sample seek support.

commit 78a5f090d02e7e6e1a146b29bdb7771eecaa2f86
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 1 13:51:11 2009 -0700

    Distinguish shutdown from port-flush since one requires buffers to be freed and the other one doesn't. Fixes a problem with seek.

commit e57781d3b2c985a74cd8b60e7c8f2d576459d038
Author: Andreas Huber <andih@google.com>
Date:   Mon Jun 1 10:52:20 2009 -0700

    First shot at support for seeking a MediaSource. Sync frames are not properly handled yet.

commit 0551cd78fda78bf66877fb26c5a55e5ae23d8367
Author: Andreas Huber <andih@google.com>
Date:   Thu May 28 16:23:38 2009 -0700

    Preliminary support for camera input.

commit f8ebafa65d10d5a06944de6b2e2992a33121b857
Author: Andreas Huber <andih@google.com>
Date:   Thu May 28 12:13:47 2009 -0700

    Allow NativeMediaPlayer access to Surface's getISurface() method.

commit b1a9fb36eeccd9f49d28c1c64b31fccbd6506eeb
Author: Andreas Huber <andih@google.com>
Date:   Thu May 28 11:38:25 2009 -0700

    Header files are now in their own genesis2 hierarchy below frameworks/base/include.

commit f49b8b234b8f6ce83148787eef540dd920f04aa6
Author: Andreas Huber <andih@google.com>
Date:   Thu May 28 11:22:03 2009 -0700

    moved MPEG4Writer into libgenesis2.

commit 5224254919dac4728677335ea60429fa16f518b4
Author: Andreas Huber <andih@google.com>
Date:   Thu May 28 11:13:38 2009 -0700

    Everything now lives in the android namespace, integrated errors with android errors, renamed MediaPlayer to MediaPlayerImpl.

commit f9a9d84f7e0465ef5d1938a068655ba39527cf99
Author: Andreas Huber <andih@google.com>
Date:   Wed May 27 16:43:11 2009 -0700

    Support for getPosition() and getDuration().

commit 3206cc5140bcbc88be039f8d94b954af63e69752
Author: Andreas Huber <andih@google.com>
Date:   Wed May 27 15:37:45 2009 -0700

    Support for {MediaPlayer, GenesisPlayer, Genesis2Player}::isPlaying()

commit 9f41b248e0dfce71bbc50f883750cec52ebfd1fe
Author: Andreas Huber <andih@google.com>
Date:   Wed May 27 13:49:50 2009 -0700

    Proper disconnection from the OMX service.

commit cdcf47a2c31599109ee42277c7fa14af3c600091
Author: Andreas Huber <andih@google.com>
Date:   Tue May 26 17:27:06 2009 -0700

    New player type for the genesis player in libmediaplayerservice. Playing video through an ISurface now.

commit 0586af20ac9ae0403dd190bafd290b0f90549723
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 15:53:19 2009 -0700

    Fix a buffer overflow error by adding padding in case we need to de-frame AVC data.

commit eac62fff6ad2ffb7b75c0d4a1b9620d33e93fb9b
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 13:35:30 2009 -0700

    Support for http URIs in MediaPlayer, compensate for AudioTrack latency.

commit a7db456e3173d94d6b5e457547e2a6a5f7a8e1cc
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 11:33:25 2009 -0700

    Support for URIs in MediaPlayer class, support for shoutcast streams in MediaPlayer, force shutdown of OMX nodes if they don't shutdown cleanly within a second.

commit 1f0268f4f14ad5215668f34e06a420850174d665
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 08:33:16 2009 -0700

    and foo.txt is gone again.

commit 0feca4e0919f345704d78ec78894bac5027bd5ed
Author: Andreas Huber <andih@dhcp-172-19-27-148.mtv.corp.google.com>
Date:   Fri May 22 08:28:49 2009 -0700

    added foo.txt

commit 9c7d04b35cdc895a2de3602dc46522f608bd205f
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 08:28:04 2009 -0700

    delete foo again

commit fec3ca1720992cce51b9a92b86b945da88a6b16c
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 08:27:45 2009 -0700

    weird

commit 30a6571302333146e537e537a3a8986245cca87c
Author: Andreas Huber <andih@dhcp-172-19-27-148.mtv.corp.google.com>
Date:   Fri May 22 08:18:55 2009 -0700

    reverse test

commit dea3d99dd0fe9386e8a3c51954d9d0fe2be09d38
Author: Andreas Huber <andih@google.com>
Date:   Fri May 22 08:18:22 2009 -0700

    test

commit a9eeafec6e46072cac41e54ebdbd153cb7ae7518
Author: Andreas Huber <andih@google.com>
Date:   Thu May 21 16:37:50 2009 -0700

    Use the video ring again for now.

commit e05ff3d3c1c4f89ef499a2b172138a775fd694e3
Author: Andreas Huber <andih@google.com>
Date:   Thu May 21 15:42:19 2009 -0700

    Export to .mp4 now works for MPEG4 video content. Fixed a bug in the sample table wrt co64 chunks.

commit 5c44c540374a4e50c4e8aaab2b7a34aed6e1391e
Author: Andreas Huber <andih@google.com>
Date:   Thu May 21 09:56:11 2009 -0700

    Fix the build, all binder-related headers have moved and there's a new library libbinde
    r to link against now.

commit 23e0a24404d16c898c2c6b3c7495ad303844bc71
Author: Andreas Huber <andih@google.com>
Date:   Thu May 21 08:42:04 2009 -0700

    Initial checkin of MPEG4Writer, a class to export media sources into an mpeg4 file. MPEG4/AVC metadata (efss & friends) not currently working.

commit 9cd77adb1ac194197364ffad00a0d7215f458e1a
Author: Andreas Huber <andih@google.com>
Date:   Wed May 20 12:31:45 2009 -0700

    New shell command to test recording/encoding. Various changes to OMXDecoder to support encoding properly. Now each OMXDecoder needs a dedicated thread on the client side since onEvent responses could block which would cause deadlocks if a node depends on the output of another node for example.

commit 5c510fb55ffed7ec25305999ed9b6c1eec48d503
Author: Andreas Huber <andih@google.com>
Date:   Mon May 18 15:40:06 2009 -0700

    Make media decoding the default in the genesis2 commandline app instead of shoutcast playback.

commit f6c7a2040b8eb43326621f12c3a936e09b3a70e3
Author: Andreas Huber <andih@google.com>
Date:   Mon May 18 11:03:04 2009 -0700

    The king is dead, long live the kind... Replaced old OMX binder interface with new OMX binder interface/socket hybrid.

commit 0d4955eb5df9bfafb576d22f2ed572644d6d69ac
Author: Andreas Huber <andih@google.com>
Date:   Thu May 14 12:39:34 2009 -0700

    dynamic negotiation of NAL framing with the MPEG4Source, removed stale code from genesis2 commandline tool. Enable support form PV H264 software decoder.

commit 380369f54a8027cbc9349305184d6bf527a24efe
Author: Andreas Huber <andih@google.com>
Date:   Wed May 13 17:32:00 2009 -0700

    Explore the option of running everything inside the mediaserver process by encapsulating the player in an IGenesisPlayer binder interface.

commit b5cada56b9089a23e0c461352a97dc71e08b424d
Author: Andreas Huber <andih@google.com>
Date:   Wed May 13 12:11:06 2009 -0700

    Introduction of TimeSource class, clean shutdown of OMX Nodes.

commit 89f6e582e605dcb2149eb67f73fe9345d4b9be2e
Author: Andreas Huber <andih@google.com>
Date:   Tue May 12 17:11:56 2009 -0700

    Helper classes MediaRing and MediaPlayer.

commit 9aaed8739b4bb941473da367fb88f63224d2f1b7
Author: Andreas Huber <andih@google.com>
Date:   Tue May 12 14:19:18 2009 -0700

    Using mmap to map a file instead of going through FILE* improves performance, who knew?

commit ad097a78bbd002c59193ffdc39b64935928426c7
Author: Andreas Huber <andih@google.com>
Date:   Mon May 11 16:42:42 2009 -0700

    Added a performance test, refactored AudioDecoder a little.

commit bdd1b80ab3f3ba43e04f1f996e7fa84ed2e2728a
Author: Andreas Huber <andih@google.com>
Date:   Fri May 8 16:19:29 2009 -0700

    No more copying the output buffers coming out of the decoder, NAL separation also done in the extractor to avoid copying the data.

commit 858955b42c29b8033841a8caaa56c2a449810ef3
Author: Andreas Huber <andih@google.com>
Date:   Fri May 8 14:02:38 2009 -0700

    Change from a model in which the caller specifies the destination buffer to one where the MediaSource returns a buffer.

commit 95098b6d4f8bdc37dfb6a109ca58db4d9e414e2d
Author: Andreas Huber <andih@google.com>
Date:   Fri May 8 13:21:45 2009 -0700

    Changes to support multiple pieces of codec specific data to the decoder, de-frame nal units from the h.264 stream and insert start codes

commit 3941fcf87a48dda81683df727dfb1381f62d9184
Author: Andreas Huber <andih@google.com>
Date:   Thu May 7 16:37:45 2009 -0700

    some refactoring. Most streams play now.

commit d3152862840d4dd39068e5197bec8674f3d55dd5
Author: Andreas Huber <andih@google.com>
Date:   Thu May 7 15:37:32 2009 -0700

    Misc. changes to support H264 decoding using the qcom hardware decoder

commit d4ecdfe7af36e7468270d1c2cbbdc540efe0351e
Author: Andreas Huber <andih@google.com>
Date:   Thu May 7 09:28:18 2009 -0700

    Timestamps are now stored as a fraction, i.e. units and scale, also, PV appears to violate OMX specs by assuming timestamps are in milliseconds instead of microseconds.

commit fe6a50943f885e065d4061aa727a54417e9f36db
Author: Andreas Huber <andih@google.com>
Date:   Wed May 6 14:18:27 2009 -0700

    Refactored commandline app instantiation of the decoder.

commit da1ff2724d0e78e8b360d9a2c34c55dd0e2c0492
Author: Andreas Huber <andih@google.com>
Date:   Wed May 6 10:41:14 2009 -0700

    Proper audio/video synchronization.

commit 569ee3a23f600f4b6b87c6178c0223b06e97f201
Author: Andreas Huber <andih@google.com>
Date:   Wed May 6 09:17:20 2009 -0700

    Preliminary support for timestamps.

commit e4e302a89207550d8a7170d8c0afbd9c15047c84
Author: Andreas Huber <andih@google.com>
Date:   Tue May 5 15:13:12 2009 -0700

    Another quick hack job to make CachingDataSource thread-safe as well.

commit dfb376a58bd7c09aa04e89558186fcfe13fe696c
Author: Andreas Huber <andih@google.com>
Date:   Tue May 5 15:08:14 2009 -0700

    Quick rushjob to make FileSource and SampleTable thread safe.

commit 02b29e7ebdab1f8b959b6c177ceb3b89d998f375
Author: Andreas Huber <andih@google.com>
Date:   Mon May 4 17:22:04 2009 -0700

    Made video decoding work for mpeg4/h263 and mostly(?) with AVC content.

commit 3a57b8ff15e48f5a0af03bf0a99c32e240dbb7ef
Author: Andreas Huber <andih@google.com>
Date:   Mon May 4 09:26:42 2009 -0700

    Getting rid of old sample code to drive the OMXNode binder interface.

commit 5b046aed0cf524a57ea711bc1e43ea80e57b2cb3
Author: Andreas Huber <andih@google.com>
Date:   Fri May 1 16:21:11 2009 -0700

    Moved files from the commandline utility into the framework, renamed MP3Decoder to AudioDecoder

commit 7f3fbba21512a078b732cc52c7bd5ba5acb9a317
Author: Andreas Huber <andih@google.com>
Date:   Fri May 1 15:56:19 2009 -0700

    Fixed buffer ordering and an off-by-1 error in the SampleTable code. Plays all AACs now :)

commit 024d06baab8f2c540dde16f7e7a4b6dd57f638c7
Author: Andreas Huber <andih@google.com>
Date:   Fri May 1 11:52:48 2009 -0700

    Some AAC content in .3gp or .mp4 files plays correctly now, other does not. Implemented ESFS parser.

commit 1470427866b0d3e0ce6848b4edc01c13a09be289
Author: Andreas Huber <andih@google.com>
Date:   Thu Apr 30 15:19:31 2009 -0700

    Another checkpoint, amr decoding now functional.

commit e612d044439f56331b6a2bc4a88622e04d4d42e7
Author: Andreas Huber <andih@google.com>
Date:   Wed Apr 29 12:11:29 2009 -0700

    string wrapper around String8, various fixes, shoutcast now works again.

commit 2ea52dfb1a39bf3a223ffc87855e54919e2daff7
Author: Andreas Huber <andih@google.com>
Date:   Wed Apr 29 11:08:18 2009 -0700

    Initial check-in of OMXNode binder interface.

commit 7880d2957f74c0d7fba7679431ff5adb3780543b
Author: Andreas Huber <andih@google.com>
Date:   Wed Apr 29 10:05:01 2009 -0700

    Initial check-in of both libgenesis2 and the genesis2 commandline tool.

parent d0c0e46a

cmds/stagefright/Android.mk

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		ifeq ($(BUILD_WITH_STAGEFRIGHT),true)

		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		stagefright.cpp

		LOCAL_SHARED_LIBRARIES := \
		libstagefright

		LOCAL_C_INCLUDES:= \
		frameworks/base/media/libstagefright \
		$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
		$(TOP)/external/opencore/android

		LOCAL_CFLAGS += -Wno-multichar

		LOCAL_MODULE:= stagefright

		include $(BUILD_EXECUTABLE)

		################################################################################

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		record.cpp

		LOCAL_SHARED_LIBRARIES := \
		libstagefright

		LOCAL_C_INCLUDES:= \
		frameworks/base/media/libstagefright \
		$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
		$(TOP)/external/opencore/android

		LOCAL_CFLAGS += -Wno-multichar

		LOCAL_MODULE:= record

		include $(BUILD_EXECUTABLE)

		################################################################################

		# include $(CLEAR_VARS)
		#
		# LOCAL_SRC_FILES:= \
		# play.cpp
		#
		# LOCAL_SHARED_LIBRARIES := \
		# libstagefright
		#
		# LOCAL_C_INCLUDES:= \
		# frameworks/base/media/libstagefright \
		# $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
		# $(TOP)/external/opencore/android
		#
		# LOCAL_CFLAGS += -Wno-multichar
		#
		# LOCAL_MODULE:= play
		#
		# include $(BUILD_EXECUTABLE)

		endif

cmds/stagefright/WaveWriter.h

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_WAVEWRITER_H_

		#define ANDROID_WAVEWRITER_H_

		namespace android {

		class WaveWriter {
		public:
		WaveWriter(const char *filename,
		uint16_t num_channels, uint32_t sampling_rate)
		: mFile(fopen(filename, "wb")),
		mTotalBytes(0) {
		fwrite("RIFFxxxxWAVEfmt \x10\x00\x00\x00\x01\x00", 1, 22, mFile);
		write_u16(num_channels);
		write_u32(sampling_rate);
		write_u32(sampling_rate * num_channels * 2);
		write_u16(num_channels * 2);
		write_u16(16);
		fwrite("dataxxxx", 1, 8, mFile);
		}

		~WaveWriter() {
		fseek(mFile, 40, SEEK_SET);
		write_u32(mTotalBytes);

		fseek(mFile, 4, SEEK_SET);
		write_u32(36 + mTotalBytes);

		fclose(mFile);
		mFile = NULL;
		}

		void Append(const void *data, size_t size) {
		fwrite(data, 1, size, mFile);
		mTotalBytes += size;
		}

		private:
		void write_u16(uint16_t x) {
		fputc(x & 0xff, mFile);
		fputc(x >> 8, mFile);
		}

		void write_u32(uint32_t x) {
		write_u16(x & 0xffff);
		write_u16(x >> 16);
		}

		FILE *mFile;
		size_t mTotalBytes;
		};

		} // namespace android

		#endif // ANDROID_WAVEWRITER_H_

cmds/stagefright/play.cpp

0 → 100644

+295 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <binder/ProcessState.h>
		#include <media/stagefright/OMXClient.h>
		#include <media/stagefright/TimedEventQueue.h>
		#include <media/stagefright/MPEG4Extractor.h>
		#include <media/stagefright/MediaSource.h>
		#include <media/stagefright/MetaData.h>
		#include <media/stagefright/MmapSource.h>
		#include <media/stagefright/OMXDecoder.h>

		using namespace android;

		struct NewPlayer {
		NewPlayer();
		~NewPlayer();

		void setSource(const char *uri);
		void start();
		void pause();
		void stop();

		private:
		struct PlayerEvent : public TimedEventQueue::Event {
		PlayerEvent(NewPlayer *player,
		void (NewPlayer::*method)(int64_t realtime_us))
		: mPlayer(player),
		mMethod(method) {
		}

		virtual void fire(TimedEventQueue *queue, int64_t realtime_us) {
		(mPlayer->*mMethod)(realtime_us);
		}

		private:
		NewPlayer *mPlayer;
		void (NewPlayer::*mMethod)(int64_t realtime_us);

		PlayerEvent(const PlayerEvent &);
		PlayerEvent &operator=(const PlayerEvent &);
		};

		struct PlayVideoFrameEvent : public TimedEventQueue::Event {
		PlayVideoFrameEvent(NewPlayer player, MediaBuffer buffer)
		: mPlayer(player),
		mBuffer(buffer) {
		}

		virtual ~PlayVideoFrameEvent() {
		if (mBuffer != NULL) {
		mBuffer->release();
		mBuffer = NULL;
		}
		}

		virtual void fire(TimedEventQueue *queue, int64_t realtime_us) {
		mPlayer->onPlayVideoFrame(realtime_us, mBuffer);
		mBuffer = NULL;
		}

		private:
		NewPlayer *mPlayer;
		MediaBuffer *mBuffer;

		PlayVideoFrameEvent(const PlayVideoFrameEvent &);
		PlayVideoFrameEvent &operator=(const PlayVideoFrameEvent &);
		};

		OMXClient mClient;

		MPEG4Extractor *mExtractor;
		MediaSource *mAudioSource;
		OMXDecoder *mAudioDecoder;
		MediaSource *mVideoSource;
		OMXDecoder *mVideoDecoder;

		int32_t mVideoWidth, mVideoHeight;

		TimedEventQueue mQueue;
		wp<TimedEventQueue::Event> mPlayVideoFrameEvent;

		int64_t mMediaTimeUsStart;
		int64_t mRealTimeUsStart;

		void setAudioSource(MediaSource *source);
		void setVideoSource(MediaSource *source);

		int64_t approxRealTime(int64_t mediatime_us) const;

		void onStart(int64_t realtime_us);
		void onPause(int64_t realtime_us);
		void onFetchVideoFrame(int64_t realtime_us);
		void onPlayVideoFrame(int64_t realtime_us, MediaBuffer *buffer);

		static int64_t getMediaBufferTimeUs(MediaBuffer *buffer);

		NewPlayer(const NewPlayer &);
		NewPlayer &operator=(const NewPlayer &);
		};

		NewPlayer::NewPlayer()
		: mExtractor(NULL),
		mAudioSource(NULL),
		mAudioDecoder(NULL),
		mVideoSource(NULL),
		mVideoDecoder(NULL),
		mVideoWidth(0),
		mVideoHeight(0) {
		status_t err = mClient.connect();
		assert(err == OK);
		}

		NewPlayer::~NewPlayer() {
		stop();

		mClient.disconnect();
		}

		void NewPlayer::setSource(const char *uri) {
		stop();

		mExtractor = new MPEG4Extractor(new MmapSource(uri));

		int num_tracks;
		status_t err = mExtractor->countTracks(&num_tracks);
		assert(err == OK);

		for (int i = 0; i < num_tracks; ++i) {
		const sp<MetaData> meta = mExtractor->getTrackMetaData(i);
		assert(meta != NULL);

		const char *mime;
		if (!meta->findCString(kKeyMIMEType, &mime)) {
		continue;
		}

		bool is_audio = false;
		bool is_acceptable = false;
		if (!strncasecmp(mime, "audio/", 6)) {
		is_audio = true;
		is_acceptable = (mAudioSource == NULL);
		} else if (!strncasecmp(mime, "video/", 6)) {
		is_acceptable = (mVideoSource == NULL);
		}

		if (!is_acceptable) {
		continue;
		}

		MediaSource *source;
		if (mExtractor->getTrack(i, &source) != OK) {
		continue;
		}

		if (is_audio) {
		setAudioSource(source);
		} else {
		setVideoSource(source);
		}
		}
		}

		void NewPlayer::setAudioSource(MediaSource *source) {
		mAudioSource = source;

		sp<MetaData> meta = source->getFormat();

		mAudioDecoder = OMXDecoder::Create(&mClient, meta);
		mAudioDecoder->setSource(source);
		}

		void NewPlayer::setVideoSource(MediaSource *source) {
		mVideoSource = source;

		sp<MetaData> meta = source->getFormat();

		bool success = meta->findInt32(kKeyWidth, &mVideoWidth);
		assert(success);

		success = meta->findInt32(kKeyHeight, &mVideoHeight);
		assert(success);

		mVideoDecoder = OMXDecoder::Create(&mClient, meta);
		mVideoDecoder->setSource(source);
		}

		void NewPlayer::start() {
		mQueue.start();
		mQueue.postEvent(new PlayerEvent(this, &NewPlayer::onStart));
		}

		void NewPlayer::pause() {
		mQueue.postEvent(new PlayerEvent(this, &NewPlayer::onPause));
		}

		void NewPlayer::stop() {
		mQueue.stop();

		delete mVideoDecoder;
		mVideoDecoder = NULL;
		delete mVideoSource;
		mVideoSource = NULL;
		mVideoWidth = mVideoHeight = 0;

		delete mAudioDecoder;
		mAudioDecoder = NULL;
		delete mAudioSource;
		mAudioSource = NULL;

		delete mExtractor;
		mExtractor = NULL;
		}

		int64_t NewPlayer::approxRealTime(int64_t mediatime_us) const {
		return mRealTimeUsStart + (mediatime_us - mMediaTimeUsStart);
		}

		void NewPlayer::onStart(int64_t realtime_us) {
		mRealTimeUsStart = TimedEventQueue::getRealTimeUs();

		if (mVideoDecoder != NULL) {
		mQueue.postEvent(new PlayerEvent(this, &NewPlayer::onFetchVideoFrame));
		}
		}

		void NewPlayer::onFetchVideoFrame(int64_t realtime_us) {
		MediaBuffer *buffer;
		status_t err = mVideoDecoder->read(&buffer);
		assert(err == OK);

		int64_t mediatime_us = getMediaBufferTimeUs(buffer);

		sp<TimedEventQueue::Event> event = new PlayVideoFrameEvent(this, buffer);
		mPlayVideoFrameEvent = event;

		mQueue.postTimedEvent(event, approxRealTime(mediatime_us));
		}

		// static
		int64_t NewPlayer::getMediaBufferTimeUs(MediaBuffer *buffer) {
		int32_t units, scale;
		bool success =
		buffer->meta_data()->findInt32(kKeyTimeUnits, &units);
		assert(success);
		success =
		buffer->meta_data()->findInt32(kKeyTimeScale, &scale);
		assert(success);

		return (int64_t)units * 1000000 / scale;
		}

		void NewPlayer::onPlayVideoFrame(int64_t realtime_us, MediaBuffer *buffer) {
		LOGI("playing video frame (mediatime: %.2f sec)\n",
		getMediaBufferTimeUs(buffer) / 1E6);
		fflush(stdout);

		buffer->release();
		buffer = NULL;

		mQueue.postEvent(new PlayerEvent(this, &NewPlayer::onFetchVideoFrame));
		}

		void NewPlayer::onPause(int64_t realtime_us) {
		}

		int main(int argc, char **argv) {
		android::ProcessState::self()->startThreadPool();

		if (argc != 2) {
		fprintf(stderr, "usage: %s filename\n", argv[0]);
		return 1;
		}

		NewPlayer player;
		player.setSource(argv[1]);
		player.start();
		sleep(10);
		player.stop();

		return 0;
		}

cmds/stagefright/record.cpp

0 → 100644

+181 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#undef NDEBUG
		#include <assert.h>

		#include <binder/ProcessState.h>
		#include <media/stagefright/CameraSource.h>
		#include <media/stagefright/MediaBufferGroup.h>
		#include <media/stagefright/MetaData.h>
		#include <media/stagefright/MPEG4Extractor.h>
		#include <media/stagefright/MPEG4Writer.h>
		#include <media/stagefright/MmapSource.h>
		#include <media/stagefright/OMXClient.h>
		#include <media/stagefright/OMXDecoder.h>

		using namespace android;

		class DummySource : public MediaSource {
		public:
		DummySource(int width, int height)
		: mSize((width * height * 3) / 2) {
		mGroup.add_buffer(new MediaBuffer(mSize));
		}

		virtual ::status_t getMaxSampleSize(size_t *max_size) {
		*max_size = mSize;
		return ::OK;
		}

		virtual ::status_t read(MediaBuffer **buffer) {
		::status_t err = mGroup.acquire_buffer(buffer);
		if (err != ::OK) {
		return err;
		}

		char x = (char)((double)rand() / RAND_MAX * 255);
		memset((*buffer)->data(), x, mSize);
		(*buffer)->set_range(0, mSize);

		return ::OK;
		}

		private:
		MediaBufferGroup mGroup;
		size_t mSize;

		DummySource(const DummySource &);
		DummySource &operator=(const DummySource &);
		};

		int main(int argc, char **argv) {
		android::ProcessState::self()->startThreadPool();

		#if 1
		if (argc != 2) {
		fprintf(stderr, "usage: %s filename\n", argv[0]);
		return 1;
		}

		MPEG4Extractor extractor(new MmapSource(argv[1]));
		int num_tracks;
		assert(extractor.countTracks(&num_tracks) == ::OK);

		MediaSource *source = NULL;
		sp<MetaData> meta;
		for (int i = 0; i < num_tracks; ++i) {
		meta = extractor.getTrackMetaData(i);
		assert(meta.get() != NULL);

		const char *mime;
		if (!meta->findCString(kKeyMIMEType, &mime)) {
		continue;
		}

		if (strncasecmp(mime, "video/", 6)) {
		continue;
		}

		if (extractor.getTrack(i, &source) != ::OK) {
		source = NULL;
		continue;
		}
		break;
		}

		if (source == NULL) {
		fprintf(stderr, "Unable to find a suitable video track.\n");
		return 1;
		}

		OMXClient client;
		assert(client.connect() == android::OK);

		OMXDecoder *decoder = OMXDecoder::Create(&client, meta);
		decoder->setSource(source);

		int width, height;
		bool success = meta->findInt32(kKeyWidth, &width);
		success = success && meta->findInt32(kKeyHeight, &height);
		assert(success);

		sp<MetaData> enc_meta = new MetaData;
		// enc_meta->setCString(kKeyMIMEType, "video/3gpp");
		enc_meta->setCString(kKeyMIMEType, "video/mp4v-es");
		enc_meta->setInt32(kKeyWidth, width);
		enc_meta->setInt32(kKeyHeight, height);

		OMXDecoder *encoder = OMXDecoder::CreateEncoder(&client, enc_meta);

		encoder->setSource(decoder);
		// encoder->setSource(meta, new DummySource(width, height));

		#if 1
		MPEG4Writer writer("/sdcard/output.mp4");
		writer.addSource(enc_meta, encoder);
		writer.start();
		sleep(120);
		writer.stop();
		#else
		encoder->start();

		MediaBuffer *buffer;
		while (encoder->read(&buffer) == ::OK) {
		printf("got an output frame of size %d\n", buffer->range_length());

		buffer->release();
		buffer = NULL;
		}

		encoder->stop();
		#endif

		delete encoder;
		encoder = NULL;

		delete decoder;
		decoder = NULL;

		client.disconnect();

		delete source;
		source = NULL;
		#endif

		#if 0
		CameraSource *source = CameraSource::Create();
		printf("source = %p\n", source);

		for (int i = 0; i < 100; ++i) {
		MediaBuffer *buffer;
		status_t err = source->read(&buffer);
		assert(err == OK);

		printf("got a frame, data=%p, size=%d\n",
		buffer->data(), buffer->range_length());

		buffer->release();
		buffer = NULL;
		}

		delete source;
		source = NULL;
		#endif

		return 0;
		}

cmds/stagefright/stagefright.cpp

0 → 100644

+200 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <sys/time.h>

		#undef NDEBUG
		#include <assert.h>

		#include <pthread.h>
		#include <stdlib.h>

		#include <binder/IServiceManager.h>
		#include <binder/ProcessState.h>
		#include <media/IMediaPlayerService.h>
		#include <media/stagefright/AudioPlayer.h>
		#include <media/stagefright/CachingDataSource.h>
		#include <media/stagefright/ESDS.h>
		#include <media/stagefright/FileSource.h>
		#include <media/stagefright/MediaBuffer.h>
		#include <media/stagefright/MediaPlayerImpl.h>
		#include <media/stagefright/MediaExtractor.h>
		#include <media/stagefright/MediaSource.h>
		#include <media/stagefright/MetaData.h>
		#include <media/stagefright/MmapSource.h>
		#include <media/stagefright/OMXClient.h>
		#include <media/stagefright/OMXDecoder.h>

		#include "WaveWriter.h"

		using namespace android;

		////////////////////////////////////////////////////////////////////////////////

		static bool convertToWav(
		OMXClient client, const sp<MetaData> &meta, MediaSource source) {
		printf("convertToWav\n");

		OMXDecoder *decoder = OMXDecoder::Create(client, meta);

		int32_t sampleRate;
		bool success = meta->findInt32(kKeySampleRate, &sampleRate);
		assert(success);

		int32_t numChannels;
		success = meta->findInt32(kKeyChannelCount, &numChannels);
		assert(success);

		const char *mime;
		success = meta->findCString(kKeyMIMEType, &mime);
		assert(success);

		if (!strcasecmp("audio/3gpp", mime)) {
		numChannels = 1; // XXX
		}

		WaveWriter writer("/sdcard/Music/shoutcast.wav", numChannels, sampleRate);

		decoder->setSource(source);
		for (int i = 0; i < 100; ++i) {
		MediaBuffer *buffer;

		::status_t err = decoder->read(&buffer);
		if (err != ::OK) {
		break;
		}

		writer.Append((const char *)buffer->data() + buffer->range_offset(),
		buffer->range_length());

		buffer->release();
		buffer = NULL;
		}

		delete decoder;
		decoder = NULL;

		return true;
		}

		////////////////////////////////////////////////////////////////////////////////

		static int64_t getNowUs() {
		struct timeval tv;
		gettimeofday(&tv, NULL);

		return (int64_t)tv.tv_usec + tv.tv_sec * 1000000;
		}

		int main(int argc, char **argv) {
		android::ProcessState::self()->startThreadPool();

		if (argc > 1 && !strcmp(argv[1], "--list")) {
		sp<IServiceManager> sm = defaultServiceManager();
		sp<IBinder> binder = sm->getService(String16("media.player"));
		sp<IMediaPlayerService> service = interface_cast<IMediaPlayerService>(binder);

		assert(service.get() != NULL);

		sp<IOMX> omx = service->createOMX();
		assert(omx.get() != NULL);

		List<String8> list;
		omx->list_nodes(&list);

		for (List<String8>::iterator it = list.begin();
		it != list.end(); ++it) {
		printf("%s\n", (*it).string());
		}

		return 0;
		}

		#if 0
		MediaPlayerImpl player(argv[1]);
		player.play();

		sleep(10000);
		#else
		DataSource::RegisterDefaultSniffers();

		OMXClient client;
		status_t err = client.connect();

		MmapSource *dataSource = new MmapSource(argv[1]);
		MediaExtractor *extractor = MediaExtractor::Create(dataSource);
		dataSource = NULL;

		int numTracks;
		err = extractor->countTracks(&numTracks);

		sp<MetaData> meta;
		int i;
		for (i = 0; i < numTracks; ++i) {
		meta = extractor->getTrackMetaData(i);

		const char *mime;
		meta->findCString(kKeyMIMEType, &mime);

		if (!strncasecmp(mime, "video/", 6)) {
		break;
		}
		}

		OMXDecoder *decoder = OMXDecoder::Create(&client, meta);

		if (decoder != NULL) {
		MediaSource *source;
		err = extractor->getTrack(i, &source);

		decoder->setSource(source);

		decoder->start();

		int64_t startTime = getNowUs();

		int n = 0;
		MediaBuffer *buffer;
		while ((err = decoder->read(&buffer)) == OK) {
		if ((++n % 16) == 0) {
		printf(".");
		fflush(stdout);
		}

		buffer->release();
		buffer = NULL;
		}
		decoder->stop();
		printf("\n");

		int64_t delay = getNowUs() - startTime;
		printf("avg. %.2f fps\n", n * 1E6 / delay);

		delete decoder;
		decoder = NULL;

		delete source;
		source = NULL;
		}

		delete extractor;
		extractor = NULL;

		client.disconnect();
		#endif

		return 0;
		}