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

lavf: cosmetics, reformat av_read_frame().

Browse Source
This commit is contained in:
Anton Khirnov 2012-01-05 10:16:41 +01:00
parent 6450599e22
commit f9b9dd8740
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/utils.c
View File

@ -1261,30 +1261,29 @@ static int read_from_packet_buffer(AVFormatContext *s, AVPacket *pkt)
int av_read_frame(AVFormatContext *s, AVPacket *pkt) int av_read_frame(AVFormatContext *s, AVPacket *pkt)
{ {
AVPacketList *pktl; const int genpts = s->flags & AVFMT_FLAG_GENPTS;
int eof=0; int eof = 0;
const int genpts= s->flags & AVFMT_FLAG_GENPTS;
if (!genpts) if (!genpts)
return s->packet_buffer ? read_from_packet_buffer(s, pkt) : return s->packet_buffer ? read_from_packet_buffer(s, pkt) :
read_frame_internal(s, pkt); read_frame_internal(s, pkt);
for(;;){ for (;;) {
int ret; int ret;
pktl = s->packet_buffer; AVPacketList *pktl = s->packet_buffer;
if (pktl) { if (pktl) {
AVPacket *next_pkt= &pktl->pkt; AVPacket *next_pkt = &pktl->pkt;
if (next_pkt->dts != AV_NOPTS_VALUE) { if (next_pkt->dts != AV_NOPTS_VALUE) {
int wrap_bits = s->streams[next_pkt->stream_index]->pts_wrap_bits; int wrap_bits = s->streams[next_pkt->stream_index]->pts_wrap_bits;
while(pktl && next_pkt->pts == AV_NOPTS_VALUE){ while (pktl && next_pkt->pts == AV_NOPTS_VALUE) {
if( pktl->pkt.stream_index == next_pkt->stream_index if (pktl->pkt.stream_index == next_pkt->stream_index &&
&& (0 > av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) (av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1)) < 0) &&
&& av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
next_pkt->pts= pktl->pkt.dts; next_pkt->pts = pktl->pkt.dts;
} }
pktl= pktl->next; pktl = pktl->next;
} }
pktl = s->packet_buffer; pktl = s->packet_buffer;
} }