updated README document with new renderer and capturer APIs and removed MP3 support

Signed-off-by: Geevarghese V K <geevarghese.v.k1@huawei.com>

README.md

@@ -12,7 +12,7 @@
 ## Introduction<a name="introduction"></a>
 The **audio\_standard** repository is used to implement audio-related features, including audio playback, recording, volume management and device management.
 
-**Figure  1**  Position in the subsystem architecture<a name="fig483116248288"></a>  
+**Figure  1**  Position in the subsystem architecture<a name="fig483116248288"></a>
 
 
 ![](figures/en-us_image_0000001152315135.png)
@@ -62,24 +62,24 @@ The structure of the repository directory is as follows:
 ## Usage Guidelines<a name="usage-guidelines"></a>
 ### Audio Playback<a name="audio-playback"></a>
 You can use APIs provided in this repository to convert audio data into audible analog signals, play the audio signals using output devices, and manage playback tasks. The following steps describe how to use  **AudioRenderer**  to develop the audio playback function:
-1. Use **Create** API with required stream type to get **AudioRenderer** instance.
+1. Use **Create** API with required renderer configuration to get **AudioRenderer** instance.
     ```
-    AudioStreamType streamType = STREAM_MUSIC; // example stream type
-    std::unique_ptr<AudioRenderer> audioRenderer = AudioRenderer::Create(streamType);
+    AudioRendererOptions rendererOptions;
+    rendererOptions.streamInfo.samplingRate = AudioSamplingRate::SAMPLE_RATE_44100;
+    rendererOptions.streamInfo.encoding = AudioEncodingType::ENCODING_PCM;
+    rendererOptions.streamInfo.format = AudioSampleFormat::SAMPLE_S16LE;
+    rendererOptions.streamInfo.channels = AudioChannel::STEREO;
+    rendererOptions.rendererInfo.contentType = ContentType::CONTENT_TYPE_MUSIC;
+    rendererOptions.rendererInfo.streamUsage = StreamUsage::STREAM_USAGE_MEDIA;
+    rendererOptions.rendererInfo.rendererFlags = 0;
+
+    unique_ptr<AudioRenderer> audioRenderer = AudioRenderer::Create(rendererOptions);
     ```
 2. (Optional) Static APIs **GetSupportedFormats**(), **GetSupportedChannels**(), **GetSupportedEncodingTypes**(), **GetSupportedSamplingRates**() can be used to get the supported values of the params.
-3. To Prepare the device, call **SetParams** on the instance.
-    ```
-    AudioRendererParams rendererParams;
-    rendererParams.sampleFormat = SAMPLE_S16LE;
-    rendererParams.sampleRate = SAMPLE_RATE_44100;
-    rendererParams.channelCount = STEREO;
-    rendererParams.encodingType = ENCODING_PCM;
 
-    audioRenderer->SetParams(rendererParams);
-    ```
-4. (Optional) use audioRenderer->**GetParams**(rendererParams) to validate SetParams
-5. Inorder to listen to Audio Interrupt events, it would be required to Register to **RendererCallbacks** using audioRenderer->**SetRendererCallback**
+3. (Optional) use audioRenderer->**GetRendererInfo**(AudioRendererInfo &) and audioRenderer->**GetStreamInfo**(AudioStreamInfo &) to retrieve the current renderer configuration values.
+
+4. Inorder to listen to Audio Interrupt events, it would be required to Register to **RendererCallbacks** using audioRenderer->**SetRendererCallback**
     ```
     class AudioRendererCallbackImpl : public AudioRendererCallback {
         void OnInterrupt(const InterruptEvent &interruptEvent) override
@@ -161,25 +161,25 @@ Please refer [**audio_renderer.h**](https://gitee.com/openharmony/multimedia_aud
 ### Audio Recording<a name="audio-recording"></a>
 You can use the APIs provided in this repository for your application to record voices using input devices, convert the voices into audio data, and manage recording tasks. The following steps describe how to use **AudioCapturer** to develop the audio recording function:
 
-1. Use **Create** API with required stream type to get **AudioCapturer** instance.
+1. Use **Create** API with required capturer configuration to get **AudioCapturer** instance.
     ```
