RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics, pts->dts 

Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-06-22 08:53:44 +00:00
parent 148c8d8018
commit fabb990ec2
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/ffm.h
View File

@ -48,7 +48,7 @@ typedef struct FFMContext {
int first_packet; /* true if first packet, needed to set the discontinuity tag */ int first_packet; /* true if first packet, needed to set the discontinuity tag */
int packet_size; int packet_size;
int frame_offset; int frame_offset;
int64_t pts; int64_t dts;
uint8_t *packet_ptr, *packet_end; uint8_t *packet_ptr, *packet_end;
uint8_t packet[FFM_PACKET_SIZE]; uint8_t packet[FFM_PACKET_SIZE];
} FFMContext; } FFMContext;

30
libavformat/ffmdec.c
View File

@ -99,7 +99,7 @@ static int ffm_read_data(AVFormatContext *s,
retry_read: retry_read:
get_be16(pb); /* PACKET_ID */ get_be16(pb); /* PACKET_ID */
fill_size = get_be16(pb); fill_size = get_be16(pb);
ffm->pts = get_be64(pb); ffm->dts = get_be64(pb);
frame_offset = get_be16(pb); frame_offset = get_be16(pb);
get_buffer(pb, ffm->packet, ffm->packet_size - FFM_HEADER_SIZE); get_buffer(pb, ffm->packet, ffm->packet_size - FFM_HEADER_SIZE);
ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size); ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size);
@ -156,18 +156,18 @@ static void ffm_seek1(AVFormatContext *s, offset_t pos1)
url_fseek(pb, pos, SEEK_SET); url_fseek(pb, pos, SEEK_SET);
} }
static int64_t get_pts(AVFormatContext *s, offset_t pos) static int64_t get_dts(AVFormatContext *s, offset_t pos)
{ {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
int64_t pts; int64_t dts;
ffm_seek1(s, pos); ffm_seek1(s, pos);
url_fskip(pb, 4); url_fskip(pb, 4);
pts = get_be64(pb); dts = get_be64(pb);
#ifdef DEBUG_SEEK #ifdef DEBUG_SEEK
av_log(s, AV_LOG_DEBUG, "pts=%0.6f\n", pts / 1000000.0); av_log(s, AV_LOG_DEBUG, "pts=%0.6f\n", pts / 1000000.0);
#endif #endif
return pts; return dts;
} }
static void adjust_write_index(AVFormatContext *s) static void adjust_write_index(AVFormatContext *s)
@ -184,18 +184,18 @@ static void adjust_write_index(AVFormatContext *s)
pos_min = 0; pos_min = 0;
pos_max = ffm->file_size - 2 * FFM_PACKET_SIZE; pos_max = ffm->file_size - 2 * FFM_PACKET_SIZE;
pts_start = get_pts(s, pos_min); pts_start = get_dts(s, pos_min);
pts = get_pts(s, pos_max); pts = get_dts(s, pos_max);
if (pts - 100000 > pts_start) if (pts - 100000 > pts_start)
goto end; goto end;
ffm->write_index = FFM_PACKET_SIZE; ffm->write_index = FFM_PACKET_SIZE;
pts_start = get_pts(s, pos_min); pts_start = get_dts(s, pos_min);
pts = get_pts(s, pos_max); pts = get_dts(s, pos_max);
if (pts - 100000 <= pts_start) { if (pts - 100000 <= pts_start) {
while (1) { while (1) {
@ -207,7 +207,7 @@ static void adjust_write_index(AVFormatContext *s)
if (newpos == pos_min) if (newpos == pos_min)
break; break;
newpts = get_pts(s, newpos); newpts = get_dts(s, newpos);
if (newpts - 100000 <= pts) { if (newpts - 100000 <= pts) {
pos_max = newpos; pos_max = newpos;
@ -220,7 +220,7 @@ static void adjust_write_index(AVFormatContext *s)
} }
//printf("Adjusted write index from %"PRId64" to %"PRId64": pts=%0.6f\n", orig_write_index, ffm->write_index, pts / 1000000.); //printf("Adjusted write index from %"PRId64" to %"PRId64": pts=%0.6f\n", orig_write_index, ffm->write_index, pts / 1000000.);
//printf("pts range %0.6f - %0.6f\n", get_pts(s, 0) / 1000000. , get_pts(s, ffm->file_size - 2 * FFM_PACKET_SIZE) / 1000000. ); //printf("pts range %0.6f - %0.6f\n", get_dts(s, 0) / 1000000. , get_dts(s, ffm->file_size - 2 * FFM_PACKET_SIZE) / 1000000. );
end: end:
url_fseek(pb, ptr, SEEK_SET); url_fseek(pb, ptr, SEEK_SET);
@ -337,7 +337,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
ffm->packet_ptr = ffm->packet; ffm->packet_ptr = ffm->packet;
ffm->packet_end = ffm->packet; ffm->packet_end = ffm->packet;
ffm->frame_offset = 0; ffm->frame_offset = 0;
ffm->pts = 0; ffm->dts = 0;
ffm->read_state = READ_HEADER; ffm->read_state = READ_HEADER;
ffm->first_packet = 1; ffm->first_packet = 1;
return 0; return 0;
@ -431,8 +431,8 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in
pos_min = 0; pos_min = 0;
pos_max = ffm->file_size - 2 * FFM_PACKET_SIZE; pos_max = ffm->file_size - 2 * FFM_PACKET_SIZE;
while (pos_min <= pos_max) { while (pos_min <= pos_max) {
pts_min = get_pts(s, pos_min); pts_min = get_dts(s, pos_min);
pts_max = get_pts(s, pos_max); pts_max = get_dts(s, pos_max);
/* linear interpolation */ /* linear interpolation */
pos1 = (double)(pos_max - pos_min) * (double)(wanted_pts - pts_min) / pos1 = (double)(pos_max - pos_min) * (double)(wanted_pts - pts_min) /
(double)(pts_max - pts_min); (double)(pts_max - pts_min);
@ -441,7 +441,7 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in
pos = pos_min; pos = pos_min;
else if (pos >= pos_max) else if (pos >= pos_max)
pos = pos_max; pos = pos_max;
pts = get_pts(s, pos); pts = get_dts(s, pos);
/* check if we are lucky */ /* check if we are lucky */
if (pts == wanted_pts) { if (pts == wanted_pts) {
goto found; goto found;

8
libavformat/ffmenc.c
View File

@ -37,7 +37,7 @@ static void flush_packet(AVFormatContext *s)
/* put header */ /* put header */
put_be16(pb, PACKET_ID); put_be16(pb, PACKET_ID);
put_be16(pb, fill_size); put_be16(pb, fill_size);
put_be64(pb, ffm->pts); put_be64(pb, ffm->dts);
h = ffm->frame_offset; h = ffm->frame_offset;
if (ffm->first_packet) if (ffm->first_packet)
h |= 0x8000; h |= 0x8000;
@ -54,14 +54,14 @@ static void flush_packet(AVFormatContext *s)
/* 'first' is true if first data of a frame */ /* 'first' is true if first data of a frame */
static void ffm_write_data(AVFormatContext *s, static void ffm_write_data(AVFormatContext *s,
const uint8_t *buf, int size, const uint8_t *buf, int size,
int64_t pts, int header) int64_t dts, int header)
{ {
FFMContext *ffm = s->priv_data; FFMContext *ffm = s->priv_data;
int len; int len;
if (header && ffm->frame_offset == 0) { if (header && ffm->frame_offset == 0) {
ffm->frame_offset = ffm->packet_ptr - ffm->packet + FFM_HEADER_SIZE; ffm->frame_offset = ffm->packet_ptr - ffm->packet + FFM_HEADER_SIZE;
ffm->pts = pts; ffm->dts = dts;
} }
/* write as many packets as needed */ /* write as many packets as needed */
@ -180,7 +180,7 @@ static int ffm_write_header(AVFormatContext *s)
ffm->packet_end = ffm->packet + ffm->packet_size - FFM_HEADER_SIZE; ffm->packet_end = ffm->packet + ffm->packet_size - FFM_HEADER_SIZE;
assert(ffm->packet_end >= ffm->packet); assert(ffm->packet_end >= ffm->packet);
ffm->frame_offset = 0; ffm->frame_offset = 0;
ffm->pts = 0; ffm->dts = 0;
ffm->first_packet = 1; ffm->first_packet = 1;
return 0; return 0;