Skip to content

Commit

Permalink
optimization
Browse files Browse the repository at this point in the history
removed a safety check that turns out to be unnecessary, and was preventing some frames from being decoded
  • Loading branch information
mrRay committed Aug 9, 2016
1 parent 0db6603 commit 32007a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions AVF Batch Converter/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleGetInfoString</key>
<string>1.5</string>
<string>1.6</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
Expand All @@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5</string>
<string>1.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.5</string>
<string>1.6</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
8 changes: 4 additions & 4 deletions HapInAVFoundation/AVPlayerItemHapDXTOutput.m
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,9 @@ - (void) _decodeHapDecoderFrame:(HapDecoderFrame *)n {
if (cmErr != kCMBlockBufferNoErr)
NSLog(@"\t\terr %d at CMBlockBufferGetDataPointer() in %s",(int)cmErr,__func__);
else {
if (dataBlockBufferAvailableData > (dxtDataSizes[0]+dxtDataSizes[1]))
NSLog(@"\t\terr: block buffer larger than allocated dxt data, %ld vs. (%ld + %ld), %s",dataBlockBufferAvailableData,dxtDataSizes[0],dxtDataSizes[1],__func__);
else {
//if (dataBlockBufferAvailableData > (dxtDataSizes[0]+dxtDataSizes[1]))
// NSLog(@"\t\terr: block buffer larger than allocated dxt data, %ld vs. (%ld + %ld), %s",dataBlockBufferAvailableData,dxtDataSizes[0],dxtDataSizes[1],__func__);
//else {
unsigned int hapErr = HapResult_No_Error;
unsigned int hapTexCount = 0;
hapErr = HapGetFrameTextureCount(dataBuffer, dataBlockBufferAvailableData, &hapTexCount);
Expand Down Expand Up @@ -611,7 +611,7 @@ - (void) _decodeHapDecoderFrame:(HapDecoderFrame *)n {
[n setDecoded:YES];
}

}
//}
}
}

Expand Down

0 comments on commit 32007a4

Please sign in to comment.