player: change video-bitrate and audio-bitrate properties

Remove the old implementation for these properties. It was never very
good, often returned very innaccurate values or just 0, and was static
even if the source was variable bitrate. Replace it with the
implementation of "packet-video-bitrate". Mark the "packet-..."
properties as deprecated. (The effective difference is different
formatting, and returning the raw value in bits instead of kilobits.)

Also extend the documentation a little.

It appears at least some decoders (sipr?) need the
AVCodecContext.bit_rate field set, so this one is still passed through.

3 files changed, 1 insertions, 8 deletions

diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index afbda5142f..1011124d40 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -385,9 +385,7 @@ int video_reconfig_filters(struct dec_video *d_video,
     struct mp_image_params p = *params;
     struct sh_video *sh = d_video->header->video;
 
-    MP_VERBOSE(d_video, "VIDEO:  %dx%d  %5.3f fps  %5.1f kbps (%4.1f kB/s)\n",
-               p.w, p.h, sh->fps, sh->bitrate / 1000.0,
-               sh->bitrate / 8000.0);
+    MP_VERBOSE(d_video, "VIDEO:  %dx%d  %5.3f fps\n", p.w, p.h, sh->fps);
 
     MP_VERBOSE(d_video, "VDec: vo config request - %d x %d (%s)\n",
                p.w, p.h, vo_format_name(p.imgfmt));
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index ce24d5a58e..5ab7213ee7 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -71,7 +71,6 @@ struct dec_video {
     // Final PTS of previously decoded image
     double decoded_pts;
 
-    int bitrate;          // compressed bits/sec
     float fps;            // FPS from demuxer or from user override
     float initial_decoder_aspect;
 
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 1a0d504461..ca9ab9e5eb 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -328,9 +328,6 @@ static int init(struct dec_video *vd, const char *decoder)
         }
     }
 
-    if (ctx->avctx->bit_rate != 0)
-        vd->bitrate = ctx->avctx->bit_rate;
-
     return 1;
 }
 
@@ -362,7 +359,6 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
     AVCodecContext *avctx = ctx->avctx;
     if (!ctx->avctx)
         goto error;
-    avctx->bit_rate = 0;
     avctx->opaque = vd;
     avctx->codec_type = AVMEDIA_TYPE_VIDEO;
     avctx->codec_id = lavc_codec->id;