[FFmpeg-devel] [PATCH] qcelp: silence handling

[Benoit Fouet]

Hi,

On 12/25/2008 08:09 PM, Kenan Gillet wrote:
> Hi,
>
> On Thu, Dec 25, 2008 at 10:31 AM, Diego Biurrun <diego at biurrun.de> wrote:
>   
>> On Mon, Dec 22, 2008 at 11:29:32AM -0800, Kenan Gillet wrote:
>>     
>>> corrected patches attached.
>>>
>>> --- libavcodec/qcelpdec.c     (revision 16279)
>>> +++ libavcodec/qcelpdec.c     (working copy)
>>> @@ -666,9 +679,11 @@
>>>
>>> +        //FIXME: Remove experimental warning when tested with samples.
>>> +        av_log(avctx, AV_LOG_WARNING, "'Blank frame handling is experimental."
>>> +                      " If you want to help, upload a sample "
>>> +                      "of this file to ftp://upload.mplayerhq.hu/MPlayer/incoming/ "
>>>       
>> upload.ffmpeg.org
>>     
>
> done
>
>
>   
>>> +                      "and contact the FFmpeg-devel mailing list.\n");
>>>       
>> ffmpeg-devel
>>     
>
> done, attached a patch to make also the change in libavcodec/utils.c
>
> merry christmas,
>
> Kenan
>   

> Index: libavcodec/qcelpdec.c
> ===================================================================
> --- libavcodec/qcelpdec.c	(revision 16311)
> +++ libavcodec/qcelpdec.c	(working copy)
> @@ -666,9 +679,11 @@
>  
>      if(bitrate == SILENCE)
>      {
> -        // FIXME: the decoder should not handle SILENCE frames as I_F_Q frames
> -        ff_log_missing_feature(avctx, "Blank frame", 1);
> -        bitrate = I_F_Q;
> +        //FIXME: Remove experimental warning when tested with samples.
> +        av_log(avctx, AV_LOG_WARNING, "'Blank frame handling is experimental."
> +                      " If you want to help, upload a sample "
> +                      "of this file to ftp://upload.ffmpeg.org/MPlayer/incoming/ "
> +                      "and contact the ffmpeg-devel mailing list.\n");
>   

why not modify ff_log_missing_feature() instead ? that would avoid the
copy/paste

>      }
>      return bitrate;
>  }
>
> ------------------------------------------------------------------------
>
> Index: libavcodec/utils.c
> ===================================================================
> --- libavcodec/utils.c	(revision 16311)
> +++ libavcodec/utils.c	(working copy)
> @@ -1519,6 +1519,6 @@
>      if(want_sample)
>          av_log(avc, AV_LOG_WARNING, " If you want to help, upload a sample "
>                  "of this file to ftp://upload.ffmpeg.org/MPlayer/incoming/ "
> -                "and contact the FFmpeg-devel mailing list.");
> +                "and contact the ffmpeg-devel mailing list.");
>   

applied this part

Ben