-    AudioStreamType streamType = STREAM_MUSIC;
-    std::unique_ptr<AudioCapturer> audioCapturer = AudioCapturer::Create(streamType);
+    AudioCapturerOptions capturerOptions;
+    capturerOptions.streamInfo.samplingRate = AudioSamplingRate::SAMPLE_RATE_48000;
+    capturerOptions.streamInfo.encoding = AudioEncodingType::ENCODING_PCM;
+    capturerOptions.streamInfo.format = AudioSampleFormat::SAMPLE_S16LE;
+    capturerOptions.streamInfo.channels = AudioChannel::MONO;
+    capturerOptions.capturerInfo.sourceType = SourceType::SOURCE_TYPE_MIC;
+    capturerOptions.capturerInfo.capturerFlags = CAPTURER_FLAG;;
+
+    unique_ptr<AudioCapturer> audioCapturer = AudioCapturer::Create(capturerOptions);
     ```
 2. (Optional) Static APIs **GetSupportedFormats**(), **GetSupportedChannels**(), **GetSupportedEncodingTypes**(), **GetSupportedSamplingRates()** can be used to get the supported values of the params.
-3. To Prepare the device, call **SetParams** on the instance.
-    ```
-    AudioCapturerParams capturerParams;
-    capturerParams.sampleFormat = SAMPLE_S16LE;
-    capturerParams.sampleRate = SAMPLE_RATE_44100;
-    capturerParams.channelCount = STEREO;
-    capturerParams.encodingType = ENCODING_PCM;
 
-    audioCapturer->SetParams(capturerParams);
-    ```
-4. (Optional) use audioCapturer->**GetParams**(capturerParams) to validate SetParams()
+4. (Optional) use audioCapturer->**GetCapturerInfo**(AudioCapturerInfo &) and audioCapturer->**GetStreamInfo**(AudioStreamInfo &) to retrieve the current capturer configuration values.
+
 5. Call audioCapturer->**Start**() function on the AudioCapturer instance to start the recording task.
-6. Get the buffer length to be read, using **GetBufferSize** API. 
+
+6. Get the buffer length to be read, using **GetBufferSize** API.
     ```
     audioCapturer->GetBufferSize(bufferLen);
     ```

frameworks/native/audiocapturer/src/audio_capturer.cpp

@@ -80,7 +80,7 @@ int32_t AudioCapturerPrivate::GetParams(AudioCapturerParams &params) const
     int32_t result = audioCapturer->GetAudioStreamInfo(audioStreamParams);
     if (SUCCESS == result) {
         params.audioSampleFormat = static_cast<AudioSampleFormat>(audioStreamParams.format);
-        params.samplingRate =  static_cast<AudioSamplingRate>(audioStreamParams.samplingRate);
+        params.samplingRate = static_cast<AudioSamplingRate>(audioStreamParams.samplingRate);
         params.audioChannel = static_cast<AudioChannel>(audioStreamParams.channels);
         params.audioEncoding = static_cast<AudioEncodingType>(audioStreamParams.encoding);
     }
@@ -101,7 +101,7 @@ int32_t AudioCapturerPrivate::GetStreamInfo(AudioStreamInfo &streamInfo) const
     int32_t result = audioCapturer->GetAudioStreamInfo(audioStreamParams);
     if (SUCCESS == result) {
         streamInfo.format = static_cast<AudioSampleFormat>(audioStreamParams.format);
-        streamInfo.samplingRate =  static_cast<AudioSamplingRate>(audioStreamParams.samplingRate);
+        streamInfo.samplingRate = static_cast<AudioSamplingRate>(audioStreamParams.samplingRate);
         streamInfo.channels = static_cast<AudioChannel>(audioStreamParams.channels);
         streamInfo.encoding = static_cast<AudioEncodingType>(audioStreamParams.encoding);
     }

interfaces/inner_api/native/audiocommon/include/audio_info.h

@@ -175,8 +175,6 @@ enum AudioStreamType {
 
 enum AudioEncodingType {
     ENCODING_PCM = 0,
-    ENCODING_MP3,
-    ENCODING_AAC, // Currently not supported
     ENCODING_INVALID = -1
 };
 

interfaces/kits/js/audio_capturer/include/audio_parameters_napi.h

@@ -56,8 +56,7 @@ static const std::map<std::string, AudioSamplingRate> samplingRateMap = {
 
 static const std::map<std::string, AudioEncodingType> encodingTypeMap = {
     {"ENCODING_TYPE_INVALID", ENCODING_INVALID},
-    {"ENCODING_TYPE_RAW", ENCODING_PCM},
-    {"ENCODING_TYPE_MP3", ENCODING_MP3}
+    {"ENCODING_TYPE_RAW", ENCODING_PCM}
 };
 
 static const std::map<std::string, ContentType> contentTypeMap = {

interfaces/kits/js/audio_manager/@ohos.multimedia.audio.d.ts

@@ -306,12 +306,7 @@ declare namespace audio {
      * Raw pcm type.
      * @since 8
      */
-    ENCODING_TYPE_RAW = 0,
-    /**
-     * Mp3 encoding type.
-     * @since 8
-     */
-    ENCODING_TYPE_MP3 = 1,
+    ENCODING_TYPE_RAW = 0
   }
 
   /**