generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: use ist->dts instead of passing an argument into transcode_video().

Browse Source 
This makes the code more similar to qatar
And fixes decoding of the last frame of fate/vc1-ism

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-02-08 06:31:06 +01:00
parent f72eaf69ab
commit 4eea0cfc22
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmpeg.c
View File

@ -2048,7 +2048,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
return ret; return ret;
} }
static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts, int64_t *pkt_dts) static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts)
{ {
AVFrame *decoded_frame, *filtered_frame = NULL; AVFrame *decoded_frame, *filtered_frame = NULL;
void *buffer_to_free = NULL; void *buffer_to_free = NULL;
@ -2067,7 +2067,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
avcodec_get_frame_defaults(ist->decoded_frame); avcodec_get_frame_defaults(ist->decoded_frame);
decoded_frame = ist->decoded_frame; decoded_frame = ist->decoded_frame;
pkt->pts = *pkt_pts; pkt->pts = *pkt_pts;
pkt->dts = *pkt_dts; pkt->dts = ist->dts;
*pkt_pts = AV_NOPTS_VALUE; *pkt_pts = AV_NOPTS_VALUE;
if (pkt->duration) { if (pkt->duration) {
@ -2079,10 +2079,10 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
ist->st->codec->time_base.den; ist->st->codec->time_base.den;
} }
if(*pkt_dts != AV_NOPTS_VALUE && duration) { if(ist->dts != AV_NOPTS_VALUE && duration) {
*pkt_dts += duration; ist->next_dts += duration;
}else }else
*pkt_dts = AV_NOPTS_VALUE; ist->next_dts = AV_NOPTS_VALUE;
ret = avcodec_decode_video2(ist->st->codec, ret = avcodec_decode_video2(ist->st->codec,
decoded_frame, got_output, pkt); decoded_frame, got_output, pkt);
@ -2222,7 +2222,6 @@ static int output_packet(InputStream *ist,
{ {
int ret = 0, i; int ret = 0, i;
int got_output; int got_output;
int64_t pkt_dts = AV_NOPTS_VALUE;
int64_t pkt_pts = AV_NOPTS_VALUE; int64_t pkt_pts = AV_NOPTS_VALUE;
AVPacket avpkt; AVPacket avpkt;
@ -2246,7 +2245,6 @@ static int output_packet(InputStream *ist,
ist->next_dts = ist->dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); ist->next_dts = ist->dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
if (ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed) if (ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed)
ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
pkt_dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
} }
if(pkt->pts != AV_NOPTS_VALUE) if(pkt->pts != AV_NOPTS_VALUE)
pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q); pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
@ -2269,7 +2267,7 @@ static int output_packet(InputStream *ist,
ret = transcode_audio (ist, &avpkt, &got_output); ret = transcode_audio (ist, &avpkt, &got_output);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ret = transcode_video (ist, &avpkt, &got_output, &pkt_pts, &pkt_dts); ret = transcode_video (ist, &avpkt, &got_output, &pkt_pts);
break; break;
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
ret = transcode_subtitles(ist, &avpkt, &got_output); ret = transcode_subtitles(ist, &avpkt, &got_output);

1
tests/ref/fate/vc1-ism
View File

@ -118,3 +118,4 @@
0, 117, 117, 1, 37440, 0xf0fe8c1c 0, 117, 117, 1, 37440, 0xf0fe8c1c
0, 118, 118, 1, 37440, 0xc0036222 0, 118, 118, 1, 37440, 0xc0036222
0, 119, 119, 1, 37440, 0x3058385c 0, 119, 119, 1, 37440, 0x3058385c
0, 120, 120, 1, 37440, 0x68141016