RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/channel_layout: don't clear the opaque pointer on type conversion 

Otherwise it would not be lossless.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-03-22 13:00:46 -03:00
parent 1f1b773859
commit 65a04cae6f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/channel_layout.c
View File

@ -902,9 +902,11 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
lossy = 1; lossy = 1;
} }
if (!lossy || allow_lossy) { if (!lossy || allow_lossy) {
void *opaque = channel_layout->opaque;
av_channel_layout_uninit(channel_layout); av_channel_layout_uninit(channel_layout);
channel_layout->order = AV_CHANNEL_ORDER_UNSPEC; channel_layout->order = AV_CHANNEL_ORDER_UNSPEC;
channel_layout->nb_channels = nb_channels; channel_layout->nb_channels = nb_channels;
channel_layout->opaque = opaque;
return lossy; return lossy;
} }
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
@ -916,8 +918,10 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
lossy = has_channel_names(channel_layout); lossy = has_channel_names(channel_layout);
if (!lossy || allow_lossy) { if (!lossy || allow_lossy) {
void *opaque = channel_layout->opaque;
av_channel_layout_uninit(channel_layout); av_channel_layout_uninit(channel_layout);
av_channel_layout_from_mask(channel_layout, mask); av_channel_layout_from_mask(channel_layout, mask);
channel_layout->opaque = opaque;
return lossy; return lossy;
} }
} }
@ -925,6 +929,7 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
case AV_CHANNEL_ORDER_CUSTOM: { case AV_CHANNEL_ORDER_CUSTOM: {
AVChannelLayout custom = { 0 }; AVChannelLayout custom = { 0 };
int ret = av_channel_layout_custom_init(&custom, channel_layout->nb_channels); int ret = av_channel_layout_custom_init(&custom, channel_layout->nb_channels);
void *opaque = channel_layout->opaque;
if (ret < 0) if (ret < 0)
return ret; return ret;
if (channel_layout->order != AV_CHANNEL_ORDER_UNSPEC) if (channel_layout->order != AV_CHANNEL_ORDER_UNSPEC)
@ -932,6 +937,7 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
custom.u.map[i].id = av_channel_layout_channel_from_index(channel_layout, i); custom.u.map[i].id = av_channel_layout_channel_from_index(channel_layout, i);
av_channel_layout_uninit(channel_layout); av_channel_layout_uninit(channel_layout);
*channel_layout = custom; *channel_layout = custom;
channel_layout->opaque = opaque;
return 0; return 0;
} }
case AV_CHANNEL_ORDER_AMBISONIC: case AV_CHANNEL_ORDER_AMBISONIC:
@ -946,10 +952,12 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
lossy = has_channel_names(channel_layout); lossy = has_channel_names(channel_layout);
if (!lossy || allow_lossy) { if (!lossy || allow_lossy) {
void *opaque = channel_layout->opaque;
av_channel_layout_uninit(channel_layout); av_channel_layout_uninit(channel_layout);
channel_layout->order = AV_CHANNEL_ORDER_AMBISONIC; channel_layout->order = AV_CHANNEL_ORDER_AMBISONIC;
channel_layout->nb_channels = nb_channels; channel_layout->nb_channels = nb_channels;
channel_layout->u.mask = mask; channel_layout->u.mask = mask;
channel_layout->opaque = opaque;
return lossy; return lossy;
} }
} }