Wrong ARMovie audio codec detection

[stohrendorf]

Summary of the bug: ARMovie Audio Codec detection must not be case sensitive

Details:
The string checks at ​https://github.com/FFmpeg/FFmpeg/blob/master/libavformat/rpl.c#L213 should be case-insensitive. Tomb Raider 1 has ARMovie files which contain uppercase "LINEAR" and "UNSIGNED", so libavformat falsely returns AV_CODEC_ID_PCM_VIDC instead of AV_CODEC_ID_PCM_U8.

Example:

8          bits per sample (LINEAR UNSIGNED)

[James]

Can you upload a sample?

[stohrendorf]

Replying to jamrial:

Can you upload a sample?

Unfortunately not without copyright infringement. What I am currently doing to circumvent this is

        if(stream->codecpar->codec_id == AV_CODEC_ID_PCM_VIDC)
            stream->codecpar->codec_id = AV_CODEC_ID_PCM_U8;

The ARMovie header is:

ARMovie
RPLFAKE movie                                                                    
Copyright unknown                                                                
No description                                                                   
124        video format
320        x size in pixels
120        y size in pixels
24         bits per pixel RGB
15         frames per second
1          sound format
44100      Hz Samples
2          channel
8          bits per sample (LINEAR UNSIGNED)
1          frames per chunk
2714       number of chunks
180068     even chunk size
180068     odd chunk size
32409868   offset to chunk cat
720        offset to sprite
60         size of sprite
0          (no keys)

Hope this helps.

[Carl Eugen Hoyos]

Please test this patch:

diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index fa63576..7aec350 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -210,10 +210,10 @@ static int rpl_read_header(AVFormatContext *s)
                     ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE;
                     break;
                 } else if (ast->codecpar->bits_per_coded_sample == 8) {
-                    if(strstr(audio_type, "unsigned") != NULL) {
+                    if(av_strcasecmp(audio_type, "unsigned") >= 0) {
                         ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8;
                         break;
-                    } else if(strstr(audio_type, "linear") != NULL) {
+                    } else if(av_strcasecmp(audio_type, "linear") >= 0) {
                         ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8;
                         break;
                     } else {

[Elon Musk]

You should post this patch to ML.

[stohrendorf]

Replying to cehoyos:

Please test this patch:
<<<snip>>>

Thanks, seems to work.

[Carl Eugen Hoyos]

Should be fixed in 8cf5f948f24aef163fc57c3115440ef2d9c6cfd9, thank you for the report!

[stohrendorf]

Replying to cehoyos:

Should be fixed in 8cf5f948f24aef163fc57c3115440ef2d9c6cfd9, thank you for the report!

I am very sorry, but I somehow forgot that I changed the comparison to av_stristr while testing it, so the current patch is wrong ("linear" and "unsigned" are contained within audio_type, not equal to it).

[Balling]

Replying to stohrendorf:
Should be fixed in dcf3f8b368cdab908a84ad28ec5a7e0f15f5b33d