[FFmpeg-devel] [PATCH v3] avcodec/mediacodecdec: Do not abort when H264/HEVC extradata extraction fails

[sfan5]

12.02.21 - 21:43 - Andreas Rheinhardt:
> sfan5:
>> Hi,
>>
>>
>> attached v2 patch after discussion on IRC with JEEB (as he already
>> mentioned).
>>
>> Only change is that the log level turns to debug when missing parameter
>> sets are within spec (cf. 14496-15).
>>
>>
>> -        av_log(avctx, AV_LOG_ERROR, "Could not extract PPS/SPS from extradata");
>> -        ret = AVERROR_INVALIDDATA;
>> +        const int warn = is_avc && avctx->codec_tag != MKTAG('a','v','c','1') &&
>> +            avctx->codec_tag != MKTAG('a','v','c','2');
>> +        av_log(avctx, warn ? AV_LOG_WARNING : AV_LOG_DEBUG,
>> +            "Could not extract PPS/SPS from extradata\n");
>> +        ret = 0;
>>       }
> warn = is_avc && (avctx->codec_tag == MKTAG('a','v','c','1') ||
>                    avctx->codec_tag == MKTAG('a','v','c','2')
> is what you (should) want.
>
> - Andreas

Thanks for pointing that out, you're correct.

here's v3:

-------------- next part --------------
A non-text attachment was scrubbed...
Name: v3-0001-avcodec-mediacodecdec-Do-not-abort-when-H264-HEVC.patch
Type: text/x-patch
Size: 1932 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20210212/027b2f32/attachment.bin>