summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Writer.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-13 16:30:51 -0700
committerJames Dong <jdong@google.com>2010-09-14 14:39:32 -0700
commita1abc1a76741914c7bc43f1df9e32744f023ab75 (patch)
tree9ec3b7884558789d3ac2d6855f986a6b340bc5ef /media/libstagefright/MPEG4Writer.cpp
parente0aed6ddcb4e3c301b80aa26706b6052dab42c41 (diff)
downloadframeworks_av-a1abc1a76741914c7bc43f1df9e32744f023ab75.zip
frameworks_av-a1abc1a76741914c7bc43f1df9e32744f023ab75.tar.gz
frameworks_av-a1abc1a76741914c7bc43f1df9e32744f023ab75.tar.bz2
Add some explicit error log messages
Change-Id: I8a69157b75a67f0d3c19f05775a8cb0629232299
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index de4233d..f0d8943 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -1675,9 +1675,9 @@ status_t MPEG4Writer::Track::threadEntry() {
}
- if (mSampleSizes.empty()) {
- err = ERROR_MALFORMED;
- } else if (OK != checkCodecSpecificData()) {
+ if (mSampleSizes.empty() || // no samples written
+ (!mIsAudio && mNumStssTableEntries == 0) || // no sync frames for video
+ (OK != checkCodecSpecificData())) { // no codec specific data
err = ERROR_MALFORMED;
}
mOwner->trackProgressStatus(this, -1, err);
@@ -1794,13 +1794,13 @@ status_t MPEG4Writer::Track::checkCodecSpecificData() const {
!strcasecmp(MEDIA_MIMETYPE_VIDEO_AVC, mime)) {
if (!mCodecSpecificData ||
mCodecSpecificDataSize <= 0) {
- // Missing codec specific data
+ LOGE("Missing codec specific data");
return ERROR_MALFORMED;
}
} else {
if (mCodecSpecificData ||
mCodecSpecificDataSize > 0) {
- // Unexepected codec specific data found
+ LOGE("Unexepected codec specific data found");
return ERROR_MALFORMED;
}
}