February 2010 - ffmpeg-cvslog

r21592 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 13:31:28 2010 New Revision: 21592 Log: Reset frame_last_delay to 0. This avoids a few ms delay for the first frame after a seek in theory. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 13:30:14 2010 (r21591) +++ trunk/ffplay.c Mon Feb 1 13:31:28 2010 (r21592) @@ -1363,7 +1363,7 @@ static int video_thread(void *arg) is->last_dts_for_fault_detection= is->last_pts_for_fault_detection= INT64_MIN; is->frame_last_pts= AV_NOPTS_VALUE; - is->frame_last_delay = 40e-3; + is->frame_last_delay = 0; continue; }

1 0

r21591 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 13:30:14 2010 New Revision: 21591 Log: Move frame_last_delay into flush code as it must be reset on seeks to, otherwise the first frame after a seek would be delayed by that amount. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 13:27:26 2010 (r21590) +++ trunk/ffplay.c Mon Feb 1 13:30:14 2010 (r21591) @@ -1363,6 +1363,7 @@ static int video_thread(void *arg) is->last_dts_for_fault_detection= is->last_pts_for_fault_detection= INT64_MIN; is->frame_last_pts= AV_NOPTS_VALUE; + is->frame_last_delay = 40e-3; continue; } @@ -1812,7 +1813,6 @@ static int stream_component_open(VideoSt is->video_stream = stream_index; is->video_st = ic->streams[stream_index]; - is->frame_last_delay = 40e-3; is->frame_timer = (double)av_gettime() / 1000000.0; // is->video_current_pts_time = av_gettime();

1 0

r21590 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 13:27:26 2010 New Revision: 21590 Log: Reset frame_last_pts on flush (and thus also at start) fixes issue558 and probably others. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 13:22:12 2010 (r21589) +++ trunk/ffplay.c Mon Feb 1 13:27:26 2010 (r21590) @@ -1362,6 +1362,8 @@ static int video_thread(void *arg) is->last_dts_for_fault_detection= is->last_pts_for_fault_detection= INT64_MIN; + is->frame_last_pts= AV_NOPTS_VALUE; + continue; }

1 0

r21589 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 13:22:12 2010 New Revision: 21589 Log: Insert a flush packet into the que on init, that way common code between flush and init can be put into the flush handling. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 13:19:28 2010 (r21588) +++ trunk/ffplay.c Mon Feb 1 13:22:12 2010 (r21589) @@ -239,12 +239,15 @@ static AVPacket flush_pkt; static SDL_Surface *screen; +static int packet_queue_put(PacketQueue *q, AVPacket *pkt); + /* packet queue handling */ static void packet_queue_init(PacketQueue *q) { memset(q, 0, sizeof(PacketQueue)); q->mutex = SDL_CreateMutex(); q->cond = SDL_CreateCond(); + packet_queue_put(q, &flush_pkt); } static void packet_queue_flush(PacketQueue *q)

1 0

