Re: [FFmpeg-devel] [PATCH] ffserver: use -b instead of -ab for setting audio bitrate.

2015-08-28 Thread Ronald S. Bultje
Hi,

On Thu, Aug 20, 2015 at 3:07 PM, Paul B Mahol  wrote:

> On 8/18/15, Ronald S. Bultje  wrote:
> > ---
> >  ffserver_config.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/ffserver_config.c b/ffserver_config.c
> > index 06bd8ac..de8a454 100644
> > --- a/ffserver_config.c
> > +++ b/ffserver_config.c
> > @@ -230,9 +230,9 @@ static void add_codec(FFServerStream *stream,
> > AVCodecContext *av,
> >  /* compute default parameters */
> >  switch(av->codec_type) {
> >  case AVMEDIA_TYPE_AUDIO:
> > -if (!av_dict_get(recommended, "ab", NULL, 0)) {
> > +if (!av_dict_get(recommended, "b", NULL, 0)) {
> >  av->bit_rate = 64000;
> > -av_dict_set_int(&recommended, "ab", av->bit_rate, 0);
> > +av_dict_set_int(&recommended, "b", av->bit_rate, 0);
> >  WARNING("Setting default value for audio bit rate = %d. "
> >  "Use NoDefaults to disable it.\n",
> >  av->bit_rate);
> > @@ -923,7 +923,7 @@ static int
> ffserver_parse_config_stream(FFServerConfig
> > *config, const char *cmd,
> >  ffserver_get_arg(arg, sizeof(arg), p);
> >  ffserver_set_float_param(&f, arg, 1000, -FLT_MAX, FLT_MAX,
> config,
> >  "Invalid %s: '%s'\n", cmd, arg);
> > -if (ffserver_save_avoption_int("ab", (int64_t)lrintf(f),
> > +if (ffserver_save_avoption_int("b", (int64_t)lrintf(f),
> > AV_OPT_FLAG_AUDIO_PARAM, config)
> <
> > 0)
> >  goto nomem;
> >  } else if (!av_strcasecmp(cmd, "AudioChannels")) {
> > --
> > 2.1.2
>
>
> I guess this is ok, assuming video bit rate can differ from audio bit
> rate when set inside ffserver.


ty, pushed.

Ronald
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] ffserver: use -b instead of -ab for setting audio bitrate.

2015-08-20 Thread Paul B Mahol
On 8/18/15, Ronald S. Bultje  wrote:
> ---
>  ffserver_config.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/ffserver_config.c b/ffserver_config.c
> index 06bd8ac..de8a454 100644
> --- a/ffserver_config.c
> +++ b/ffserver_config.c
> @@ -230,9 +230,9 @@ static void add_codec(FFServerStream *stream,
> AVCodecContext *av,
>  /* compute default parameters */
>  switch(av->codec_type) {
>  case AVMEDIA_TYPE_AUDIO:
> -if (!av_dict_get(recommended, "ab", NULL, 0)) {
> +if (!av_dict_get(recommended, "b", NULL, 0)) {
>  av->bit_rate = 64000;
> -av_dict_set_int(&recommended, "ab", av->bit_rate, 0);
> +av_dict_set_int(&recommended, "b", av->bit_rate, 0);
>  WARNING("Setting default value for audio bit rate = %d. "
>  "Use NoDefaults to disable it.\n",
>  av->bit_rate);
> @@ -923,7 +923,7 @@ static int ffserver_parse_config_stream(FFServerConfig
> *config, const char *cmd,
>  ffserver_get_arg(arg, sizeof(arg), p);
>  ffserver_set_float_param(&f, arg, 1000, -FLT_MAX, FLT_MAX, config,
>  "Invalid %s: '%s'\n", cmd, arg);
> -if (ffserver_save_avoption_int("ab", (int64_t)lrintf(f),
> +if (ffserver_save_avoption_int("b", (int64_t)lrintf(f),
> AV_OPT_FLAG_AUDIO_PARAM, config) <
> 0)
>  goto nomem;
>  } else if (!av_strcasecmp(cmd, "AudioChannels")) {
> --
> 2.1.2


I guess this is ok, assuming video bit rate can differ from audio bit
rate when set inside ffserver.

>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH] ffserver: use -b instead of -ab for setting audio bitrate.

2015-08-18 Thread Ronald S. Bultje
---
 ffserver_config.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffserver_config.c b/ffserver_config.c
index 06bd8ac..de8a454 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -230,9 +230,9 @@ static void add_codec(FFServerStream *stream, 
AVCodecContext *av,
 /* compute default parameters */
 switch(av->codec_type) {
 case AVMEDIA_TYPE_AUDIO:
-if (!av_dict_get(recommended, "ab", NULL, 0)) {
+if (!av_dict_get(recommended, "b", NULL, 0)) {
 av->bit_rate = 64000;
-av_dict_set_int(&recommended, "ab", av->bit_rate, 0);
+av_dict_set_int(&recommended, "b", av->bit_rate, 0);
 WARNING("Setting default value for audio bit rate = %d. "
 "Use NoDefaults to disable it.\n",
 av->bit_rate);
@@ -923,7 +923,7 @@ static int ffserver_parse_config_stream(FFServerConfig 
*config, const char *cmd,
 ffserver_get_arg(arg, sizeof(arg), p);
 ffserver_set_float_param(&f, arg, 1000, -FLT_MAX, FLT_MAX, config,
 "Invalid %s: '%s'\n", cmd, arg);
-if (ffserver_save_avoption_int("ab", (int64_t)lrintf(f),
+if (ffserver_save_avoption_int("b", (int64_t)lrintf(f),
AV_OPT_FLAG_AUDIO_PARAM, config) < 0)
 goto nomem;
 } else if (!av_strcasecmp(cmd, "AudioChannels")) {
-- 
2.1.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel