[FFmpeg-devel] [PATCH] electronicarts: support rare samples containing adpcm_ea_r1 audio

[Paul B Mahol]

On 11/9/12, Peter Ross <pross at xvid.org> wrote:
> Fixes ticked #1549.
>
> ---
>  libavformat/electronicarts.c |   11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
> index c5533f2..0467914 100644
> --- a/libavformat/electronicarts.c
> +++ b/libavformat/electronicarts.c
> @@ -189,7 +189,16 @@ static int
> process_audio_header_elements(AVFormatContext *s)
>          }
>          switch (revision2) {
>          case  8: ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR; break;
> -        case 10: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break;
> +        case 10:
> +            switch (revision) {
> +            case -1:
> +            case  2: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R1; break;
> +            case  3: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break;
> +            default:
> +                av_log(s, AV_LOG_ERROR, "unsupported stream type;
> revision=%i, revision2=%i\n", revision, revision2);
> +                return 0;
av_log_ask_for_sample() and why return 0?
> +            }
> +            break;
>          case 16: ea->audio_codec = AV_CODEC_ID_MP3; break;
>          case -1: break;
>          default:
> --
> 1.7.10.4
>
> -- Peter
> (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
>