[FFmpeg-devel] [PATCH 5/7] avcodec/dsddec: Fix decoding LSBF samples

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Tue Apr 2 13:16:03 EEST 2024


Peter Ross:
> On Tue, Apr 02, 2024 at 03:37:06AM +0200, Andreas Rheinhardt wrote:
>> ff_dsd2pcm_translate() works internally by converting LSBF input
>> to MSBF upon reading; its buffer is therefore always MSBF
>> and should therefore be initialized with MSBF silence;
>> but this is not true since e3d8963c3cb5b8cd31460dd9b3b9dba2a2343bf5
>> which this patch effectively reverts.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
>> ---
>>  libavcodec/dsddec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c
>> index 22009c70ef..2bb2e73b75 100644
>> --- a/libavcodec/dsddec.c
>> +++ b/libavcodec/dsddec.c
>> @@ -56,7 +56,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
>>      if (!s)
>>          return AVERROR(ENOMEM);
>>  
>> -    silence = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ? DSD_SILENCE_REVERSED : DSD_SILENCE;
>> +    silence = DSD_SILENCE;
>>      for (i = 0; i < avctx->ch_layout.nb_channels; i++) {
>>          s[i].pos = 0;
>>          memset(s[i].buf, silence, sizeof(s[i].buf));
>> -- 
> 
> ok.
> 
> with this patch, DSD_SILENCE, DSD_SILENCE_REVERSED macros and even the silence
> var are no longer neccessary.
> 
> i suggest reverting the memset line and attached comment back to way it was in
> the initial commit (5f4f9ee99f4e9ab980bb18475009c701ba47a74f).
> 

I see you haven't made it till the next commit yet.

- Andreas



More information about the ffmpeg-devel mailing list