diff options
| author | Andreas Huber <andih@google.com> | 2010-01-11 15:35:19 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-01-12 09:14:15 -0800 |
| commit | aee3c6394a367abf283936cb8b8bd85ed028c050 (patch) | |
| tree | b6e95cdaa35e612745ed9505b1bdf4f1fd1fb52f /media/libstagefright/FileSource.cpp | |
| parent | 93aea69649c2ac163db3333563644d2593f2770c (diff) | |
| download | frameworks_base-aee3c6394a367abf283936cb8b8bd85ed028c050.zip frameworks_base-aee3c6394a367abf283936cb8b8bd85ed028c050.tar.gz frameworks_base-aee3c6394a367abf283936cb8b8bd85ed028c050.tar.bz2 | |
Squashed commit of the following:
commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:55:56 2010 -0800
Support for duration metadata, midi and ogg-vorbis files (in mediascanner)
commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:20:45 2010 -0800
Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor.
commit f9818dfac39c96e5fefe8c8295e60580692d5990
Author: Andreas Huber <andih@google.com>
Date: Fri Jan 8 14:26:09 2010 -0800
A first pass at supporting metadata through ID3 tags.
commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 7 15:48:44 2010 -0800
Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright.
related-to-bug: 2295456
Diffstat (limited to 'media/libstagefright/FileSource.cpp')
| -rw-r--r-- | media/libstagefright/FileSource.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index 37c2450..b6f1af2 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -58,7 +58,10 @@ ssize_t FileSource::readAt(off_t offset, void *data, size_t size) { } int err = fseeko(mFile, offset + mOffset, SEEK_SET); - CHECK(err != -1); + if (err < 0) { + LOGE("seek to %lld failed", offset + mOffset); + return UNKNOWN_ERROR; + } return fread(data, 1, size, mFile); } |