virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

doc/examples/transcoding: use av_packet_rescale_ts()

Browse Source 
Simplify.
This commit is contained in:
Stefano Sabatini 2014-09-10 12:16:09 +02:00
parent 5ddfac81c4
commit 3a0c70f1e3
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doc/examples/transcoding.c
View File

@ -385,17 +385,9 @@ static int encode_write_frame(AVFrame *filt_frame, unsigned int stream_index, in
/* prepare packet for muxing */ /* prepare packet for muxing */
enc_pkt.stream_index = stream_index; enc_pkt.stream_index = stream_index;
enc_pkt.dts = av_rescale_q_rnd(enc_pkt.dts, av_packet_rescale_ts(&enc_pkt,
ofmt_ctx->streams[stream_index]->codec->time_base, ofmt_ctx->streams[stream_index]->codec->time_base,
ofmt_ctx->streams[stream_index]->time_base, ofmt_ctx->streams[stream_index]->time_base);
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
enc_pkt.pts = av_rescale_q_rnd(enc_pkt.pts,
ofmt_ctx->streams[stream_index]->codec->time_base,
ofmt_ctx->streams[stream_index]->time_base,
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
enc_pkt.duration = av_rescale_q(enc_pkt.duration,
ofmt_ctx->streams[stream_index]->codec->time_base,
ofmt_ctx->streams[stream_index]->time_base);
av_log(NULL, AV_LOG_DEBUG, "Muxing frame\n"); av_log(NULL, AV_LOG_DEBUG, "Muxing frame\n");
/* mux encoded frame */ /* mux encoded frame */
@ -509,14 +501,9 @@ int main(int argc, char **argv)
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
break; break;
} }
packet.dts = av_rescale_q_rnd(packet.dts, av_packet_rescale_ts(&packet,
ifmt_ctx->streams[stream_index]->time_base, ifmt_ctx->streams[stream_index]->time_base,
ifmt_ctx->streams[stream_index]->codec->time_base, ifmt_ctx->streams[stream_index]->codec->time_base);
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
packet.pts = av_rescale_q_rnd(packet.pts,
ifmt_ctx->streams[stream_index]->time_base,
ifmt_ctx->streams[stream_index]->codec->time_base,
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
dec_func = (type == AVMEDIA_TYPE_VIDEO) ? avcodec_decode_video2 : dec_func = (type == AVMEDIA_TYPE_VIDEO) ? avcodec_decode_video2 :
avcodec_decode_audio4; avcodec_decode_audio4;
ret = dec_func(ifmt_ctx->streams[stream_index]->codec, frame, ret = dec_func(ifmt_ctx->streams[stream_index]->codec, frame,
@ -538,14 +525,9 @@ int main(int argc, char **argv)
} }
} else { } else {
/* remux this frame without reencoding */ /* remux this frame without reencoding */
packet.dts = av_rescale_q_rnd(packet.dts, av_packet_rescale_ts(&packet,
ifmt_ctx->streams[stream_index]->time_base, ifmt_ctx->streams[stream_index]->time_base,
ofmt_ctx->streams[stream_index]->time_base, ofmt_ctx->streams[stream_index]->time_base);
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
packet.pts = av_rescale_q_rnd(packet.pts,
ifmt_ctx->streams[stream_index]->time_base,
ofmt_ctx->streams[stream_index]->time_base,
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
ret = av_interleaved_write_frame(ofmt_ctx, &packet); ret = av_interleaved_write_frame(ofmt_ctx, &packet);
if (ret < 0) if (ret < 0)