Merge changes I3f69e410,Ieccf3b8e (305edd2d) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,7 @@ int main(int argc, char *argv[]) {
	int bytesRead = fread(header, 1, kFileHeaderSize, fpInput);		int bytesRead = fread(header, 1, kFileHeaderSize, fpInput);
	if (bytesRead != kFileHeaderSize \|\| memcmp(header, "#!AMR\n", kFileHeaderSize)) {		if (bytesRead != kFileHeaderSize \|\| memcmp(header, "#!AMR\n", kFileHeaderSize)) {
	fprintf(stderr, "Invalid AMR-NB file\n");		fprintf(stderr, "Invalid AMR-NB file\n");
			fclose(fpInput);
	return 1;		return 1;
	}		}

	@@ -79,6 +80,7 @@ int main(int argc, char *argv[]) {
	SNDFILE *handle = sf_open(argv[2], SFM_WRITE, &sfInfo);		SNDFILE *handle = sf_open(argv[2], SFM_WRITE, &sfInfo);
	if(!handle){		if(!handle){
	fprintf(stderr, "Could not create %s\n", argv[2]);		fprintf(stderr, "Could not create %s\n", argv[2]);
			fclose(fpInput);
	return 1;		return 1;
	}		}

	@@ -87,6 +89,8 @@ int main(int argc, char *argv[]) {
	int err = GSMInitDecode(&amrHandle, (Word8*)"AMRNBDecoder");		int err = GSMInitDecode(&amrHandle, (Word8*)"AMRNBDecoder");
	if(err != 0){		if(err != 0){
	fprintf(stderr, "Error creating AMR-NB decoder instance\n");		fprintf(stderr, "Error creating AMR-NB decoder instance\n");
			fclose(fpInput);
			sf_close(handle);
	return 1;		return 1;
	}		}

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -134,14 +134,16 @@ int encode(
	if(handle == 0)		if(handle == 0)
	{		{
	printf("open dll error......");		printf("open dll error......");
	return -1;		ret = -1;
			goto safe_exit;
	}		}

	pfunc = dlsym(handle, "voGetAMRWBEncAPI");		pfunc = dlsym(handle, "voGetAMRWBEncAPI");
	if(pfunc == 0)		if(pfunc == 0)
	{		{
	printf("open function error......");		printf("open function error......");
	return -1;		ret = -1;
			goto safe_exit;
	}		}

	pGetAPI = (VOGETAUDIOENCAPI)pfunc;		pGetAPI = (VOGETAUDIOENCAPI)pfunc;
	@@ -150,7 +152,8 @@ int encode(
	if(returnCode)		if(returnCode)
	{		{
	printf("get APIs error......");		printf("get APIs error......");
	return -1;		ret = -1;
			goto safe_exit;
	}		}
	#else		#else
	ret = voGetAMRWBEncAPI(&AudioAPI);		ret = voGetAMRWBEncAPI(&AudioAPI);
	@@ -253,6 +256,7 @@ safe_exit:
	fclose(fdst);		fclose(fdst);

	#ifdef LINUX		#ifdef LINUX
			if (handle)
	dlclose(handle);		dlclose(handle);
	#endif		#endif