Mercurial > libavformat.hg

comparison utils.c @ 5913:11bb10c37225 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. Patch by Jean-Daniel Dupas, devlists shadowlab org
author cehoyos
date Wed, 31 Mar 2010 12:29:58 +0000
parents 10f577d87c71
children ae90b07a6f29
comparison
equal deleted inserted replaced
5912:10f577d87c71 5913:11bb10c37225
984 984
985 // av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts); 985 // av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts);
986 986
987 /* update flags */ 987 /* update flags */
988 if(is_intra_only(st->codec)) 988 if(is_intra_only(st->codec))
989 pkt->flags |= PKT_FLAG_KEY; 989 pkt->flags |= AV_PKT_FLAG_KEY;
990 else if (pc) { 990 else if (pc) {
991 pkt->flags = 0; 991 pkt->flags = 0;
992 /* keyframe computation */ 992 /* keyframe computation */
993 if (pc->key_frame == 1) 993 if (pc->key_frame == 1)
994 pkt->flags |= PKT_FLAG_KEY; 994 pkt->flags |= AV_PKT_FLAG_KEY;
995 else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE) 995 else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE)
996 pkt->flags |= PKT_FLAG_KEY; 996 pkt->flags |= AV_PKT_FLAG_KEY;
997 } 997 }
998 if (pc) 998 if (pc)
999 pkt->convergence_duration = pc->convergence_duration; 999 pkt->convergence_duration = pc->convergence_duration;
1000 } 1000 }
1001 1001
1016 /* raw data support */ 1016 /* raw data support */
1017 *pkt = st->cur_pkt; st->cur_pkt.data= NULL; 1017 *pkt = st->cur_pkt; st->cur_pkt.data= NULL;
1018 compute_pkt_fields(s, st, NULL, pkt); 1018 compute_pkt_fields(s, st, NULL, pkt);
1019 s->cur_st = NULL; 1019 s->cur_st = NULL;
1020 if ((s->iformat->flags & AVFMT_GENERIC_INDEX) && 1020 if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&
1021 (pkt->flags & PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) { 1021 (pkt->flags & AV_PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) {
1022 ff_reduce_index(s, st->index); 1022 ff_reduce_index(s, st->index);
1023 av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME); 1023 av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME);
1024 } 1024 }
1025 break; 1025 break;
1026 } else if (st->cur_len > 0 && st->discard < AVDISCARD_ALL) { 1026 } else if (st->cur_len > 0 && st->discard < AVDISCARD_ALL) {
1043 pkt->dts = st->parser->dts; 1043 pkt->dts = st->parser->dts;
1044 pkt->pos = st->parser->pos; 1044 pkt->pos = st->parser->pos;
1045 pkt->destruct = NULL; 1045 pkt->destruct = NULL;
1046 compute_pkt_fields(s, st, st->parser, pkt); 1046 compute_pkt_fields(s, st, st->parser, pkt);
1047 1047
1048 if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){ 1048 if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY){
1049 ff_reduce_index(s, st->index); 1049 ff_reduce_index(s, st->index);
1050 av_add_index_entry(st, st->parser->frame_offset, pkt->dts, 1050 av_add_index_entry(st, st->parser->frame_offset, pkt->dts,
1051 0, 0, AVINDEX_KEYFRAME); 1051 0, 0, AVINDEX_KEYFRAME);
1052 } 1052 }
1053 1053
1619 }while(ret == AVERROR(EAGAIN)); 1619 }while(ret == AVERROR(EAGAIN));
1620 if(ret<0) 1620 if(ret<0)
1621 break; 1621 break;
1622 av_free_packet(&pkt); 1622 av_free_packet(&pkt);
1623 if(stream_index == pkt.stream_index){ 1623 if(stream_index == pkt.stream_index){
1624 if((pkt.flags & PKT_FLAG_KEY) && pkt.dts > timestamp) 1624 if((pkt.flags & AV_PKT_FLAG_KEY) && pkt.dts > timestamp)
1625 break; 1625 break;
1626 } 1626 }
1627 } 1627 }
1628 index = av_index_search_timestamp(st, timestamp, flags); 1628 index = av_index_search_timestamp(st, timestamp, flags);
1629 } 1629 }
3379 static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload) 3379 static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload)
3380 { 3380 {
3381 #undef fprintf 3381 #undef fprintf
3382 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0) 3382 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
3383 PRINT("stream #%d:\n", pkt->stream_index); 3383 PRINT("stream #%d:\n", pkt->stream_index);
3384 PRINT(" keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0)); 3384 PRINT(" keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));
3385 PRINT(" duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE); 3385 PRINT(" duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE);
3386 /* DTS is _always_ valid after av_read_frame() */ 3386 /* DTS is _always_ valid after av_read_frame() */
3387 PRINT(" dts="); 3387 PRINT(" dts=");
3388 if (pkt->dts == AV_NOPTS_VALUE) 3388 if (pkt->dts == AV_NOPTS_VALUE)
3389 PRINT("N/A"); 3389 PRINT("N/A");