github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-31 16:29:58 +02:00
Code Releases Activity

af_convert24: fix complicated and incorrect format negotiation

Browse Source 
The conversion works for native endian only. The correct check lists
supported format combination explicitly, but is also much simpler.
This commit is contained in:
wm4 2013-11-09 23:20:02 +01:00
parent 31f409a3c5
commit 5735b684de
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/filter/af_convert24.c
View File

@ -23,15 +23,10 @@
static bool test_conversion(int src_format, int dst_format)
{
if (!(src_format & AF_FORMAT_POINT_MASK) == AF_FORMAT_I)
return false;
if ((src_format & ~AF_FORMAT_BITS_MASK) !=
(dst_format & ~AF_FORMAT_BITS_MASK))
return false;
int srcbits = src_format & AF_FORMAT_BITS_MASK;
int dstbits = dst_format & AF_FORMAT_BITS_MASK;
return (srcbits == AF_FORMAT_24BIT && dstbits == AF_FORMAT_32BIT) ||
(srcbits == AF_FORMAT_32BIT && dstbits == AF_FORMAT_24BIT);
return (src_format == AF_FORMAT_U24_NE && dst_format == AF_FORMAT_U32_NE) ||
(src_format == AF_FORMAT_S24_NE && dst_format == AF_FORMAT_S32_NE) ||
(src_format == AF_FORMAT_U32_NE && dst_format == AF_FORMAT_U24_NE) ||
(src_format == AF_FORMAT_S32_NE && dst_format == AF_FORMAT_S24_NE);
}
static int control(struct af_instance *af, int cmd, void *arg)