diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 12:09:01 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-08 12:09:01 -0700 |
commit | a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f (patch) | |
tree | 19d521b2ac7b1d8d1f4ff7f58ea284a1cde4b8fe /media/libstagefright/codecs/avc | |
parent | b71298eeeb16d942dd5144e550731e6e29b6436e (diff) | |
parent | 21dc4b6a99f0427cc1c0b10d3dcdb34c7571d10f (diff) | |
download | frameworks_av-a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f.zip frameworks_av-a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f.tar.gz frameworks_av-a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f.tar.bz2 |
Merge "avcenc: Remove redundant zero-initialization of allocated memory"
Diffstat (limited to 'media/libstagefright/codecs/avc')
-rw-r--r-- | media/libstagefright/codecs/avc/enc/src/avcenc_api.cpp | 8 | ||||
-rw-r--r-- | media/libstagefright/codecs/avc/enc/src/rate_control.cpp | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/avcenc_api.cpp b/media/libstagefright/codecs/avc/enc/src/avcenc_api.cpp index 3631536..cf14e10 100644 --- a/media/libstagefright/codecs/avc/enc/src/avcenc_api.cpp +++ b/media/libstagefright/codecs/avc/enc/src/avcenc_api.cpp @@ -77,7 +77,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar } encvid = (AVCEncObject*) avcHandle->AVCObject; - memset(encvid, 0, sizeof(AVCEncObject)); /* reset everything */ encvid->enc_state = AVCEnc_Initializing; @@ -90,7 +89,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar } video = encvid->common; - memset(video, 0, sizeof(AVCCommonObj)); /* allocate bitstream structure */ encvid->bitstream = (AVCEncBitstream*) avcHandle->CBAVC_Malloc(userData, sizeof(AVCEncBitstream), DEFAULT_ATTR); @@ -106,7 +104,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar { return AVCENC_MEMORY_FAIL; } - memset(video->currSeqParams, 0, sizeof(AVCSeqParamSet)); /* allocate picture parameter set structure */ video->currPicParams = (AVCPicParamSet*) avcHandle->CBAVC_Malloc(userData, sizeof(AVCPicParamSet), DEFAULT_ATTR); @@ -114,7 +111,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar { return AVCENC_MEMORY_FAIL; } - memset(video->currPicParams, 0, sizeof(AVCPicParamSet)); /* allocate slice header structure */ video->sliceHdr = (AVCSliceHeader*) avcHandle->CBAVC_Malloc(userData, sizeof(AVCSliceHeader), DEFAULT_ATTR); @@ -122,7 +118,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar { return AVCENC_MEMORY_FAIL; } - memset(video->sliceHdr, 0, sizeof(AVCSliceHeader)); /* allocate encoded picture buffer structure*/ video->decPicBuf = (AVCDecPicBuffer*) avcHandle->CBAVC_Malloc(userData, sizeof(AVCDecPicBuffer), DEFAULT_ATTR); @@ -130,7 +125,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar { return AVCENC_MEMORY_FAIL; } - memset(video->decPicBuf, 0, sizeof(AVCDecPicBuffer)); /* allocate rate control structure */ encvid->rateCtrl = (AVCRateControl*) avcHandle->CBAVC_Malloc(userData, sizeof(AVCRateControl), DEFAULT_ATTR); @@ -138,7 +132,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar { return AVCENC_MEMORY_FAIL; } - memset(encvid->rateCtrl, 0, sizeof(AVCRateControl)); /* reset frame list, not really needed */ video->currPic = NULL; @@ -194,7 +187,6 @@ OSCL_EXPORT_REF AVCEnc_Status PVAVCEncInitialize(AVCHandle *avcHandle, AVCEncPar { return AVCENC_MEMORY_FAIL; } - memset(encvid->mot16x16, 0, sizeof(AVCMV)*framesize); encvid->intraSearch = (uint8*) avcHandle->CBAVC_Malloc(userData, sizeof(uint8) * framesize, DEFAULT_ATTR); if (encvid->intraSearch == NULL) diff --git a/media/libstagefright/codecs/avc/enc/src/rate_control.cpp b/media/libstagefright/codecs/avc/enc/src/rate_control.cpp index 50b764f..aa13873 100644 --- a/media/libstagefright/codecs/avc/enc/src/rate_control.cpp +++ b/media/libstagefright/codecs/avc/enc/src/rate_control.cpp @@ -190,7 +190,6 @@ AVCEnc_Status InitRateControlModule(AVCHandle *avcHandle) { goto CLEANUP_RC; } - memset(rateCtrl->pMP, 0, sizeof(MultiPass)); rateCtrl->pMP->encoded_frames = -1; /* forget about the very first I frame */ /* RDInfo **pRDSamples */ @@ -207,7 +206,6 @@ AVCEnc_Status InitRateControlModule(AVCHandle *avcHandle) { goto CLEANUP_RC; } - for (j = 0; j < 32; j++) memset(&(rateCtrl->pMP->pRDSamples[i][j]), 0, sizeof(RDInfo)); } rateCtrl->pMP->frameRange = (int)(rateCtrl->frame_rate * 1.0); /* 1.0s time frame*/ rateCtrl->pMP->frameRange = AVC_MAX(rateCtrl->pMP->frameRange, 5); |