Merge "Fix omx_tests to no longer refer to test files that are no longer available." (f4188fa8) · Commits · e / os / android_frameworks_base

media/libstagefright/SampleTable.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -453,6 +453,10 @@ status_t SampleTable::findSampleAtTime(
	}		}

	if (left == mNumSampleSizes) {		if (left == mNumSampleSizes) {
			if (flags == kFlagAfter) {
			return ERROR_OUT_OF_RANGE;
			}

	--left;		--left;
	}		}

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -487,14 +487,12 @@ static const char GetURLForMime(const char mime) {
	{ "audio/3gpp",		{ "audio/3gpp",
	"file:///sdcard/media_api/video/H263_500_AMRNB_12.3gp" },		"file:///sdcard/media_api/video/H263_500_AMRNB_12.3gp" },
	{ "audio/amr-wb",		{ "audio/amr-wb",
	"file:///sdcard/media_api/music_perf/AMRWB/"		"file:///sdcard/media_api/music/"
	"NIN_AMR-WB_15.85kbps_16kbps.amr" },		"AI_AMR-WB_12.65kbps(13kbps)_16khz_mono_NMC.awb" },
	{ "audio/mp4a-latm",		{ "audio/mp4a-latm",
	"file:///sdcard/media_api/music_perf/AAC/"		"file:///sdcard/media_api/video/H264_AAC.3gp" },
	"WC_AAC_80kbps_32khz_Stereo_1pCBR_SSE.mp4" },
	{ "audio/mpeg",		{ "audio/mpeg",
	"file:///sdcard/media_api/music_perf/MP3/"		"file:///sdcard/media_api/music/MP3CBR.mp3" }
	"WC_256kbps_44.1khz_mono_CBR_DPA.mp3" }
	};		};

	for (size_t i = 0; i < sizeof(kMimeToURL) / sizeof(kMimeToURL[0]); ++i) {		for (size_t i = 0; i < sizeof(kMimeToURL) / sizeof(kMimeToURL[0]); ++i) {
	@@ -626,8 +624,10 @@ status_t Harness::testSeek(
	requestedSeekTimeUs, requestedSeekTimeUs / 1E6);		requestedSeekTimeUs, requestedSeekTimeUs / 1E6);
	}		}

	MediaBuffer *buffer;		MediaBuffer *buffer = NULL;
	options.setSeekTo(requestedSeekTimeUs);		options.setSeekTo(
			requestedSeekTimeUs, MediaSource::ReadOptions::SEEK_NEXT_SYNC);

	if (seekSource->read(&buffer, &options) != OK) {		if (seekSource->read(&buffer, &options) != OK) {
	CHECK_EQ(buffer, NULL);		CHECK_EQ(buffer, NULL);
	actualSeekTimeUs = -1;		actualSeekTimeUs = -1;