RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mediacodecdec: use AV_TIME_BASE_Q 

Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Jan Ekström <jeebjp@gmail.com>
Signed-off-by: Aman Gupta <aman@tmm1.net>
This commit is contained in:
Aman Gupta 2018-04-24 13:45:30 -07:00
parent 6a7a84b2d1
commit 7a4639b1eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mediacodecdec_common.c
View File

@ -209,7 +209,7 @@ static int mediacodec_wrap_hw_buffer(AVCodecContext *avctx,
if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) {
frame->pts = av_rescale_q(info->presentationTimeUs, frame->pts = av_rescale_q(info->presentationTimeUs,
av_make_q(1, 1000000), AV_TIME_BASE_Q,
avctx->pkt_timebase); avctx->pkt_timebase);
} else { } else {
frame->pts = info->presentationTimeUs; frame->pts = info->presentationTimeUs;
@ -298,7 +298,7 @@ static int mediacodec_wrap_sw_buffer(AVCodecContext *avctx,
* * 0-sized avpackets are pushed to flush remaining frames at EOS */ * * 0-sized avpackets are pushed to flush remaining frames at EOS */
if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) {
frame->pts = av_rescale_q(info->presentationTimeUs, frame->pts = av_rescale_q(info->presentationTimeUs,
av_make_q(1, 1000000), AV_TIME_BASE_Q,
avctx->pkt_timebase); avctx->pkt_timebase);
} else { } else {
frame->pts = info->presentationTimeUs; frame->pts = info->presentationTimeUs;
@ -610,7 +610,7 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s,
uint32_t flags = ff_AMediaCodec_getBufferFlagEndOfStream(codec); uint32_t flags = ff_AMediaCodec_getBufferFlagEndOfStream(codec);
if (s->surface) { if (s->surface) {
pts = av_rescale_q(pts, avctx->pkt_timebase, av_make_q(1, 1000000)); pts = av_rescale_q(pts, avctx->pkt_timebase, AV_TIME_BASE_Q);
} }
av_log(avctx, AV_LOG_DEBUG, "Sending End Of Stream signal\n"); av_log(avctx, AV_LOG_DEBUG, "Sending End Of Stream signal\n");
@ -634,7 +634,7 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s,
offset += size; offset += size;
if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) {
pts = av_rescale_q(pts, avctx->pkt_timebase, av_make_q(1, 1000000)); pts = av_rescale_q(pts, avctx->pkt_timebase, AV_TIME_BASE_Q);
} }
status = ff_AMediaCodec_queueInputBuffer(codec, index, 0, size, pts, 0); status = ff_AMediaCodec_queueInputBuffer(codec, index, 0, size, pts, 0);