openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-26 19:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement SFC_SET_COMPRESSION_LEVEL command.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2012-06-20 21:52:43 +10:00
parent 9f10d036b7
commit 339dea4206
3 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -8,6 +8,13 @@
* src/sndfile.h.in doc/command.html * src/sndfile.h.in doc/command.html
Add SFC_SET_COMPRESSION_LEVEL and document it. Add SFC_SET_COMPRESSION_LEVEL and document it.
* src/sndfile.c
Catch SFC_SET_VBR_ENCODING_QUALITY command and implement it as the inverse
of SFC_SET_COMPRESSION_LEVEL.
* src/ogg_vorbis.c src/flac.c
Implement SFC_SET_COMPRESSION_LEVEL command.
2012-06-19 Erik de Castro Lopo <erikd AT mega-nerd DOT com> 2012-06-19 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* tests/ * tests/

47
src/flac.c
View File

@ -39,6 +39,8 @@
** Private static functions. ** Private static functions.
*/ */
#define FLAC_DEFAULT_COMPRESSION_LEVEL 5
#define ENC_BUFFER_SIZE 8192 #define ENC_BUFFER_SIZE 8192
typedef enum typedef enum
@ -67,6 +69,8 @@ typedef struct
const FLAC__Frame *frame ; const FLAC__Frame *frame ;
FLAC__bool bufferbackup ; FLAC__bool bufferbackup ;
unsigned compression ;
} FLAC_PRIVATE ; } FLAC_PRIVATE ;
typedef struct typedef struct
@ -630,6 +634,10 @@ flac_open (SF_PRIVATE *psf)
FLAC_PRIVATE* pflac = calloc (1, sizeof (FLAC_PRIVATE)) ; FLAC_PRIVATE* pflac = calloc (1, sizeof (FLAC_PRIVATE)) ;
psf->codec_data = pflac ; psf->codec_data = pflac ;
/* Set the default value here. Over-ridden later if necessary. */
pflac->compression = FLAC_DEFAULT_COMPRESSION_LEVEL ;
if (psf->file.mode == SFM_RDWR) if (psf->file.mode == SFM_RDWR)
return SFE_BAD_MODE_RW ; return SFE_BAD_MODE_RW ;
@ -764,6 +772,11 @@ flac_enc_init (SF_PRIVATE *psf)
return SFE_FLAC_INIT_DECODER ; return SFE_FLAC_INIT_DECODER ;
} ; } ;
if (! FLAC__stream_encoder_set_compression_level (pflac->fse, pflac->compression))
{ psf_log_printf (psf, "FLAC__stream_encoder_set_compression_level (%d) return false.\n", pflac->compression) ;
return SFE_FLAC_INIT_DECODER ;
} ;
return 0 ; return 0 ;
} /* flac_enc_init */ } /* flac_enc_init */
@ -795,9 +808,37 @@ flac_read_header (SF_PRIVATE *psf)
} /* flac_read_header */ } /* flac_read_header */
static int static int
flac_command (SF_PRIVATE * UNUSED (psf), int UNUSED (command), void * UNUSED (data), int UNUSED (datasize)) flac_command (SF_PRIVATE * psf, int command, void * data, int datasize)
{ { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
return 0 ; double quality ;
switch (command)
{ case SFC_SET_COMPRESSION_LEVEL :
if (data == NULL || datasize != sizeof (double))
return SF_FALSE ;
if (psf->have_written)
return SF_FALSE ;
/* FLAC compression level is in the range [0, 8] while libsndfile takes
** values in the range [0.0, 1.0]. Massage the libsndfile value here.
*/
quality = (*((double *) data)) * 8.0 ;
/* Clip range. */
pflac->compression = lrint (SF_MAX (0.0, SF_MIN (8.0, quality))) ;
psf_log_printf (psf, "%s : Setting SFC_SET_COMPRESSION_LEVEL to %u.\n", __func__, pflac->compression) ;
if (flac_enc_init (psf))
return SF_FALSE ;
return SF_TRUE ;
default :
return SF_FALSE ;
} ;
return SF_FALSE ;
} /* flac_command */ } /* flac_command */
int int

4
src/ogg_vorbis.c
View File

@ -549,14 +549,14 @@ vorbis_command (SF_PRIVATE *psf, int command, void * data, int datasize)
{ VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; { VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
switch (command) switch (command)
{ case SFC_SET_VBR_ENCODING_QUALITY : { case SFC_SET_COMPRESSION_LEVEL :
if (data == NULL || datasize != sizeof (double)) if (data == NULL || datasize != sizeof (double))
return SF_FALSE ; return SF_FALSE ;
if (psf->have_written) if (psf->have_written)
return SF_FALSE ; return SF_FALSE ;
vdata->quality = *((double *) data) ; vdata->quality = 1.0 - *((double *) data) ;
/* Clip range. */ /* Clip range. */
vdata->quality = SF_MAX (0.0, SF_MIN (1.0, vdata->quality)) ; vdata->quality = SF_MAX (0.0, SF_MIN (1.0, vdata->quality)) ;