From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Mon, 6 Dec 2021 09:47:17 +0000 (+0900)
Subject: Merge tag 'upstream/1.0.31' into tizen
X-Git-Tag: submit/tizen/20211209.031327~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F267508%2F1;p=platform%2Fupstream%2Flibsndfile.git

Merge tag 'upstream/1.0.31' into tizen

Change-Id: I6b4f834ae3a79c744b738a104846040bb35d5d0c
---

fc476221de70bcca403667ea2ff929e8da9620a3
diff --cc src/common.h
index 3e51828,08360d0..199ed8f
--- a/src/common.h
+++ b/src/common.h
@@@ -939,8 -940,12 +939,10 @@@ int		alaw_init		(SF_PRIVATE *psf) 
  int		float32_init	(SF_PRIVATE *psf) ;
  int		double64_init	(SF_PRIVATE *psf) ;
  int		dwvw_init		(SF_PRIVATE *psf, int bitwidth) ;
+ int		gsm610_init		(SF_PRIVATE *psf) ;
+ int		nms_adpcm_init	(SF_PRIVATE *psf) ;
  int		vox_adpcm_init	(SF_PRIVATE *psf) ;
  int		flac_init		(SF_PRIVATE *psf) ;
 -int		g72x_init 		(SF_PRIVATE * psf) ;
 -int		alac_init		(SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ;
  
  int 	dither_init		(SF_PRIVATE *psf, int mode) ;
  
diff --cc src/raw.c
index d640075,c8fcbfd..0c768e3
--- a/src/raw.c
+++ b/src/raw.c
@@@ -67,7 -67,18 +67,14 @@@ raw_open	(SF_PRIVATE *psf
  				error = alaw_init (psf) ;
  				break ;
  
 -		case SF_FORMAT_GSM610 :
 -				error = gsm610_init (psf) ;
 -				break ;
 -
  		/* Lite remove start */
+ 
+ 		case SF_FORMAT_NMS_ADPCM_16 :
+ 		case SF_FORMAT_NMS_ADPCM_24 :
+ 		case SF_FORMAT_NMS_ADPCM_32 :
+ 				error = nms_adpcm_init (psf) ;
+ 				break ;
+ 
  		case SF_FORMAT_FLOAT :
  				error = float32_init (psf) ;
  				break ;
diff --cc src/wav.c
index c21d333,fd3e453..6d93935
--- a/src/wav.c
+++ b/src/wav.c
@@@ -258,8 -258,22 +258,18 @@@ wav_open	(SF_PRIVATE *psf
  					error = wavlike_msadpcm_init (psf, blockalign, framesperblock) ;
  					break ;
  
+ 		case SF_FORMAT_G721_32 :
+ 					error = g72x_init (psf) ;
+ 					break ;
+ 
+ 		case SF_FORMAT_NMS_ADPCM_16 :
+ 		case SF_FORMAT_NMS_ADPCM_24 :
+ 		case SF_FORMAT_NMS_ADPCM_32 :
+ 					error = nms_adpcm_init (psf) ;
+ 					break ;
+ 
  		/* Lite remove end */
  
 -		case SF_FORMAT_GSM610 :
 -					error = gsm610_init (psf) ;
 -					break ;
 -
  		default : 	return SFE_UNIMPLEMENTED ;
  		} ;