Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 421f5f71: Merge change 23169 into eclair

Browse Source 
Merge commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe' into eclair-plus-aosp

* commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe':
  More assert => CHECK
This commit is contained in:
Andreas Huber
2009-08-28 13:36:34 -07:00
committed by Android Git Automerger
parent 932cb5507e 421f5f7136
commit e9c69c665b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/stagefright/record.cpp
View File

@@ -14,12 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
#undef NDEBUG
#include <assert.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>
#include <media/stagefright/CameraSource.h> #include <media/stagefright/CameraSource.h>
#include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MetaData.h> #include <media/stagefright/MetaData.h>
#include <media/stagefright/MPEG4Extractor.h> #include <media/stagefright/MPEG4Extractor.h>
#include <media/stagefright/MPEG4Writer.h> #include <media/stagefright/MPEG4Writer.h>
@@ -97,7 +95,7 @@ sp<MediaSource> createSource(const char *filename) {
sp<MetaData> meta; sp<MetaData> meta;
for (size_t i = 0; i < num_tracks; ++i) { for (size_t i = 0; i < num_tracks; ++i) {
meta = extractor->getTrackMetaData(i); meta = extractor->getTrackMetaData(i);
assert(meta.get() != NULL); CHECK(meta.get() != NULL);
const char *mime; const char *mime;
if (!meta->findCString(kKeyMIMEType, &mime)) { if (!meta->findCString(kKeyMIMEType, &mime)) {
@@ -125,7 +123,7 @@ int main(int argc, char **argv) {
} }
OMXClient client; OMXClient client;
assert(client.connect() == android::OK); CHECK_EQ(client.connect(), OK);
#if 0 #if 0
sp<MediaSource> source = createSource(argv[1]); sp<MediaSource> source = createSource(argv[1]);
@@ -143,7 +141,7 @@ int main(int argc, char **argv) {
int width, height; int width, height;
bool success = meta->findInt32(kKeyWidth, &width); bool success = meta->findInt32(kKeyWidth, &width);
success = success && meta->findInt32(kKeyHeight, &height); success = success && meta->findInt32(kKeyHeight, &height);
assert(success); CHECK(success);
#else #else
int width = 320; int width = 320;
int height = 240; int height = 240;
@@ -171,7 +169,7 @@ int main(int argc, char **argv) {
encoder->start(); encoder->start();
MediaBuffer *buffer; MediaBuffer *buffer;
while (encoder->read(&buffer) == ::OK) { while (encoder->read(&buffer) == OK) {
printf("got an output frame of size %d\n", buffer->range_length()); printf("got an output frame of size %d\n", buffer->range_length());
buffer->release(); buffer->release();
@@ -191,7 +189,7 @@ int main(int argc, char **argv) {
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
MediaBuffer *buffer; MediaBuffer *buffer;
status_t err = source->read(&buffer); status_t err = source->read(&buffer);
assert(err == OK); CHECK_EQ(err, OK);
printf("got a frame, data=%p, size=%d\n", printf("got a frame, data=%p, size=%d\n",
buffer->data(), buffer->range_length()); buffer->data(), buffer->range_length());