Update common-c and use codec masks rather than exact formats

This commit is contained in:
Cameron Gutman
2017-12-03 11:33:11 -08:00
parent 4b9bd8398b
commit 3bc9e050f1
2 changed files with 4 additions and 4 deletions

View File

@@ -75,7 +75,7 @@
- (Boolean)readyForPictureData - (Boolean)readyForPictureData
{ {
if (videoFormat == VIDEO_FORMAT_H264) { if (videoFormat & VIDEO_FORMAT_MASK_H264) {
return !waitingForSps && !waitingForPps; return !waitingForSps && !waitingForPps;
} }
else { else {
@@ -86,7 +86,7 @@
- (Boolean)isNalReferencePicture:(unsigned char)nalType - (Boolean)isNalReferencePicture:(unsigned char)nalType
{ {
if (videoFormat == VIDEO_FORMAT_H264) { if (videoFormat & VIDEO_FORMAT_MASK_H264) {
return nalType == 0x65; return nalType == 0x65;
} }
else { else {
@@ -201,7 +201,7 @@
// See if we've got all the parameter sets we need for our video format // See if we've got all the parameter sets we need for our video format
if ([self readyForPictureData]) { if ([self readyForPictureData]) {
if (videoFormat == VIDEO_FORMAT_H264) { if (videoFormat & VIDEO_FORMAT_MASK_H264) {
const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] }; const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] };
const size_t parameterSetSizes[] = { [spsData length], [ppsData length] }; const size_t parameterSetSizes[] = { [spsData length], [ppsData length] };