summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-20 20:52:16 +0200
committerwm4 <wm4@nowhere>2015-04-20 20:52:16 +0200
commitc6d046414b1d31046c39da6399130b39fe54813d (patch)
tree30c1d2b0ac5e13fa9954dae8db0e8d85fb7cc6b4 /demux
parentc5654e400587a8358e486da7da468a775dcd8cc2 (diff)
downloadmpv-c6d046414b1d31046c39da6399130b39fe54813d.tar.bz2
mpv-c6d046414b1d31046c39da6399130b39fe54813d.tar.xz
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.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c4
-rw-r--r--demux/demux_raw.c1
-rw-r--r--demux/stheader.h1
3 files changed, 0 insertions, 6 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 16cff835f8..c14869555c 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -545,10 +545,6 @@ static void handle_stream(demuxer_t *demuxer, int i)
sh_video->aspect = codec->width * codec->sample_aspect_ratio.num
/ (float)(codec->height * codec->sample_aspect_ratio.den);
- sh_video->bitrate = codec->bit_rate;
- if (sh_video->bitrate == 0)
- sh_video->bitrate = avfc->bit_rate;
-
uint8_t *sd = av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
if (sd)
sh_video->rotate = -av_display_rotation_get((uint32_t *)sd);
diff --git a/demux/demux_raw.c b/demux/demux_raw.c
index f12b774984..65d6b754be 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -226,7 +226,6 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check)
sh_video->fps = opts->fps;
sh_video->disp_w = width;
sh_video->disp_h = height;
- sh_video->bitrate = sh_video->fps * imgsize * 8;
struct priv *p = talloc_ptrtype(demuxer, p);
demuxer->priv = p;
diff --git a/demux/stheader.h b/demux/stheader.h
index 3f44a5c57c..444f2f3e34 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -82,7 +82,6 @@ typedef struct sh_video {
bool avi_dts; // use DTS timing; first frame and DTS is 0
float fps; // frames per second (set only if constant fps)
float aspect; // aspect ratio stored in the file (for prescaling)
- int bitrate; // compressed bits/sec
int bits_per_coded_sample;
unsigned char *extradata;
int extradata_len;