Merge branch 'tizen_line_coverage' into tizen

Change-Id: Ia162ed8e8ea4bb8d60ce2ae1333d5e5c232caa12

diff --git a/include/CAudioInfo.h b/include/CAudioInfo.h
index 8c674aa..ac75c64 100644 (file)
--- a/include/CAudioInfo.h
+++ b/include/CAudioInfo.h
@@ -66,6 +66,7 @@ namespace tizen_media_audio {
             //AUDIO_IN_TYPE_RADIO,
             AUDIO_IN_TYPE_LOOPBACK,
             AUDIO_IN_TYPE_VOICE_RECOGNITION_SERVICE,
+            //AUDIO_IN_TYPE_MEDIA_NETWORK_SOURCE,
 
             /* Output Type */
             AUDIO_OUT_TYPE_MEDIA,
@@ -84,6 +85,7 @@ namespace tizen_media_audio {
             //AUDIO_OUT_TYPE_RADIO,
             //AUDIO_OUT_TYPE_LOOPBACK,
             //AUDIO_OUT_TYPE_VOICE_RECOGNITION_SERVICE,
+            AUDIO_OUT_TYPE_MEDIA_NETWORK_SOURCE,
 
             AUDIO_TYPE_MAX
         };
@@ -141,6 +143,7 @@ namespace tizen_media_audio {
             //"radio",                /**< AUDIO_IN_TYPE_RADIO */
             "loopback-mirroring",     /**< AUDIO_IN_TYPE_LOOPBACK */
             "voice-recognition-service",     /**< AUDIO_IN_TYPE_VOICE_RECOGNITION_SERVICE */
+            //"network-source-media", /**< AUDIO_IN_TYPE_MEDIA_NETWORK_SOURCE */
 
             /* Output Type */
             "media",                  /**< AUDIO_OUT_TYPE_MEDIA */
@@ -159,6 +162,7 @@ namespace tizen_media_audio {
             //"radio",                /**< AUDIO_OUT_TYPE_RADIO */
             //"loopback-mirroring",   /**< AUDIO_OUT_TYPE_LOOPBACK */
             //"voice-recognition-service",/**< AUDIO_OUT_TYPE_VOICE_RECOGNITION_SERVICE */
+            "network-source-media",   /**< AUDIO_OUT_TYPE_MEDIA_NETWORK_SOURCE */
         };
 
         unsigned int __mSampleRate;

diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index 1d9ecbf..2bb0e20 100644 (file)
--- a/packaging/capi-media-audio-io.spec
+++ b/packaging/capi-media-audio-io.spec
@@ -1,6 +1,6 @@
 Name:           capi-media-audio-io
 Summary:        An Audio Input & Audio Output library in Tizen Native API
-Version:        0.5.15
+Version:        0.5.16
 Release:        0
 Group:          Multimedia/API
 License:        Apache-2.0

diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp
index fdf70f9..2aaf058 100644 (file)
--- a/src/cpp/CAudioOutput.cpp
+++ b/src/cpp/CAudioOutput.cpp
@@ -143,6 +143,8 @@ void CAudioOutput::prepare() {
         /* Override the default value by audio type */
         if (audioType == CAudioInfo::EAudioType::AUDIO_OUT_TYPE_VOIP)
             streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_VOIP;
+        else if (audioType == CAudioInfo::EAudioType::AUDIO_OUT_TYPE_MEDIA_NETWORK_SOURCE)
+            streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_HIGH;
 
         CPulseStreamSpec spec(streamSpec, mAudioInfo);