mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
avdemux: Stop using r_frame_rate field
It was removed and quite meaningless anyway. Use the average framerate instead.
This commit is contained in:
parent
53966ee304
commit
28d1c135bb
1 changed files with 8 additions and 8 deletions
|
@ -748,8 +748,8 @@ gst_ffmpegdemux_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
|
||||||
break;
|
break;
|
||||||
case GST_FORMAT_DEFAULT:
|
case GST_FORMAT_DEFAULT:
|
||||||
gst_query_set_position (query, GST_FORMAT_DEFAULT,
|
gst_query_set_position (query, GST_FORMAT_DEFAULT,
|
||||||
gst_util_uint64_scale (timeposition, avstream->r_frame_rate.num,
|
gst_util_uint64_scale (timeposition, avstream->avg_frame_rate.num,
|
||||||
GST_SECOND * avstream->r_frame_rate.den));
|
GST_SECOND * avstream->avg_frame_rate.den));
|
||||||
res = TRUE;
|
res = TRUE;
|
||||||
break;
|
break;
|
||||||
case GST_FORMAT_BYTES:
|
case GST_FORMAT_BYTES:
|
||||||
|
@ -785,8 +785,8 @@ gst_ffmpegdemux_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
|
||||||
break;
|
break;
|
||||||
case GST_FORMAT_DEFAULT:
|
case GST_FORMAT_DEFAULT:
|
||||||
gst_query_set_duration (query, GST_FORMAT_DEFAULT,
|
gst_query_set_duration (query, GST_FORMAT_DEFAULT,
|
||||||
gst_util_uint64_scale (timeduration, avstream->r_frame_rate.num,
|
gst_util_uint64_scale (timeduration, avstream->avg_frame_rate.num,
|
||||||
GST_SECOND * avstream->r_frame_rate.den));
|
GST_SECOND * avstream->avg_frame_rate.den));
|
||||||
res = TRUE;
|
res = TRUE;
|
||||||
break;
|
break;
|
||||||
case GST_FORMAT_BYTES:
|
case GST_FORMAT_BYTES:
|
||||||
|
@ -865,8 +865,8 @@ gst_ffmpegdemux_src_convert (GstPad * pad,
|
||||||
switch (*dest_fmt) {
|
switch (*dest_fmt) {
|
||||||
case GST_FORMAT_DEFAULT:
|
case GST_FORMAT_DEFAULT:
|
||||||
*dest_value = gst_util_uint64_scale (src_value,
|
*dest_value = gst_util_uint64_scale (src_value,
|
||||||
avstream->r_frame_rate.num,
|
avstream->avg_frame_rate.num,
|
||||||
GST_SECOND * avstream->r_frame_rate.den);
|
GST_SECOND * avstream->avg_frame_rate.den);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
res = FALSE;
|
res = FALSE;
|
||||||
|
@ -877,8 +877,8 @@ gst_ffmpegdemux_src_convert (GstPad * pad,
|
||||||
switch (*dest_fmt) {
|
switch (*dest_fmt) {
|
||||||
case GST_FORMAT_TIME:
|
case GST_FORMAT_TIME:
|
||||||
*dest_value = gst_util_uint64_scale (src_value,
|
*dest_value = gst_util_uint64_scale (src_value,
|
||||||
GST_SECOND * avstream->r_frame_rate.num,
|
GST_SECOND * avstream->avg_frame_rate.num,
|
||||||
avstream->r_frame_rate.den);
|
avstream->avg_frame_rate.den);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
res = FALSE;
|
res = FALSE;
|
||||||
|
|
Loading…
Reference in a new issue