* [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe
@ 2022-01-20 22:14 Peter Ross
2022-01-25 7:26 ` [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants Peter Ross
2022-02-02 7:52 ` [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
0 siblings, 2 replies; 4+ messages in thread
From: Peter Ross @ 2022-01-20 22:14 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1.1: Type: text/plain, Size: 1028 bytes --]
Use correct logic to express limits of the planes and pattern_size fields.
Fix ticket# 9605
Signed-off-by: Peter Ross <pross@xvid.org>
---
libavformat/img2dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 4d5ac51b53..2583ca2465 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -1115,8 +1115,8 @@ static int gem_probe(const AVProbeData *p)
int ret = 0;
if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 &&
AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 &&
- (AV_RB16(b + 4) > 0 || AV_RB16(b + 4) <= 8) &&
- (AV_RB16(b + 6) > 0 || AV_RB16(b + 6) <= 8) &&
+ (AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */
+ (AV_RB16(b + 6) > 0 && AV_RB16(b + 6) <= 8) && /* pattern_size */
AV_RB16(b + 8) &&
AV_RB16(b + 10) &&
AV_RB16(b + 12) &&
--
2.34.1
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread* [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants
2022-01-20 22:14 [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
@ 2022-01-25 7:26 ` Peter Ross
2022-02-02 7:52 ` Peter Ross
2022-02-02 7:52 ` [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
1 sibling, 1 reply; 4+ messages in thread
From: Peter Ross @ 2022-01-25 7:26 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1.1: Type: text/plain, Size: 1307 bytes --]
Signed-off-by: Peter Ross <pross@xvid.org>
---
libavformat/img2dec.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 2583ca2465..8608252d83 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -1112,7 +1112,6 @@ static int photocd_probe(const AVProbeData *p)
static int gem_probe(const AVProbeData *p)
{
const uint8_t *b = p->buf;
- int ret = 0;
if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 &&
AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 &&
(AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */
@@ -1121,13 +1120,13 @@ static int gem_probe(const AVProbeData *p)
AV_RB16(b + 10) &&
AV_RB16(b + 12) &&
AV_RB16(b + 14)) {
- ret = AVPROBE_SCORE_EXTENSION / 4;
if (AV_RN32(b + 16) == AV_RN32("STTT") ||
AV_RN32(b + 16) == AV_RN32("TIMG") ||
AV_RN32(b + 16) == AV_RN32("XIMG"))
- ret += 1;
+ return AVPROBE_SCORE_EXTENSION + 1;
+ return AVPROBE_SCORE_EXTENSION / 4;
}
- return ret;
+ return 0;
}
#define IMAGEAUTO_DEMUXER_0(imgname, codecid)
--
2.34.1
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants
2022-01-25 7:26 ` [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants Peter Ross
@ 2022-02-02 7:52 ` Peter Ross
0 siblings, 0 replies; 4+ messages in thread
From: Peter Ross @ 2022-02-02 7:52 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 1478 bytes --]
On Tue, Jan 25, 2022 at 06:26:23PM +1100, Peter Ross wrote:
> Signed-off-by: Peter Ross <pross@xvid.org>
> ---
> libavformat/img2dec.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
> index 2583ca2465..8608252d83 100644
> --- a/libavformat/img2dec.c
> +++ b/libavformat/img2dec.c
> @@ -1112,7 +1112,6 @@ static int photocd_probe(const AVProbeData *p)
> static int gem_probe(const AVProbeData *p)
> {
> const uint8_t *b = p->buf;
> - int ret = 0;
> if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 &&
> AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 &&
> (AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */
> @@ -1121,13 +1120,13 @@ static int gem_probe(const AVProbeData *p)
> AV_RB16(b + 10) &&
> AV_RB16(b + 12) &&
> AV_RB16(b + 14)) {
> - ret = AVPROBE_SCORE_EXTENSION / 4;
> if (AV_RN32(b + 16) == AV_RN32("STTT") ||
> AV_RN32(b + 16) == AV_RN32("TIMG") ||
> AV_RN32(b + 16) == AV_RN32("XIMG"))
> - ret += 1;
> + return AVPROBE_SCORE_EXTENSION + 1;
> + return AVPROBE_SCORE_EXTENSION / 4;
> }
> - return ret;
> + return 0;
> }
>
> #define IMAGEAUTO_DEMUXER_0(imgname, codecid)
> --
> 2.34.1
will apply in a couple of days too
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe
2022-01-20 22:14 [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
2022-01-25 7:26 ` [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants Peter Ross
@ 2022-02-02 7:52 ` Peter Ross
1 sibling, 0 replies; 4+ messages in thread
From: Peter Ross @ 2022-02-02 7:52 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 1175 bytes --]
On Fri, Jan 21, 2022 at 09:14:05AM +1100, Peter Ross wrote:
> Use correct logic to express limits of the planes and pattern_size fields.
>
> Fix ticket# 9605
>
> Signed-off-by: Peter Ross <pross@xvid.org>
> ---
> libavformat/img2dec.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
> index 4d5ac51b53..2583ca2465 100644
> --- a/libavformat/img2dec.c
> +++ b/libavformat/img2dec.c
> @@ -1115,8 +1115,8 @@ static int gem_probe(const AVProbeData *p)
> int ret = 0;
> if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 &&
> AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 &&
> - (AV_RB16(b + 4) > 0 || AV_RB16(b + 4) <= 8) &&
> - (AV_RB16(b + 6) > 0 || AV_RB16(b + 6) <= 8) &&
> + (AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */
> + (AV_RB16(b + 6) > 0 && AV_RB16(b + 6) <= 8) && /* pattern_size */
> AV_RB16(b + 8) &&
> AV_RB16(b + 10) &&
> AV_RB16(b + 12) &&
> --
> 2.34.1
will apply in a couple of days
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-02 7:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-20 22:14 [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
2022-01-25 7:26 ` [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants Peter Ross
2022-02-02 7:52 ` Peter Ross
2022-02-02 7:52 ` [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git