Changeset 228448 in webkit


Ignore:
Timestamp:
Feb 13, 2018 8:15:48 PM (6 years ago)
Author:
jmarcell@apple.com
Message:

Cherry-pick r228325. rdar://problem/37518694

Location:
branches/safari-605-branch/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-605-branch/Source/WebCore/ChangeLog

    r228447 r228448  
     12018-02-13  Jason Marcell  <jmarcell@apple.com>
     2
     3        Cherry-pick r228325. rdar://problem/37518694
     4
     5    2018-02-09  Youenn Fablet  <youenn@apple.com>
     6
     7            Make CoreAudioCaptureSource error logging be release logging
     8            https://bugs.webkit.org/show_bug.cgi?id=182614
     9
     10            Reviewed by Eric Carlson.
     11
     12            No change of behavior.
     13
     14            * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
     15            (WebCore::CoreAudioSharedUnit::addEchoCancellationSource):
     16            (WebCore::CoreAudioSharedUnit::setupAudioUnit):
     17            (WebCore::CoreAudioSharedUnit::configureMicrophoneProc):
     18            (WebCore::CoreAudioSharedUnit::configureSpeakerProc):
     19            (WebCore::CoreAudioSharedUnit::checkTimestamps):
     20            (WebCore::CoreAudioSharedUnit::provideSpeakerData):
     21            (WebCore::CoreAudioSharedUnit::processMicrophoneSamples):
     22            (WebCore::CoreAudioSharedUnit::cleanupAudioUnit):
     23            (WebCore::CoreAudioSharedUnit::reconfigureAudioUnit):
     24            (WebCore::CoreAudioSharedUnit::startInternal):
     25            (WebCore::CoreAudioSharedUnit::verifyIsCapturing):
     26            (WebCore::CoreAudioSharedUnit::stopInternal):
     27            (WebCore::CoreAudioSharedUnit::defaultInputDevice):
     28
    1292018-02-13  Jason Marcell  <jmarcell@apple.com>
    230

  • branches/safari-605-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp

    r228405 r228448  
    206206{
    207207    if (!source.setOutputFormat(m_speakerProcFormat)) {
    208         LOG(Media, "CoreAudioSharedUnit::addEchoCancellationSource: source %p configureOutput failed", &source);
     208        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::addEchoCancellationSource: source %p configureOutput failed", &source);
    209209        return;
    210210    }
    … …  
    240240    ASSERT(ioComponent);
    241241    if (!ioComponent) {
    242         LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to find vpio unit component", this);
     242        RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to find vpio unit component", this);
    243243        return -1;
    244244    }
    … …  
    250250        m_ioUnitName = name;
    251251        CFRelease(name);
    252         LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) created \"%s\" component", this, m_ioUnitName.utf8().data());
     252        RELEASE_LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) created \"%s\" component", this, m_ioUnitName.utf8().data());
    253253    }
    254254#endif
    … …  
    256256    auto err = AudioComponentInstanceNew(ioComponent, &m_ioUnit);
    257257    if (err) {
    258         LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to open vpio unit, error %d (%.4s)", this, (int)err, (char*)&err);
     258        RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to open vpio unit, error %d (%.4s)", this, (int)err, (char*)&err);
    259259        return err;
    260260    }
    … …  
    264264        err = AudioUnitSetProperty(m_ioUnit, kAUVoiceIOProperty_VoiceProcessingEnableAGC, kAudioUnitScope_Global, inputBus, &param, sizeof(param));
    265265        if (err) {
    266             LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to set vpio automatic gain control, error %d (%.4s)", this, (int)err, (char*)&err);
     266            RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to set vpio automatic gain control, error %d (%.4s)", this, (int)err, (char*)&err);
    267267            return err;
    268268        }
    … …  
    270270        err = AudioUnitSetProperty(m_ioUnit, kAUVoiceIOProperty_BypassVoiceProcessing, kAudioUnitScope_Global, inputBus, &param, sizeof(param));
    271271        if (err) {
    272             LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to set vpio unit echo cancellation, error %d (%.4s)", this, (int)err, (char*)&err);
     272            RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to set vpio unit echo cancellation, error %d (%.4s)", this, (int)err, (char*)&err);
    273273            return err;
    274274        }
    … …  
    279279    err = AudioUnitSetProperty(m_ioUnit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, inputBus, &param, sizeof(param));
    280280    if (err) {
    281         LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to enable vpio unit input, error %d (%.4s)", this, (int)err, (char*)&err);
     281        RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to enable vpio unit input, error %d (%.4s)", this, (int)err, (char*)&err);
    282282        return err;
    283283    }
    … …  
    291291    err = AudioUnitSetProperty(m_ioUnit, kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, inputBus, &m_captureDeviceID, sizeof(m_captureDeviceID));
    292292    if (err) {
    293         LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to set vpio unit capture device ID, error %d (%.4s)", this, (int)err, (char*)&err);
     293        RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) unable to set vpio unit capture device ID, error %d (%.4s)", this, (int)err, (char*)&err);
    294294        return err;
    295295    }
    … …  
    304304    err = AudioUnitInitialize(m_ioUnit);
    305305    if (err) {
    306         LOG(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) AudioUnitInitialize() failed, error %d (%.4s)", this, (int)err, (char*)&err);
     306        RELEASE_LOG_ERROR(Media, "CoreAudioCaptureSource::setupAudioUnit(%p) AudioUnitInitialize() failed, error %d (%.4s)", this, (int)err, (char*)&err);
    307307        return err;
    308308    }
    … …  
    318318    auto err = AudioUnitSetProperty(m_ioUnit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Global, inputBus, &callback, sizeof(callback));
    319319    if (err) {
    320         LOG(Media, "CoreAudioSharedUnit::configureMicrophoneProc(%p) unable to set vpio unit mic proc, error %d (%.4s)", this, (int)err, (char*)&err);
     320        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::configureMicrophoneProc(%p) unable to set vpio unit mic proc, error %d (%.4s)", this, (int)err, (char*)&err);
    321321        return err;
    322322    }
    … …  
    327327    err = AudioUnitGetProperty(m_ioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, inputBus, &microphoneProcFormat, &size);
    328328    if (err) {
    329         LOG(Media, "CoreAudioSharedUnit::configureMicrophoneProc(%p) unable to get output stream format, error %d (%.4s)", this, (int)err, (char*)&err);
     329        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::configureMicrophoneProc(%p) unable to get output stream format, error %d (%.4s)", this, (int)err, (char*)&err);
    330330        return err;
    331331    }
    … …  
    334334    err = AudioUnitSetProperty(m_ioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, inputBus, &microphoneProcFormat, size);
    335335    if (err) {
    336         LOG(Media, "CoreAudioSharedUnit::configureMicrophoneProc(%p) unable to set output stream format, error %d (%.4s)", this, (int)err, (char*)&err);
     336        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::configureMicrophoneProc(%p) unable to set output stream format, error %d (%.4s)", this, (int)err, (char*)&err);
    337337        return err;
    338338    }
    … …  
    349349    auto err = AudioUnitSetProperty(m_ioUnit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, outputBus, &callback, sizeof(callback));
    350350    if (err) {
    351         LOG(Media, "CoreAudioSharedUnit::configureSpeakerProc(%p) unable to set vpio unit speaker proc, error %d (%.4s)", this, (int)err, (char*)&err);
     351        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::configureSpeakerProc(%p) unable to set vpio unit speaker proc, error %d (%.4s)", this, (int)err, (char*)&err);
    352352        return err;
    353353    }
    … …  
    358358    err = AudioUnitGetProperty(m_ioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, outputBus, &speakerProcFormat, &size);
    359359    if (err) {
    360         LOG(Media, "CoreAudioSharedUnit::configureSpeakerProc(%p) unable to get input stream format, error %d (%.4s)", this, (int)err, (char*)&err);
     360        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::configureSpeakerProc(%p) unable to get input stream format, error %d (%.4s)", this, (int)err, (char*)&err);
    361361        return err;
    362362    }
    … …  
    365365    err = AudioUnitSetProperty(m_ioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, outputBus, &speakerProcFormat, size);
    366366    if (err) {
    367         LOG(Media, "CoreAudioSharedUnit::configureSpeakerProc(%p) unable to get input stream format, error %d (%.4s)", this, (int)err, (char*)&err);
     367        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::configureSpeakerProc(%p) unable to get input stream format, error %d (%.4s)", this, (int)err, (char*)&err);
    368368        return err;
    369369    }
    … …  
    379379{
    380380    if (!timeStamp.mSampleTime || sampleTime == m_latestMicTimeStamp || !hostTime)
    381         LOG(Media, "CoreAudioSharedUnit::checkTimestamps: unusual timestamps, sample time = %lld, previous sample time = %lld, hostTime %f", sampleTime, m_latestMicTimeStamp, hostTime);
     381        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::checkTimestamps: unusual timestamps, sample time = %lld, previous sample time = %lld, hostTime %f", sampleTime, m_latestMicTimeStamp, hostTime);
    382382}
    383383#endif
    … …  
    391391
    392392    if (m_speakerSampleBuffer->sampleCapacity() < inNumberFrames) {
    393         LOG(Media, "CoreAudioSharedUnit::provideSpeakerData: speaker sample buffer size (%d) too small for amount of sample data requested (%d)!", m_speakerSampleBuffer->sampleCapacity(), (int)inNumberFrames);
     393        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::provideSpeakerData: speaker sample buffer size (%d) too small for amount of sample data requested (%d)!", m_speakerSampleBuffer->sampleCapacity(), (int)inNumberFrames);
    394394        return kAudio_ParamError;
    395395    }
    … …  
    454454    auto err = AudioUnitRender(m_ioUnit, &ioActionFlags, &timeStamp, inBusNumber, inNumberFrames, &bufferList);
    455455    if (err) {
    456         LOG(Media, "CoreAudioSharedUnit::processMicrophoneSamples(%p) AudioUnitRender failed with error %d (%.4s)", this, (int)err, (char*)&err);
     456        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::processMicrophoneSamples(%p) AudioUnitRender failed with error %d (%.4s)", this, (int)err, (char*)&err);
    457457        return err;
    458458    }
    … …  
    490490        auto err = AudioUnitUninitialize(m_ioUnit);
    491491        if (err)
    492             LOG(Media, "CoreAudioSharedUnit::cleanupAudioUnit(%p) AudioUnitUninitialize failed with error %d (%.4s)", this, (int)err, (char*)&err);
     492            RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::cleanupAudioUnit(%p) AudioUnitUninitialize failed with error %d (%.4s)", this, (int)err, (char*)&err);
    493493        m_ioUnitInitialized = false;
    494494    }
    … …  
    515515        err = AudioOutputUnitStop(m_ioUnit);
    516516        if (err) {
    517             LOG(Media, "CoreAudioSharedUnit::reconfigureAudioUnit(%p) AudioOutputUnitStop failed with error %d (%.4s)", this, (int)err, (char*)&err);
     517            RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::reconfigureAudioUnit(%p) AudioOutputUnitStop failed with error %d (%.4s)", this, (int)err, (char*)&err);
    518518            return err;
    519519        }
    … …  
    528528        err = AudioOutputUnitStart(m_ioUnit);
    529529        if (err) {
    530             LOG(Media, "CoreAudioSharedUnit::reconfigureAudioUnit(%p) AudioOutputUnitStart failed with error %d (%.4s)", this, (int)err, (char*)&err);
     530            RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::reconfigureAudioUnit(%p) AudioOutputUnitStart failed with error %d (%.4s)", this, (int)err, (char*)&err);
    531531            return err;
    532532        }
    … …  
    588588    err = AudioOutputUnitStart(m_ioUnit);
    589589    if (err) {
    590         LOG(Media, "CoreAudioSharedUnit::start(%p) AudioOutputUnitStart failed with error %d (%.4s)", this, (int)err, (char*)&err);
     590        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::start(%p) AudioOutputUnitStart failed with error %d (%.4s)", this, (int)err, (char*)&err);
    591591        return;
    592592    }
    … …  
    609609
    610610#if !RELEASE_LOG_DISABLED
    611     RELEASE_LOG(Media, "CoreAudioSharedUnit::verifyIsCapturing - capture failed\n");
     611    RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::verifyIsCapturing - capture failed\n");
    612612#endif
    613613    for (CoreAudioCaptureSource& client : m_clients)
    … …  
    650650    auto err = AudioOutputUnitStop(m_ioUnit);
    651651    if (err) {
    652         LOG(Media, "CoreAudioSharedUnit::stop(%p) AudioOutputUnitStop failed with error %d (%.4s)", this, (int)err, (char*)&err);
     652        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::stop(%p) AudioOutputUnitStop failed with error %d (%.4s)", this, (int)err, (char*)&err);
    653653        return;
    654654    }
    … …  
    664664    auto err = AudioUnitGetProperty(m_ioUnit, kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, inputBus, deviceID, &propertySize);
    665665    if (err)
    666         LOG(Media, "CoreAudioSharedUnit::defaultInputDevice(%p) unable to get default input device ID, error %d (%.4s)", this, (int)err, (char*)&err);
     666        RELEASE_LOG_ERROR(Media, "CoreAudioSharedUnit::defaultInputDevice(%p) unable to get default input device ID, error %d (%.4s)", this, (int)err, (char*)&err);
    667667
    668668    return err;
Note: See TracChangeset for help on using the changeset viewer.