r21588 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 13:19:28 2010 New Revision: 21588 Log: "Flush" the picture que on seeks, this prevents the display thread from having frames from before and after the seek which just isnt a good idea. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 12:39:10 2010 (r21587) +++ trunk/ffplay.c Mon Feb 1 13:19:28 2010 (r21588) @@ -90,6 +90,7 @@ typedef struct VideoPicture { SDL_Overlay *bmp; int width, height; /* source height & width */ int allocated; + SDL_TimerID timer_id; } VideoPicture; typedef struct SubPicture { @@ -913,10 +914,10 @@ static Uint32 sdl_refresh_timer_cb(Uint3 } /* schedule a video refresh in 'delay' ms */ -static void schedule_refresh(VideoState *is, int delay) +static SDL_TimerID schedule_refresh(VideoState *is, int delay) { if(!delay) delay=1; //SDL seems to be buggy when the delay is 0 - SDL_AddTimer(delay, sdl_refresh_timer_cb, is); + return SDL_AddTimer(delay, sdl_refresh_timer_cb, is); } /* get the current audio clock value */ @@ -1122,6 +1123,7 @@ static void video_refresh_timer(void *op is->pictq_rindex = 0; SDL_LockMutex(is->pictq_mutex); + vp->timer_id= 0; is->pictq_size--; SDL_CondSignal(is->pictq_cond); SDL_UnlockMutex(is->pictq_mutex); @@ -1277,8 +1279,9 @@ static int queue_picture(VideoState *is, is->pictq_windex = 0; SDL_LockMutex(is->pictq_mutex); is->pictq_size++; + //We must schedule in a mutex as we must store the timer id before the timer dies or might end up freeing a alraedy freed id + vp->timer_id= schedule_refresh(is, (int)(compute_frame_delay(vp->pts, is) * 1000 + 0.5)); SDL_UnlockMutex(is->pictq_mutex); - schedule_refresh(is, (int)(compute_frame_delay(vp->pts, is) * 1000 + 0.5)); } return 0; } @@ -1326,7 +1329,7 @@ static int video_thread(void *arg) { VideoState *is = arg; AVPacket pkt1, *pkt = &pkt1; - int len1, got_picture; + int len1, got_picture, i; AVFrame *frame= avcodec_alloc_frame(); double pts; @@ -1339,6 +1342,21 @@ static int video_thread(void *arg) if(pkt->data == flush_pkt.data){ avcodec_flush_buffers(is->video_st->codec); + + SDL_LockMutex(is->pictq_mutex); + //Make sure there are no long delay timers (ideally we should just flush the que but thats harder) + for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++){ + if(is->pictq[i].timer_id){ + SDL_RemoveTimer(is->pictq[i].timer_id); + is->pictq[i].timer_id=0; + schedule_refresh(is, 1); + } + } + while (is->pictq_size && !is->videoq.abort_request) { + SDL_CondWait(is->pictq_cond, is->pictq_mutex); + } + SDL_UnlockMutex(is->pictq_mutex); + is->last_dts_for_fault_detection= is->last_pts_for_fault_detection= INT64_MIN; continue;

1 0

r21587 - in trunk: doc/APIchanges libavformat/asf.c libavformat/avformat.h libavformat/id3v1.c libavformat/id3v2.c libavformat/matroska.c libavformat/matroskadec.c libavformat/metadata_compat.c lib...
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: pross Date: Mon Feb 1 12:39:10 2010 New Revision: 21587 Log: Add a list of generic tags and change demuxers to follow it. Patch by Anton Khirnov, wyskas at gmail dot com Modified: trunk/doc/APIchanges trunk/libavformat/asf.c trunk/libavformat/avformat.h trunk/libavformat/id3v1.c trunk/libavformat/id3v2.c trunk/libavformat/matroska.c trunk/libavformat/matroskadec.c trunk/libavformat/metadata_compat.c trunk/libavformat/mov.c trunk/libavformat/movenc.c trunk/libavformat/mp3.c trunk/libavformat/oggparsevorbis.c Modified: trunk/doc/APIchanges ============================================================================== --- trunk/doc/APIchanges Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/doc/APIchanges Mon Feb 1 12:39:10 2010 (r21587) @@ -12,6 +12,10 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-02-01 - r21587 - lavf 52.50.0 - metadata API + Add a list of generic tag names, change 'author' -> 'artist', + 'year' -> 'date'. + 2010-01-30 - r21545 - lavu 50.8.0 - av_get_pix_fmt() Add av_get_pix_fmt(). Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/asf.c Mon Feb 1 12:39:10 2010 (r21587) @@ -129,12 +129,10 @@ const ff_asf_guid ff_asf_digital_signatu }; const AVMetadataConv ff_asf_metadata_conv[] = { - { "AlbumArtist", "artist" }, + { "AlbumArtist", "album_artist"}, { "AlbumTitle" , "album" }, - { "Author" , "author" }, - { "Genre" , "genre" }, - { "Copyright" , "copyright" }, + { "Author" , "artist" }, { "TrackNumber", "track" }, - { "Year" , "year" }, +// { "Year" , "date" }, TODO: conversion year<->date { 0 } }; Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/avformat.h Mon Feb 1 12:39:10 2010 (r21587) @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 49 +#define LIBAVFORMAT_VERSION_MINOR 50 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -73,11 +73,44 @@ struct AVFormatContext; * 2. Metadata is flat, not hierarchical; there are no subtags. If you * want to store, e.g., the email address of the child of producer Alice * and actor Bob, that could have key=alice_and_bobs_childs_email_address. - * 3. A tag whose value is localized for a particular language is appended - * with a dash character ('-') and the ISO 639-2/B 3-letter language code. - * For example: Author-ger=Michael, Author-eng=Mike - * The original/default language is in the unqualified "Author" tag. - * A demuxer should set a default if it sets any translated tag. + * 3. Several modifiers can be applied to the tag name. This is done by + * appending a dash character ('-') and the modifier name in the order + * they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng. + * a) language -- a tag whose value is localized for a particular language + * is appended with the ISO 639-2/B 3-letter language code. + * For example: Author-ger=Michael, Author-eng=Mike + * The original/default language is in the unqualified "Author" tag. + * A demuxer should set a default if it sets any translated tag. + * b) sorting -- a modified version of a tag that should be used for + * sorting will have '-sort' appended. E.g. artist="The Beatles", + * artist-sort="Beatles, The". + * + * 4. Tag names are normally exported exactly as stored in the container to + * allow lossless remuxing to the same format. For container-independent + * handling of metadata, av_metadata_conv() can convert it to ffmpeg generic + * format. Follows a list of generic tag names: + * + * album -- name of the set this work belongs to + * album_artist -- main creator of the set/album, if different from artist. + * e.g. "Various Artists" for compilation albums. + * artist -- main creator of the work + * comment -- any additional description of the file. + * composer -- who composed the work, if different from artist. + * copyright -- name of copyright holder. + * date -- date when the work was created, preferably in ISO 8601. + * disc -- number of a subset, e.g. disc in a multi-disc collection. + * encoder -- name/settings of the software/hardware that produced the file. + * encoded_by -- person/group who created the file. + * filename -- original name of the file. + * genre -- <self-evident>. + * language -- main language in which the work is performed, preferably + * in ISO 639-2 format. + * performer -- artist who performed the work, if different from artist. + * E.g for "Also sprach Zarathustra", artist would be "Richard + * Strauss" and performer "London Philharmonic Orchestra". + * publisher -- name of the label/publisher. + * title -- name of the work. + * track -- number of this work in the set, can be in form current/total. */ #define AV_METADATA_MATCH_CASE 1 @@ -122,7 +155,8 @@ int av_metadata_set2(AVMetadata **pm, co /** * Converts all the metadata sets from ctx according to the source and - * destination conversion tables. + * destination conversion tables. If one of the tables is NULL, then + * tags are converted to/from ffmpeg generic tag names. * @param d_conv destination tags format conversion table * @param s_conv source tags format conversion table */ Modified: trunk/libavformat/id3v1.c ============================================================================== --- trunk/libavformat/id3v1.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/id3v1.c Mon Feb 1 12:39:10 2010 (r21587) @@ -211,7 +211,7 @@ static int parse_tag(AVFormatContext *s, get_string(s, "title", buf + 3, 30); get_string(s, "artist", buf + 33, 30); get_string(s, "album", buf + 63, 30); - get_string(s, "year", buf + 93, 4); + get_string(s, "date", buf + 93, 4); get_string(s, "comment", buf + 97, 30); if (buf[125] == 0 && buf[126] != 0) av_metadata_set2(&s->metadata, "track", av_d2str(buf[126]), AV_METADATA_DONT_STRDUP_VAL); Modified: trunk/libavformat/id3v2.c ============================================================================== --- trunk/libavformat/id3v2.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/id3v2.c Mon Feb 1 12:39:10 2010 (r21587) @@ -240,20 +240,26 @@ const AVMetadataConv ff_id3v2_metadata_c { "TCO", "genre"}, { "TCOP", "copyright"}, { "TDRL", "date"}, - { "TENC", "encoder"}, - { "TEN", "encoder"}, + { "TDRC", "date"}, + { "TENC", "encoded_by"}, + { "TEN", "encoded_by"}, { "TIT2", "title"}, { "TT2", "title"}, { "TLAN", "language"}, { "TPE1", "artist"}, { "TP1", "artist"}, + { "TPE2", "album_artist"}, + { "TP2", "album_artist"}, + { "TPE3", "performer"}, + { "TP3", "performer"}, { "TPOS", "disc"}, { "TPUB", "publisher"}, { "TRCK", "track"}, { "TRK", "track"}, - { "TSOA", "albumsort"}, - { "TSOP", "authorsort"}, - { "TSOT", "titlesort"}, + { "TSOA", "album-sort"}, + { "TSOP", "artist-sort"}, + { "TSOT", "title-sort"}, + { "TSSE", "encoder"}, { 0 } }; Modified: trunk/libavformat/matroska.c ============================================================================== --- trunk/libavformat/matroska.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/matroska.c Mon Feb 1 12:39:10 2010 (r21587) @@ -93,8 +93,7 @@ const CodecMime ff_mkv_mime_tags[] = { }; const AVMetadataConv ff_mkv_metadata_conv[] = { - { "ARTIST" , "artist" }, - { "LEAD_PERFORMER", "artist" }, + { "LEAD_PERFORMER", "performer" }, { "PART_NUMBER" , "track" }, { 0 } }; Modified: trunk/libavformat/matroskadec.c ============================================================================== --- trunk/libavformat/matroskadec.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/matroskadec.c Mon Feb 1 12:39:10 2010 (r21587) @@ -1342,7 +1342,7 @@ static int matroska_read_header(AVFormat st->start_time = 0; if (strcmp(track->language, "und")) av_metadata_set(&st->metadata, "language", track->language); - av_metadata_set(&st->metadata, "description", track->name); + av_metadata_set(&st->metadata, "title", track->name); if (track->flag_default) st->disposition |= AV_DISPOSITION_DEFAULT; Modified: trunk/libavformat/metadata_compat.c ============================================================================== --- trunk/libavformat/metadata_compat.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/metadata_compat.c Mon Feb 1 12:39:10 2010 (r21587) @@ -45,8 +45,11 @@ static const struct { { "creator", SIZE_OFFSET(author) }, { "written_by", SIZE_OFFSET(author) }, { "lead_performer", SIZE_OFFSET(author) }, + { "composer", SIZE_OFFSET(author) }, + { "performer", SIZE_OFFSET(author) }, { "description", SIZE_OFFSET(comment) }, { "albumtitle", SIZE_OFFSET(album) }, + { "date", SIZE_OFFSET(year) }, { "date_written", SIZE_OFFSET(year) }, { "date_released", SIZE_OFFSET(year) }, { "tracknumber", SIZE_OFFSET(track) }, Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/mov.c Mon Feb 1 12:39:10 2010 (r21587) @@ -113,7 +113,7 @@ static int mov_read_udta_string(MOVConte case MKTAG(0xa9,'c','m','t'): case MKTAG(0xa9,'i','n','f'): key = "comment"; break; case MKTAG(0xa9,'a','l','b'): key = "album"; break; - case MKTAG(0xa9,'d','a','y'): key = "year"; break; + case MKTAG(0xa9,'d','a','y'): key = "date"; break; case MKTAG(0xa9,'g','e','n'): key = "genre"; break; case MKTAG(0xa9,'t','o','o'): case MKTAG(0xa9,'e','n','c'): key = "encoder"; break; Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/movenc.c Mon Feb 1 12:39:10 2010 (r21587) @@ -1437,7 +1437,7 @@ static int mov_write_ilst_tag(ByteIOCont mov_write_string_metadata(s, pb, "aART", "album_artist", 1); mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1); mov_write_string_metadata(s, pb, "\251alb", "album" , 1); - mov_write_string_metadata(s, pb, "\251day", "year" , 1); + mov_write_string_metadata(s, pb, "\251day", "date" , 1); mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1); mov_write_string_metadata(s, pb, "\251gen", "genre" , 1); @@ -1511,7 +1511,7 @@ static int mov_write_3gp_udta_tag(ByteIO put_be16(pb, language_code("eng")); /* language */ put_buffer(pb, t->value, strlen(t->value)+1); /* UTF8 string value */ if (!strcmp(tag, "albm") && - (t = av_metadata_get(s->metadata, "year", NULL, 0))) + (t = av_metadata_get(s->metadata, "date", NULL, 0))) put_byte(pb, atoi(t->value)); } return updateSize(pb, pos); @@ -1540,12 +1540,12 @@ static int mov_write_udta_tag(ByteIOCont mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment"); mov_write_3gp_udta_tag(pb_buf, s, "albm", "album"); mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright"); - mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "year"); + mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date"); } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0); mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0); mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0); - mov_write_string_metadata(s, pb_buf, "\251day", "year" , 0); + mov_write_string_metadata(s, pb_buf, "\251day", "date" , 0); mov_write_string_tag(pb_buf, "\251enc", LIBAVFORMAT_IDENT, 0, 0); mov_write_string_metadata(s, pb_buf, "\251des", "comment" , 0); mov_write_string_metadata(s, pb_buf, "\251gen", "genre" , 0); Modified: trunk/libavformat/mp3.c ============================================================================== --- trunk/libavformat/mp3.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/mp3.c Mon Feb 1 12:39:10 2010 (r21587) @@ -214,7 +214,7 @@ static int id3v1_create_tag(AVFormatCont count += id3v1_set_string(s, "title", buf + 3, 30); count += id3v1_set_string(s, "author", buf + 33, 30); count += id3v1_set_string(s, "album", buf + 63, 30); - count += id3v1_set_string(s, "year", buf + 93, 4); + count += id3v1_set_string(s, "date", buf + 93, 4); count += id3v1_set_string(s, "comment", buf + 97, 30); if ((tag = av_metadata_get(s->metadata, "track", NULL, 0))) { buf[125] = 0; Modified: trunk/libavformat/oggparsevorbis.c ============================================================================== --- trunk/libavformat/oggparsevorbis.c Mon Feb 1 12:30:31 2010 (r21586) +++ trunk/libavformat/oggparsevorbis.c Mon Feb 1 12:39:10 2010 (r21587) @@ -36,8 +36,7 @@ * http://xiph.org/vorbis/doc/v-comment.html */ const AVMetadataConv ff_vorbiscomment_metadata_conv[] = { - { "ARTIST" , "author" }, - { "DATE" , "year" }, + { "ALBUMARTIST", "album_artist"}, { "TRACKNUMBER", "track" }, { 0 } };

1 0

[ffmpeg.org]: r421 - trunk/src/contact
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: cehoyos Date: Mon Feb 1 11:55:55 2010 New Revision: 421 Log: Try to clarify the usage of ffmpeg-devel. Modified: trunk/src/contact Modified: trunk/src/contact ============================================================================== --- trunk/src/contact Sat Jan 23 19:08:37 2010 (r420) +++ trunk/src/contact Mon Feb 1 11:55:55 2010 (r421) @@ -40,7 +40,8 @@ <a href="https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-devel/">ffmpeg-devel</a>: This list is for development of FFmpeg itself. It is not for -development of software that use the FFmpeg libraries. +development of software that use the FFmpeg libraries and not +for bug reports. <a href="https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-cvslog/">ffmpeg-cvslog</a>: This list gets all changes to the FFmpeg sources.

1 0

r21585 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 11:55:51 2010 New Revision: 21585 Log: Fix race condition with reading between video_current_pts and video_current_pts_time. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 11:32:17 2010 (r21584) +++ trunk/ffplay.c Mon Feb 1 11:55:51 2010 (r21585) @@ -168,7 +168,7 @@ typedef struct VideoState { AVStream *video_st; PacketQueue videoq; double video_current_pts; ///<current displayed pts (different from video_clock if frame fifos are used) - int64_t video_current_pts_time; ///<time (av_gettime) at which we updated video_current_pts - used to have running video pts + double video_current_pts_drift; ///<video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE]; int pictq_size, pictq_rindex, pictq_windex; SDL_mutex *pictq_mutex; @@ -942,7 +942,7 @@ static double get_video_clock(VideoState if (is->paused) { return is->video_current_pts; } else { - return is->video_current_pts + (av_gettime() - is->video_current_pts_time) / 1000000.0; + return is->video_current_pts_drift + av_gettime() / 1000000.0; } } @@ -990,15 +990,14 @@ static void stream_seek(VideoState *is, /* pause or resume the video */ static void stream_pause(VideoState *is) { - is->paused = !is->paused; - if (!is->paused) { + if (is->paused) { + is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts; if(is->read_pause_return != AVERROR(ENOSYS)){ - is->video_current_pts = get_video_clock(is); + is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0; } - - is->frame_timer += (av_gettime() - is->video_current_pts_time) / 1000000.0; - is->video_current_pts_time= av_gettime(); + is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0; } + is->paused = !is->paused; } static double compute_frame_delay(double frame_current_pts, VideoState *is) @@ -1070,7 +1069,7 @@ static void video_refresh_timer(void *op /* update current video pts */ is->video_current_pts = vp->pts; - is->video_current_pts_time = av_gettime(); + is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0; /* launch timer for next picture */ schedule_refresh(is, (int)(compute_frame_delay(vp->pts, is) * 1000 + 0.5)); @@ -1795,7 +1794,7 @@ static int stream_component_open(VideoSt is->frame_last_delay = 40e-3; is->frame_timer = (double)av_gettime() / 1000000.0; - is->video_current_pts_time = av_gettime(); +// is->video_current_pts_time = av_gettime(); packet_queue_init(&is->videoq); is->video_tid = SDL_CreateThread(video_thread, is);

1 0

r21584 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 11:32:17 2010 New Revision: 21584 Log: Try to more completely update time variables on unpause. Could not notice a differenc in behavior. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 10:53:37 2010 (r21583) +++ trunk/ffplay.c Mon Feb 1 11:32:17 2010 (r21584) @@ -115,6 +115,7 @@ typedef struct VideoState { int seek_flags; int64_t seek_pos; int64_t seek_rel; + int read_pause_return; AVFormatContext *ic; int dtg_active_format; @@ -991,8 +992,12 @@ static void stream_pause(VideoState *is) { is->paused = !is->paused; if (!is->paused) { - is->video_current_pts = get_video_clock(is); + if(is->read_pause_return != AVERROR(ENOSYS)){ + is->video_current_pts = get_video_clock(is); + } + is->frame_timer += (av_gettime() - is->video_current_pts_time) / 1000000.0; + is->video_current_pts_time= av_gettime(); } } @@ -2007,7 +2012,7 @@ static int decode_thread(void *arg) if (is->paused != is->last_paused) { is->last_paused = is->paused; if (is->paused) - av_read_pause(ic); + is->read_pause_return= av_read_pause(ic); else av_read_play(ic); }

1 0

r21583 - trunk/libavcodec/alsdec.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: thilo.borgmann Date: Mon Feb 1 10:53:37 2010 New Revision: 21583 Log: Remove unnecessary fields in ALSSpecificConfig. Modified: trunk/libavcodec/alsdec.c Modified: trunk/libavcodec/alsdec.c ============================================================================== --- trunk/libavcodec/alsdec.c Mon Feb 1 10:26:30 2010 (r21582) +++ trunk/libavcodec/alsdec.c Mon Feb 1 10:53:37 2010 (r21583) @@ -148,8 +148,6 @@ typedef struct { int rlslms; ///< use "Recursive Least Square-Least Mean Square" predictor: 1 = on, 0 = off int chan_config_info; ///< mapping of channels to loudspeaker locations. Unused until setting channel configuration is implemented. int *chan_pos; ///< original channel positions - uint32_t header_size; ///< header size of original audio file in bytes, provided for debugging - uint32_t trailer_size; ///< trailer size of original audio file in bytes, provided for debugging } ALSSpecificConfig; @@ -234,8 +232,6 @@ static av_cold void dprint_specific_conf dprintf(avctx, "chan_sort = %i\n", sconf->chan_sort); dprintf(avctx, "RLSLMS = %i\n", sconf->rlslms); dprintf(avctx, "chan_config_info = %i\n", sconf->chan_config_info); - dprintf(avctx, "header_size = %i\n", sconf->header_size); - dprintf(avctx, "trailer_size = %i\n", sconf->trailer_size); #endif } @@ -250,7 +246,7 @@ static av_cold int read_specific_config( MPEG4AudioConfig m4ac; ALSSpecificConfig *sconf = &ctx->sconf; AVCodecContext *avctx = ctx->avctx; - uint32_t als_id; + uint32_t als_id, header_size, trailer_size; init_get_bits(&gb, avctx->extradata, avctx->extradata_size * 8); @@ -333,14 +329,14 @@ static av_cold int read_specific_config( if (get_bits_left(&gb) < 64) return -1; - sconf->header_size = get_bits_long(&gb, 32); - sconf->trailer_size = get_bits_long(&gb, 32); - if (sconf->header_size == 0xFFFFFFFF) - sconf->header_size = 0; - if (sconf->trailer_size == 0xFFFFFFFF) - sconf->trailer_size = 0; + header_size = get_bits_long(&gb, 32); + trailer_size = get_bits_long(&gb, 32); + if (header_size == 0xFFFFFFFF) + header_size = 0; + if (trailer_size == 0xFFFFFFFF) + trailer_size = 0; - ht_size = ((int64_t)(sconf->header_size) + (int64_t)(sconf->trailer_size)) << 3; + ht_size = ((int64_t)(header_size) + (int64_t)(trailer_size)) << 3; // skip the header and trailer data

1 0

r21582 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 10:26:30 2010 New Revision: 21582 Log: Simplify get_video_clock() Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 04:12:01 2010 (r21581) +++ trunk/ffplay.c Mon Feb 1 10:26:30 2010 (r21582) @@ -938,13 +938,11 @@ static double get_audio_clock(VideoState /* get the current video clock value */ static double get_video_clock(VideoState *is) { - double delta; if (is->paused) { - delta = 0; + return is->video_current_pts; } else { - delta = (av_gettime() - is->video_current_pts_time) / 1000000.0; + return is->video_current_pts + (av_gettime() - is->video_current_pts_time) / 1000000.0; } - return is->video_current_pts + delta; } /* get the current external clock value */

1 0

r21581 - trunk/ffplay.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 04:12:01 2010 New Revision: 21581 Log: 10l, forgot HAS_ARG, -drp segfaulted. Modified: trunk/ffplay.c Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Mon Feb 1 01:18:49 2010 (r21580) +++ trunk/ffplay.c Mon Feb 1 04:12:01 2010 (r21581) @@ -2505,7 +2505,7 @@ static const OptionDef options[] = { { "vismv", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" }, { "fast", OPT_BOOL | OPT_EXPERT, {(void*)&fast}, "non spec compliant optimizations", "" }, { "genpts", OPT_BOOL | OPT_EXPERT, {(void*)&genpts}, "generate pts", "" }, - { "drp", OPT_INT |OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts 0=off 1=on -1=auto", ""}, + { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts 0=off 1=on -1=auto", ""}, { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" }, { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_loop_filter}, "", "" }, { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" },

1 0

r21580 - trunk/libavcodec/options.c
by subversion＠mplayerhq.hu 01 Feb '10

01 Feb '10

Author: michael Date: Mon Feb 1 01:18:49 2010 New Revision: 21580 Log: Set reordered_opaque during context alloc by default to AV_NOPTS_VALUE. This should make sure that pictures allocated prior to avcodec_decode_video() get AV_NOPTS_VALUE assigned. Modified: trunk/libavcodec/options.c Modified: trunk/libavcodec/options.c ============================================================================== --- trunk/libavcodec/options.c Sun Jan 31 19:54:32 2010 (r21579) +++ trunk/libavcodec/options.c Mon Feb 1 01:18:49 2010 (r21580) @@ -442,6 +442,7 @@ void avcodec_get_context_defaults2(AVCod s->palctrl = NULL; s->reget_buffer= avcodec_default_reget_buffer; + s->reordered_opaque= AV_NOPTS_VALUE; } AVCodecContext *avcodec_alloc_context2(enum CodecType codec_type){

1 0