[FFmpeg-devel] [PATCH] avformat/mpegtsenc: correct bitstream check

[FFmpeg-devel] [PATCH] avformat/mpegtsenc: correct bitstream check

[Gyan Doshi]

8559cce3c3 made the bitstream check generic using a LUT.
However, one of the comparisons which involves a bitwise AND
and equality check is faulty due to operator precedence.

First reported and analysed at
https://github.com/streamlink/streamlink/issues/5876

Fixes #10908
---
 libavformat/mpegtsenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 06e88e9879..b8efc535a7 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -2319,7 +2319,7 @@ static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st,
                 pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
                 (AV_RB24(pkt->data) != 0x000001 ||
                     (st->codecpar->extradata_size > 0 &&
-                        (st->codecpar->extradata[0] & e->mask == e->value))))
+                        ((st->codecpar->extradata[0] & e->mask) == e->value))))
             return ff_stream_add_bitstream_filter(st, e->bsf_name, NULL);
     }
     return 1;
-- 
2.44.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avformat/mpegtsenc: correct bitstream check

[Marton Balint]

On Sat, 16 Mar 2024, Gyan Doshi wrote:

> 8559cce3c3 made the bitstream check generic using a LUT.
> However, one of the comparisons which involves a bitwise AND
> and equality check is faulty due to operator precedence.
>
> First reported and analysed at
> https://github.com/streamlink/streamlink/issues/5876
>
> Fixes #10908
> ---
> libavformat/mpegtsenc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> index 06e88e9879..b8efc535a7 100644
> --- a/libavformat/mpegtsenc.c
> +++ b/libavformat/mpegtsenc.c
> @@ -2319,7 +2319,7 @@ static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st,
>                 pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
>                 (AV_RB24(pkt->data) != 0x000001 ||
>                     (st->codecpar->extradata_size > 0 &&
> -                        (st->codecpar->extradata[0] & e->mask == e->value))))
> +                        ((st->codecpar->extradata[0] & e->mask) == e->value))))
>             return ff_stream_add_bitstream_filter(st, e->bsf_name, NULL);
>     }
>     return 1;
> --

LGTM, thanks.

Marton
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avformat/mpegtsenc: correct bitstream check

[Gyan Doshi]

On 2024-03-16 02:02 pm, Marton Balint wrote:
>
>
> On Sat, 16 Mar 2024, Gyan Doshi wrote:
>
>> 8559cce3c3 made the bitstream check generic using a LUT.
>> However, one of the comparisons which involves a bitwise AND
>> and equality check is faulty due to operator precedence.
>>
>> First reported and analysed at
>> https://github.com/streamlink/streamlink/issues/5876
>>
>> Fixes #10908
>> ---
>> libavformat/mpegtsenc.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
>> index 06e88e9879..b8efc535a7 100644
>> --- a/libavformat/mpegtsenc.c
>> +++ b/libavformat/mpegtsenc.c
>> @@ -2319,7 +2319,7 @@ static int 
>> mpegts_check_bitstream(AVFormatContext *s, AVStream *st,
>>                 pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 &&
>>                 (AV_RB24(pkt->data) != 0x000001 ||
>>                     (st->codecpar->extradata_size > 0 &&
>> -                        (st->codecpar->extradata[0] & e->mask == 
>> e->value))))
>> +                        ((st->codecpar->extradata[0] & e->mask) == 
>> e->value))))
>>             return ff_stream_add_bitstream_filter(st, e->bsf_name, 
>> NULL);
>>     }
>>     return 1;
>> -- 
>
> LGTM, thanks.

Thanks. Pushed as f5441e441f9b0d235e49bdccc69e141ccd92e854

Regards,
Gyan

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".