Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bcf4989 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use system/audio to/from string converters in TypeConverter""

parents 14a1a173 78d02237

media/libaaudio/src/utility/AAudioUtilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "core/AudioGlobal.h"

#include <aaudio/AAudioTesting.h>

#include <math.h>

#include <system/audio.h>

#include <system/audio-base.h>

#include <assert.h>



#include "utility/AAudioUtilities.h"

media/libeffects/config/src/EffectsConfig.cpp

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ bool stringToStreamType(const char *streamName, Type* type) 


template <>

bool stringToStreamType(const char *streamName, audio_devices_t* type) {

    return DeviceConverter::fromString(streamName, *type);

    return deviceFromString(streamName, *type);

}



/** Parse a library xml note and push the result in libraries or return false on failure. */

media/libmediahelper/TypeConverter.cpp

+376 −9

File changed.

Preview size limit exceeded, changes collapsed.

media/libmediahelper/include/media/TypeConverter.h

+56 −267

File changed.

Preview size limit exceeded, changes collapsed.

media/libmediaplayerservice/tests/stagefrightRecorder/StagefrightRecorderTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <MediaPlayerService.h>

#include <media/NdkMediaExtractor.h>

#include <media/stagefright/MediaCodec.h>

#include <system/audio.h>

#include <system/audio-base.h>



#include "StagefrightRecorder.h"