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

doxygenize a few comments

Browse Source 
very minor cleanup

Originally committed as revision 4601 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-09-20 18:47:08 +00:00
parent d2752a0ddf
commit 267e9dfa9d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ffplay.c
View File

@ -90,7 +90,7 @@ typedef struct PacketQueue {
#define SUBPICTURE_QUEUE_SIZE 4 #define SUBPICTURE_QUEUE_SIZE 4
typedef struct VideoPicture { typedef struct VideoPicture {
double pts; /* presentation time stamp for this picture */ double pts; ///<presentation time stamp for this picture
SDL_Overlay *bmp; SDL_Overlay *bmp;
int width, height; /* source height & width */ int width, height; /* source height & width */
int allocated; int allocated;
@ -162,17 +162,12 @@ typedef struct VideoState {
double frame_timer; double frame_timer;
double frame_last_pts; double frame_last_pts;
double frame_last_delay; double frame_last_delay;
double video_clock; double video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame
int video_stream; int video_stream;
AVStream *video_st; AVStream *video_st;
PacketQueue videoq; PacketQueue videoq;
double video_last_P_pts; /* pts of the last P picture (needed if B double video_current_pts; ///<current displayed pts (different from video_clock if frame fifos are used)
frames are present) */ 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; /* current displayed pts (different from
video_clock if frame fifos are used) */
int64_t video_current_pts_time; /* time at which we updated
video_current_pts - used to
have running video pts */
VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE]; VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
int pictq_size, pictq_rindex, pictq_windex; int pictq_size, pictq_rindex, pictq_windex;
SDL_mutex *pictq_mutex; SDL_mutex *pictq_mutex;
@ -1146,6 +1141,10 @@ static void alloc_picture(void *opaque)
SDL_UnlockMutex(is->pictq_mutex); SDL_UnlockMutex(is->pictq_mutex);
} }
/**
*
* @param pts the dts of the pkt / pts of the frame and guessed if not known
*/
static int queue_picture(VideoState *is, AVFrame *src_frame, double pts) static int queue_picture(VideoState *is, AVFrame *src_frame, double pts)
{ {
VideoPicture *vp; VideoPicture *vp;
@ -1221,7 +1220,10 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts)
return 0; return 0;
} }
/* compute the exact PTS for the picture if it is omitted in the stream */ /**
* compute the exact PTS for the picture if it is omitted in the stream
* @param pts1 the dts of the pkt / pts of the frame
*/
static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1) static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1)
{ {
double frame_delay, pts; double frame_delay, pts;
@ -1238,9 +1240,7 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1)
frame_delay = av_q2d(is->video_st->codec->time_base); frame_delay = av_q2d(is->video_st->codec->time_base);
/* for MPEG2, the frame can be repeated, so we update the /* for MPEG2, the frame can be repeated, so we update the
clock accordingly */ clock accordingly */
if (src_frame->repeat_pict) { frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
}
is->video_clock += frame_delay; is->video_clock += frame_delay;
#if defined(DEBUG_SYNC) && 0 #if defined(DEBUG_SYNC) && 0